Refactoring

Author: Jakub Szczyrk

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

@@ -49,6 +49,6 @@ public interface ILocalMetaData
 
         string GetMainExecutable();
 
-        string GetMainExecutableArgs();
+        string MainExecutableArgs { get; }
     }
 }

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

@@ -41,10 +41,10 @@ private struct Data
             [JsonProperty("product_key_encryption", DefaultValueHandling = DefaultValueHandling.Populate)]
             public string ProductKeyEncryption;
 
-            [JsonProperty("main_executable")]
+            [JsonProperty("start_exe_path")]
             public string MainExecutable;
 
-            [JsonProperty("main_executable_args")]
+            [JsonProperty("start_exe_args")]
             public string MainExecutableArgs;
 
             [JsonProperty("_fileVersions")] public Dictionary<string, int> FileVersionIds;
@@ -194,9 +194,9 @@ public string GetMainExecutable()
             return _data.MainExecutable;
         }
 
-        public string GetMainExecutableArgs()
+        public string MainExecutableArgs
         {
-            return _data.MainExecutableArgs;
+            get { return _data.MainExecutableArgs; }
         }
 
         private void CreateDataDir()

Assets/PatchKit Patcher/Scripts/AppStarter.cs

@@ -100,9 +100,9 @@ private void StartAppVersion(AppVersion? appVersion, string customArgs)
             {
                 appArgs += " " + appVersion.Value.MainExecutableArgs;
             }
-            else
+            else if (string.IsNullOrEmpty(_app.LocalMetaData.MainExecutableArgs))
             {
-                appArgs += " " + _app.LocalMetaData.GetMainExecutableArgs();
+                appArgs += " " + _app.LocalMetaData.MainExecutableArgs;
             }
 
             if (appFilePath == null)

Assets/PatchKit Patcher/Scripts/Patcher.cs

@@ -14,6 +14,7 @@
 using UnityEngine;
 using CancellationToken = PatchKit.Unity.Patcher.Cancellation.CancellationToken;
 using System.IO;
+using PatchKit.Api.Models.Main;
 using PatchKit.Network;
 using PatchKit.Unity.Patcher.AppData;
 using PatchKit.Unity.Patcher.AppData.FileSystem;
@@ -899,9 +900,6 @@ private void ThreadUpdateApp(bool automatically, CancellationToken cancellationT
             {
                 _appInfo.Value = _app.RemoteMetaData.GetAppInfo(!automatically, _updateAppCancellationTokenSource.Token);
                 _remoteVersionId.Value = _app.GetLatestVersionId(!automatically, _updateAppCancellationTokenSource.Token);
-                var latestAppVersion =
-                    _app.RemoteMetaData.GetAppVersionInfo(_remoteVersionId.Value.Value, false, cancellationToken);
-                _app.LocalMetaData.SetMainExecutableAndArgs(latestAppVersion.MainExecutable, latestAppVersion.MainExecutableArgs);
 
                 if (_app.IsFullyInstalled())
                 {
@@ -919,6 +917,10 @@ private void ThreadUpdateApp(bool automatically, CancellationToken cancellationT
                         appUpdater.Update(_updateAppCancellationTokenSource.Token);
                         _wasUpdateSuccessfulOrNotNecessary = true;
                     }
+
+                    AppVersion latestAppVersion =
+                        _app.RemoteMetaData.GetAppVersionInfo(_remoteVersionId.Value.Value, false, cancellationToken);
+                    _app.LocalMetaData.SetMainExecutableAndArgs(latestAppVersion.MainExecutable, latestAppVersion.MainExecutableArgs);
                 }
                 catch (OperationCanceledException)
                 {

Assets/PatchKit Patcher/Scripts/Version.cs

@@ -4,7 +4,7 @@ public static class Version
     {
         public const int Major = 3;
         public const int Minor = 17;
-        public const int Patch = 5;
+        public const int Patch = 6;
         public const int Hotfix = 0;
 
         public static string Value