Bugfix: Fix MTP browsing and device name

vdavid · vdavid · commit d37b8a5f5ddf · 2026-03-18T13:19:25.000+01:00
- Fix panic in `MtpVolume::list_directory`: the cancellation-aware `std::thread::spawn` in `streaming.rs` had no Tokio runtime context, so `Handle::current()` panicked. Pass the runtime handle into the thread via `handle.enter()`.
- Show device name ("Pixel 9 Pro XL") instead of storage name ("Internal shared storage") for single-storage MTP devices in the volume picker.
diff --git a/apps/desktop/src-tauri/src/file_system/listing/streaming.rs b/apps/desktop/src-tauri/src/file_system/listing/streaming.rs
@@ -271,7 +271,14 @@ fn read_directory_with_progress(
     let app_for_progress = app.clone();
     let listing_id_for_progress = listing_id.to_string();
 
+    // Capture the Tokio runtime handle so the spawned thread can access it.
+    // This is needed for MTP volumes, which use `Handle::block_on` internally.
+    let runtime_handle = tokio::runtime::Handle::current();
+
     std::thread::spawn(move || {
+        // Enter the Tokio runtime context so `Handle::current()` works inside volumes
+        let _guard = runtime_handle.enter();
+
         let on_progress = |loaded_count: usize| {
             use tauri::Emitter;
             let _ = app_for_progress.emit(
diff --git a/apps/desktop/src/lib/mtp/mtp-store.svelte.ts b/apps/desktop/src/lib/mtp/mtp-store.svelte.ts
@@ -402,7 +402,7 @@ export interface MtpVolume {
     deviceId: string
     /** Storage ID */
     storageId: number
-    /** Display name: "{DeviceName} - {StorageName}" or just storage name if device has one storage */
+    /** Display name: "{DeviceName} - {StorageName}" for multi-storage, or just device name for single storage */
     name: string
     /** Virtual path: "mtp://{deviceId}/{storageId}" */
     path: string
@@ -423,11 +423,11 @@ export function getMtpVolumes(): MtpVolume[] {
     for (const deviceState of state.devices.values()) {
         if (deviceState.connectionState === 'connected' && deviceState.storages.length > 0) {
             // Connected device with storages: create one volume per storage
-            const showDeviceName = deviceState.storages.length > 1
+            const hasMultipleStorages = deviceState.storages.length > 1
             for (const storage of deviceState.storages) {
-                const volumeName = showDeviceName
+                const volumeName = hasMultipleStorages
                     ? `${deviceState.displayName} - ${storage.name}`
-                    : storage.name || deviceState.displayName
+                    : deviceState.displayName || storage.name
 
                 volumes.push({
                     id: `${deviceState.device.id}:${String(storage.id)}`,
diff --git a/apps/desktop/src/lib/mtp/mtp-store.test.ts b/apps/desktop/src/lib/mtp/mtp-store.test.ts
@@ -431,7 +431,7 @@ describe('mtp-store', () => {
             expect(volumes[0].isReadOnly).toBe(true)
         })
 
-        it('uses storage name only for single storage device', async () => {
+        it('uses device name for single storage device', async () => {
             vi.mocked(listMtpDevices).mockResolvedValue([mockDevice])
             vi.mocked(connectMtpDevice).mockResolvedValue(mockConnectedInfo)
             const { scanDevices, connect, getMtpVolumes } = await loadModule()
@@ -441,8 +441,8 @@ describe('mtp-store', () => {
 
             const volumes = getMtpVolumes()
             expect(volumes).toHaveLength(1)
-            // Single storage: use storage name, not "Device - Storage"
-            expect(volumes[0].name).toBe('Internal shared storage')
+            // Single storage: use device name, not storage name
+            expect(volumes[0].name).toBe('Pixel 8')
         })
     })
 
