Merge branch 'dev/v3.x.x.x' into feature/v3.x.x.x/1350-cache-app-display-name

Author: witcher112

Assets/PatchKit Patcher/Scripts/Api/Models/Main/AppDiffSummary.cs

@@ -51,6 +51,9 @@ public struct AppDiffSummary
         /// </summary>
         [JsonProperty("removed_files")]
         public string[] RemovedFiles;
+
+        [JsonProperty("unchanged_files")]
+        public string[] UnchangedFiles;
 
         [JsonProperty("hash_code")]
         public string HashCode;

Assets/PatchKit Patcher/Scripts/AppData/Local/BaseWritableDirectory.cs

@@ -51,14 +51,11 @@ public virtual void PrepareForWriting()
         {
             DebugLogger.Log("Preparing directory for writing.");
 
-            if (!_hasWriteAccess)
-            {
-                DebugLogger.Log("Creating directory.");
+            DirectoryOperations.CreateDirectory(_path, CancellationToken.Empty);
 
-                DirectoryOperations.CreateDirectory(_path, CancellationToken.Empty);
+            _hasWriteAccess = true;
 
-                _hasWriteAccess = true;
-            }
+            DebugLogger.Log("Directory prepared for writing.");
         }
 
         ~BaseWritableDirectory()

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

@@ -486,15 +486,6 @@ private void PatchFile(
                     string.Format("Couldn't patch file {0} because it doesn't exists in local data.", fileName));
             }
 
-            var sourceDeltaFilePath = Path.Combine(packageDirPath, fileName + suffix);
-            _logger.LogTrace("sourceDeltaFilePath = " + sourceDeltaFilePath);
-
-            if (!File.Exists(sourceDeltaFilePath))
-            {
-                throw new MissingFileFromPackageException(string.Format("Cannot find delta file {0} in diff package.",
-                    fileName));
-            }
-
             var fileVersion = _localMetaData.GetEntryVersionId(fileName);
             _logger.LogTrace("fileVersion = " + fileVersion);
 
@@ -510,6 +501,15 @@ private void PatchFile(
             {
                 _logger.LogDebug("Patching is necessary. Generating new file with patched content...");
 
+                var sourceDeltaFilePath = Path.Combine(packageDirPath, fileName + suffix);
+                _logger.LogTrace("sourceDeltaFilePath = " + sourceDeltaFilePath);
+
+                if (!File.Exists(sourceDeltaFilePath))
+                {
+                    throw new MissingFileFromPackageException(string.Format("Cannot find delta file {0} in diff package.",
+                        fileName));
+                }
+
                 var newFilePath = tempDiffDir.GetUniquePath();
                 _logger.LogTrace("newFilePath = " + newFilePath);
 
@@ -536,6 +536,11 @@ private void PatchFile(
 
         private bool IsPatchingFileContentNecessary(string fileName)
         {
+            if (_diffSummary.UnchangedFiles.Contains(fileName))
+            {
+                return false;
+            }
+
             //TODO: Throw exceptions if file is not present in any of both content summaries
             var fileHash = _contentSummary.Files.First(x => x.Path == fileName).Hash;
             var previousFileHash = _previousContentSummary.Files.First(x => x.Path == fileName).Hash;

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

@@ -68,12 +68,12 @@ public override void Execute(CancellationToken cancellationToken)
 
             foreach (var entry in _entries)
             {
-                var tempDirName = _packagePath + string.Format("{0}_{1}_{2}", entry.Name, entry.Offset, entry.Size);
+                var tempDirName = _packagePath + "_repair";
                 TemporaryDirectory.ExecuteIn(tempDirName, (tempDir) =>
                 {
                     _logger.LogDebug(string.Format("Repairing the file {0}", entry.Name));
-                    string packagePath = Path.Combine(tempDir.Path, ".pack" + Path.GetRandomFileName());
-                    string unarchivePath = Path.Combine(tempDir.Path, Path.GetRandomFileName());
+                    string packagePath = Path.Combine(tempDir.Path, "p_" + Path.GetRandomFileName());
+                    string unarchivePath = Path.Combine(tempDir.Path, "u_" + Path.GetRandomFileName());
 
                     if (!Directory.Exists(unarchivePath))
                     {

Assets/PatchKit Patcher/Scripts/Patcher.cs

@@ -249,6 +249,11 @@ private void Awake()
             DebugLogger.LogFormat("System version: {0}", EnvironmentInfo.GetSystemVersion());
             DebugLogger.LogFormat("Runtime version: {0}", EnvironmentInfo.GetSystemVersion());
 
+            // In .NET API ProcessPriorityClass.Idle is really 'Low' process priority
+            Process.GetCurrentProcess().PriorityClass = System.Diagnostics.ProcessPriorityClass.Idle;
+
+            DebugLogger.LogFormat("Process priority has been set to Low");
+
             CheckEditorAppSecretSecure();
 
             if (_canStartThread)

Assets/PatchKit Patcher/Scripts/UI/Changelog/ChangelogList.cs

@@ -1,6 +1,9 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Linq;
+using Newtonsoft.Json;
 using PatchKit.Api.Models.Main;
+using PatchKit.Unity.Patcher.AppData.Local;
 using PatchKit.Unity.Patcher.Cancellation;
 using PatchKit.Unity.UI;
 using PatchKit.Unity.Utilities;
@@ -20,15 +23,73 @@ protected override IEnumerator LoadCoroutine()
                 yield return null;
             }
 
+            var appSecret = Patcher.Instance.Data.Value.AppSecret;
+
+            LoadChangelogFromCache(appSecret);
+
             yield return
-                Threading.StartThreadCoroutine(() => MainApiConnection.GetAppVersionList(Patcher.Instance.Data.Value.AppSecret, null, CancellationToken.Empty),
-                    response =>
-                    {
-                        foreach (var version in response.OrderByDescending(version => version.Id))
-                        {
-                            CreateVersionChangelog(version);
-                        }
-                    });
+                Threading.StartThreadCoroutine(() =>
+                        MainApiConnection.GetAppVersionList(
+                            Patcher.Instance.Data.Value.AppSecret,
+                            null,
+                            CancellationToken.Empty),
+                    versions => CreateAndCacheChangelog(appSecret, versions));
+        }
+
+        private void LoadChangelogFromCache(string appSecret)
+        {
+            try
+            {
+                var cacheValue = new UnityCache(appSecret).GetValue("app-changelog", null);
+
+                if (cacheValue == null)
+                {
+                    return;
+                }
+
+                var versions = JsonConvert.DeserializeObject<AppVersion[]>(cacheValue);
+
+                CreateChangelog(versions);
+            }
+            catch (Exception)
+            {
+                // ignore
+            }
+        }
+
+        private void CreateAndCacheChangelog(string appSecret, AppVersion[] versions)
+        {
+            try
+            {
+                var cacheValue = JsonConvert.SerializeObject(versions);
+
+                new UnityCache(appSecret).SetValue("app-changelog", cacheValue);
+            }
+            catch (Exception e)
+            {
+                UnityEngine.Debug.Log(e.ToString());
+            }
+
+            CreateChangelog(versions);
+        }
+
+        private void DestroyOldChangelog()
+        {
+            while(transform.childCount > 0)
+            {
+                DestroyImmediate(transform.GetChild(0).gameObject);
+            }
+
+        }
+
+        private void CreateChangelog(AppVersion[] versions)
+        {
+            DestroyOldChangelog();
+
+            foreach (AppVersion version in versions.OrderByDescending(version => version.Id))
+            {
+                CreateVersionChangelog(version);
+            }
         }
 
         private void CreateVersionChangelog(AppVersion version)

CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [3.x.x.x]
 ### Added
 - Caching application display name so it can be displayed in offline mode (#1350)
+- Caching application changelog so it can be displayed in offline mode (#1361)
+- Skip unchanged files while patching (#994)
+
+### Changed
+- Set process priority to Low (#1375)
+
+### Fixed
+- Repairing files placed at long path (#1369)
+- Fix download directory recreation after removing it during patcher execution (#1360)
 
 ## [3.14.0.0]
 ### Added