src-tauri/Cargo.lock

@@ -335,7 +335,6 @@ dependencies = [
  "mime_guess",
  "mountpoints",
  "once_cell",
- "regex",
  "serde",
  "serde_json",
  "serde_repr",
@@ -2286,9 +2285,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.7.2"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cce168fea28d3e05f158bda4576cf0c844d5045bc2cc3620fa0292ed5bb5814c"
+checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2306,9 +2305,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.29"
+version = "0.6.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
 
 [[package]]
 name = "rfd"

src-tauri/Cargo.toml

@@ -28,7 +28,6 @@ mountpoints = "0.2.1"
 md-5 = "0.10.5"
 urlencoding = "2.1.2"
 mime_guess = "2.0.4"
-regex = "1.7.2"
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem

src-tauri/src/commands/files.rs

@@ -4,21 +4,12 @@ use std::{
 };
 
 use mountpoints::mountinfos;
-use regex::Regex;
 use serde::Serialize;
 use tauri::Runtime;
 
 use crate::utils;
 
-fn compute_all_digits(text: &str) -> usize {
+#[derive(Debug, Clone, Serialize)]
-    let re = Regex::new(r#"\d+"#).unwrap();
-    re.find_iter(&["a", text, "0"].join(" "))
-        .map(|b| b.as_str())
-        .map(|b| usize::from_str_radix(b, 10).unwrap_or(0))
-        .sum::<usize>()
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize)]
 pub struct FileItem {
     pub id: String,
     pub filename: String,
@@ -27,19 +18,7 @@ pub struct FileItem {
     pub width: u32,
 }
 
-impl PartialOrd for FileItem {
+#[derive(Debug, Clone, Serialize)]
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        let this_digit = compute_all_digits(&self.filename);
-        let other_digit = compute_all_digits(&other.filename);
-        if this_digit == other_digit {
-            self.filename.partial_cmp(&other.filename)
-        } else {
-            this_digit.partial_cmp(&other_digit)
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize)]
 pub struct DirItem {
     pub id: String,
     pub dirname: String,
@@ -47,18 +26,6 @@ pub struct DirItem {
     pub root: bool,
 }
 
-impl PartialOrd for DirItem {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        let this_digit = compute_all_digits(&self.dirname);
-        let other_digit = compute_all_digits(&other.dirname);
-        if this_digit == other_digit {
-            self.dirname.partial_cmp(&other.dirname)
-        } else {
-            this_digit.partial_cmp(&other_digit)
-        }
-    }
-}
-
 fn is_hidden(entry: &DirEntry) -> bool {
     entry
         .file_name()
@@ -125,7 +92,7 @@ pub async fn scan_directory(target: String) -> Result<Vec<FileItem>, String> {
             width,
         });
     }
-    file_items.sort_by(|a, b| a.partial_cmp(&b).unwrap());
+    file_items.sort_by(|a, b| a.filename.partial_cmp(&b.filename).unwrap());
 
     Ok(file_items)
 }
@@ -226,7 +193,7 @@ pub async fn scan_for_child_dirs<R: Runtime>(
             root: false,
         });
     }
-    child_dirs.sort_by(|a, b| a.partial_cmp(&b).unwrap());
+    child_dirs.sort_by(|a, b| a.dirname.partial_cmp(&b.dirname).unwrap());
     Ok(child_dirs)
 }