Merge commit 'dbde3c4669af10dd577590ed6980e5bd4552d13c' into feature-clean

packages/app-lib/src/util/fetch.rs

@@ -80,10 +80,9 @@ pub async fn fetch_advanced(
 ) -> crate::Result<Bytes> {
     let _permit = semaphore.0.acquire().await?;
 
-    let creds = if !header
+    let creds = if header
         .as_ref()
-        .map(|x| &*x.0.to_lowercase() == "authorization")
-        .unwrap_or(false)
+        .is_none_or(|x| &*x.0.to_lowercase() != "authorization")
         && (url.starts_with("https://cdn.modrinth.com")
             || url.starts_with(MODRINTH_API_URL)
             || url.starts_with(MODRINTH_API_URL_V3))

packages/app-lib/src/util/io.rs

@@ -35,7 +35,6 @@ impl IOError {
     }
 }
 
-// dunce canonicalize
 pub fn canonicalize(
     path: impl AsRef<std::path::Path>,
 ) -> Result<std::path::PathBuf, IOError> {
@@ -46,7 +45,6 @@ pub fn canonicalize(
     })
 }
 
-// read_dir
 pub async fn read_dir(
     path: impl AsRef<std::path::Path>,
 ) -> Result<tokio::fs::ReadDir, IOError> {
@@ -59,7 +57,6 @@ pub async fn read_dir(
         })
 }
 
-// create_dir
 pub async fn create_dir(
     path: impl AsRef<std::path::Path>,
 ) -> Result<(), IOError> {
@@ -72,7 +69,6 @@ pub async fn create_dir(
         })
 }
 
-// create_dir_all
 pub async fn create_dir_all(
     path: impl AsRef<std::path::Path>,
 ) -> Result<(), IOError> {
@@ -85,7 +81,6 @@ pub async fn create_dir_all(
         })
 }
 
-// remove_dir_all
 pub async fn remove_dir_all(
     path: impl AsRef<std::path::Path>,
 ) -> Result<(), IOError> {
@@ -98,20 +93,37 @@ pub async fn remove_dir_all(
         })
 }
 
-// read_to_string
-pub async fn read_to_string(
+/// Reads a text file to a string, automatically detecting its encoding and
+/// substituting any invalid characters with the Unicode replacement character.
+///
+/// This function is best suited for reading Minecraft instance files, whose
+/// encoding may vary depending on the platform, launchers, client versions
+/// (older Minecraft versions tended to rely on the system's default codepage
+/// more on Windows platforms), and mods used, while not being highly sensitive
+/// to occasional occurrences of mojibake or character replacements.
+pub async fn read_any_encoding_to_string(
     path: impl AsRef<std::path::Path>,
-) -> Result<String, IOError> {
+) -> Result<(String, &'static encoding_rs::Encoding), IOError> {
     let path = path.as_ref();
-    tokio::fs::read_to_string(path)
-        .await
-        .map_err(|e| IOError::IOPathError {
-            source: e,
-            path: path.to_string_lossy().to_string(),
-        })
+    let file_bytes =
+        tokio::fs::read(path)
+            .await
+            .map_err(|e| IOError::IOPathError {
+                source: e,
+                path: path.to_string_lossy().to_string(),
+            })?;
+
+    let file_encoding = {
+        let mut encoding_detector = chardetng::EncodingDetector::new();
+        encoding_detector.feed(&file_bytes, true);
+        encoding_detector.guess(None, true)
+    };
+
+    let (file_string, actual_file_encoding, _) =
+        file_encoding.decode(&file_bytes);
+    Ok((file_string.to_string(), actual_file_encoding))
 }
 
-// read
 pub async fn read(
     path: impl AsRef<std::path::Path>,
 ) -> Result<Vec<u8>, IOError> {
@@ -124,7 +136,6 @@ pub async fn read(
         })
 }
 
-// write
 pub async fn write(
     path: impl AsRef<std::path::Path>,
     data: impl AsRef<[u8]>,
@@ -186,7 +197,6 @@ pub fn is_same_disk(old_dir: &Path, new_dir: &Path) -> Result<bool, IOError> {
     }
 }
 
-// rename
 pub async fn rename_or_move(
     from: impl AsRef<std::path::Path>,
     to: impl AsRef<std::path::Path>,
@@ -228,7 +238,6 @@ async fn move_recursive(from: &Path, to: &Path) -> Result<(), IOError> {
     Ok(())
 }
 
-// copy
 pub async fn copy(
     from: impl AsRef<std::path::Path>,
     to: impl AsRef<std::path::Path>,
@@ -243,7 +252,6 @@ pub async fn copy(
         })
 }
 
-// remove file
 pub async fn remove_file(
     path: impl AsRef<std::path::Path>,
 ) -> Result<(), IOError> {
@@ -256,7 +264,6 @@ pub async fn remove_file(
         })
 }
 
-// open file
 pub async fn open_file(
     path: impl AsRef<std::path::Path>,
 ) -> Result<tokio::fs::File, IOError> {
@@ -269,7 +276,6 @@ pub async fn open_file(
         })
 }
 
-// remove dir
 pub async fn remove_dir(
     path: impl AsRef<std::path::Path>,
 ) -> Result<(), IOError> {
@@ -282,7 +288,6 @@ pub async fn remove_dir(
         })
 }
 
-// metadata
 pub async fn metadata(
     path: impl AsRef<std::path::Path>,
 ) -> Result<std::fs::Metadata, IOError> {

packages/app-lib/src/util/jre.rs

@@ -227,13 +227,11 @@ async fn get_all_jre_path() -> HashSet<PathBuf> {
     paths.unwrap_or_else(|_| HashSet::new())
 }
 
-#[cfg(target_os = "windows")]
-#[allow(dead_code)]
-pub const JAVA_BIN: &str = "javaw.exe";
-
-#[cfg(not(target_os = "windows"))]
-#[allow(dead_code)]
-pub const JAVA_BIN: &str = "java";
+pub const JAVA_BIN: &str = if cfg!(target_os = "windows") {
+    "javaw.exe"
+} else {
+    "java"
+};
 
 // For each example filepath in 'paths', perform check_java_at_filepath, checking each one concurrently
 // and returning a JavaVersion for every valid path that points to a java bin
@@ -249,7 +247,7 @@ pub async fn check_java_at_filepaths(
         .collect::<Vec<_>>()
         .await;
 
-    jres.into_iter().flat_map(|x| x.ok()).flatten().collect()
+    jres.into_iter().filter_map(|x| x.ok()).flatten().collect()
 }
 
 // For example filepath 'path', attempt to resolve it and get a Java version at this path

packages/app-lib/src/util/mod.rs

@@ -5,15 +5,3 @@ pub mod jre;
 pub mod platform;
 pub mod utils; // AstralRinth
 pub mod server_ping;
-
-/// Wrap a builder which uses a mut reference into one which outputs an owned value
-macro_rules! wrap_ref_builder {
-    ($id:ident = $init:expr => $transform:block) => {{
-        let mut it = $init;
-        {
-            let $id = &mut it;
-            $transform;
-        }
-        it
-    }};
-}