Make directories sortable by size

- Make them actually sort by size if the sort order is that for files
- Add a "Directory sort setting" to settings to turn this off

Author: vdavid

apps/desktop/src-tauri/src/commands/file_system.rs

@@ -7,9 +7,9 @@ use crate::file_system::write_operations::{
     resolve_write_conflict as ops_resolve_write_conflict, start_scan_preview as ops_start_scan_preview,
 };
 use crate::file_system::{
-    FileEntry, ListingStartResult, ListingStats, OperationStatus, OperationSummary, ResortResult, ScanConflict,
-    SortColumn, SortOrder, StreamingListingStartResult, VolumeCopyConfig, VolumeCopyScanResult, WriteOperationConfig,
-    WriteOperationError, WriteOperationStartResult, cancel_listing as ops_cancel_listing,
+    DirectorySortMode, FileEntry, ListingStartResult, ListingStats, OperationStatus, OperationSummary, ResortResult,
+    ScanConflict, SortColumn, SortOrder, StreamingListingStartResult, VolumeCopyConfig, VolumeCopyScanResult,
+    WriteOperationConfig, WriteOperationError, WriteOperationStartResult, cancel_listing as ops_cancel_listing,
     cancel_write_operation as ops_cancel_write_operation, copy_between_volumes as ops_copy_between_volumes,
     copy_files_start as ops_copy_files_start, delete_files_start as ops_delete_files_start,
     find_file_index as ops_find_file_index, get_file_at as ops_get_file_at, get_file_range as ops_get_file_range,
@@ -132,23 +132,27 @@ pub fn list_directory_start(
     include_hidden: bool,
     sort_by: SortColumn,
     sort_order: SortOrder,
+    directory_sort_mode: Option<DirectorySortMode>,
 ) -> Result<ListingStartResult, String> {
     let expanded_path = expand_tilde(&path);
     let path_buf = PathBuf::from(&expanded_path);
-    ops_list_directory_start_with_volume("root", &path_buf, include_hidden, sort_by, sort_order)
+    let dir_sort_mode = directory_sort_mode.unwrap_or_default();
+    ops_list_directory_start_with_volume("root", &path_buf, include_hidden, sort_by, sort_order, dir_sort_mode)
         .map_err(|e| format!("Failed to start directory listing '{}': {}", path, e))
 }
 
 /// Returns immediately; reads in background.
 /// Emits listing-progress, listing-complete, listing-error, listing-cancelled.
 #[tauri::command]
+#[allow(clippy::too_many_arguments, reason = "Tauri commands require top-level arguments")]
 pub async fn list_directory_start_streaming(
     app: tauri::AppHandle,
     volume_id: String,
     path: String,
     include_hidden: bool,
     sort_by: SortColumn,
     sort_order: SortOrder,
+    directory_sort_mode: Option<DirectorySortMode>,
     listing_id: String,
 ) -> Result<StreamingListingStartResult, String> {
     // Only expand tilde for local volumes (not MTP)
@@ -158,13 +162,15 @@ pub async fn list_directory_start_streaming(
         path.clone()
     };
     let path_buf = PathBuf::from(&expanded_path);
+    let dir_sort_mode = directory_sort_mode.unwrap_or_default();
     ops_list_directory_start_streaming(
         app,
         &volume_id,
         &path_buf,
         include_hidden,
         sort_by,
         sort_order,
+        dir_sort_mode,
         listing_id,
     )
     .await
@@ -176,11 +182,13 @@ pub fn cancel_listing(listing_id: String) {
     ops_cancel_listing(&listing_id);
 }
 
+#[allow(clippy::too_many_arguments, reason = "Tauri commands require top-level arguments")]
 #[tauri::command]
 pub fn resort_listing(
     listing_id: String,
     sort_by: SortColumn,
     sort_order: SortOrder,
+    directory_sort_mode: Option<DirectorySortMode>,
     cursor_filename: Option<String>,
     include_hidden: bool,
     selected_indices: Option<Vec<usize>>,
@@ -190,6 +198,7 @@ pub fn resort_listing(
         &listing_id,
         sort_by,
         sort_order,
+        directory_sort_mode.unwrap_or_default(),
         cursor_filename.as_deref(),
         include_hidden,
         selected_indices.as_deref(),

apps/desktop/src-tauri/src/file_system/listing/caching.rs

@@ -5,7 +5,7 @@ use std::path::PathBuf;
 use std::sync::{LazyLock, RwLock};
 
 use crate::file_system::listing::metadata::FileEntry;
-use crate::file_system::listing::sorting::{SortColumn, SortOrder};
+use crate::file_system::listing::sorting::{DirectorySortMode, SortColumn, SortOrder};
 
 /// Cache for directory listings (on-demand virtual scrolling).
 /// Key: listing_id, Value: cached listing with all entries.
@@ -29,6 +29,8 @@ pub(crate) struct CachedListing {
     pub sort_by: SortColumn,
     /// Current sort order
     pub sort_order: SortOrder,
+    /// How directories are sorted relative to the current sort column
+    pub directory_sort_mode: DirectorySortMode,
 }
 
 /// Cached directory listing for on-demand virtual scrolling.
@@ -44,4 +46,6 @@ pub(crate) struct CachedListing {
     pub sort_by: SortColumn,
     /// Current sort order
     pub sort_order: SortOrder,
+    /// How directories are sorted relative to the current sort column
+    pub directory_sort_mode: DirectorySortMode,
 }

apps/desktop/src-tauri/src/file_system/listing/hidden_files_test.rs

@@ -5,6 +5,7 @@
 
 use super::caching::{CachedListing, LISTING_CACHE};
 use super::operations::{find_file_index, get_file_at, get_file_range, get_total_count, list_directory_end};
+use super::sorting::DirectorySortMode;
 use super::{FileEntry, SortColumn, SortOrder};
 use crate::file_system::volume::{InMemoryVolume, Volume};
 use std::path::Path;
@@ -69,6 +70,7 @@ fn test_get_total_count_with_hidden_includes_all() {
                 entries,
                 sort_by: SortColumn::Name,
                 sort_order: SortOrder::Ascending,
+                directory_sort_mode: DirectorySortMode::LikeFiles,
             },
         );
     }
@@ -99,6 +101,7 @@ fn test_get_total_count_without_hidden_excludes_dot_files() {
                 entries,
                 sort_by: SortColumn::Name,
                 sort_order: SortOrder::Ascending,
+                directory_sort_mode: DirectorySortMode::LikeFiles,
             },
         );
     }
@@ -133,6 +136,7 @@ fn test_get_file_range_with_hidden_returns_all() {
                 entries,
                 sort_by: SortColumn::Name,
                 sort_order: SortOrder::Ascending,
+                directory_sort_mode: DirectorySortMode::LikeFiles,
             },
         );
     }
@@ -168,6 +172,7 @@ fn test_get_file_range_without_hidden_excludes_dot_files() {
                 entries,
                 sort_by: SortColumn::Name,
                 sort_order: SortOrder::Ascending,
+                directory_sort_mode: DirectorySortMode::LikeFiles,
             },
         );
     }
@@ -207,6 +212,7 @@ fn test_get_file_range_pagination_respects_hidden_filter() {
                 entries,
                 sort_by: SortColumn::Name,
                 sort_order: SortOrder::Ascending,
+                directory_sort_mode: DirectorySortMode::LikeFiles,
             },
         );
     }
@@ -253,6 +259,7 @@ fn test_find_file_index_hidden_file_with_hidden_enabled() {
                 entries,
                 sort_by: SortColumn::Name,
                 sort_order: SortOrder::Ascending,
+                directory_sort_mode: DirectorySortMode::LikeFiles,
             },
         );
     }
@@ -282,6 +289,7 @@ fn test_find_file_index_hidden_file_with_hidden_disabled() {
                 entries,
                 sort_by: SortColumn::Name,
                 sort_order: SortOrder::Ascending,
+                directory_sort_mode: DirectorySortMode::LikeFiles,
             },
         );
     }
@@ -311,6 +319,7 @@ fn test_find_file_index_visible_file_index_changes_with_hidden_setting() {
                 entries,
                 sort_by: SortColumn::Name,
                 sort_order: SortOrder::Ascending,
+                directory_sort_mode: DirectorySortMode::LikeFiles,
             },
         );
     }
@@ -357,6 +366,7 @@ fn test_get_file_at_index_0_with_hidden_enabled() {
                 entries,
                 sort_by: SortColumn::Name,
                 sort_order: SortOrder::Ascending,
+                directory_sort_mode: DirectorySortMode::LikeFiles,
             },
         );
     }
@@ -392,6 +402,7 @@ fn test_get_file_at_index_0_with_hidden_disabled() {
                 entries,
                 sort_by: SortColumn::Name,
                 sort_order: SortOrder::Ascending,
+                directory_sort_mode: DirectorySortMode::LikeFiles,
             },
         );
     }
@@ -436,6 +447,7 @@ fn test_directory_with_only_hidden_files() {
                 entries,
                 sort_by: SortColumn::Name,
                 sort_order: SortOrder::Ascending,
+                directory_sort_mode: DirectorySortMode::LikeFiles,
             },
         );
     }
@@ -470,6 +482,7 @@ fn test_directory_with_no_hidden_files() {
                 entries,
                 sort_by: SortColumn::Name,
                 sort_order: SortOrder::Ascending,
+                directory_sort_mode: DirectorySortMode::LikeFiles,
             },
         );
     }

apps/desktop/src-tauri/src/file_system/listing/mod.rs

@@ -15,7 +15,7 @@ pub use operations::{
     get_max_filename_width, get_total_count, list_directory_end, list_directory_start_with_volume, resort_listing,
 };
 pub use reading::{get_single_entry, list_directory_core};
-pub use sorting::{SortColumn, SortOrder};
+pub use sorting::{DirectorySortMode, SortColumn, SortOrder};
 pub use streaming::{StreamingListingStartResult, cancel_listing, list_directory_start_streaming};
 
 // macOS-only exports (used by drag operations)

apps/desktop/src-tauri/src/file_system/listing/operations.rs

@@ -12,7 +12,7 @@ use uuid::Uuid;
 use crate::benchmark;
 use crate::file_system::listing::caching::{CachedListing, LISTING_CACHE};
 use crate::file_system::listing::metadata::FileEntry;
-use crate::file_system::listing::sorting::{SortColumn, SortOrder, sort_entries};
+use crate::file_system::listing::sorting::{DirectorySortMode, SortColumn, SortOrder, sort_entries};
 use crate::file_system::watcher::{start_watching, stop_watching};
 
 /// Returns true if the entry is not a hidden dotfile.
@@ -39,7 +39,14 @@ pub struct ListingStartResult {
 /// Reads the directory once, caches it, and returns listing ID + total count.
 /// Frontend then fetches visible ranges on demand via `get_file_range`.
 pub fn list_directory_start(path: &Path, include_hidden: bool) -> Result<ListingStartResult, std::io::Error> {
-    list_directory_start_with_volume("root", path, include_hidden, SortColumn::Name, SortOrder::Ascending)
+    list_directory_start_with_volume(
+        "root",
+        path,
+        include_hidden,
+        SortColumn::Name,
+        SortOrder::Ascending,
+        DirectorySortMode::LikeFiles,
+    )
 }
 
 /// Starts a new directory listing using a specific volume.
@@ -51,6 +58,7 @@ pub fn list_directory_start_with_volume(
     include_hidden: bool,
     sort_by: SortColumn,
     sort_order: SortOrder,
+    dir_sort_mode: DirectorySortMode,
 ) -> Result<ListingStartResult, std::io::Error> {
     // Reset benchmark epoch for this navigation
     benchmark::reset_epoch();
@@ -80,9 +88,13 @@ pub fn list_directory_start_with_volume(
         all_entries.iter().filter(|e| is_visible(e)).count()
     };
 
-    // Sort the entries
+    // Enrich directory entries with index data (recursive_size etc.) before sorting,
+    // so that sort-by-size works correctly for directories.
     let mut all_entries = all_entries;
-    sort_entries(&mut all_entries, sort_by, sort_order);
+    crate::indexing::enrich_entries_with_index(&mut all_entries);
+
+    // Sort the entries
+    sort_entries(&mut all_entries, sort_by, sort_order, dir_sort_mode);
 
     // Cache the entries FIRST (watcher will read from here)
     if let Ok(mut cache) = LISTING_CACHE.write() {
@@ -94,6 +106,7 @@ pub fn list_directory_start_with_volume(
                 entries: all_entries.clone(),
                 sort_by,
                 sort_order,
+                directory_sort_mode: dir_sort_mode,
             },
         );
     }
@@ -318,10 +331,15 @@ pub struct ResortResult {
 /// Re-sorts an existing cached listing in-place.
 ///
 /// More efficient than creating a new listing when you just want to change the sort order.
+#[allow(
+    clippy::too_many_arguments,
+    reason = "Resort requires sort params, cursor tracking, and selection state"
+)]
 pub fn resort_listing(
     listing_id: &str,
     sort_by: SortColumn,
     sort_order: SortOrder,
+    dir_sort_mode: DirectorySortMode,
     cursor_filename: Option<&str>,
     include_hidden: bool,
     selected_indices: Option<&[usize]>,
@@ -351,9 +369,13 @@ pub fn resort_listing(
         })
     };
 
+    // Refresh index data before re-sorting (cache entries may not have fresh sizes)
+    crate::indexing::enrich_entries_with_index(&mut listing.entries);
+
     // Re-sort the entries
-    sort_entries(&mut listing.entries, sort_by, sort_order);
+    sort_entries(&mut listing.entries, sort_by, sort_order, dir_sort_mode);
     listing.sort_by = sort_by;
+    listing.directory_sort_mode = dir_sort_mode;
     listing.sort_order = sort_order;
 
     // Find the new cursor position
@@ -417,7 +439,13 @@ pub(crate) fn update_listing_entries(listing_id: &str, entries: Vec<FileEntry>)
         && let Some(listing) = cache.get_mut(listing_id)
     {
         let mut entries = entries;
-        sort_entries(&mut entries, listing.sort_by, listing.sort_order);
+        crate::indexing::enrich_entries_with_index(&mut entries);
+        sort_entries(
+            &mut entries,
+            listing.sort_by,
+            listing.sort_order,
+            listing.directory_sort_mode,
+        );
         listing.entries = entries;
     }
 }

apps/desktop/src-tauri/src/file_system/listing/reading.rs

@@ -14,7 +14,7 @@ use std::path::Path;
 
 use crate::benchmark;
 use crate::file_system::listing::metadata::{ExtendedMetadata, FileEntry, get_group_name, get_icon_id, get_owner_name};
-use crate::file_system::listing::sorting::{SortColumn, SortOrder, sort_entries};
+use crate::file_system::listing::sorting::{DirectorySortMode, SortColumn, SortOrder, sort_entries};
 
 /// Lists the contents of a directory with full metadata (including macOS extended metadata).
 ///
@@ -112,7 +112,12 @@ pub fn list_directory_core(path: &Path) -> Result<Vec<FileEntry>, std::io::Error
 
     // Sort: directories first, then files, both alphabetically (using natural sort)
     benchmark::log_event("sort START");
-    sort_entries(&mut entries, SortColumn::Name, SortOrder::Ascending);
+    sort_entries(
+        &mut entries,
+        SortColumn::Name,
+        SortOrder::Ascending,
+        DirectorySortMode::LikeFiles,
+    );
     benchmark::log_event("sort END");
 
     let total_time = overall_start.elapsed();