updated tui for new weather api

Minigrim0 · Minigrim0 · commit bbe8a23e5c65 · 2025-02-11T11:01:29.000+01:00
diff --git a/tui/Cargo.toml b/tui/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2021"
 color-eyre = { version = "0.6.3" }
 crossterm = { version = "0.28.1" }
 ratatui = { version = "0.29.0" }
-common = { path = "../common" }
+common = { path = "../common", features = ["network"] }
 tokio = "1.39.2"
 chrono = "0.4.38"
 simplelog = "0.12.2"
diff --git a/tui/src/app.rs b/tui/src/app.rs
@@ -5,7 +5,7 @@ use std::time::{Duration, SystemTime};
 
 use ratatui::{
     crossterm::event::{self, poll, Event, KeyCode, KeyEvent, KeyEventKind},
-    layout::{Constraint, Layout, Rect},
+    layout::{Constraint, Layout},
     Frame,
 };
 
@@ -46,35 +46,19 @@ impl App {
     }
 
     fn render_frame(&self, frame: &mut Frame) {
-        let chunks = Layout::horizontal([
-            Constraint::Ratio(1, 3); 3
-        ])
-        .split(frame.area());
-
-        let middle_split = Layout::vertical([
-            Constraint::Ratio(4, 5),
-            Constraint::Ratio(1, 5),
-        ])
-        .split(chunks[1]);
-
-        frame.render_widget(
-            &self.weather,
-            chunks[0],
-        );
-        frame.render_widget(
-            &self.datetime,
-            middle_split[0],
-        );
-        frame.render_widget(
-            &self.currency,
-            middle_split[1],
-        );
-        frame.render_widget(
-            &self.transports,
-            chunks[2],
-        );
+        let chunks = Layout::horizontal([Constraint::Ratio(1, 3); 3])
+            .split(frame.area());
+
+        let middle_split = Layout::vertical([Constraint::Ratio(4, 5), Constraint::Ratio(1, 5)])
+            .split(chunks[1]);
+
+        frame.render_widget(&self.weather, chunks[0]);
+        frame.render_widget(&self.datetime, middle_split[0]);
+        frame.render_widget(&self.currency, middle_split[1]);
+        frame.render_widget(&self.transports, chunks[2]);
     }
 
+    /// Updates the state of the application every frame
     fn update_state(&mut self) -> io::Result<()> {
         match SystemTime::now().duration_since(self.weather.last_refresh) {
             Ok(duration) => {
@@ -103,6 +87,18 @@ impl App {
             Err(e) => self.transports.departures.error = Some(e.to_string()),
         }
 
+        match SystemTime::now().duration_since(self.weather.last_forecast_change) {
+            Ok(duration) => {
+                if duration.as_secs() > 5 {
+                    self.weather.current_forecast_day = (self.weather.current_forecast_day + 1) % 7;
+                    self.weather.last_forecast_change = SystemTime::now();
+                }
+            },
+            Err(e) => {
+                eprintln!("Error: {}", e.to_string());
+            }
+        }
+
         Ok(())
     }
 
diff --git a/tui/src/currency.rs b/tui/src/currency.rs
@@ -3,11 +3,10 @@ use std::time::{Duration, SystemTime};
 
 use ratatui::{
     buffer::Buffer,
-    layout::{Alignment, Rect},
+    layout::Rect,
     style::Stylize,
     text::{Line, Text},
     widgets::{
-        block::{Position, Title},
         Block, Paragraph, Widget,
     },
 };
@@ -44,7 +43,7 @@ impl CurrencyComponent {
 
 impl Widget for &CurrencyComponent {
     fn render(self, area: Rect, buf: &mut Buffer) {
-        let last_refreshed = Title::from(Line::from(
+        let last_refreshed = Line::from(
             match SystemTime::now().duration_since(self.last_refresh) {
                 Ok(duration) => {
                     let minutes = duration.as_secs() / 60;
@@ -56,14 +55,11 @@ impl Widget for &CurrencyComponent {
                 }
                 Err(e) => format!("Err: {}", e.to_string()),
             },
-        ));
-
-        let currency_block = Block::new().title(
-            last_refreshed
-                .alignment(Alignment::Center)
-                .position(Position::Bottom),
         );
 
+        let currency_block = Block::new()
+            .title_bottom(last_refreshed.centered());
+
         let currency_text: Text = match &self.conversion {
             Ok(conversion) => {
                 let refresh_date = {
diff --git a/tui/src/transports.rs b/tui/src/transports.rs
@@ -3,12 +3,11 @@ use std::time::{Duration, SystemTime};
 
 use ratatui::{
     buffer::Buffer,
-    layout::{Alignment, Rect},
+    layout::Rect,
     style::Stylize,
     symbols::border,
     text::{Line, Text},
     widgets::{
-        block::{Position, Title},
         Block, Borders, Paragraph, Widget,
     },
 };
@@ -64,7 +63,7 @@ impl Default for TransportComponent {
 
 impl Widget for &TransportComponent {
     fn render(self, area: Rect, buf: &mut Buffer) {
-        let last_refreshed = Title::from(Line::from(
+        let last_refreshed = Line::from(
             match SystemTime::now().duration_since(self.last_refresh) {
                 Ok(duration) => {
                     let seconds = duration.as_secs();
@@ -76,15 +75,11 @@ impl Widget for &TransportComponent {
                 }
                 Err(e) => format!("Err: {}", e.to_string()),
             },
-        ));
+        );
 
         let weather_block = Block::new()
             .borders(Borders::LEFT)
-            .title(
-                last_refreshed
-                    .alignment(Alignment::Center)
-                    .position(Position::Bottom),
-            )
+            .title_bottom(last_refreshed.centered())
             .border_set(border::THICK);
 
         let counter_text: Text = if let Some(e) = &self.departures.error {
diff --git a/tui/src/weather.rs b/tui/src/weather.rs
@@ -1,14 +1,13 @@
-use chrono::prelude::{DateTime, Local, Timelike};
+use chrono::prelude::{Local, Timelike};
 use std::time::{Duration, SystemTime};
 
 use ratatui::{
     buffer::Buffer,
-    layout::{Alignment, Rect},
+    layout::Rect,
     style::Stylize,
     symbols::border,
     text::{Line, Text},
     widgets::{
-        block::{Position, Title},
         Block, Borders, Paragraph, Widget,
     },
 };
@@ -23,6 +22,7 @@ pub struct WeatherComponent {
     pub weather: Result<WeatherInfo, String>,
     pub cooldown: Duration,
     pub current_forecast_day: u8,
+    pub last_forecast_change: SystemTime,
 }
 
 impl WeatherComponent {
@@ -41,6 +41,7 @@ impl Default for WeatherComponent {
             weather: Err("No weather was fetched yet".to_string()),
             cooldown: Duration::from_secs(30 * 60),
             current_forecast_day: 0,
+            last_forecast_change: SystemTime::now(),
         }
     }
 }
@@ -80,6 +81,13 @@ impl Widget for &WeatherComponent {
                 let sunset = {
                     format!("{:02}:{:02}",  sun_info.1.hour(),  sun_info.1.minute())
                 };
+                let daytime = {
+                    let daytime = sun_info.2 as i32;
+                    let hours = daytime / 3600;
+                    let minutes = (daytime - hours * 3600) / 60;
+                    let seconds = daytime % 60;
+                    format!("{:02}h {:02}m {:02}s", hours, minutes, seconds)
+                };
 
                 let separator = "-".repeat((0.66 * area.width as f32) as usize);
 
@@ -142,10 +150,36 @@ impl Widget for &WeatherComponent {
                     Line::from(""),
                     Line::from(separator.clone()).centered(),
                     Line::from("Forecast".bold()).centered(),
+                    Line::from(format!("{:6} Min | Max |  UV  | F Min | F Max", "Date")).centered(),
+                    Line::from(match forecast.get(self.current_forecast_day as usize) {
+                        Some(f) => format!(
+                            "{:6} {:3.0} | {:3.0} | {:1.2} |  {:3.0}  |  {:3.0}",
+                            f.time.format("%a %d"),
+                            f.temperature_2m_min,
+                            f.temperature_2m_max,
+                            f.uv_index_max,
+                            f.apparent_temperature_min,
+                            f.apparent_temperature_max
+                        ),
+                        None => "No forecast available".to_string(),
+                    }).centered(),
+                    Line::from(match forecast.get((self.current_forecast_day as usize + 1) % 7) {
+                        Some(f) => format!(
+                            "{:6} {:3.0} | {:3.0} | {:1.2} |  {:3.0}  |  {:3.0}",
+                            f.time.format("%a %d"),
+                            f.temperature_2m_min,
+                            f.temperature_2m_max,
+                            f.uv_index_max,
+                            f.apparent_temperature_min,
+                            f.apparent_temperature_max
+                        ),
+                        None => "No forecast available".to_string(),
+                    }).centered(),
                     Line::from(separator.clone()).centered(),
                     Line::from("🌕 Day time ☀️".bold()).centered(),
                     Line::from(""),
                     Line::from(format!("🌅 {} 🌄 {}", sunrise, sunset)).centered(),
+                    Line::from(format!("({})", daytime)).centered(),
                 ])
             }
             Err(e) => {
