✨ add first release candidate changes (#75)

Author: ttytm

Cargo.toml

@@ -13,7 +13,10 @@ categories = ["command-line-utilities"]
 
 [dependencies]
 anyhow = "1.0"
-chrono = { version = "0.4", default-features = false, features = ["clock", "unstable-locales"] }
+chrono = { version = "0.4", default-features = false, features = [
+	"clock",
+	"unstable-locales",
+] }
 clap = { version = "4.1", default-features = false, features = [
 	"derive",
 	"std",

rustfmt.toml

@@ -1,4 +1,7 @@
 hard_tabs = true
 max_width = 120
 array_width = 80
+fn_call_width = 80
+attr_fn_like_width = 80
+chain_width = 80
 struct_lit_width = 36

src/main.rs

@@ -13,17 +13,7 @@ async fn main() -> Result<()> {
 	let config = Config::get();
 	let params = Params::merge(&config, &args).await?;
 
-	let product = run(&params).await?;
-	product
-		.render(
-			&params.config.forecast,
-			&params.config.units,
-			&params.config.gui,
-			&params.config.language,
-			&params.texts.weather,
-		)
-		.await?;
-
+	run(&params).await?.render(&params).await?;
 	params.handle_next(args, config).await?;
 
 	Ok(())

src/modules/args.rs

@@ -13,6 +13,10 @@ pub struct Cli {
 	#[arg(long, short, use_value_delimiter = true, value_name = "FORECAST,...")]
 	pub forecast: Vec<Forecast>,
 
+	// /// [e.g.: -F 2021-01-01]
+	// #[arg(long, short, use_value_delimiter = true, value_name = "HISTORICAL WEATHER,...")]
+	// pub historical_weather: Date,
+	//
 	/// [e.g.: -u f,12h,in]
 	#[arg(long, short, use_value_delimiter = true, value_name = "UNIT,...")]
 	pub units: Vec<UnitArg>,
@@ -30,43 +34,43 @@ pub struct Cli {
 	pub reset: bool,
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, ValueEnum, AsRefStr, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, ValueEnum, AsRefStr, Serialize, Deserialize, Hash)]
 #[allow(non_camel_case_types)]
 pub enum Forecast {
 	disable,
 	#[value(name = "(w)eek", aliases = ["w", "week"])]
 	week,
-	#[value(name = "(d)ay", aliases = ["d", "day", "today"])]
+	#[value(name = "to(d)ay", aliases = ["d", "day", "today"])]
 	day,
-	// #[value(alias = "monday")]
-	// mo,
-	// #[value(alias = "tuesday")]
-	// tu,
-	// #[value(alias = "wednesday")]
-	// we,
-	// #[value(alias = "thursday")]
-	// th,
-	// #[value(alias = "friday")]
-	// fr,
-	// #[value(alias = "saturday")]
-	// sa,
-	// #[value(alias = "sunday")]
-	// su,
+	#[value(aliases = ["mon", "monday"])]
+	mo,
+	#[value(aliases = ["tue", "tuesday"])]
+	tu,
+	#[value(aliases = ["wed", "wednesday"])]
+	we,
+	#[value(aliases = ["thu", "thursday"])]
+	th,
+	#[value(aliases = ["fri", "friday"])]
+	fr,
+	#[value(aliases = ["sat", "saturday"])]
+	sa,
+	#[value(aliases = ["sun", "sunday"])]
+	su,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, ValueEnum, AsRefStr, Serialize, Deserialize)]
 #[strum(serialize_all = "snake_case")]
 pub enum UnitArg {
-	// -- Temperature
+	// Temperature
 	#[value(name = "(c)elsius", aliases = ["c", "celsius"])]
 	Celsius,
 	#[value(name = "(f)ahrenheit", aliases = ["f", "fahrenheit"])]
 	Fahrenheit,
-	// -- Windspeed
+	// Windspeed
 	Kmh,
 	Mph,
 	#[value(name = "(kn)ots", aliases = ["kn", "knots"])]
-	// serialize as kn for open-meteo api call
+	// Serialize as kn for open-meteo api call
 	#[strum(serialize = "kn")]
 	Knots,
 	Ms,

src/modules/config.rs

@@ -8,6 +8,7 @@ use ron::{
 };
 use serde::{Deserialize, Serialize};
 use std::{
+	collections::HashSet,
 	fs::{self, File},
 	io::Write,
 	path::PathBuf,
@@ -24,7 +25,7 @@ use super::{
 pub struct Config {
 	pub address: String,
 	pub language: String,
-	pub forecast: Vec<Forecast>,
+	pub forecast: HashSet<Forecast>,
 	#[optional_rename(ConfigFileUnits)]
 	pub units: Units,
 	#[optional_rename(ConfigFileGui)]
@@ -35,7 +36,7 @@ impl Default for Config {
 	fn default() -> Self {
 		Self {
 			address: String::new(),
-			forecast: vec![],
+			forecast: HashSet::new(),
 			language: "en_US".to_string(),
 			units: Units::default(),
 			gui: Gui::default(),

src/modules/display/current.rs

@@ -1,18 +1,14 @@
 use anyhow::Result;
 use colored::{Color::BrightBlack, Colorize};
 
-use crate::modules::{
-	localization::WeatherLocales,
-	units::{Time, Units},
-};
+use crate::modules::params::Params;
 
 use super::{
 	border::*,
-	graph::GraphOpts,
-	gui_config::{ColorOption, Gui},
+	gui_config::ColorOption,
 	hourly::HourlyForecast,
 	product::{Product, MIN_WIDTH},
-	utils::lang_len_diff,
+	utils::{lang_len_diff, Times},
 	weathercode::WeatherCode,
 	wind::WindDirection,
 };
@@ -25,10 +21,9 @@ pub struct Current {
 	dewpoint: String,
 	wind: String,
 	pressure: String,
-	sun_rise: String,
-	sun_set: String,
+	sunrise: String,
+	sunset: String,
 	wmo_code: WeatherCode,
-	hourly_forecast: Option<HourlyForecast>,
 	dimensions: Dimensions,
 }
 
@@ -38,14 +33,7 @@ pub struct Dimensions {
 }
 
 impl Current {
-	pub fn render(
-		product: &Product,
-		add_hourly: bool,
-		units: &Units,
-		gui: &Gui,
-		lang: &str,
-		t: &WeatherLocales,
-	) -> Result<Dimensions> {
+	pub fn render(product: &Product, params: &Params, add_hourly: bool) -> Result<Dimensions> {
 		let Current {
 			address,
 			temperature,
@@ -54,20 +42,17 @@ impl Current {
 			dewpoint,
 			wind,
 			pressure,
-			sun_rise,
-			sun_set,
+			sunrise,
+			sunset,
 			wmo_code,
-			hourly_forecast,
 			dimensions,
-		} = Self::prepare(product, add_hourly, units, &gui.graph, t)?;
+		} = Self::prepare(product, params, add_hourly)?;
 
 		let Dimensions { width, cell_width } = dimensions;
+		let (gui, lang) = (&params.config.gui, &params.config.language);
 
 		// Border Top
-		println!(
-			"{}",
-			&Edge::Top.fmt(width, &gui.border).color_option(BrightBlack, &gui.color)
-		);
+		println!("{}", &Edge::Top.fmt(width, &gui.border).color_option(BrightBlack, &gui.color));
 
 		// Address / Title
 		println!(
@@ -105,28 +90,29 @@ impl Current {
 			apparent_temperature,
 			Border::R.fmt(&gui.border).color_option(BrightBlack, &gui.color),
 			width = width - 2 - lang_len_diff(&apparent_temperature, lang)
+            // manually account for displacepment of this row until improving the lang_len_diff regex
+            + if &lang[..2] == "ja" || &lang[..2] == "ko" { 2 } else { 0 }
 		);
 
 		// Blank Line
 		println!(
 			"{}",
-			Separator::Blank
-				.fmt(width, &gui.border)
-				.color_option(BrightBlack, &gui.color)
+			Separator::Blank.fmt(width, &gui.border).color_option(BrightBlack, &gui.color)
 		);
 
 		// Humidity & Dewpoint
 		println!(
 			"{} {: <width$} {}",
 			Border::L.fmt(&gui.border).color_option(BrightBlack, &gui.color),
 			format!(
-				"{: <cell_width$}{}",
+				"{: <cell_width$} {}",
 				humidity,
 				dewpoint,
 				cell_width = cell_width - lang_len_diff(&humidity, lang)
 			),
 			Border::R.fmt(&gui.border).color_option(BrightBlack, &gui.color),
 			width = width - 2 - lang_len_diff(&humidity, lang) - lang_len_diff(&dewpoint, lang)
+				+ if &lang[..2] == "ja" || &lang[..2] == "ko" { 3 } else { 0 }
 		);
 
 		// Wind & Pressure
@@ -143,71 +129,45 @@ impl Current {
 		println!(
 			"{} {: <cell_width$}{: <width$} {}",
 			Border::L.fmt(&gui.border).color_option(BrightBlack, &gui.color),
-			sun_rise,
-			sun_set,
+			sunrise,
+			sunset,
 			Border::R.fmt(&gui.border).color_option(BrightBlack, &gui.color),
 			width = width - 2 - cell_width
 		);
 
 		// Hourly Forecast
-		if let Some(hourly_forecast) = hourly_forecast {
-			hourly_forecast.render(width, units, &gui.border, &gui.color, t)
+		if add_hourly {
+			HourlyForecast::render(&product.weather, params, 0)?;
 		}
 
 		// Border Bottom
-		println!(
-			"{}",
-			Edge::Bottom
-				.fmt(width, &gui.border)
-				.color_option(BrightBlack, &gui.color)
-		);
+		println!("{}", Edge::Bottom.fmt(width, &gui.border).color_option(BrightBlack, &gui.color));
 
 		Ok(dimensions)
 	}
 
-	fn prepare(
-		product: &Product,
-		add_hourly: bool,
-		units: &Units,
-		graph_opts: &GraphOpts,
-		t: &WeatherLocales,
-	) -> Result<Self> {
+	fn prepare(product: &Product, params: &Params, add_hourly: bool) -> Result<Self> {
 		let weather = &product.weather;
 		let address = Product::trunc_address(product.address.clone(), 60);
+		let t = &params.texts.weather;
 
-		// Helpers
-		let (current_hour, sunrise_hour, sunset_hour) = (
-			weather.current_weather.time[11..13]
-				.parse::<usize>()
-				.unwrap_or_default(),
-			weather.daily.sunrise[0][11..13].parse::<usize>().unwrap_or_default(),
-			weather.daily.sunset[0][11..13].parse::<usize>().unwrap_or_default(),
-		);
-		let sunrise_time = match units.time {
-			Time::am_pm => format!("{}:{}am", sunrise_hour, &weather.daily.sunrise[0][14..16]),
-			_ => weather.daily.sunrise[0][11..16].to_string(),
-		};
-		let sunset_time = match units.time {
-			Time::am_pm => format!("{}:{}pm", sunset_hour - 12, &weather.daily.sunset[0][14..16]),
-			_ => weather.daily.sunset[0][11..16].to_string(),
-		};
-		let night = current_hour < sunrise_hour || current_hour > sunset_hour;
+		let Times { current_hour, sunrise, sunset, night } = product.weather.get_times(params.config.units.time, 0);
 
 		// Display Items
 		let temperature = format!(
-			"{}{}",
+			"{:.1}{}",
 			weather.current_weather.temperature, weather.hourly_units.temperature_2m
 		);
 		let apparent_temperature = format!(
-			"{} {}{}",
+			"{} {:.1}{}",
 			t.feels_like, weather.hourly.apparent_temperature[current_hour], weather.hourly_units.temperature_2m
 		);
 		let humidity = format!(
 			"{}: {}{}",
 			t.humidity, weather.hourly.relativehumidity_2m[current_hour], weather.hourly_units.relativehumidity_2m,
 		);
 		let dewpoint = format!(
-			"{}: {}{}",
+			"{}: {:.1}{}",
 			t.dew_point, weather.hourly.dewpoint_2m[current_hour], weather.hourly_units.dewpoint_2m
 		);
 		let wind_direction = WindDirection::get_direction(weather.current_weather.winddirection)?;
@@ -222,28 +182,17 @@ impl Current {
 			" {}{}",
 			weather.hourly.surface_pressure[current_hour], weather.hourly_units.surface_pressure
 		);
-		let sun_rise = format!(" {sunrise_time}");
-		let sun_set = format!(" {sunset_time}");
+		let sunrise = format!(" {sunrise}");
+		let sunset = format!(" {sunset}");
 		let wmo_code = WeatherCode::resolve(weather.current_weather.weathercode, night, &t.weather_code)?;
-		let hourly_forecast = match add_hourly {
-			true => Some(HourlyForecast::prepare(
-				weather,
-				current_hour,
-				night,
-				graph_opts,
-				units,
-				&t.weather_code,
-			)?),
-			_ => None,
-		};
 
 		// Dimensions
 		let title_width = address.chars().count();
 		let title_padding = 2 * 2; // 2 spaces on each side
 		let longest_cell_width = humidity.chars().count();
 		let dimensions = Dimensions {
 			width: if add_hourly {
-				72
+				super::hourly::WIDTH
 			} else if title_width > MIN_WIDTH {
 				title_width + title_padding
 			} else {
@@ -267,10 +216,9 @@ impl Current {
 			dewpoint,
 			wind,
 			pressure,
-			sun_rise,
-			sun_set,
+			sunrise,
+			sunset,
 			wmo_code,
-			hourly_forecast,
 			dimensions,
 		})
 	}