Merge branch 'dev/v3.10.x' into freezed

Author: witcher112

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

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Collections.Generic;
 using PatchKit.Logging;
+using PatchKit.Unity.Patcher.AppData;
 using PatchKit.Unity.Patcher.Cancellation;
 using PatchKit.Unity.Patcher.Debug;
 using PatchKit.Unity.Patcher.AppData.Local;
@@ -76,6 +77,30 @@ ICheckVersionIntegrityCommand checkVersionIntegrityCommand
 
             FileIntegrity[] filesIntegrity = checkVersionIntegrityCommand.Results.Files;
 
+            var contentSummary = _context.App.RemoteMetaData.GetContentSummary(installedVersionId);
+
+            foreach (var invalidVersionIdFile in filesIntegrity.Where(x =>
+                x.Status == FileIntegrityStatus.InvalidVersion).ToArray())
+            {
+                var fileName = invalidVersionIdFile.FileName;
+                var file = contentSummary.Files.First(x => x.Path == fileName);
+
+                var localPath = _context.App.LocalDirectory.Path.PathCombine(file.Path);
+
+                string actualFileHash = HashCalculator.ComputeFileHash(localPath);
+                if (actualFileHash != file.Hash)
+                {
+                    FileOperations.Delete(localPath);
+                    _context.App.LocalMetaData.RegisterEntry(fileName, installedVersionId);
+                    invalidVersionIdFile.Status = FileIntegrityStatus.MissingData;
+                }
+                else
+                {
+                    _context.App.LocalMetaData.RegisterEntry(fileName, installedVersionId);
+                    invalidVersionIdFile.Status = FileIntegrityStatus.Ok;
+                }
+            }
+
             Pack1Meta.FileEntry[] brokenFiles = filesIntegrity
                 // Filter only files with invalid size, hash or missing entirely
                 .Where(f => f.Status == FileIntegrityStatus.InvalidHash 

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

@@ -70,7 +70,9 @@ public StrategyType Resolve([NotNull] AppUpdaterContext context)
             {
                 _logger.LogDebug("Resolving best strategy for updating...");
 
-                if (context.App.IsFullyInstalled() || context.App.IsInstallationBroken())
+                bool isInstallationBroken = context.App.IsInstallationBroken();
+
+                if (context.App.IsFullyInstalled() || isInstallationBroken)
                 {
                     int installedVersionId = context.App.GetInstalledVersionId();
                     _logger.LogTrace("installedVersionId = " + installedVersionId);
@@ -82,6 +84,11 @@ public StrategyType Resolve([NotNull] AppUpdaterContext context)
                     {
                         _logger.LogDebug("Installed version is the same as the latest version. Using empty strategy.");
 
+                        if (isInstallationBroken)
+                        {
+                            return StrategyType.Repair;
+                        }
+
                         return StrategyType.Empty;
                     }
 

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

@@ -13,7 +13,7 @@ public FileIntegrity(string fileName, FileIntegrityStatus status, string message
 
         public readonly string Message;
 
-        public FileIntegrityStatus Status { get; private set; }
+        public FileIntegrityStatus Status { get; set; }
 
         public static FileIntegrity WithMessage<T>(T expectedValue, T actualValue, FileIntegrityStatus status, string filePath)
         {

CHANGELOG.md

@@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Patcher will timeout if the downloading stopped sooner than after 5 minutes
 
+## [3.10.1p3]
+### Fixed
+- Fix repairing files with invalid version id
+
 ## [3.10.1p2]
 ### Fixed
 - Slow download performance due to small buffer size