Add lexical-sort again after reverting it by mistake

Aligorith · Jun 22, 2020 · 08ca26c · 08ca26c
1 parent 6c57992
commit 08ca26c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -50,6 +50,6 @@ backtrace = "0.3"
 serde = { version = "1.0", features = ["derive"] }
 toml = "0.5"
 rand = "0.7"
-alphanumeric-sort = "1.0"
+lexical-sort = "0.3"
 trash = "1.0"
 clap = { version = "2.33", default-features = false }
diff --git a/src/image_cache/mod.rs b/src/image_cache/mod.rs
@@ -746,7 +746,10 @@ impl ImageCache {
 			.collect();
 
 		dir_files.sort_unstable_by(|a, b| {
-			alphanumeric_sort::compare_os_str(&a.dir_entry.file_name(), &b.dir_entry.file_name())
+			lexical_sort::natural_lexical_cmp(
+				&a.dir_entry.file_name().to_string_lossy(),
+				&b.dir_entry.file_name().to_string_lossy(),
+			)
 		});
 
 		Ok(dir_files)