Clean up file reader

DrZoddiak · Mar 28, 2024 · 5f28bd1 · 5f28bd1
1 parent 7394aca
commit 5f28bd1
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/crates/ore_monitor/src/lib.rs b/crates/ore_monitor/src/lib.rs
@@ -271,16 +271,15 @@ pub mod file_reader {
         /// assert_eq!(file,mod_info);
         /// ```
         pub fn handle_file(&self, path: Option<&Path>) -> Result<OreModInfo> {
-            Ok(path.unwrap_or(self.base_path.deref()))
+            let mut reader = Ok(path.unwrap_or(self.base_path.deref()))
                 .map(File::open)?
                 .map(BufReader::new)
                 .map(ZipArchive::new)?
-                .map(JarFileReader::new)
-                .map(|mut reader| {
-                    FileTypes::InfoFile
-                        .try_get(&mut reader)
-                        .or_else(|_| FileTypes::PluginFile.try_get(&mut reader))
-                })?
+                .map(JarFileReader::new)?;
+
+            FileTypes::InfoFile
+                .try_get(&mut reader)
+                .or_else(|_| FileTypes::PluginFile.try_get(&mut reader))
         }
     }