Merge pull request #5 from andygeorge/ttytm/main

andygeorge · web-flow · commit 5908b1bb6119 · 2024-12-26T22:17:21.000-06:00
Ttytm/main
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,8 +26,8 @@ clap = { version = "4.5", default-features = false, features = [
 	"error-context",
 	"suggestions",
 ] }
-directories = "5.0"
 dialoguer = { version = "0.11", default-features = false }
+dirs = "5.0"
 futures = "0.3"
 optional_struct = "0.5"
 regex = { version = "1.10" }
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# ww
+# 🦀 `ww`
 
 [![][ci_shield]](https://github.com/andygeorge/ww/actions/workflows/ci.yml?query=branch%3Amain)
 [![][last_commit_shield]](https://github.com/andygeorge/ww/commits/main)
@@ -141,7 +141,6 @@ Win: `%USERPROFILE%\AppData\Roaming\ww\`
 
 Use rusts package manger to install ww.
 
-
 **From crates.io**
 
 |             |                       |
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,54 +1,53 @@
 {
-  inputs = {
-    nixpkgs = {
-      url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    };
+	inputs = {
+		utils.url = "github:numtide/flake-utils";
+	};
+	outputs =
+		{
+			self,
+			nixpkgs,
+			utils,
+			...
+		}:
+		utils.lib.eachDefaultSystem (
+			system:
+			let
+				pkgs = import nixpkgs { inherit system; };
+				ww =
+					{
+						lib,
+						openssl,
+						pkg-config,
+						rustPlatform,
+					}:
+					rustPlatform.buildRustPackage {
+						name = "ww";
+						src = lib.cleanSource ./.;
+						cargoLock.lockFile = ./Cargo.lock;
+						nativeBuildInputs = [
+							pkg-config
+							rustPlatform.bindgenHook
+						];
+						buildInputs = [ openssl ];
+						checkFlags = [
+							# connecting to internet does not work in the sandbox
+							"--skip=modules::location::tests::geolocation_response"
+							"--skip=modules::localization::tests::translate_string"
+						];
 
-    flake-utils = {
-      url = "github:numtide/flake-utils";
-    };
-  };
-  outputs = inputs @ {
-    self,
-    nixpkgs,
-    flake-utils,
-    ...
-  }:
-    flake-utils.lib.eachDefaultSystem (system: let
-      pkgs = nixpkgs.legacyPackages.${system};
-      ww = {
-        lib,
-        openssl,
-        pkg-config,
-        rustPlatform,
-      }:
-        rustPlatform.buildRustPackage {
-          name = "ww";
-          src = lib.cleanSource ./.;
-          cargoLock.lockFile = ./Cargo.lock;
-          nativeBuildInputs = [
-            pkg-config
-            rustPlatform.bindgenHook
-          ];
-          buildInputs = [openssl];
-
-          checkFlags = [
-            # connecting to internet does not work in the sandbox
-            "--skip=modules::location::tests::geolocation_response"
-            "--skip=modules::localization::tests::translate_string"
-          ];
-          
-          meta = with lib; {
-            license = licenses.mit;
-            homepage = "https://github.com/andygeorge/ww";
-            platforms = platforms.all;
-          };
-        };
-    in {
-      packages.default = pkgs.callPackage ww {};
-      apps.default = {
-        type = "app";
-        program = "${self.outputs.packages.${system}.default}/bin/ww";
-      };
-    });
+						meta = with lib; {
+							license = licenses.mit;
+							homepage = "https://github.com/andygeorge/ww";
+							platforms = platforms.all;
+						};
+					};
+			in
+			{
+				packages.default = pkgs.callPackage ww { };
+				apps.default = {
+					type = "app";
+					program = "${self.outputs.packages.${system}.default}/bin/ww";
+				};
+			}
+		);
 }
diff --git a/locales/generate.sh b/locales/generate.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+(printf "# This file was generated from the localedata in 'github.com/chronotope/pure-rust-locales'.\n"; \
+ curl https://api.github.com/repos/chronotope/pure-rust-locales/contents/localedata/locales | jq -r '.[].name') \
+ | sed '/^translit_/d; /^iso/d; s/@/_/g' \
+ > "$(dirname "$(realpath "$0")")/pure-rust-locales.txt"
diff --git a/locales/pure-rust-locales.txt b/locales/pure-rust-locales.txt
@@ -1,5 +1,4 @@
-# This file was auto generated from the available localedata in pure-rust-locales.git.
-
+# This file was generated from the localedata in 'github.com/chronotope/pure-rust-locales'.
 POSIX
 aa_DJ
 aa_ER
diff --git a/src/modules/api.rs b/src/modules/api.rs
@@ -2,7 +2,7 @@ pub trait Api {
 	fn assemble(&self) -> String;
 }
 
-impl<'a> Api for Box<dyn 'a + Api> {
+impl Api for Box<dyn '_ + Api> {
 	fn assemble(&self) -> String {
 		self.as_ref().assemble()
 	}
@@ -54,7 +54,7 @@ impl<'a> ApiQuery<'a> {
 	}
 }
 
-impl<'a> Default for ApiQuery<'a> {
+impl Default for ApiQuery<'_> {
 	fn default() -> Self {
 		Self {
 			api: ApiName::OpenMeteo,
@@ -81,7 +81,7 @@ pub struct OpenMeteoLocationQuery<'a> {
 	language: &'a str,
 }
 
-impl<'a> Api for OpenMeteoLocationQuery<'a> {
+impl Api for OpenMeteoLocationQuery<'_> {
 	fn assemble(&self) -> String {
 		format!(
 			"https://geocoding-api.open-meteo.com/v1/search?name={}&language={}",
@@ -95,7 +95,7 @@ pub struct OpenStreetMapLocationQuery<'a> {
 	language: &'a str,
 }
 
-impl<'a> Api for OpenStreetMapLocationQuery<'a> {
+impl Api for OpenStreetMapLocationQuery<'_> {
 	fn assemble(&self) -> String {
 		format!(
 			"https://nominatim.openstreetmap.org/search?q={}&accept-language={}&limit=1&format=jsonv2",
diff --git a/src/modules/args.rs b/src/modules/args.rs
@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Result};
+use anyhow::{bail, Result};
 use chrono::NaiveDate;
 use clap::{Parser, ValueEnum};
 use serde::{Deserialize, Serialize};
@@ -28,11 +28,11 @@ pub struct Cli {
 	pub language: Option<String>,
 
 	/// Save the supplied values as default
-	#[arg(short, long, action, group = "config_file_action")]
+	#[arg(short, long, group = "config_file_action")]
 	pub save: bool,
 
 	/// Wipe ww's configuration data
-	#[arg(short, long, action, group = "config_file_action")]
+	#[arg(short, long, group = "config_file_action")]
 	pub reset: bool,
 }
 
@@ -91,8 +91,7 @@ pub enum UnitArg {
 
 fn parse_language_code(s: &str) -> Result<String> {
 	if s.len() < 2 {
-		Err(anyhow!("\n  The language code must be at least two characters long."))
-	} else {
-		Ok(s.to_string())
+		bail!("\n  The language code must be at least two characters long.")
 	}
+	Ok(s.to_string())
 }
diff --git a/src/modules/config.rs b/src/modules/config.rs
@@ -1,6 +1,5 @@
 use anyhow::Result;
 use dialoguer::console::style;
-use directories::ProjectDirs;
 use optional_struct::{optional_struct, Applicable};
 use ron::{
 	extensions::Extensions,
@@ -90,9 +89,6 @@ impl Config {
 	}
 
 	pub fn get_path() -> PathBuf {
-		ProjectDirs::from("", "", CONFIG_DIR_NAME)
-			.unwrap()
-			.config_dir()
-			.join(CONFIG_FILE_NAME)
+		dirs::config_dir().unwrap().join(CONFIG_DIR_NAME).join(CONFIG_FILE_NAME)
 	}
 }
diff --git a/src/modules/display/current.rs b/src/modules/display/current.rs
@@ -261,7 +261,7 @@ mod tests {
 │⁰⁰˙⁰⁰    ⁰³˙⁰⁰    ⁰⁶˙⁰⁰    ⁰⁹˙⁰⁰    ¹²˙⁰⁰    ¹⁵˙⁰⁰    ¹⁸˙⁰⁰    ²¹˙⁰⁰    │
 ╰────────────────────────────────────────────────────────────────────────╯";
 
-		let (lines, _) = prep(&test_product, &test_params, true).unwrap();
+		let (lines, _) = prep(test_product, test_params, true).unwrap();
 		let have = strip_ansi_escapes::strip_str(lines.join("\n"));
 		assert_eq!(want, have);
 	}
diff --git a/src/modules/display/utils.rs b/src/modules/display/utils.rs
@@ -83,6 +83,7 @@ pub mod common_tests {
 	pub static TEST_PRODUCT: OnceLock<Product> = OnceLock::new();
 	pub static TEST_PARAMS: OnceLock<Params> = OnceLock::new();
 
+	#[allow(clippy::too_many_lines)]
 	pub fn init_test_product() -> Product<'static> {
 		Product {
 			address: String::from("Berlin, Germany"),
diff --git a/src/modules/display/weathercode.rs b/src/modules/display/weathercode.rs
@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Result};
+use anyhow::{bail, Result};
 
 use crate::modules::localization::WeatherCodeLocales;
 
@@ -38,7 +38,7 @@ impl WeatherCode {
 			95 => (&t.thunderstorm, if is_night { '' } else { '' }),
 			96 => (&t.thunderstorm_slight_hail, if is_night { '' } else { '' }),
 			99 => (&t.thunderstorm_heavy_hail, if is_night { '' } else { '' }),
-			_ => return Err(anyhow!("Unknown weather code")),
+			_ => bail!("Unknown weather code"),
 		};
 
 		Ok(Self {
diff --git a/src/modules/display/wind.rs b/src/modules/display/wind.rs
@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Result};
+use anyhow::{bail, Result};
 use strum_macros::Display;
 
 #[derive(Display)]
@@ -24,7 +24,7 @@ impl WindDirection {
 			wd if (202.5..247.5).contains(&wd) => Self::SW,
 			wd if (247.5..292.5).contains(&wd) => Self::W,
 			wd if (292.5..337.5).contains(&wd) => Self::NW,
-			_ => return Err(anyhow!("Wind from another dimension")),
+			_ => bail!("Wind from another dimension"),
 		};
 
 		Ok(direction)
diff --git a/src/modules/localization.rs b/src/modules/localization.rs
@@ -1,6 +1,5 @@
 use anyhow::{Context, Result};
 use chrono::{Local, NaiveDate};
-use directories::ProjectDirs;
 use futures::{stream::FuturesOrdered, TryStreamExt};
 use optional_struct::{optional_struct, Applicable};
 use reqwest::Url;
@@ -243,9 +242,9 @@ impl Locales {
 	}
 
 	pub fn get_path(lang: &str) -> PathBuf {
-		ProjectDirs::from("", "", crate::modules::config::CONFIG_DIR_NAME)
+		dirs::config_dir()
 			.unwrap()
-			.config_dir()
+			.join(super::config::CONFIG_DIR_NAME)
 			.join("locales")
 			.join(format!("{lang}.json"))
 	}
diff --git a/src/modules/location.rs b/src/modules/location.rs

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ pub trait Api {`
`2`	`2`	`fn assemble(&self) -> String;`
`3`	`3`	`}`
`4`	`4`
`5`		`-impl<'a> Api for Box<dyn 'a + Api> {`
	`5`	`+impl Api for Box<dyn '_ + Api> {`
`6`	`6`	`fn assemble(&self) -> String {`
`7`	`7`	`self.as_ref().assemble()`
`8`	`8`	`}`
`@@ -54,7 +54,7 @@ impl<'a> ApiQuery<'a> {`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`57`		`-impl<'a> Default for ApiQuery<'a> {`
	`57`	`+impl Default for ApiQuery<'_> {`
`58`	`58`	`fn default() -> Self {`
`59`	`59`	`Self {`
`60`	`60`	`api: ApiName::OpenMeteo,`
`@@ -81,7 +81,7 @@ pub struct OpenMeteoLocationQuery<'a> {`
`81`	`81`	`language: &'a str,`
`82`	`82`	`}`
`83`	`83`
`84`		`-impl<'a> Api for OpenMeteoLocationQuery<'a> {`
	`84`	`+impl Api for OpenMeteoLocationQuery<'_> {`
`85`	`85`	`fn assemble(&self) -> String {`
`86`	`86`	`format!(`
`87`	`87`	`"https://geocoding-api.open-meteo.com/v1/search?name={}&language={}",`
`@@ -95,7 +95,7 @@ pub struct OpenStreetMapLocationQuery<'a> {`
`95`	`95`	`language: &'a str,`
`96`	`96`	`}`
`97`	`97`
`98`		`-impl<'a> Api for OpenStreetMapLocationQuery<'a> {`
	`98`	`+impl Api for OpenStreetMapLocationQuery<'_> {`
`99`	`99`	`fn assemble(&self) -> String {`
`100`	`100`	`format!(`
`101`	`101`	`"https://nominatim.openstreetmap.org/search?q={}&accept-language={}&limit=1&format=jsonv2",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`use anyhow::Result;`
`2`	`2`	`use dialoguer::console::style;`
`3`		`-use directories::ProjectDirs;`
`4`	`3`	`use optional_struct::{optional_struct, Applicable};`
`5`	`4`	`use ron::{`
`6`	`5`	`extensions::Extensions,`
`@@ -90,9 +89,6 @@ impl Config {`
`90`	`89`	`}`
`91`	`90`
`92`	`91`	`pub fn get_path() -> PathBuf {`
`93`		`- ProjectDirs::from("", "", CONFIG_DIR_NAME)`
`94`		`- .unwrap()`
`95`		`- .config_dir()`
`96`		`- .join(CONFIG_FILE_NAME)`
	`92`	`+ dirs::config_dir().unwrap().join(CONFIG_DIR_NAME).join(CONFIG_FILE_NAME)`
`97`	`93`	`}`
`98`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ mod tests {`
`261`	`261`	`│⁰⁰˙⁰⁰ ⁰³˙⁰⁰ ⁰⁶˙⁰⁰ ⁰⁹˙⁰⁰ ¹²˙⁰⁰ ¹⁵˙⁰⁰ ¹⁸˙⁰⁰ ²¹˙⁰⁰ │`
`262`	`262`	`╰────────────────────────────────────────────────────────────────────────╯";`
`263`	`263`
`264`		`- let (lines, _) = prep(&test_product, &test_params, true).unwrap();`
	`264`	`+ let (lines, _) = prep(test_product, test_params, true).unwrap();`
`265`	`265`	`let have = strip_ansi_escapes::strip_str(lines.join("\n"));`
`266`	`266`	`assert_eq!(want, have);`
`267`	`267`	`}`