tracing and changes

crates/modules/src/clock.rs

@@ -29,7 +29,7 @@ pub struct Clock {
 #[derive(Deserialize, Default)]
 struct ClockConfig {
     #[serde(default)]
-    format: bool,
+    show_seconds: bool,
 }
 
 impl Clock {
@@ -37,7 +37,7 @@ impl Clock {
         match config_clock(config) {
             Some(x) => Self {
                 value: "--:--:--".to_string(),
-                show_seconds: x.format,
+                show_seconds: x.show_seconds,
             },
             None => Self::default(),
         }
@@ -102,6 +102,7 @@ impl BarModule for Clock {
         match msg.downcast::<ClockMsg>() {
             Some(ClockMsg::ToggleSeconds) => {
                 self.show_seconds = !self.show_seconds;
+                tracing::debug!(show_seconds = self.show_seconds, "clock toggle");
                 let want = if self.show_seconds {
                     ClockKind::Seconds
                 } else {

crates/modules/src/weather.rs

@@ -1,6 +1,10 @@
 use std::error::Error;
 
-use common::{BarModule, Endpoint, ModuleEffect, Service, WeatherKind, WeatherMsg, Wire};
+use chrono::Timelike;
+use common::{
+    BarModule, ClockKind, ClockPayload, Endpoint, Hourly, ModuleEffect, Service, WeatherKind,
+    WeatherMsg, WeatherPayload, WeatherResponse, Wire,
+};
 use iced::{
     widget::{container, mouse_area, text},
     Element, Task,
@@ -8,11 +12,37 @@ use iced::{
 
 pub struct WeatherModule {
     text: String,
+    /// Cached hourly forecast from the last weather update.
+    hourly: Option<Hourly>,
+    /// Current hour, mirrored from the datetime service's clock ticks.
+    hour: Option<u32>,
+}
+
+impl WeatherModule {
+    /// Shows the forecast temperature for the tracked current hour.
+    fn refresh(&mut self) {
+        let (Some(hourly), Some(hour)) = (&self.hourly, self.hour) else {
+            return;
+        };
+        if let Some(i) = hourly.time.iter().position(|t| t.hour() == hour) {
+            if let Some(&temp) = hourly.temperature_2m.get(i) {
+                let value = format!("{}°", temp as i32);
+                if self.text != value {
+                    self.text = value;
+                    tracing::info!(hour, temp, "weather: current hour");
+                }
+            }
+        }
+    }
 }
 
 impl Default for WeatherModule {
     fn default() -> Self {
-        Self { text: "hi".into() }
+        Self {
+            text: "waiting ".into(),
+            hourly: None,
+            hour: None,
+        }
     }
 }
 
@@ -32,18 +62,36 @@ impl BarModule for WeatherModule {
     }
 
     fn update(&mut self, msg: Wire) -> Task<ModuleEffect> {
+        // Weather state: cache the hourly forecast, then show the current hour.
+        if let Some(env) = msg.downcast::<WeatherPayload>() {
+            match env.kind {
+                WeatherMsg::State => match env.payload.downcast_ref::<WeatherResponse>() {
+                    Some(resp) => {
+                        self.hourly = Some(resp.hourly.clone());
+                        self.refresh();
+                    }
+                    None => tracing::warn!("weather payload was not a WeatherResponse"),
+                },
+            }
+        }
+        // Clock tick from the datetime service: track the current hour.
+        if let Some(payload) = msg.downcast::<ClockPayload>() {
+            self.hour = payload.value.split(':').next().and_then(|h| h.parse().ok());
+            self.refresh();
+        }
         match msg.downcast::<WeatherKind>() {
             Some(WeatherKind::Poke) => {
+                tracing::debug!("weather poked");
                 self.text = "poked".into();
-                Task::none()
             }
-            None => Task::none(),
+            None => (),
         }
+        Task::none()
     }
 
     /// Route keys this module subscribes to.
     fn services(&self) -> Vec<Service> {
-        vec![WeatherMsg::State.key()]
+        vec![WeatherMsg::State.key(), ClockKind::Seconds.key()]
     }
 
     /// Optional: read `module.weather` from the config table.