From 591587649ccc6db17e6c52f95736c415898e2a1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=98=D0=B0=D0=BD=20=D0=93=D0=B5=D0=BE?= =?UTF-8?q?=D1=80=D0=B3=D0=B8=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?= Date: Wed, 4 Jul 2018 23:41:54 +0200 Subject: [PATCH] sort directories first, and then alphabetically by filename --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index b42f722..9b4f451 100644 --- a/src/main.rs +++ b/src/main.rs @@ -50,7 +50,7 @@ fn handle_directory<'a, 'b>( .filter(|r| dir.is_visible(r)) .filter_map(|r| r.ok()) .collect(); - paths.sort_by_key(|dir| dir.metadata().unwrap().file_type().is_dir()); + paths.sort_by_key(|r| (!r.metadata().unwrap().file_type().is_dir(), r.file_name())); for entry in paths { let meta = entry.metadata()?; let file_url = utf8_percent_encode(&entry.file_name().to_string_lossy(), DEFAULT_ENCODE_SET).to_string();