♻️ move greeting to gui config table

- this change is related to the recent implementation of the gui style
  table, which access is restricted to the config file
- the greeting message is not considered so important that it has to
  be switched on and off quickly via args
- this results in less bloated args

Author: ttytm

src/main.rs

@@ -15,13 +15,7 @@ async fn main() -> Result<()> {
 
 	let product = run(&params).await?;
 	product
-		.render(
-			&params.forecast,
-			&params.units,
-			&params.gui,
-			params.greeting,
-			&params.language,
-		)
+		.render(&params.forecast, &params.units, &params.gui, &params.language)
 		.await?;
 
 	config.handle_next(args, params).await?;

src/modules/args.rs

@@ -1,4 +1,3 @@
-// use clap::{Args, Parser, Subcommand, ValueEnum};
 use clap::{Parser, ValueEnum};
 use serde::{Deserialize, Serialize};
 use strum_macros::AsRefStr;
@@ -21,10 +20,6 @@ pub struct Cli {
 	#[arg(short, long, global = true)]
 	pub language: Option<String>,
 
-	/// Toggle greeting message
-	#[arg(short, long, action, hide = true)]
-	pub greeting: bool,
-
 	/// Save the supplied values as default
 	#[arg(short, long, action, group = "config_file_action")]
 	pub save: bool,

src/modules/config.rs

@@ -12,7 +12,6 @@ use crate::{
 #[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Clone)]
 pub struct Config {
 	pub address: Option<String>,
-	pub greeting: Option<bool>,
 	pub language: Option<String>,
 	pub forecast: Option<Vec<Forecast>>,
 	pub units: Option<Units>,
@@ -24,7 +23,6 @@ impl Default for Config {
 		Self {
 			address: None,
 			forecast: None,
-			greeting: Some(true),
 			language: Some("en".to_string()),
 			units: Some(Units::default()),
 			gui: Some(Gui::default()),
@@ -35,12 +33,14 @@ impl Default for Config {
 #[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Clone)]
 pub struct Gui {
 	pub border: Option<BorderVariant>,
+	pub greeting: Option<bool>,
 }
 
 impl Default for Gui {
 	fn default() -> Self {
 		Self {
 			border: Some(BorderVariant::default()),
+			greeting: Some(true),
 		}
 	}
 }
@@ -57,7 +57,6 @@ impl Config {
 			} else {
 				Some(params.address)
 			},
-			greeting: Some(params.greeting),
 			language: Some(params.language),
 			forecast: if !params.forecast.is_empty() {
 				Some(params.forecast)

src/modules/display.rs

@@ -26,15 +26,8 @@ pub struct Product {
 pub const MIN_WIDTH: usize = 34;
 
 impl Product {
-	pub async fn render(
-		&self,
-		forecast: &[ForecastParams],
-		units: &Units,
-		gui: &Gui,
-		include_greeting: bool,
-		lang: &str,
-	) -> Result<()> {
-		greeting::render(include_greeting, lang).await?;
+	pub async fn render(&self, forecast: &[ForecastParams], units: &Units, gui: &Gui, lang: &str) -> Result<()> {
+		greeting::render(gui.greeting.unwrap_or_else(|| Gui::default().greeting.unwrap()), lang).await?;
 
 		if !forecast.is_empty() {
 			Forecast::render(self, forecast, units, &gui.border.unwrap_or_default(), lang).await?;

src/modules/params.rs

@@ -9,14 +9,12 @@ use self::units::Units;
 
 mod address;
 pub mod forecast;
-mod greeting;
 mod language;
 pub mod units;
 
 pub struct Params {
 	pub address: String,
 	pub units: Units,
-	pub greeting: bool,
 	pub language: String,
 	pub forecast: Vec<Forecast>,
 	pub gui: Gui,
@@ -47,13 +45,10 @@ impl Params {
 
 		let gui = config.gui.unwrap_or_default();
 
-		let greeting = greeting::get(args.greeting, config.greeting)?;
-
 		Ok(Params {
 			address,
 			units,
 			language,
-			greeting,
 			forecast,
 			gui,
 		})