astropanel 2.3 → 2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de884bc4fb426c44911a873006857920bd52313fcd5ac719578a4bc3357877a6
-  data.tar.gz: b367c2e2ba020f6bf3cd982da21d9cec58bce2d9e3598afca28d19ab0108e53d
+  metadata.gz: 939fa439565527c2c8b9f0ce4e1e13ab008bd3c23f153efd9e2e01d65a50fe45
+  data.tar.gz: 368bbb21a445bfff885cbf6a9b1f526fe11531cdb9be1ad0ad02760ca5818416
 SHA512:
-  metadata.gz: fd9cc4447bf4900d393986a317daf171cc460dbbed69fc3debcb8d90115e1dcc6d37fc3f3bb7bc8d66c13770adbcc7daee90372e74b56d515e3f3c19082c03b5
-  data.tar.gz: 57eadc094de148690f8a3a2b60c52c3933730a8a127f6b7a9d8ed7da70009833bbbdce88ee73caf0f72ca8db9ef69adf298fcd421d3e3c274785d96d1e55f3dc
+  metadata.gz: f393f7af8500905358502ef1a78b1e9c3808e883f8febc21bec01f84221b101fd00a305a5e7c6d522baf1fcf1343e9f9c42765fc542e2b673d925739880fa272
+  data.tar.gz: dd1447a1e2c3cc56f4e4d30e5284d0ceef71bc45e2dae203017b054789e4c3bbcb6ef826a682751bb39198a543c26203b03088571765ede52211e1fc1b5c5148

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.3: Greaceful exit when networks is down
+# Version:    2.6: 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 " \
@@ -758,70 +761,81 @@ class AstroPanelApp
   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]
+    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
 
@@ -914,11 +928,23 @@ class AstroPanelApp
   end
 
   def get_weather # {{{2
+    # Fetch weather from met.no, but never let network errors crash the app
     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 +965,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
@@ -985,25 +1011,34 @@ class AstroPanelApp
   end
 
   def get_planets # {{{2
+    # Build @planets entries for each unique date in @weather
     @planets.clear
-    12.times do |i|
-      date = (Date.today + i).strftime('%F')
-      ep   = Ephemeris.new(date,@lat,@lon,@tz.to_i)
+
+    # Collect exactly the dates we need (in first-seen order)
+    dates = @weather.map { |w| w[:date] }.uniq
+
+    dates.each do |date|
+      # Compute a fresh Ephemeris for that date
+      ep = Ephemeris.new(date, @lat, @lon, @tz.to_i)
+
+      # Start with the printed table + moon phase info
       entry = {
         table:  ep.print,
-        mphase: ep.mphase,   # e.g. 67.4
-        mph_s:  ep.mph_s     # e.g. "Waxing gibbous"
+        mphase: ep.mphase,
+        mph_s:  ep.mph_s
       }
-      Ephemeris::BODY_ORDER.each do |b|
-        arr = ep.send(b)
-        entry[:"#{b}_rise"] = arr[5]
-        entry[:"#{b}_set"]  = arr[7]
+
+      # Add rise/set times for each body
+      Ephemeris::BODY_ORDER.each do |body|
+        arr = ep.send(body)
+        entry[:"#{body}_rise"] = arr[5]
+        entry[:"#{body}_set"]  = arr[7]
       end
+
       @planets[date] = entry
     end
   end
 
-
   def get_events # {{{2
     @events.clear
     uri = URI(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: astropanel
 version: !ruby/object:Gem::Version
-  version: '2.3'
+  version: '2.6'
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-11 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.3:
-  Greaceful exit when networks is down.'
+  New in 2.0: Full rewrite using rcurses (https://github.com/isene/rcurses). 2.6:
+  Bug fix.'
 email: g@isene.com
 executables:
 - astropanel