fix(browser): status handling of multiple files/versions can cause crash (#352)

Author: alexsee

src/BSH.Engine/Jobs/IJobReport.cs

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using Brightbits.BSH.Engine.Models;
 
@@ -35,3 +36,59 @@ public interface IJobReport
 
     void RequestShowErrorInsufficientDiskSpace();
 }
+
+public class ForwardJobReport : IJobReport
+{
+    private readonly IJobReport report;
+    private List<FileExceptionEntry> files = new();
+
+    public ForwardJobReport(IJobReport report)
+    {
+        this.report = report;
+    }
+
+    public void ReportAction(ActionType action, bool silent)
+    {
+        // not used
+    }
+
+    public void ReportState(JobState jobState)
+    {
+        // not used
+    }
+
+    public void ReportStatus(string title, string text)
+    {
+        this.report.ReportStatus(title, text);
+    }
+
+    public void ReportProgress(int total, int current)
+    {
+        // not used
+    }
+
+    public void ReportFileProgress(string file)
+    {
+        this.report.ReportFileProgress(file);
+    }
+
+    public void ReportExceptions(Collection<FileExceptionEntry> files, bool silent)
+    {
+        this.files.AddRange(files);
+    }
+
+    public RequestOverwriteResult RequestOverwrite(FileTableRow localFile, FileTableRow remoteFile)
+    {
+        return this.report.RequestOverwrite(localFile, remoteFile);
+    }
+
+    public void RequestShowErrorInsufficientDiskSpace()
+    {
+        this.report.RequestShowErrorInsufficientDiskSpace();
+    }
+
+    public void ForwardExceptions(bool silent)
+    {
+        this.report.ReportExceptions(new Collection<FileExceptionEntry>(this.files), silent);
+    }
+}

src/BSH.Engine/Jobs/Job.cs

@@ -15,11 +15,9 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.IO;
 using System.Threading.Tasks;
 using Brightbits.BSH.Engine.Contracts;
 using Brightbits.BSH.Engine.Contracts.Database;
-using Brightbits.BSH.Engine.Database;
 using Brightbits.BSH.Engine.Exceptions;
 using Brightbits.BSH.Engine.Models;
 using Brightbits.BSH.Engine.Storage;

src/BSH.Main/Dialogs/frmBrowser.cs

@@ -1360,7 +1360,9 @@ private async void bgrWorkSearch_DoWork(object sender, System.ComponentModel.DoW
     private void bgrWorkSearch_RunWorkerCompleted(object sender, System.ComponentModel.RunWorkerCompletedEventArgs e)
     {
         if (e.Result == null)
+        {
             return;
+        }
 
         // update UI
         lvFiles.BeginUpdate();

src/BSH.Main/Modules/BackupController.cs

@@ -347,11 +347,19 @@ public async Task RestoreBackupAsync(string version, List<string> files, string
         // run restore job
         var fileOverwrite = FileOverwrite.Ask;
 
+        jobReportCallback.ReportAction(ActionType.Restore, !statusDialog);
+        jobReportCallback.ReportState(JobState.RUNNING);
+
+        IJobReport forwardJobReport = new ForwardJobReport(jobReportCallback);
+
         foreach (var file in files)
         {
             try
             {
-                var task = backupService.StartRestore(version, file, destination, ref jobReportCallback, cancellationToken, fileOverwrite, !statusDialog);
+                jobReportCallback.ReportProgress(files.Count, files.IndexOf(file) + 1);
+
+                // restore file
+                var task = backupService.StartRestore(version, file, destination, ref forwardJobReport, cancellationToken, fileOverwrite, !statusDialog);
                 await task.ConfigureAwait(true);
             }
             catch
@@ -373,6 +381,9 @@ public async Task RestoreBackupAsync(string version, List<string> files, string
             }
         }
 
+        ((ForwardJobReport)forwardJobReport).ForwardExceptions(!statusDialog);
+        jobReportCallback.ReportState(JobState.FINISHED);
+
         // finish
         HandleFinishedStatusDialog(statusDialog);
     }
@@ -394,6 +405,7 @@ public async Task DeleteBackupAsync(string version, bool statusDialog = true)
         }
 
         // run delete job
+
         try
         {
             var task = backupService.StartDelete(version, ref jobReportCallback, cancellationToken, !statusDialog);
@@ -425,11 +437,16 @@ public async Task DeleteBackupsAsync(List<string> versions, bool statusDialog =
         }
 
         // run delete job
+        jobReportCallback.ReportAction(ActionType.Delete, !statusDialog);
+        jobReportCallback.ReportState(JobState.RUNNING);
+
+        IJobReport forwardJobReport = new ForwardJobReport(jobReportCallback);
+
         foreach (var version in versions)
         {
             try
             {
-                var task = backupService.StartDelete(version, ref jobReportCallback, cancellationToken, !statusDialog);
+                var task = backupService.StartDelete(version, ref forwardJobReport, cancellationToken, !statusDialog);
                 await task.ConfigureAwait(true);
             }
             catch
@@ -443,6 +460,9 @@ public async Task DeleteBackupsAsync(List<string> versions, bool statusDialog =
             }
         }
 
+        ((ForwardJobReport)forwardJobReport).ForwardExceptions(!statusDialog);
+        jobReportCallback.ReportState(JobState.FINISHED);
+
         // finish
         HandleFinishedStatusDialog(statusDialog);
     }

src/BSH.MainApp/BSH.MainApp.csproj

@@ -33,7 +33,7 @@
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageReference Include="H.NotifyIcon.WinUI" Version="2.2.0" />
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />