Merge pull request #85 from patchkit-net/feature/v3.x.x/1022-and-1021-app-version-process-info

Feature/v3.x.x/1022 and 1021 app version process info

Author: witcher112

Assets/PatchKit Patcher/Library/PatchKit.Api.dll

@@ -26,6 +26,12 @@ public interface IRemoteMetaData
         /// <param name="versionId">The version identifier.</param>
         AppDiffSummary GetDiffSummary(int versionId);
 
+        /// <summary>
+        /// Returns the AppVersion model for the specified version id.
+        /// </summary>
+        /// <param name="versionId">The version identifier.</param>
+        AppVersion GetAppVersionInfo(int versionId);
+
         /// <summary>
         /// Returns key secret for certain key.
         /// </summary>

Assets/PatchKit Patcher/Scripts/AppData/Remote/IRemoteMetaData.cs

@@ -95,5 +95,17 @@ public string GetKeySecret(string key, string cachedKeySecret)
 
             return keySecret;
         }
+
+        public AppVersion GetAppVersionInfo(int versionId)
+        {
+            if (versionId <= 0)
+            {
+                throw new ArgumentException("Version id is invalid.", "versionId");
+            }
+
+            DebugLogger.Log(string.Format("Getting app version info for version with id {0}", versionId));
+
+            return _mainApiConnection.GetAppVersion(_appSecret, versionId);
+        }
     }
 }

Assets/PatchKit Patcher/Scripts/AppData/Remote/RemoteMetaData.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using PatchKit.Api.Models.Main;
 using PatchKit.Unity.Patcher.AppData;
 using PatchKit.Unity.Patcher.Data;
 using PatchKit.Unity.Patcher.Debug;
@@ -26,12 +27,46 @@ public AppStarter(App app)
             AppFinder = new AppFinder();
         }
 
+        private string ResolveExecutablePath(AppVersion appVersion)
+        {
+            if (!string.IsNullOrEmpty(appVersion.MainExecutable))
+            {
+                string executablePath = Path.Combine(_app.LocalDirectory.Path, appVersion.MainExecutable);
+
+                if (File.Exists(executablePath))
+                {
+                    return executablePath;
+                }
+
+                // Reports to Sentry
+                try
+                {
+                    throw new FileNotFoundException(string.Format("Couldn't resolve executable in {0}", executablePath));
+                }
+                catch (Exception e)
+                {
+                    DebugLogger.LogException(e);
+                }
+
+            }
+
+            PlatformType platformType = Platform.GetPlatformType();
+            return AppFinder.FindExecutable(_app.LocalDirectory.Path, platformType);
+        }
+
         public void Start()
+        {
+            var appVersion = _app.RemoteMetaData.GetAppVersionInfo(_app.GetInstalledVersionId());
+            StartAppVersion(appVersion);
+        }
+
+        private void StartAppVersion(AppVersion appVersion)
         {
             DebugLogger.Log("Starting application.");
 
             PlatformType platformType = Platform.GetPlatformType();
-            string appFilePath = AppFinder.FindExecutable(_app.LocalDirectory.Path, platformType);
+            string appFilePath = ResolveExecutablePath(appVersion);
+
             if (appFilePath == null)
             {
                 throw new InvalidOperationException("Couldn't find executable.");
@@ -53,6 +88,12 @@ public void Start()
             }
 
             var processStartInfo = GetProcessStartInfo(appFilePath, platformType);
+
+            if (!string.IsNullOrEmpty(appVersion.MainExecutableArgs))
+            {
+                processStartInfo.Arguments += " " + appVersion.MainExecutableArgs;
+            }
+
             StartAppProcess(processStartInfo);
         }
 
@@ -67,7 +108,7 @@ private ProcessStartInfo GetProcessStartInfo(string executablePath, PlatformType
             switch (platform)
             {
                 case PlatformType.Unknown:
-                    throw new ArgumentException("Unknown");;
+                    throw new ArgumentException("Unknown");
                 case PlatformType.Windows:
                     return new ProcessStartInfo
                     {

Assets/PatchKit Patcher/Scripts/AppStarter.cs

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Support for LZMA2 compression using XZ
 - Sending all events to Statistics Reporting Service
+- Support for main_executable and main_executable_args fields in AppVersion
 - Added processing of --online or --offline command line argument
 - Sending 'patcher_started' event to Statistics Reporting Service
 - Custom building options under `Tools/Build`