Fix progress reporting on import export

DSPaul · May 4, 2024 · 04deebf · 04deebf
1 parent b0c60a5
commit 04deebf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/Services/IOService.cs b/src/Services/IOService.cs
@@ -145,7 +145,7 @@ public static async Task<string> UnZipCollection(string path)
             progressVM.TotalAmount = 1;
 
             //extract
-            await Task.Run(() => archive.ExtractToDirectory(tmpCollectionPath)); //TODO add cancelation and progress reporting
+            await Task.Run(() => archive.ExtractToDirectory(tmpCollectionPath, progressReport: new Action<double>(progressVM.UpdateFromPercentage)));
 
             progressVM.IncrementCounter();
             return tmpCollectionPath;

diff --git a/src/ViewModels/ExportCollectionViewModel.cs b/src/ViewModels/ExportCollectionViewModel.cs
@@ -168,18 +168,21 @@ public async Task ExportToFile(string targetPath)
                 //Now add xml files
                 archive.AddAllFromDirectory(ContentSelectorVM.CuratedCollection.FullDataPath);
 
+                //Add version so we can check compatibility when importing
+                SatchelInfo info = new();
+                archive.AddEntry(Constants.SatchelInfoFileName, new MemoryStream(JsonSerializer.SerializeToUtf8Bytes(info)));
+
                 //Progress reporting
                 progressVM.Text = "Exporting Collection";
                 progressVM.ShowCount = false;
                 progressVM.ResetCounter();
+                progressVM.TotalAmount = 1;
                 //TODO find new way to track progress
 
-                //Add version so we can check compatibility when importing
-                SatchelInfo info = new();
-                archive.AddEntry(Constants.SatchelInfoFileName, new MemoryStream(JsonSerializer.SerializeToUtf8Bytes(info)));
-
                 //Export
                 await Task.Run(() => archive.SaveTo(targetPath, CompressionType.None));
+
+                progressVM.IncrementCounter();
                 Logger.Info($"Exported {CollectionToExport.DirectoryName} to {targetPath}");
             }
             catch (Exception ex)

diff --git a/src/ViewModels/ProgressViewModel.cs b/src/ViewModels/ProgressViewModel.cs
@@ -98,6 +98,12 @@ public void IncrementCounter()
             _progressMutex.ReleaseMutex();
         }
 
+        public void UpdateFromPercentage(double percentage)
+        {
+            TotalAmount = 100;
+            Counter = (int)(percentage * 100);
+        }
+
         public void ResetCounter()
         {
             _progressMutex.WaitOne();