MTP: Show loading progress when opening folders

vdavid · vdavid · commit 77ebaa00cbda · 2026-03-18T13:19:26.000+01:00
- `list_directory_with_progress()` on `MtpConnectionManager` uses mtp-rs's
  new `list_objects_stream()` to get the handle count upfront, then fetches
  metadata per handle with progress callbacks every 20 items
- `MtpVolume` overrides the `Volume` trait's `list_directory_with_progress()`
  to wire this through
- Extracted `convert_object_infos()` and `finalize_listing()` to share
  post-processing between the two listing code paths
- No frontend changes needed — the existing streaming listing pipeline
  already displays "Loaded N files..." when progress callbacks fire
diff --git a/apps/desktop/src-tauri/src/file_system/volume/mtp.rs b/apps/desktop/src-tauri/src/file_system/volume/mtp.rs
@@ -112,8 +112,6 @@ impl Volume for MtpVolume {
             mtp_path
         );
 
-        // Get the tokio runtime handle - we're inside spawn_blocking,
-        // so block_on is safe here
         let handle = tokio::runtime::Handle::current();
 
         let start = std::time::Instant::now();
@@ -139,6 +137,48 @@ impl Volume for MtpVolume {
         result.map_err(map_mtp_error)
     }
 
+    fn list_directory_with_progress(
+        &self,
+        path: &Path,
+        on_progress: &dyn Fn(usize),
+    ) -> Result<Vec<FileEntry>, VolumeError> {
+        let mtp_path = self.to_mtp_path(path);
+        let device_id = self.device_id.clone();
+        let storage_id = self.storage_id;
+
+        debug!(
+            "MtpVolume::list_directory_with_progress: device={}, storage={}, input_path={}, mtp_path={}",
+            device_id,
+            storage_id,
+            path.display(),
+            mtp_path
+        );
+
+        let handle = tokio::runtime::Handle::current();
+
+        let start = std::time::Instant::now();
+        let result = handle.block_on(async move {
+            connection_manager()
+                .list_directory_with_progress(&device_id, storage_id, &mtp_path, on_progress)
+                .await
+        });
+
+        match &result {
+            Ok(entries) => debug!(
+                "MtpVolume::list_directory_with_progress: completed in {:?}, {} entries",
+                start.elapsed(),
+                entries.len()
+            ),
+            Err(e) => debug!(
+                "MtpVolume::list_directory_with_progress: failed in {:?}, error={:?}",
+                start.elapsed(),
+                e
+            ),
+        }
+
+        result.map_err(map_mtp_error)
+    }
+
     fn get_metadata(&self, path: &Path) -> Result<FileEntry, VolumeError> {
         // MTP doesn't have a direct "get metadata" API - we need to list the parent
         // and find the entry. For now, return NotSupported.
diff --git a/apps/desktop/src-tauri/src/indexing/store.rs b/apps/desktop/src-tauri/src/indexing/store.rs
@@ -828,8 +828,14 @@ impl IndexStore {
             Ok(())
         })();
         match result {
-            Ok(()) => { conn.execute_batch("RELEASE insert_entries")?; Ok(()) }
-            Err(e) => { let _ = conn.execute_batch("ROLLBACK TO insert_entries"); Err(e) }
+            Ok(()) => {
+                conn.execute_batch("RELEASE insert_entries")?;
+                Ok(())
+            }
+            Err(e) => {
+                let _ = conn.execute_batch("ROLLBACK TO insert_entries");
+                Err(e)
+            }
         }
     }
 
@@ -899,8 +905,14 @@ impl IndexStore {
             Ok(())
         })();
         match result {
-            Ok(()) => { conn.execute_batch("RELEASE upsert_stats")?; Ok(()) }
-            Err(e) => { let _ = conn.execute_batch("ROLLBACK TO upsert_stats"); Err(e) }
+            Ok(()) => {
+                conn.execute_batch("RELEASE upsert_stats")?;
+                Ok(())
+            }
+            Err(e) => {
+                let _ = conn.execute_batch("ROLLBACK TO upsert_stats");
+                Err(e)
+            }
         }
     }
 
diff --git a/apps/desktop/src-tauri/src/mtp/connection/directory_ops.rs b/apps/desktop/src-tauri/src/mtp/connection/directory_ops.rs
