Fix a bunch of bugs in the git installation sequence and update progress

Author: shana

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -12,11 +12,17 @@ abstract class ApplicationManagerBase : IApplicationManager
         protected static ILogging Logger { get; } = LogHelper.GetLogger<IApplicationManager>();
 
         private RepositoryManager repositoryManager;
+        private Progress progressReporter;
         protected bool isBusy;
-        public event Action<IProgress> OnProgress;
+        public event Action<IProgress> OnProgress
+        {
+            add { progressReporter.OnProgress += value; }
+            remove { progressReporter.OnProgress -= value; }
+        }
 
         public ApplicationManagerBase(SynchronizationContext synchronizationContext)
         {
+            progressReporter = new Progress();
             SynchronizationContext = synchronizationContext;
             SynchronizationContext.SetSynchronizationContext(SynchronizationContext);
             ThreadingHelper.SetUIThread();
@@ -60,7 +66,8 @@ public void Run(bool firstRun)
                 Logger.Trace("No git path found in settings");
 
                 isBusy = true;
-                var initEnvironmentTask = new ActionTask<NPath>(CancellationToken, (b, path) => InitializeEnvironment(path)) { Affinity = TaskAffinity.UI };
+                var initEnvironmentTask = new ActionTask<NPath>(CancellationToken,
+                    (b, path) => InitializeEnvironment(path)) { Affinity = TaskAffinity.UI };
                 var findExecTask = new FindExecTask("git", CancellationToken)
                     .FinallyInUI((b, ex, path) =>
                     {
@@ -80,7 +87,15 @@ public void Run(bool firstRun)
                 var gitInstaller = new GitInstaller(Environment, CancellationToken);
 
                 // if successful, continue with environment initialization, otherwise try to find an existing git installation
-                gitInstaller.SetupGitIfNeeded(initEnvironmentTask, findExecTask);
+                var setupTask = gitInstaller.SetupGitIfNeeded();
+                setupTask.Progress(progressReporter.UpdateProgress);
+                setupTask.OnEnd += (thisTask, result, success, exception) =>
+                {
+                    if (success && result != null)
+                        thisTask.Then(initEnvironmentTask);
+                    else
+                        thisTask.Then(findExecTask);
+                };
             }
         }
 

src/GitHub.Api/Helpers/Progress.cs

@@ -1,3 +1,4 @@
+using GitHub.Logging;
 using System;
 
 namespace GitHub.Unity
@@ -11,25 +12,41 @@ public interface IProgress
         float Percentage { get; }
         long Value { get; }
         long Total { get; }
+        string Message { get; }
+        event Action<IProgress> OnProgress;
     }
 
     public class Progress : IProgress
     {
+        private static ILogging Logger = LogHelper.GetLogger<Progress>(); 
         public ITask Task { get; internal set; }
         public float Percentage { get { return Total > 0 ? (float)(double)Value / Total : 0f; } }
         public long Value { get; internal set; }
         public long Total { get; internal set; }
+        public string Message { get; internal set; }
 
         private long previousValue;
         private float averageSpeed = -1f;
         private float lastSpeed = 0f;
         private float smoothing = 0.005f;
+        public event Action<IProgress> OnProgress;
 
-        public void UpdateProgress(long value, long total)
+        public void UpdateProgress(IProgress progress)
+        {
+            Task = progress.Task;
+            UpdateProgress(progress.Value, progress.Total, progress.Message);
+        }
+
+        public void UpdateProgress(long value, long total, string message = null)
         {
-            previousValue = Value;
             Total = total;
             Value = value;
+            Message = message ?? Message;
+            if (Total == 0 || ((float)(double)Value / Total) - ((float)(double)previousValue / Total) > 1f / 100f)
+            { // signal progress in 1% increments or if we don't know what the total is
+                previousValue = Value;
+                OnProgress?.Invoke(this);
+            }
         }
     }
 }

src/GitHub.Api/IO/Utils.cs

@@ -14,7 +14,6 @@ public static bool Copy(Stream source, Stream destination,
             Func<long, long, bool> progress = null,
             int progressUpdateRate = 100)
         {
-            var logger = LogHelper.GetLogger("Copy");
             byte[] buffer = new byte[chunkSize];
             int bytesRead = 0;
             long totalRead = 0;
@@ -62,7 +61,6 @@ public static bool Copy(Stream source, Stream destination,
                             timeToFinish = Math.Max(1L,
                                 (long)((totalSize - totalRead) / (averageSpeed / progressUpdateRate)));
 
-                            logger.Trace($"totalRead: {totalRead} of {totalSize}");
                             success = progress(totalRead, timeToFinish);
                             if (!success)
                                 break;