From 2e8e4ae3ae5ccf9956f39d3b3979a90243dd28be Mon Sep 17 00:00:00 2001
From: Pat Hartl <pat@pathar.tl>
Date: Sun, 21 Jun 2026 23:00:56 -0500
Subject: [PATCH] Allow selected local files for archive upload to be moved
 instead of copied

Fixes #413
---
 .../ArchiveService.cs                         | 20 +++++++++++++++++--
 .../UI/Components/ArchiveUploader.razor       | 11 +++++++++-
 .../UI/Components/ImportUploadDialog.razor    |  4 ++--
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/LANCommander.Server.Services/ArchiveService.cs b/LANCommander.Server.Services/ArchiveService.cs
index 24f798bc..56036922 100644
--- a/LANCommander.Server.Services/ArchiveService.cs
+++ b/LANCommander.Server.Services/ArchiveService.cs
@@ -189,7 +189,7 @@ namespace LANCommander.Server.Services
             return File.Exists(path);
         }
 
-        public async Task<Guid> CopyFromLocalFileAsync(string path, Guid storageLocationId)
+        public async Task<Guid> CopyFromLocalFileAsync(string path, Guid storageLocationId, bool move = false)
         {
             var storageLocation = await storageLocationService.GetAsync(storageLocationId);
 
@@ -212,7 +212,23 @@ namespace LANCommander.Server.Services
             if (!string.IsNullOrEmpty(archiveDirectory) && !Directory.Exists(archiveDirectory))
                 Directory.CreateDirectory(archiveDirectory);
 
-            File.Copy(path, archivePath, true);
+            if (move)
+            {
+                try
+                {
+                    File.Move(path, archivePath, true);
+                }
+                catch (IOException ex)
+                {
+                    _logger.LogInformation(ex, "Could not move local file from {SourcePath} to {DestinationPath}, falling back to copy", path, archivePath);
+
+                    File.Copy(path, archivePath, true);
+                }
+            }
+            else
+            {
+                File.Copy(path, archivePath, true);
+            }
 
             return Guid.Parse(archive.ObjectKey);
         }
diff --git a/LANCommander.Server/UI/Components/ArchiveUploader.razor b/LANCommander.Server/UI/Components/ArchiveUploader.razor
index 3d4eec26..c187247d 100644
--- a/LANCommander.Server/UI/Components/ArchiveUploader.razor
+++ b/LANCommander.Server/UI/Components/ArchiveUploader.razor
@@ -4,6 +4,7 @@
 @using LANCommander.UI.Services
 @using Microsoft.Extensions.Options
 @inject ArchiveService ArchiveService
+@inject StorageLocationService StorageLocationService
 @inject IOptions<Settings.Settings> Settings
 @inject IMessageService MessageService
 @inject ConfirmService ConfirmService
@@ -13,6 +14,9 @@
 @{
     RenderFragment Footer =
     @<Template>
+        <Tooltip Title="Moves the selected local file instead of copy">
+            <Checkbox @bind-Checked="MoveLocalFile" Disabled="@(Status != "")">Move</Checkbox>
+        </Tooltip>
         <FilePickerButton EntrySelectable="@(entry => !String.IsNullOrWhiteSpace(entry.Name) && entry.Name.ToLower().EndsWith(".zip"))"
                           OnSelected="OnLocalFileSelected"
                           Root="@RootPath"
@@ -76,6 +80,8 @@
 
     string Status = "";
 
+    bool MoveLocalFile = false;
+
     private async Task Start()
     {
         Uploading = true;
@@ -195,6 +201,9 @@
                 Archive.ToolId = ToolId;
         }
 
+        if (Archive.StorageLocation == null)
+            Archive.StorageLocation = await StorageLocationService.DefaultAsync(StorageLocationType.Archive) ?? new StorageLocation();
+
         Uploading = false;
         Visible = true;
 
@@ -216,7 +225,7 @@
     {
         try
         {
-            var objectKey = await ArchiveService.CopyFromLocalFileAsync(path, Archive.StorageLocation.Id);
+            var objectKey = await ArchiveService.CopyFromLocalFileAsync(path, Archive.StorageLocation.Id, MoveLocalFile);
 
             // For local files, run the completion logic directly.
             var gameId = Archive.GameId;
diff --git a/LANCommander.Server/UI/Components/ImportUploadDialog.razor b/LANCommander.Server/UI/Components/ImportUploadDialog.razor
index 297d7e52..4d510f51 100644
--- a/LANCommander.Server/UI/Components/ImportUploadDialog.razor
+++ b/LANCommander.Server/UI/Components/ImportUploadDialog.razor
@@ -20,7 +20,7 @@
             Accept=".lcx"
             @bind-File="File"
             @bind-Status="Status"
-            StorageLocationId="StorageLocation.Id"
+            StorageLocationId="@(StorageLocation?.Id ?? Guid.Empty)"
             UploadType="UploadType.Import"
             OnUploadError="OnUploadError">
             <Text>
@@ -189,7 +189,7 @@ else if (_stage == ImportStage.Failed)
         ImportContext.OnImportStatusUpdate.EventRaised += ImportStatusUpdate;
         ImportContext.OnImportError.EventRaised += ImportError;
 
-        StorageLocation = await StorageLocationService.FirstAsync(l => l.Default && l.Type == StorageLocationType.Archive);
+        StorageLocation = await StorageLocationService.DefaultAsync(StorageLocationType.Archive) ?? StorageLocation;
 
         // If a pre-uploaded object key was provided, skip the upload stage.
         if (!string.IsNullOrWhiteSpace(Options.PreUploadedObjectKey))