Wire up copy function!

vdavid · vdavid · commit fb5f0275fa3e · 2026-01-21T11:11:12.000+01:00
diff --git a/apps/desktop/coverage-allowlist.json b/apps/desktop/coverage-allowlist.json
@@ -32,6 +32,7 @@
         "updater.svelte.ts": { "reason": "Depends on Tauri updater APIs" },
         "window-state.ts": { "reason": "Depends on Tauri window APIs" },
         "write-operations/CopyDialog.svelte": { "reason": "UI modal, logic tested in copy-dialog-utils.test.ts" },
-        "write-operations/DirectionIndicator.svelte": { "reason": "Simple UI component, logic tested in copy-dialog-utils.test.ts" }
+        "write-operations/DirectionIndicator.svelte": { "reason": "Simple UI component, logic tested in copy-dialog-utils.test.ts" },
+        "write-operations/CopyProgressDialog.svelte": { "reason": "UI dialog, depends on Tauri events" }
     }
 }
diff --git a/apps/desktop/src-tauri/src/file_system/operations.rs b/apps/desktop/src-tauri/src/file_system/operations.rs
@@ -752,10 +752,26 @@ pub fn get_file_at(listing_id: &str, index: usize, include_hidden: bool) -> Resu
         .ok_or_else(|| format!("Listing not found: {}", listing_id))?;
 
     if include_hidden {
-        Ok(listing.entries.get(index).cloned())
+        let result = listing.entries.get(index).cloned();
+        if result.is_none() {
+            log::error!(
+                "get_file_at: index {} out of bounds (listing has {} entries) - frontend/backend index mismatch!",
+                index,
+                listing.entries.len()
+            );
+        }
+        Ok(result)
     } else {
         let visible: Vec<&FileEntry> = listing.entries.iter().filter(|e| !e.name.starts_with('.')).collect();
-        Ok(visible.get(index).cloned().cloned())
+        let result = visible.get(index).cloned().cloned();
+        if result.is_none() {
+            log::error!(
+                "get_file_at: index {} out of bounds (listing has {} visible entries) - frontend/backend index mismatch!",
+                index,
+                visible.len()
+            );
+        }
+        Ok(result)
     }
 }
 
diff --git a/apps/desktop/src-tauri/src/file_system/write_operations.rs b/apps/desktop/src-tauri/src/file_system/write_operations.rs
@@ -589,6 +589,13 @@ pub async fn copy_files_start(
     validate_destination_not_inside_source(&sources, &destination)?;
 
     let operation_id = Uuid::new_v4().to_string();
+    log::info!(
+        "copy_files_start: operation_id={}, sources={:?}, destination={:?}, dry_run={}",
+        operation_id,
+        sources,
+        destination,
+        config.dry_run
+    );
     let state = Arc::new(WriteOperationState {
         cancelled: AtomicBool::new(false),
         progress_interval: Duration::from_millis(config.progress_interval_ms),
@@ -1048,6 +1055,12 @@ fn scan_sources(
     }
 
     // Emit final scanning progress
+    log::debug!(
+        "scan: emitting final write-progress op={} phase=scanning files={} bytes={}",
+        operation_id,
+        files.len(),
+        total_bytes
+    );
     let _ = app.emit(
         "write-progress",
         WriteProgressEvent {
@@ -1151,6 +1164,12 @@ fn scan_path_recursive(
     // Emit progress periodically
     if last_progress_time.elapsed() >= *progress_interval {
         let current_file = path.file_name().map(|n| n.to_string_lossy().to_string());
+        log::debug!(
+            "scan: emitting write-progress op={} phase=scanning files_found={} bytes_found={}",
+            operation_id,
+            files.len(),
+            *total_bytes
+        );
         let _ = app.emit(
             "write-progress",
             WriteProgressEvent {
@@ -1729,6 +1748,12 @@ fn copy_files_with_progress(
 ) -> Result<(), WriteOperationError> {
     use tauri::Emitter;
 
+    log::debug!(
+        "copy_files_with_progress: starting operation_id={}, {} sources",
+        operation_id,
+        sources.len()
+    );
+
     // Handle dry-run mode
     if config.dry_run {
         let scan_result = dry_run_scan(
@@ -1759,7 +1784,14 @@ fn copy_files_with_progress(
     }
 
     // Phase 1: Scan
+    log::debug!("copy_files_with_progress: starting scan phase for operation_id={}", operation_id);
     let scan_result = scan_sources(sources, state, app, operation_id, WriteOperationType::Copy)?;
+    log::info!(
+        "copy_files_with_progress: scan complete for operation_id={}, files={}, bytes={}",
+        operation_id,
+        scan_result.file_count,
+        scan_result.total_bytes
+    );
 
     // Phase 2: Copy files with rollback support
     let mut transaction = CopyTransaction::new();
@@ -1798,6 +1830,13 @@ fn copy_files_with_progress(
             // Spawn async sync for durability (non-blocking)
             spawn_async_sync();
 
+            log::info!(
+                "copy_files_with_progress: completed op={} files={} bytes={}",
+                operation_id,
+                files_done,
+                bytes_done
+            );
+
             // Emit completion
             let _ = app.emit(
                 "write-complete",
@@ -1812,17 +1851,24 @@ fn copy_files_with_progress(
         }
         Err(e) => {
             // Failure - rollback created files
+            log::error!(
+                "copy_files_with_progress: failed op={} error={:?}, rolling back",
+                operation_id,
+                e
+            );
             transaction.rollback();
 
-            // Emit error
-            let _ = app.emit(
-                "write-error",
-                WriteErrorEvent {
-                    operation_id: operation_id.to_string(),
-                    operation_type: WriteOperationType::Copy,
-                    error: e.clone(),
-                },
-            );
+            // Don't emit write-error for cancellation - write-cancelled was already emitted
+            if !matches!(e, WriteOperationError::Cancelled { .. }) {
+                let _ = app.emit(
+                    "write-error",
+                    WriteErrorEvent {
+                        operation_id: operation_id.to_string(),
+                        operation_type: WriteOperationType::Copy,
+                        error: e.clone(),
+                    },
+                );
+            }
             Err(e)
         }
     }
@@ -1852,6 +1898,11 @@ fn copy_path_recursive(
 
     // Check cancellation
     if state.cancelled.load(Ordering::Relaxed) {
+        log::info!(
+            "copy: cancelled by user op={} files_processed={}",
+            operation_id,
+            *files_done
+        );
         let _ = app.emit(
             "write-cancelled",
             WriteCancelledEvent {
@@ -2003,6 +2054,14 @@ fn copy_path_recursive(
         // Emit progress
         if last_progress_time.elapsed() >= *progress_interval {
             let current_file_name = file_name.to_string_lossy().to_string();
+            log::debug!(
+                "copy: emitting write-progress op={} phase=copying files={}/{} bytes={}/{}",
+                operation_id,
+                *files_done,
+                files_total,
+                *bytes_done,
+                bytes_total
+            );
             let _ = app.emit(
                 "write-progress",
                 WriteProgressEvent {
diff --git a/apps/desktop/src/lib/file-explorer/DualPaneExplorer.svelte b/apps/desktop/src/lib/file-explorer/DualPaneExplorer.svelte
@@ -4,6 +4,9 @@
     import PaneResizer from './PaneResizer.svelte'
     import LoadingIcon from '../LoadingIcon.svelte'
     import CopyDialog from '../write-operations/CopyDialog.svelte'
+    import CopyProgressDialog from '../write-operations/CopyProgressDialog.svelte'
+    import { toBackendIndices, toBackendCursorIndex } from '../write-operations/copy-dialog-utils'
+    import { formatBytes } from '$lib/tauri-commands'
     import {
         loadAppStatus,
         saveAppStatus,
@@ -85,6 +88,15 @@
         sourceFolderPath: string
     } | null>(null)
 
+    // Copy progress dialog state
+    let showCopyProgressDialog = $state(false)
+    let copyProgressProps = $state<{
+        sourcePaths: string[]
+        sourceFolderPath: string
+        destinationPath: string
+        direction: 'left' | 'right'
+    } | null>(null)
+
     // Navigation history for each pane (per-pane, session-only)
     // Initialize with default volume - will be updated on mount with actual state
     let leftHistory = $state<NavigationHistory>(createHistory(DEFAULT_VOLUME_ID, '~'))
@@ -786,9 +798,9 @@
     }
 
     /** Gets file paths for the given indices from a listing. */
-    async function getSelectedFilePaths(listingId: string, indices: number[]): Promise<string[]> {
+    async function getSelectedFilePaths(listingId: string, backendIndices: number[]): Promise<string[]> {
         const paths: string[] = []
-        for (const index of indices) {
+        for (const index of backendIndices) {
             const file = await getFileAt(listingId, index, showHiddenFiles)
             if (file && file.name !== '..') {
                 paths.push(file.path)
@@ -806,13 +818,15 @@
         const listingId = sourcePaneRef?.getListingId?.() as string | undefined
         if (!listingId) return
 
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+        const hasParent = sourcePaneRef?.hasParentEntry?.() as boolean | undefined
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call
         const selectedIndices = sourcePaneRef?.getSelectedIndices?.() as number[] | undefined
         const hasSelection = selectedIndices && selectedIndices.length > 0
 
         const props = hasSelection
-            ? await buildCopyPropsFromSelection(listingId, selectedIndices, isLeft)
-            : await buildCopyPropsFromCursor(listingId, sourcePaneRef, isLeft)
+            ? await buildCopyPropsFromSelection(listingId, selectedIndices, hasParent ?? false, isLeft)
+            : await buildCopyPropsFromCursor(listingId, sourcePaneRef, hasParent ?? false, isLeft)
 
         if (props) {
             copyDialogProps = props
@@ -834,10 +848,15 @@
     async function buildCopyPropsFromSelection(
         listingId: string,
         selectedIndices: number[],
+        hasParent: boolean,
         isLeft: boolean,
     ): Promise<CopyDialogPropsData | null> {
-        const stats = await getListingStats(listingId, showHiddenFiles, selectedIndices)
-        const sourcePaths = await getSelectedFilePaths(listingId, selectedIndices)
+        // Convert frontend indices to backend indices (adjust for ".." entry)
+        const backendIndices = toBackendIndices(selectedIndices, hasParent)
+        if (backendIndices.length === 0) return null
+
+        const stats = await getListingStats(listingId, showHiddenFiles, backendIndices)
+        const sourcePaths = await getSelectedFilePaths(listingId, backendIndices)
         if (sourcePaths.length === 0) return null
 
         return {
@@ -855,13 +874,15 @@
     async function buildCopyPropsFromCursor(
         listingId: string,
         paneRef: FilePane | undefined,
+        hasParent: boolean,
         isLeft: boolean,
     ): Promise<CopyDialogPropsData | null> {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call
         const cursorIndex = paneRef?.getCursorIndex?.() as number | undefined
-        if (cursorIndex === undefined || cursorIndex < 0) return null
+        const backendIndex = toBackendCursorIndex(cursorIndex ?? -1, hasParent)
+        if (backendIndex === null) return null
 
-        const file = await getFileAt(listingId, cursorIndex, showHiddenFiles)
+        const file = await getFileAt(listingId, backendIndex, showHiddenFiles)
         if (!file || file.name === '..') return null
 
         return {
@@ -875,13 +896,21 @@
         }
     }
 
-    function handleCopyConfirm(destination: string, volumeId: string) {
-        // TODO: Implement actual copy operation using copyFiles() from tauri-commands
-        const itemCount = copyDialogProps?.sourcePaths.length ?? 0
-        log.info(`Copy confirmed: ${String(itemCount)} items to ${destination} (volume: ${volumeId})`)
+    function handleCopyConfirm(destination: string) {
+        if (!copyDialogProps) return
+
+        // Store the props needed for the progress dialog
+        copyProgressProps = {
+            sourcePaths: copyDialogProps.sourcePaths,
+            sourceFolderPath: copyDialogProps.sourceFolderPath,
+            destinationPath: destination,
+            direction: copyDialogProps.direction,
+        }
+
+        // Close copy dialog and open progress dialog
         showCopyDialog = false
         copyDialogProps = null
-        containerElement?.focus()
+        showCopyProgressDialog = true
     }
 
     function handleCopyCancel() {
@@ -890,6 +919,40 @@
         containerElement?.focus()
     }
 
+    function handleCopyComplete(filesProcessed: number, bytesProcessed: number) {
+        log.info(`Copy complete: ${String(filesProcessed)} files (${formatBytes(bytesProcessed)})`)
+
+        // Refresh the destination pane to show the new files
+        const destPaneRef = copyProgressProps?.direction === 'right' ? rightPaneRef : leftPaneRef
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+        destPaneRef?.refreshView?.()
+
+        showCopyProgressDialog = false
+        copyProgressProps = null
+        containerElement?.focus()
+    }
+
+    function handleCopyCancelled(filesProcessed: number) {
+        log.info(`Copy cancelled after ${String(filesProcessed)} files`)
+
+        // Refresh the destination pane to show any files that were copied
+        const destPaneRef = copyProgressProps?.direction === 'right' ? rightPaneRef : leftPaneRef
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+        destPaneRef?.refreshView?.()
+
+        showCopyProgressDialog = false
+        copyProgressProps = null
+        containerElement?.focus()
+    }
+
+    function handleCopyError(error: string) {
+        log.error(`Copy failed: ${error}`)
+        showCopyProgressDialog = false
+        copyProgressProps = null
+        // TODO: Show error notification/toast
+        containerElement?.focus()
+    }
+
     // Focus the container after initialization so keyboard events work
     $effect(() => {
         if (initialized) {
@@ -1180,6 +1243,18 @@
     />
 {/if}
 
+{#if showCopyProgressDialog && copyProgressProps}
+    <CopyProgressDialog
+        sourcePaths={copyProgressProps.sourcePaths}
+        sourceFolderPath={copyProgressProps.sourceFolderPath}
+        destinationPath={copyProgressProps.destinationPath}
+        direction={copyProgressProps.direction}
+        onComplete={handleCopyComplete}
+        onCancelled={handleCopyCancelled}
+        onError={handleCopyError}
+    />
+{/if}
+
 <style>
     .dual-pane-explorer {
         display: flex;
diff --git a/apps/desktop/src/lib/file-explorer/FilePane.svelte b/apps/desktop/src/lib/file-explorer/FilePane.svelte
@@ -193,6 +193,11 @@
         return Array.from(selectedIndices)
     }
 
+    // Check if the ".." entry is shown (needed for index adjustment in copy/move operations)
+    export function hasParentEntry(): boolean {
+        return hasParent
+    }
+
     // Check if all files are selected (optimization for resort)
     export function isAllSelected(): boolean {
         const selectableCount = hasParent ? effectiveTotalCount - 1 : effectiveTotalCount
diff --git a/apps/desktop/src/lib/logger.ts b/apps/desktop/src/lib/logger.ts
@@ -39,6 +39,7 @@ const debugCategories: string[] = [
     // 'fileExplorer',
     // 'dragDrop',
     // 'licensing',
+    'copyProgress', // Enable to debug copy operation progress events
 ]
 
 /**
diff --git a/apps/desktop/src/lib/write-operations/CopyProgressDialog.svelte b/apps/desktop/src/lib/write-operations/CopyProgressDialog.svelte
diff --git a/apps/desktop/src/lib/write-operations/copy-dialog-utils.test.ts b/apps/desktop/src/lib/write-operations/copy-dialog-utils.test.ts
diff --git a/apps/desktop/src/lib/write-operations/copy-dialog-utils.ts b/apps/desktop/src/lib/write-operations/copy-dialog-utils.ts

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`"updater.svelte.ts": { "reason": "Depends on Tauri updater APIs" },`
`33`	`33`	`"window-state.ts": { "reason": "Depends on Tauri window APIs" },`
`34`	`34`	`"write-operations/CopyDialog.svelte": { "reason": "UI modal, logic tested in copy-dialog-utils.test.ts" },`
`35`		`- "write-operations/DirectionIndicator.svelte": { "reason": "Simple UI component, logic tested in copy-dialog-utils.test.ts" }`
	`35`	`+ "write-operations/DirectionIndicator.svelte": { "reason": "Simple UI component, logic tested in copy-dialog-utils.test.ts" },`
	`36`	`+ "write-operations/CopyProgressDialog.svelte": { "reason": "UI dialog, depends on Tauri events" }`
`36`	`37`	`}`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ const debugCategories: string[] = [`
`39`	`39`	`// 'fileExplorer',`
`40`	`40`	`// 'dragDrop',`
`41`	`41`	`// 'licensing',`
	`42`	`+ 'copyProgress', // Enable to debug copy operation progress events`
`42`	`43`	`]`
`43`	`44`
`44`	`45`	`/**`