Merge branch 'ttytm:main' into main

Author: andygeorge

src/main.rs

@@ -30,14 +30,11 @@ async fn main() -> Result<()> {
 async fn run(params: &Params) -> Result<Product> {
 	let loc = Location::get(&params.config.address, &params.config.language).await?;
 	let weather = Weather::get(loc.lat, loc.lon, &params.config.units).await?;
-	let historical_weather = if params.historical_weather.is_empty() {
-		None
-	} else {
-		Some(Weather::get_dates(&params.historical_weather, loc.lat, loc.lon, &params.config.units).await?)
-	};
+	let historical_weather =
+		Weather::get_dates(&params.historical_weather, loc.lat, loc.lon, &params.config.units).await?;
 
 	Ok(Product {
-		address: loc.name.to_string(),
+		address: loc.name,
 		weather,
 		historical_weather,
 	})

src/modules/display/historical.rs

@@ -24,7 +24,7 @@ pub fn prep(product: &Product, params: &Params, date: NaiveDate) -> Result<Vec<S
 	let address = Product::trunc_address(product.address.clone(), 60);
 
 	// Helpers
-	let weather = &product.historical_weather.as_ref().unwrap()[&date];
+	let weather = &product.historical_weather[&date];
 	let weather_daily_units = weather.daily_units.as_ref().unwrap();
 	let lang = &params.config.language;
 	// Times

src/modules/display/product.rs

@@ -15,7 +15,7 @@ use super::{current, day, gui_config::ConfigurableColor, historical, week};
 pub struct Product<'a> {
 	pub address: String,
 	pub weather: Weather,
-	pub historical_weather: Option<HashMap<&'a NaiveDate, OptionalWeather>>,
+	pub historical_weather: HashMap<&'a NaiveDate, OptionalWeather>,
 }
 
 pub const MIN_WIDTH: usize = 34;

src/modules/display/utils.rs

@@ -41,10 +41,12 @@ pub fn style_number(mut num: i32, sub: bool) -> String {
 	const SUPERSCRIPT_DIGITS: [char; 10] = ['⁰', '¹', '²', '³', '⁴', '⁵', '⁶', '⁷', '⁸', '⁹'];
 	const SUBSCRIPT_DIGITS: [char; 10] = ['₀', '₁', '₂', '₃', '₄', '₅', '₆', '₇', '₈', '₉'];
 
+	let digits = if sub { SUBSCRIPT_DIGITS } else { SUPERSCRIPT_DIGITS };
+
 	let mut result = String::new();
 
 	if num == 0 {
-		result.push(if sub { SUBSCRIPT_DIGITS[0] } else { SUPERSCRIPT_DIGITS[0] });
+		result.push(digits[0]);
 		return result;
 	}
 
@@ -61,11 +63,7 @@ pub fn style_number(mut num: i32, sub: bool) -> String {
 		power_of_ten /= 10;
 		if digit != 0 || started {
 			started = true;
-			result.push(if sub {
-				SUBSCRIPT_DIGITS[digit as usize]
-			} else {
-				SUPERSCRIPT_DIGITS[digit as usize]
-			});
+			result.push(digits[digit as usize])
 		}
 	}
 
@@ -79,7 +77,7 @@ pub mod common_tests {
 	use crate::modules::localization;
 	use crate::modules::params::Params;
 	use crate::modules::weather;
-	use std::collections::HashSet;
+	use std::collections::{HashMap, HashSet};
 	use std::sync::OnceLock;
 
 	pub static TEST_PRODUCT: OnceLock<Product> = OnceLock::new();
@@ -242,7 +240,7 @@ pub mod common_tests {
 					precipitation_sum: None,
 				},
 			},
-			historical_weather: None,
+			historical_weather: HashMap::new(),
 		}
 	}