Cargo update

some small tweaks to formatting and found a display message that was not ment to be where it was
WardLordRuby · May 31, 2024 · ed17d98 · ed17d98
1 parent 4bdc5d9
commit ed17d98
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/main.rs b/src/main.rs
@@ -148,7 +148,6 @@ fn main() -> Result<(), slint::PlatformError> {
                                     order_data = Some(mod_loader_cfg.parse_into_map());
                                     ini.update().unwrap_or_else(|err| {
                                         error!(err_code = 6, "{err}");
-                                        ui.display_msg(&err.to_string());
                                     });
                                     collection =
                                         ini.collect_mods(&path, order_data.as_ref(), false);
@@ -498,7 +497,7 @@ fn main() -> Result<(), slint::PlatformError> {
                         }
                         let _ = get_or_update_game_dir(Some(try_path));
                     } else {
-                        error!("Required game files not found in: \"{}\", files missing: {}", try_path.display(), DisplayStrs(&not_found));
+                        error!("Required game files not found in: '{}', files missing: {}", try_path.display(), DisplayStrs(&not_found));
                         ui.display_msg(&format!("Could not find Elden Ring in:\n\"{}\"", try_path.display()));
                     }
                     Err(err) => {

diff --git a/src/utils/ini/mod_loader.rs b/src/utils/ini/mod_loader.rs
@@ -134,19 +134,19 @@ impl ModLoaderCfg {
     pub fn parse_section(&mut self) -> std::io::Result<OrderMap> {
         let map = self.parse_into_map();
         if self.section().len() != map.len() {
-            trace!("fixing usize parse error in \"{}\"", LOADER_FILES[2]);
+            trace!("fixing usize parse error in: {}", LOADER_FILES[2]);
             self.update_order_entries(None)?;
             return Ok(self.parse_into_map());
         }
         let mut values = self.iter().filter_map(|(k, _)| map.get(k)).collect::<Vec<_>>();
         values.sort();
         for (i, value) in values.iter().enumerate() {
             if i != **value {
-                trace!(
-                    "values in \"{}\" are not in order, sorting entries",
+                self.update_order_entries(None)?;
+                info!(
+                    "Found entries out of order, sorted load order entries in: {}",
                     LOADER_FILES[2]
                 );
-                self.update_order_entries(None)?;
                 return Ok(self.parse_into_map());
             }
         }

diff --git a/src/utils/installer.rs b/src/utils/installer.rs
@@ -572,10 +572,7 @@ pub fn scan_for_mods(game_dir: &Path, ini_dir: &Path) -> std::io::Result<usize>
     if !matches!(scan_dir.try_exists(), Ok(true)) {
         return new_io_error!(
             ErrorKind::BrokenPipe,
-            format!(
-                "\"mods\" folder does not exist in \"{}\"",
-                game_dir.display()
-            )
+            format!("\"mods\" folder does not exist in '{}'", game_dir.display())
         );
     };
     let num_files = items_in_directory(&scan_dir, FileType::File)?;