Bugfix/v3.17.x.x/repairing progress bar for unarchive package rc2 (#188)

* size of files for progress unarchive package in install content

* Size of files for progress in repair files

Co-authored-by: Jakub Szczyrk <Jakub Szczyrk>

Author: Szczyrk

Assets/PatchKit Patcher/Scripts/AppUpdater/AppUpdaterRepairStrategy.cs

@@ -132,7 +132,8 @@ ICheckVersionIntegrityCommand checkVersionIntegrityCommand
                 _context,
                 resource,
                 brokenFiles,
-                meta);
+                meta,
+                cancellationToken);
 
             repairCommand.Prepare(_status, cancellationToken);
             repairCommand.Execute(cancellationToken);

Assets/PatchKit Patcher/Scripts/AppUpdater/Commands/AppUpdaterCommandFactory.cs

@@ -40,12 +40,14 @@ public IDownloadPackageCommand CreateDownloadDiffPackageCommand(int versionId, s
             return new DownloadPackageCommand(resource, destinationFilePath, destinationMetaPath);
         }
 
-        public IRepairFilesCommand CreateRepairFilesCommand(int versionId, AppUpdaterContext context, RemoteResource resource, Pack1Meta.FileEntry[] brokenFiles, Pack1Meta meta)
+        public IRepairFilesCommand CreateRepairFilesCommand(int versionId, AppUpdaterContext context, RemoteResource resource,
+            Pack1Meta.FileEntry[] brokenFiles, Pack1Meta meta, CancellationToken cancellationToken)
         {
             string packagePath = context.App.DownloadDirectory.GetContentPackagePath(versionId);
             string packagePassword = context.App.RemoteData.GetContentPackageResourcePassword(versionId);
+            AppContentSummary versionContentSummary = context.App.RemoteMetaData.GetContentSummary(versionId, cancellationToken);
 
-            return new RepairFilesCommand(resource, meta, brokenFiles, packagePath, packagePassword, context.App.LocalDirectory);
+            return new RepairFilesCommand(resource, meta, brokenFiles, packagePath, packagePassword, context.App.LocalDirectory, versionContentSummary);
         }
 
         public IInstallContentCommand CreateInstallContentCommand(int versionId, AppUpdaterContext context, CancellationToken cancellationToken)

Assets/PatchKit Patcher/Scripts/AppUpdater/Commands/InstallContentCommand.cs

@@ -29,7 +29,7 @@ public class InstallContentCommand : BaseAppUpdaterCommand, IInstallContentComma
         private readonly ILocalMetaData _localMetaData;
 
         private OperationStatus _copyFilesStatus;
-        private OperationStatus _unarchivePackageStatus;
+        private ProgressBytesFilesStatus _unarchivePackageStatus;
         private Pack1Meta _pack1Meta;
 
         public InstallContentCommand(string packagePath, string packageMetaPath, string packagePassword, int versionId,
@@ -69,7 +69,7 @@ public override void Prepare(UpdaterStatus status, CancellationToken cancellatio
             };
             status.RegisterOperation(_copyFilesStatus);
 
-            _unarchivePackageStatus = new OperationStatus
+            _unarchivePackageStatus = new ProgressBytesFilesStatus("Unarchiving package")
             {
                 Weight = {Value = StatusWeightHelper.GetUnarchivePackageWeight(_versionContentSummary.Size)}
             };
@@ -108,15 +108,29 @@ public override void Execute(CancellationToken cancellationToken)
                 _unarchivePackageStatus.IsActive.Value = true;
                 _unarchivePackageStatus.Description.Value = "Unarchiving package...";
                 _unarchivePackageStatus.Progress.Value = 0.0;
+                _unarchivePackageStatus.TotalBytes.Value = _versionContentSummary.UncompressedSize;
 
+                int lastEntry = 0, nextEntry = -1;
+                
                 unarchiver.UnarchiveProgressChanged += (name, isFile, entry, amount, entryProgress) =>
                 {
-                    var entryMinProgress = (entry - 1) / (double) amount;
-                    var entryMaxProgress = entry / (double) amount;
+                    if (lastEntry != entry)
+                    {
+                        lastEntry = entry;
 
-                    _unarchivePackageStatus.Progress.Value = entryMinProgress + (entryMaxProgress - entryMinProgress) * entryProgress;
+                        DebugLogger.Log(string.Format("Unarchiving entry ({0}/{1})...", entry, amount));
+                        DebugLogger.Log("entry = " + entry);
+                    }
 
-                    _unarchivePackageStatus.Description.Value = string.Format("Unarchiving package ({0}/{1})...", entry, amount);
+                    if (nextEntry == entry)
+                    {
+                        return;
+                    }
+                
+                    nextEntry = entry;
+                    string entryName = HashCalculator.ComputeMD5Hash(name);
+                
+                    _unarchivePackageStatus.ObserveFile(Path.Combine(packageDir.Path, entryName) + Suffix);
                 };
 
                 // Allow to unpack with errors. This allows to install content even on corrupted hard drives, and attempt to fix these later

Assets/PatchKit Patcher/Scripts/AppUpdater/Commands/RepairFilesCommand.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using PatchKit.Api.Models.Main;
 using PatchKit.Logging;
 using PatchKit.Network;
 using PatchKit.Unity.Patcher.AppData;
@@ -22,11 +24,12 @@ public class RepairFilesCommand : BaseAppUpdaterCommand, IRepairFilesCommand
     {
         private struct EntryStatus
         {
-            public OperationStatus RepairStatus;
+            public ProgressBytesFilesStatus RepairStatus;
             public DownloadStatus DownloadStatus;
         }
 
         private RemoteResource _resource;
+        private AppContentSummary _contentSummary;
         private Pack1Meta _meta;
         private Pack1Meta.FileEntry[] _entries;
 
@@ -48,14 +51,16 @@ public RepairFilesCommand(
             Pack1Meta.FileEntry[] fileEntries,
             string destinationPackagePath,
             string packagePassword,
-            ILocalDirectory localData)
+            ILocalDirectory localData,
+            AppContentSummary contentSummary)
         {
             _resource = resource;
             _meta = meta;
             _entries = fileEntries;
 
             _packagePath = destinationPackagePath;
             _packagePassword = packagePassword;
+            _contentSummary = contentSummary;
 
             _localData = localData;
 
@@ -113,20 +118,18 @@ public override void Execute(CancellationToken cancellationToken)
                     repairStatus.IsActive.Value = true;
                     repairStatus.Description.Value = "Applying fixes...";
                     repairStatus.Progress.Value = 0.0;
+                    repairStatus.TotalBytes.Value = _contentSummary.Files.First(f => f.Path == entry.Name).Size;
 
                     _logger.LogDebug("Unarchiving the package.");
                     var unarchiver = new Pack1Unarchiver(packagePath, _meta, unarchivePath, _packagePassword, _unpackingSuffix, effectiveRange);
                     // allow repair to continue on errors, because after the repair process, all the files must be validated again
                     unarchiver.ContinueOnError = true;
-
-                    unarchiver.UnarchiveProgressChanged += (name, isFile, unarchiveEntry, amount,  entryProgress) =>
-                    {
-                        repairStatus.Progress.Value = entryProgress;
-                    };
-
-                    unarchiver.UnarchiveSingleFile(entry, cancellationToken);
+                    
                     string nameHash = HashCalculator.ComputeMD5Hash(entry.Name);
+                    repairStatus.ObserveFile(Path.Combine(unarchivePath, nameHash) + _unpackingSuffix);
 
+                    unarchiver.UnarchiveSingleFile(entry, cancellationToken);
+                    
                     EmplaceFile(Path.Combine(unarchivePath, nameHash + _unpackingSuffix),
                         Path.Combine(_localData.Path, entry.Name), cancellationToken);
 
@@ -141,7 +144,7 @@ public override void Prepare(UpdaterStatus status, CancellationToken cancellatio
 
             foreach(var entry in _entries)
             {
-                var repairStatus = new OperationStatus
+                var repairStatus = new ProgressBytesFilesStatus("Applying fixes")
                 {
                     Weight = { Value = StatusWeightHelper.GetUnarchivePackageWeight(entry.Size.Value) }
                 };