astropanel 4.0.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 721a794f0a0c6c84cafa4dff6c93ad6741a247ece7710809735b631a3c9a782c
-  data.tar.gz: 1ddffb11f1a0f61b2764295e846dfd80ca74497b5025ab4fdc716d632496f067
+  metadata.gz: d9868bc13e6a6ee12c977d549646731414134fa1a3efcc369011f4ab905ac19e
+  data.tar.gz: eeecdb2b16dafa1d5fb7c7eed003786ade001843be356051ccaa3d9093e19c4d
 SHA512:
-  metadata.gz: 0ae5ab39b7eea65c3338d73e4041926a9850eb9c7b8c18241a75f530b83d7e61592a188cf0f7af029744dd53f929f23fb684a7b5c62398eef8cdc40d2055fbbf
-  data.tar.gz: '08227fd9689b5d494518a8f465c0835c63bb082e3cd615f0f7f6c5272eb2fb117de618457ac31a48055274e6f51c0f0396fd350f5c12a45d1008781f10b103cb'
+  metadata.gz: f63cb7786331c386cb05cf098fb70f6e22722e2ec56c020d84fac57840769420342d16f36cd4335e199044bb1aa70d3f8880e97c3a9496509659c28d0b56fed0
+  data.tar.gz: 3363eab644b0fde17f2dbf0c4f5b9d2982e48527edb9355510ae3fc5c2566d90cedbec9fd76fb84719cdc733bd11a73d8042ad46e81b7758d52242720defd94e

data/README.md

@@ -1,5 +1,11 @@
 # Astropanel
 
+[![Gem Version](https://badge.fury.io/rb/astropanel.svg)](https://badge.fury.io/rb/astropanel)
+[![Ruby](https://img.shields.io/badge/Ruby-CC342D?style=flat&logo=ruby&logoColor=white)](https://www.ruby-lang.org/)
+[![License](https://img.shields.io/badge/License-Public%20Domain-brightgreen.svg)](https://unlicense.org/)
+[![GitHub stars](https://img.shields.io/github/stars/isene/astropanel.svg)](https://github.com/isene/astropanel/stargazers)
+[![Stay Amazing](https://img.shields.io/badge/Stay-Amazing-blue.svg)](https://isene.org)
+
 <img src="logo.jpg" align="left" width="150" height="150">Terminal program for
 amateur astronomers with weather forecast, ephemeris, astronomical events and
 more. It's what you need to decide wether to take your telescope out for a

data/bin/astropanel

@@ -14,7 +14,7 @@
 #             for any damages resulting from its use. Further, I am under no
 #             obligation to maintain or extend this software. It is provided 
 #             on an 'as is' basis without any expressed or implied warranty.
-# Version:    4.0.0: Breaking change - requires rcurses 6.0.0+ with explicit initialization
+# Version:    4.1.1: Add network error handling & input validation
 #             for Ruby 3.4+ compatibility
 
 # LOAD MODULES {{{1
@@ -27,6 +27,7 @@ require 'json'
 require 'date'
 require 'time'
 require 'rcurses'
+require 'termpix'
 include Rcurses
 include Rcurses::Input
 include Rcurses::Cursor
@@ -558,19 +559,19 @@ class AstroPanelApp
       end
     end
 
-    # 8) Bortle scale (0.0–9.0) {{{3
+    # 8) Bortle scale (1..9) {{{3
     loop do
-      input = @footer.ask("Bortle scale (0.0–9.0): ", "")
+      input = @footer.ask("Bortle scale (1..9): ", "")
       if input.strip.empty?
         @footer.say("Bortle value is required")
         next
       end
       val = input.to_f
-      if (0.0..9.0).include?(val)
+      if (1.0..9.0).include?(val)
         @bortle = val
         break
       else
-        @footer.say("Enter a number between 0.0 and 9.0")
+        @footer.say("Enter a number between 1 and 9")
       end
     end
   end
@@ -613,34 +614,34 @@ class AstroPanelApp
   end
 
   def setup_image_display # {{{2
-    # allow override from ~/.ap.conf
-    @w3mimgdisplay ||= "/usr/lib/w3m/w3mimgdisplay"
-    @showimage     = File.executable?(@w3mimgdisplay)
+    @termpix = Termpix::Display.new
+    @showimage = @termpix.supported?
     @current_image = nil
   end
 
   def check_image_redraw # {{{2
     # Only check if image display is enabled
     return unless @showimage
-    
+
     # Only check if we have an image currently displayed
     return unless @current_image && File.exist?(@current_image)
-    
+
     begin
-      # Check if we're in the active window - if not, image overlay might be cleared
-      active_window = `xdotool getactivewindow 2>/dev/null`.chomp
-      return if active_window.empty?
-      
-      # Check if this terminal window is the active one
-      current_window = `xdotool getwindowfocus 2>/dev/null`.chomp
-      
-      # Only redraw if we detect a focus change (simple heuristic)
-      if @last_active_window && @last_active_window != active_window && current_window == active_window
-        # Window focus changed and we're now active - redraw image
-        show_image(@current_image)
+      # For w3m protocol, check if image overlay was cleared
+      if @termpix.protocol == :w3m
+        active_window = `xdotool getactivewindow 2>/dev/null`.chomp
+        return if active_window.empty?
+
+        current_window = `xdotool getwindowfocus 2>/dev/null`.chomp
+
+        # Only redraw if we detect a focus change
+        if @last_active_window && @last_active_window != active_window && current_window == active_window
+          show_image(@current_image)
+        end
+
+        @last_active_window = active_window
       end
-      
-      @last_active_window = active_window
+      # Sixel images persist, no redraw needed
     rescue
       # Silently fail - we don't want focus checking to break anything
     end
@@ -650,47 +651,32 @@ class AstroPanelApp
     return unless @showimage
 
     begin
-      # if anything in here takes longer than 2s, we skip it
       Timeout.timeout(2) do
-        # grab window pixel dimensions
-        info = `xwininfo -id $(xdotool getactivewindow) 2>/dev/null`
-        return unless info =~ /Width:\s*(\d+).*Height:\s*(\d+)/m
-        term_w, term_h = $1.to_i, $2.to_i
-
-        # compute character‐cell size
         rows, cols = IO.console.winsize
-        cw = term_w.to_f / cols
-        ch = term_h.to_f / rows
 
-        # top‐left pixel of the image
-        px = ((@main.x - 1) * cw).to_i
-        py = (24 * ch).to_i
+        # Always clear previous image first to prevent overlapping
+        @termpix.clear(
+          x: @main.x - 1,
+          y: 24,
+          width: @main.w,
+          height: rows - 26,
+          term_width: cols,
+          term_height: rows)
 
         if file && File.exist?(file) && File.size(file) > 0
-          # read & scale the image
-          iw, ih = `identify -format "%wx%h" #{file}`.split('x').map(&:to_i)
-          max_w = ((@main.w - 3) * cw).to_i
-          max_h = ((rows - 26) * ch).to_i
-          if iw > max_w
-            ih = ih * max_w / iw; iw = max_w
-          end
-          if ih > max_h
-            iw = iw * max_h / ih; ih = max_h
-          end
-
-          # Clear image area
-          `echo "6;#{px};#{py};#{max_w};#{max_h};\n4;\n3;" | #{@w3mimgdisplay} 2>/dev/null`
-          `echo "0;1;#{px};#{py};#{iw};#{ih};;;;;\"#{file}\"\n4;\n3;" | #{@w3mimgdisplay} 2>/dev/null`
-          
-          # Track the current image
+          # Display new image using termpix (same positioning as original)
+          @termpix.show(file,
+            x: @main.x - 1,
+            y: 27,
+            max_width: @main.w - 3,
+            max_height: rows - 26)
           @current_image = file
         else
-          # Clear image if no file or file doesn't exist
           @current_image = nil
         end
       end
     rescue Timeout::Error
-      # silently skip if w3mimgdisplay/identify/xwininfo hangs
+      # silently skip if image display hangs
     end
   end
 
@@ -733,9 +719,15 @@ class AstroPanelApp
   end
 
   def apod # {{{2
-    html = Net::HTTP.get(URI('https://apod.nasa.gov/apod/astropix.html'))
+    begin
+      html = Net::HTTP.get(URI('https://apod.nasa.gov/apod/astropix.html'))
+    rescue SocketError, Socket::ResolutionError, Timeout::Error,
+           Net::OpenTimeout, Net::ReadTimeout, Errno::ECONNREFUSED,
+           Errno::EHOSTUNREACH, Errno::ENETUNREACH, OpenURI::HTTPError => e
+      return @footer.say("APOD unavailable (network error: #{e.class})")
+    end
     img  = html[/IMG SRC="(.*?)"/,1]
-    return @footer.say("⚠️ could not parse APOD URL") unless img
+    return @footer.say("Could not parse APOD URL") unless img
 
     full = "https://apod.nasa.gov/apod/#{img}"
     tmp  = "/tmp/apod.jpg"
@@ -745,10 +737,10 @@ class AstroPanelApp
         @current_image = tmp
         show_image(@current_image)
       else
-        @footer.say("⚠️ empty apod.jpg")
+        @footer.say("Empty apod.jpg")
       end
     else
-      @footer.say("⚠️ curl APOD failed")
+      @footer.say("APOD download failed")
     end
   end
 
@@ -858,8 +850,9 @@ class AstroPanelApp
     if @main.update
       update_main
       @main.update = false
+      show_image(@current_image) if @current_image
     end
-    
+
     update_titles # Always update titles as they're lightweight
   end
 
@@ -1070,13 +1063,31 @@ class AstroPanelApp
     when 'END'     then @index = @weather.size - 1
     when '?'       then @main.say(HELP); getchr; @main.update = true
     when 'l'       then @loc           = @footer.ask('Loc? ', @loc); @header.update = @footer.update = true
-    when 'a'       then @lat           = @footer.ask('Lat? ', @lat.to_s).to_f; @header.update = @footer.update = true
-    when 'o'       then @lon           = @footer.ask('Lon? ', @lon.to_s).to_f; @header.update = @footer.update = true
+    when 'a'
+      val = @footer.ask('Lat? (-90..90) ', @lat.to_s).to_f
+      if (-90.0..90.0).include?(val)
+        @lat = val; @header.update = @footer.update = true
+      else
+        @footer.say("Latitude must be -90..90"); @footer.update = true
+      end
+    when 'o'
+      val = @footer.ask('Lon? (-180..180) ', @lon.to_s).to_f
+      if (-180.0..180.0).include?(val)
+        @lon = val; @header.update = @footer.update = true
+      else
+        @footer.say("Longitude must be -180..180"); @footer.update = true
+      end
     when 'c'       then @cloudlimit    = @footer.ask('Maximum Cloud coverage? ', @cloudlimit.to_s).to_i; @footer.update = true
     when 'h'       then @humiditylimit = @footer.ask('Maximum Humidity? ', @humiditylimit.to_s).to_i; @footer.update = true
     when 't'       then @templimit     = @footer.ask('Minimum Temperature? ', @templimit.to_s).to_i; @footer.update = true
     when 'w'       then @windlimit     = @footer.ask('Maximum Wind? ', @windlimit.to_s).to_i; @footer.update = true
-    when 'b'       then @bortle        = @footer.ask('Bortle? ', @bortle.to_s).to_f; @footer.update = true
+    when 'b'
+      val = @footer.ask('Bortle? (1..9) ', @bortle.to_s).to_f
+      if (1.0..9.0).include?(val)
+        @bortle = val; @footer.update = true
+      else
+        @footer.say("Bortle must be 1..9"); @footer.update = true
+      end
     when 'e'       then show_all_events; @main.update = true
     when 's'       then starchart; @main.update = true
     when 'S'       then system("xdg-open /tmp/starchart.jpg &")
@@ -1211,7 +1222,14 @@ class AstroPanelApp
       "https://in-the-sky.org/rss.php?feed=dfan"\
       "&latitude=#{@lat}&longitude=#{@lon}&timezone=#{@loc}"
     )
-    raw = Net::HTTP.get(uri)
+    begin
+      raw = Net::HTTP.get(uri)
+    rescue SocketError, Socket::ResolutionError, Timeout::Error,
+           Net::OpenTimeout, Net::ReadTimeout, Errno::ECONNREFUSED,
+           Errno::EHOSTUNREACH, Errno::ENETUNREACH, OpenURI::HTTPError => e
+      @footer.say("Events unavailable (network error: #{e.class})")
+      return
+    end
 
     raw.scan(/<item>(.*?)<\/item>/m).each do |match|
       item = match.first
@@ -1247,9 +1265,10 @@ end
 # START PROGRAM {{{1
 begin
   # a single quick DNS + TCP check
-  TCPSocket.new('api.met.no', 443).close
-rescue SocketError, Socket::ResolutionError => e
-  $stderr.puts "FATAL: can't resolve api.met.no – network appears down (#{e.message})"
+  Timeout.timeout(5) { TCPSocket.new('api.met.no', 443).close }
+rescue SocketError, Socket::ResolutionError, Timeout::Error,
+       Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ENETUNREACH => e
+  $stderr.puts "Cannot reach api.met.no, network appears down (#{e.class}: #{e.message})"
   $stdin.cooked!
   $stdin.echo = true
   exit!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: astropanel
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-15 00:00:00.000000000 Z
+date: 2026-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcurses
@@ -24,12 +24,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
-description: 'This program shows essential data in order to plan your observations:
-  9 days weather forecast, full ephemeris for the Sun, the Moon and all major planets,
-  complete with graphic representation of rise/set times, detailed info for each day
-  with important astronomical events, star chart displayed in the terminal and more.
-  Version 4.0.0: Breaking change - requires rcurses 6.0.0+ with explicit initialization
-  for Ruby 3.4+ compatibility.'
+- !ruby/object:Gem::Dependency
+  name: termpix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+description: 'AstroPanel v4.1.1: Modern image display using termpix gem with Sixel
+  and w3m protocol support. This program shows essential data in order to plan your
+  observations: 9 days weather forecast, full ephemeris for the Sun, the Moon and
+  all major planets, complete with graphic representation of rise/set times, detailed
+  info for each day with important astronomical events, star chart displayed in the
+  terminal and more.'
 email: g@isene.com
 executables:
 - astropanel