Merge pull request #58 from patchkit-net/feature/v3.10.0/progress-bar

Feature/v3.10.0/progress bar

Author: witcher112

Assets/PatchKit Patcher/Scripts/Patcher.cs

@@ -71,7 +71,7 @@ public static Patcher Instance
         private readonly ManualResetEvent _userDecisionSetEvent = new ManualResetEvent(false);
 
         private readonly IRequestTimeoutCalculator _requestTimeoutCalculator = new SimpleRequestTimeoutCalculator();
-        
+
         private bool _hasAutomaticallyInstalledApp;
 
         private bool _hasAutomaticallyCheckedForAppUpdate;
@@ -138,7 +138,7 @@ public IReadOnlyReactiveProperty<PatcherData> Data
         {
             get { return _data; }
         }
-        
+
         private readonly ReactiveProperty<string> _warning = new ReactiveProperty<string>();
 
         public IReadOnlyReactiveProperty<string> Warning
@@ -206,11 +206,11 @@ public void Quit()
         private void CloseLockFile()
         {
             try
-            { 
+            {
                 if (_lockFileStream != null)
                 {
                     _lockFileStream.Close();
-                    
+
                     DebugLogger.Log("Deleting the lock file.");
                     File.Delete(_data.Value.LockFilePath);
                 }
@@ -278,7 +278,7 @@ private void OnApplicationQuit()
                 DebugLogger.Log("Cancelling application quit because patcher thread is alive.");
 
                 Application.CancelQuit();
-                
+
                 StartCoroutine(KillThread());
             }
         }
@@ -433,11 +433,11 @@ private void ThreadExecution(CancellationToken cancellationToken)
             catch (ThreadAbortException)
             {
                 DebugLogger.Log("Patcher thread finished: thread has been aborted.");
-            }            
+            }
             catch (MultipleInstancesException exception)
             {
                 DebugLogger.LogException(exception);
-                Quit();                
+                Quit();
             }
             catch (Exception exception)
             {
@@ -630,11 +630,11 @@ private void ThreadWaitForUserDecision(CancellationToken cancellationToken)
         private void ThreadExecuteUserDecision(CancellationToken cancellationToken)
         {
             bool displayWarningInsteadOfError = false;
-            
+
             try
             {
                 _warning.Value = string.Empty;
-                
+
                 DebugLogger.Log(string.Format("Executing user decision {0}...", _userDecision));
 
                 switch (_userDecision)
@@ -687,7 +687,7 @@ private void ThreadExecuteUserDecision(CancellationToken cancellationToken)
             catch (ApiConnectionException e)
             {
                 DebugLogger.LogException(e);
-                
+
                 if (displayWarningInsteadOfError)
                 {
                     _warning.Value = "Unable to check for updates. Please check your internet connection.";
@@ -737,6 +737,8 @@ private void ThreadDisplayError(PatcherError error, CancellationToken cancellati
         {
             try
             {
+                _state.Value = PatcherState.DisplayingError;
+
                 DebugLogger.Log(string.Format("Displaying patcher error {0}...", error));
 
                 ErrorDialog.Display(error, cancellationToken);
@@ -777,7 +779,7 @@ private void ThreadStartApp()
 
         private void ThreadUpdateApp(bool automatically, CancellationToken cancellationToken)
         {
-            _state.Value = PatcherState.UpdatingApp;
+            _state.Value = PatcherState.Connecting;
 
             _appInfo.Value = _app.RemoteMetaData.GetAppInfo(!automatically);
             _remoteVersionId.Value = _app.GetLatestVersionId(!automatically);
@@ -795,10 +797,16 @@ private void ThreadUpdateApp(bool automatically, CancellationToken cancellationT
                 try
                 {
                     _updaterStatus.Value = appUpdater.Status;
-                    appUpdater.Update(_updateAppCancellationTokenSource.Token);
+
+                    using (_updaterStatus.Take(1).Subscribe((status) => _state.Value = PatcherState.UpdatingApp))
+                    {
+                        appUpdater.Update(_updateAppCancellationTokenSource.Token);
+                    }
                 }
                 finally
                 {
+                    _state.Value = PatcherState.None;
+
                     _updaterStatus.Value = null;
                     _updateAppCancellationTokenSource = null;
                 }

Assets/PatchKit Patcher/Scripts/PatcherState.cs

@@ -3,10 +3,12 @@
     public enum PatcherState
     {
         None,
+        Connecting,
         LoadingPatcherData,
         LoadingPatcherConfiguration,
         WaitingForUserDecision,
         UpdatingApp,
-        StartingApp
+        StartingApp,
+        DisplayingError,
     }
 }

Assets/PatchKit Patcher/Scripts/UI/ProgressBar.cs

@@ -11,6 +11,12 @@ public class ProgressBar : MonoBehaviour
 
         public Image Image;
 
+        private struct UpdateData
+        {
+            public double Progress;
+            public PatcherState State;
+        }
+
         private void SetBar(float start, float end)
         {
             var anchorMax = Image.rectTransform.anchorMax;
@@ -23,15 +29,31 @@ private void SetBar(float start, float end)
             Image.rectTransform.anchorMin = anchorMin;
         }
 
-        private void SetProgress(double progress)
+        private void SetProgress(UpdateData data)
         {
-            if (progress <= 0 && _isIdle)
+            _isIdle = data.State == PatcherState.Connecting;
+
+            if (data.State == PatcherState.None)
+            {
+                Text.text = "";
+                SetBar(0, 0);
+                return;
+            }
+
+            if (data.State == PatcherState.DisplayingError)
+            {
+                Text.text = "Error!";
+                SetBar(0, 0);
+                return;
+            }
+
+            if (data.State == PatcherState.Connecting)
             {
                 Text.text = "Connecting...";
                 return;
             }
 
-            _isIdle = false;
+            double progress = data.Progress;
 
             Text.text = progress >= 0.0 ? progress.ToString("0.0%") : "";
             float visualProgress = progress >= 0.0 ? (float) progress : 0.0f;
@@ -41,15 +63,18 @@ private void SetProgress(double progress)
 
         private void Start()
         {
-            Patcher.Instance.UpdaterStatus
-                .SelectSwitchOrDefault(s => s.Progress, -1.0)
+            var progress = Patcher.Instance.UpdaterStatus
+                .SelectSwitchOrDefault(s => s.Progress, -1.0);
+
+            Patcher.Instance.State
+                .CombineLatest(progress, (state, d) => new UpdateData { Progress = d, State = state })
                 .ObserveOnMainThread()
                 .Subscribe(SetProgress)
                 .AddTo(this);
         }
 
 
-        private bool _isIdle = true;
+        private bool _isIdle = false;
         private const float IdleBarWidth = 0.2f;
         private const float IdleBarSpeed = 1.2f;
         private float _idleProgress = -IdleBarWidth;