From 380a4193c920bb90606ef4590ad5111161fedfc7 Mon Sep 17 00:00:00 2001 From: krolxon Date: Wed, 22 May 2024 19:36:49 +0530 Subject: [PATCH] fix sorting --- src/browser.rs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/browser.rs b/src/browser.rs index 3d57a79..3ec0fac 100755 --- a/src/browser.rs +++ b/src/browser.rs @@ -62,8 +62,19 @@ impl FileBrowser { } } - dir_vec.sort_by(|a, b| a.0.cmp(&b.0)); - file_vec.sort_by(|a, b| a.0.cmp(&b.0)); + // dir_vec.sort_by(|a, b| a.1.cmp(&b.1)); + dir_vec.sort_by(|a, b| { + let num_a = a.1.parse::().unwrap_or(u32::MAX); + let num_b = b.1.parse::().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::().unwrap_or(u32::MAX); + let num_b = b.1.parse::().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); self.filetree = dir_vec;