Merge pull request #157 from IwantHappiness/main

Author: insolor

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "dfint-installer"
 version = "0.4.6"
-edition = "2021"
+edition = "2024"
 build = "build.rs"
 
 [profile.release]

src/app.rs

@@ -212,13 +212,10 @@ impl eframe::App for App {
             self.hook_metadata.manifest.df == self.bin.checksum,
             self.hook_metadata.manifest.checksum == self.hook_checksum,
             self.hook_metadata.manifest.checksum == 0,
-            self.hook_metadata.vec_manifests.len() == 0,
+            self.hook_metadata.vec_manifests.is_empty(),
           ) {
             (_, _, true, true) => (format!("✖ {}", t!("hook data was not loaded")), COLOR_ERROR),
-            (false, _, _, _) => (
-              format!("✖ {}", t!("this DF version is not supported")),
-              COLOR_ERROR,
-            ),
+            (false, _, _, _) => (format!("✖ {}", t!("this DF version is not supported")),COLOR_ERROR),
             (true, true, _, _) => (format!("✅ {}", t!("up-to-date")), COLOR_UP_TO_DATE),
             (true, false, _, _) => (format!("⚠ {}", t!("update available")), COLOR_UPDATE_AVAILABLE),
           };
@@ -249,13 +246,12 @@ impl eframe::App for App {
                     item.language.clone(),
                   )
                   .clicked()
+                  && self.selected_language != "None"
                 {
-                  if self.selected_language != "None" {
-                    self
-                      .dict_metadata
-                      .pick_language_by_name(self.selected_language.clone())
-                  }
-                };
+                  self
+                    .dict_metadata
+                    .pick_language_by_name(self.selected_language.clone())
+                }
               }
             });
           ui.label(self.dict_checksum.to_string());
@@ -268,12 +264,9 @@ impl eframe::App for App {
           let (text, color) = match (
             self.dict_metadata.manifest.checksum == self.dict_checksum,
             self.selected_language == "None",
-            self.dict_metadata.vec_manifests.len() == 0,
+            self.dict_metadata.vec_manifests.is_empty(),
           ) {
-            (_, _, true) => (
-              format!("✖ {}", t!("dictionary data was not loaded")),
-              COLOR_ERROR,
-            ),
+            (_, _, true) => (format!("✖ {}", t!("dictionary data was not loaded")), COLOR_ERROR),
             (true, false, false) => (format!("✅ {}", t!("up-to-date")), COLOR_UP_TO_DATE),
             (false, false, false) => (format!("⚠ {}", t!("update available")), COLOR_UPDATE_AVAILABLE),
             (_, true, false) => (format!("⚠ {}", t!("choose language")), COLOR_CHOOSE_LANGUAGE),

src/df_binary.rs

@@ -45,7 +45,7 @@ impl Default for DfBinary {
 
 impl std::fmt::Display for DfBinary {
   fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-    std::write!(f, "{}", self.path.as_path().display().to_string())
+    std::write!(f, "{}", self.path.as_path().display())
   }
 }
 
@@ -76,7 +76,7 @@ impl DfBinary {
     }
   }
 
-  fn os(path: &PathBuf) -> OS {
+  fn os(path: &Path) -> OS {
     if path.file_name() == Some(OsStr::new("Dwarf Fortress.exe")) {
       OS::Windows
     } else {

src/dict_metadata.rs

@@ -23,20 +23,12 @@ impl Default for Manifest {
   }
 }
 
+#[derive(Default)]
 pub struct DictMetadata {
   pub manifest: Manifest,
   pub vec_manifests: Vec<Manifest>,
 }
 
-impl Default for DictMetadata {
-  fn default() -> Self {
-    Self {
-      manifest: Manifest::default(),
-      vec_manifests: vec![],
-    }
-  }
-}
-
 impl DictMetadata {
   pub async fn from_url(url: &str, pick_language: Option<String>) -> Result<Self> {
     let manifests: Vec<Manifest> = ureq::get(url).call()?.into_json()?;

src/hook_metadata.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
+#[derive(Debug, Default, Serialize, Deserialize, Clone)]
 pub struct Manifest {
   pub df: u32,
   pub checksum: u32,
@@ -10,33 +10,12 @@ pub struct Manifest {
   pub dfhooks: String,
 }
 
-impl Default for Manifest {
-  fn default() -> Self {
-    Self {
-      df: 0,
-      checksum: 0,
-      lib: "".to_string(),
-      config: "".to_string(),
-      offsets: "".to_string(),
-      dfhooks: "".to_string(),
-    }
-  }
-}
-
+#[derive(Default)]
 pub struct HookMetadata {
   pub manifest: Manifest,
   pub vec_manifests: Vec<Manifest>,
 }
 
-impl Default for HookMetadata {
-  fn default() -> Self {
-    Self {
-      manifest: Manifest::default(),
-      vec_manifests: vec![],
-    }
-  }
-}
-
 impl HookMetadata {
   pub async fn from_url(url: &str, pick_df_checksum: Option<u32>) -> Result<Self> {
     let manifests: Vec<Manifest> = ureq::get(url).call()?.into_json()?;

src/logic.rs

@@ -327,7 +327,7 @@ impl App {
   }
 
   pub fn remove_hook_data(&self) {
-    let _ = std::fs::write(self.bin.dir.join(PATH_FONT), &ORIGINAL_FONT);
+    let _ = std::fs::write(self.bin.dir.join(PATH_FONT), ORIGINAL_FONT);
     let _ = std::fs::remove_file(self.bin.lib_path.clone());
     let _ = std::fs::remove_dir_all(self.bin.dir.join("dfint-data"));
   }

src/persistent.rs

@@ -26,7 +26,7 @@ impl Store {
   }
 
   pub fn save(&self) -> Result<()> {
-    let _ = std::fs::write(PATH_CACHE_FILE, serde_json::to_string_pretty(self)?)?;
+    std::fs::write(PATH_CACHE_FILE, serde_json::to_string_pretty(self)?)?;
     Ok(())
   }
 

src/utils.rs

@@ -16,7 +16,7 @@ pub fn checksum_for_files(vec: Vec<PathBuf>) -> Result<u32> {
 
 pub fn scan_df() -> Option<PathBuf> {
   let current = std::env::current_dir().unwrap();
-  let pathes = vec![
+  let pathes = [
     current.join("Dwarf Fortress.exe"),
     current.join("dwarfort"),
     PathBuf::from("C:\\Program Files (x86)\\Steam\\steamapps\\common\\Dwarf Fortress\\Dwarf Fortress.exe"),
@@ -29,8 +29,7 @@ pub async fn is_df_running() -> bool {
   System::new_all()
     .processes()
     .values()
-    .find(|val: &&Process| ["Dwarf Fortress.exe", "dwarfort", "Dwarf Fortress."].contains(&val.name()))
-    .is_some()
+    .any(|val: &Process| ["Dwarf Fortress.exe", "dwarfort", "Dwarf Fortress."].contains(&val.name()))
 }
 
 pub async fn download_to_file(url: String, file: PathBuf) -> Result<()> {