astropanel 2.2 → 2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18a6f4c22f384f633ee5d6ceccf1c360b5531ef0b60b2515330bcc67943462fa
-  data.tar.gz: 53d3eec673b1e085eeeff5255e28a42d3241499ec9f0bcbe277b9da040b30d40
+  metadata.gz: ba68a8b88ebc1705f759ebf2b93bb0bfc8f13a0fc3ee75b8223e0c0f46f7e0d5
+  data.tar.gz: 7cd712f5bbc7951d13c6b6f1394984950bc732970ce593b21a2d78d1d94f4ad4
 SHA512:
-  metadata.gz: 9c6298b4461d14b5e7f588d2ac25e0f27b584b3ba3d3173c800edfcff5037c0d828594804fc0c3babe496b0c5153238b6bd213d2fef75a69b4dfd2c32bf2b6d1
-  data.tar.gz: 30e9ad3300d9db14a584c57efc30f6edf5cb231cbb35ce0e920db7cc8dbcd7b040950eaa8b1d09c9ffbf7afd91ac814a94a0fcdc074bb2bbeead9ea7ff8c2c6f
+  metadata.gz: 072c8766c42c619a0999c8aa715bfc35e696f3798c1db3f0124c76b8f3531059369c0826dde7b42745ba7c7dbf925c9edfddc543ad68f1e2301bc6146955b784
+  data.tar.gz: 70cb74c006fc864713f93f67615339fef2cc90f8e4776b355797c79ea80bd0fd66feb02d4357b1f643025fa31cfde99df468337590cf900d287a383fcc62b069

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:    2.2: Fixed help (key '?')
+# Version:    2.5: Bug fix
 
 # LOAD MODULES {{{1
 require 'io/console'
@@ -31,9 +31,6 @@ include Rcurses::Input
 include Rcurses::Cursor
 
 # BASIC SETUP {{{1
-$stdin.raw!
-$stdin.echo = false
-
 CONFIG_FILE = File.join(Dir.home, '.ap.conf')
 
 # CLASS EXTENSIONS {{{1
@@ -56,13 +53,6 @@ class String # {{{2
   end
 end
 
-# AT_EXIT {{{1
-at_exit do
-  $stdin.cooked!
-  $stdin.echo = true
-  Rcurses.clear_screen
-  Cursor.show
-end
 
 # EPHEMERIS CORE {{{1
 class Ephemeris
@@ -728,27 +718,40 @@ class AstroPanelApp
     @header.say(txt.ljust(cols))
   end
 
-  def update_titles # {{{2
+  # Update the top‐bar title line, safely handling missing planet data
+  def update_titles
     _, cols = IO.console.winsize
 
-    title  = "                 …#{@cloudlimit}%   …#{@humiditylimit}%    "\
-            "#{@templimit}°C…   …#{@windlimit}m/s".fg(244)
+    # Base limits display
+    title  = "                 …#{@cloudlimit}%   …#{@humiditylimit}%    " \
+             "#{@templimit}°C…   …#{@windlimit}m/s".fg(244)
 
-    date = @weather[@index][:date]
-    hr   = @weather[@index][:hour]
-    col  = cond_color(@index)
-
-    # fetch this day's moon info (illumination % and phase name)
-    mp, mp_name = @planets[date].values_at(:mphase, :mph_s)
+    # Current date/hour
+    if @weather[@index]
+      date = @weather[@index][:date]
+      hr   = @weather[@index][:hour]
+      col  = cond_color(@index)
+    else
+      date = nil
+      hr   = nil
+      col  = 244
+    end
 
     title << '     ⋮ ⋮ ⋮ ⋮ ⋮ ⋮ ⋮ ⋮ ⋮      '.fg(244)
-    title << "#{date} (#{Date.parse(date).strftime("%A")}) #{hr}:00".b.fg(col)
-    title << "  Moon: #{mp_name} (#{mp}%)".fg(244)
+    title << "#{date}#{ date ? " (#{Date.parse(date).strftime("%A")}) #{hr}:00" : ""}".b.fg(col)
 
+    # Safely fetch moon‐phase info (mphase/mph_s) if it exists
+    if date && (pd = @planets[date])
+      mp, mp_name = pd.values_at(:mphase, :mph_s)
+      title << "  Moon: #{mp_name} (#{mp}%)".fg(244)
+    else
+      title << "  Moon: unavailable".fg(244)
+    end
+
+    @titles.clear
     @titles.say(title.ljust(cols))
   end
 
-
   def update_footer # {{{2
     _, cols = IO.console.winsize
     cmds = "?=Help l=Loc a=Lat o=Lon c=Cloud h=Hum t=Temp w=Wind b=Bortle " \
@@ -757,71 +760,85 @@ class AstroPanelApp
     @footer.say(cmds.ljust(cols))
   end
 
-  def update_left # {{{2
-    # build an array of all lines
-    date_n = date_n = ''
-    all_lines = @weather.each_with_index.map do |w,i|
-      col = cond_color(i) # choose row‐color
-      mp = @planets[w[:date]][:mphase]
-
-      # fixed‐width values tinted
-      date_o  =    date_n
-      date_n  =    w[:date] 
-      date_s  = (date_n == date_o ? " ".ljust(10) : date_n) 
-      hour_s  =    w[:hour]
+  # Redraw the left‐pane list of weather + visibility blocks,
+  # Redraw the left‐pane list of weather + visibility blocks,
+  # safely handling missing planet data and converting rise/set to integers
+  def update_left
+    date_o = ''
+    date_n = ''
+
+    all_lines = @weather.each_with_index.map do |w, i|
+      col = cond_color(i)
+
+      # Safely fetch planet data for this date (may be nil)
+      pd = @planets[w[:date]] || {}
+      mp = pd[:mphase]
+
+      # Prepare date display, only show the date when it changes
+      date_o = date_n
+      date_n = w[:date]
+      date_s = (date_n == date_o ? ' '.ljust(10) : date_n)
+
+      # Fixed‐width weather columns
+      hour_s  = w[:hour]
       cloud_s = "#{w[:cloud]}%".rjust(4)
       hum_s   = "#{w[:humidity]}%".rjust(5)
       tmp_s   = "#{w[:temp]}°C".rjust(6)
       wnd_s   = "#{w[:wind]}(#{w[:wdir]})".rjust(8)
 
-      # start composing this row
+      # Build the left‐pane row
       row  = "#{date_s}  ".fg(col)
       ul   = "#{hour_s}  #{cloud_s}  #{hum_s}  #{tmp_s}  #{wnd_s}".fg(col)
       ul   = ul.u if i == @index
       row += ul
 
-      # event marker
+      # Event marker
       if ev = @events[w[:date]] and ev[:time][0..1] == w[:hour]
         row += "  !".fg(col)
       else
         row += "   "
       end
 
-      # one‐space‐prefixed visibility blocks
-      BODIES.each_with_index do |b,i|
-        rise = @planets[w[:date]][:"#{b}_rise"][0..1].to_i rescue nil
-        set  = @planets[w[:date]][:"#{b}_set"][0..1].to_i   rescue nil
-        hr   = w[:hour].to_i
-
-        above = if rise.nil? || set.nil?
-          false
-        elsif rise > set
-          hr >= rise || hr <= set
+      # Visibility blocks for Sun, Moon & planets
+      BODIES.each_with_index do |b, j|
+        # Extract just the hour component from rise/set, convert to Integer
+        rise_h = pd[:"#{b}_rise"] ? pd[:"#{b}_rise"][0..1].to_i : nil
+        set_h  = pd[:"#{b}_set"]  ? pd[:"#{b}_set"][0..1].to_i  : nil
+        hr     = w[:hour].to_i
+
+        above = if rise_h.nil? || set_h.nil?
+                  false
+                elsif rise_h > set_h
+                  (hr >= rise_h) || (hr <= set_h)
+                else
+                  (hr >= rise_h) && (hr <= set_h)
+                end
+
+        # Choose block character and color
+        block_char = (0..1) === j ? '█' : '┃'
+        if above
+          color = (b == 'moon' ? moon_phase_color(mp) : BODY_COLORS[b])
+          block = block_char.fg(color)
         else
-          hr >= rise && hr <= set
+          block = ' '
         end
-        block = above ? ((0..1) === i ? '█' : '┃').fg(b == 'moon' ? moon_phase_color(mp) : BODY_COLORS[b]) : ' '
+
         row << " #{block}"
       end
 
       row
     end
 
-    # stash into the left pane’s buffer
+    # Write into the pane buffer and center the selection
     @left.text = all_lines.join("\n")
+    height    = @left.h
 
-    # figure out how many rows we can show
-    height = @left.h
-
-    # center the selection (３-row “scroll‐off”)…
     top = @index - (height / 2)
     top = 0 if top < 0
     max_top = all_lines.size - height
     top = max_top if top > max_top
 
     @left.ix = top
-
-    # redraw just the left pane
     @left.refresh
   end
 
@@ -913,12 +930,24 @@ class AstroPanelApp
     update_main
   end
 
-  def get_weather # {{{2
+  # Fetch weather from met.no, but never let network errors crash the app
+  def get_weather
     uri = URI("https://api.met.no/weatherapi/locationforecast/2.0/complete?lat=#{@lat}&lon=#{@lon}")
     req = Net::HTTP::Get.new(uri)
     req['User-Agent'] = 'astropanel/1.0 g@isene.com'
-    res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) { |http| http.request(req) }
-    
+
+    begin
+      res = Net::HTTP.start(uri.hostname, uri.port,
+                            use_ssl: true,
+                            read_timeout: 10) do |http|
+        http.request(req)
+      end
+    rescue SocketError, Socket::ResolutionError, Timeout::Error, Net::OpenTimeout => e
+      @footer.say("⚠️ Weather fetch failed: #{e.class}: #{e.message}")
+      @weather = []
+      return
+    end
+
     if res.is_a?(Net::HTTPSuccess)
       series = JSON.parse(res.body)
                     .dig('properties','timeseries') || []
@@ -939,7 +968,7 @@ class AstroPanelApp
         }
       end
     else
-      @footer.say("Weather API error: #{res.code} #{res.message}")
+      @footer.say("⚠️ Weather API error: #{res.code} #{res.message}")
       @weather = []
     end
   end
@@ -1043,6 +1072,17 @@ class AstroPanelApp
   end
 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})"
+  $stdin.cooked!
+  $stdin.echo = true
+  exit!
+end
+
 AstroPanelApp.new
 
 # VIM MODELINE{{{1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: astropanel
 version: !ruby/object:Gem::Version
-  version: '2.2'
+  version: '2.5'
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-10 00:00:00.000000000 Z
+date: 2025-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcurses
@@ -28,8 +28,8 @@ description: 'This program shows essential data in order to plan your observatio
   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.
-  New in 2.0: Full rewrite using rcurses (https://github.com/isene/rcurses). 2.2:
-  Fixed help (key ''?'')'
+  New in 2.0: Full rewrite using rcurses (https://github.com/isene/rcurses). 2.5:
+  Bug fix.'
 email: g@isene.com
 executables:
 - astropanel