krolyxon
/
rmptui
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix sorting

This commit is contained in:
krolxon 2024-05-22 19:36:49 +05:30
parent c3dc9931d5
commit 380a4193c9
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/browser.rs
View File

@ -62,8 +62,19 @@ impl FileBrowser {
} }
} }
dir_vec.sort_by(|a, b| a.0.cmp(&b.0)); // dir_vec.sort_by(|a, b| a.1.cmp(&b.1));
file_vec.sort_by(|a, b| a.0.cmp(&b.0)); dir_vec.sort_by(|a, b| {
let num_a = a.1.parse::<u32>().unwrap_or(u32::MAX);
let num_b = b.1.parse::<u32>().unwrap_or(u32::MAX);
num_a.cmp(&num_b).then_with(|| a.1.to_lowercase().cmp(&b.1.to_lowercase()))
});
file_vec.sort_by(|a, b| {
let num_a = a.1.parse::<u32>().unwrap_or(u32::MAX);
let num_b = b.1.parse::<u32>().unwrap_or(u32::MAX);
num_a.cmp(&num_b).then_with(|| a.1.to_lowercase().cmp(&b.1.to_lowercase()))
});
dir_vec.extend(file_vec); dir_vec.extend(file_vec);
self.filetree = dir_vec; self.filetree = dir_vec;