Make DownloadTask cancellable and add progress reporting

Author: shana

src/GitHub.Api/GitHub.Api.csproj

@@ -149,7 +149,7 @@
     <Compile Include="Tasks\TaskExtensions.cs" />
     <Compile Include="Tasks\TaskManager.cs" />
     <Compile Include="Platform\FindExecTask.cs" />
-    <Compile Include="Helpers\ProgressReport.cs" />
+    <Compile Include="Helpers\Progress.cs" />
     <Compile Include="Metrics\IMetricsService.cs" />
     <Compile Include="Metrics\IUsageTracker.cs" />
     <Compile Include="Metrics\UsageModel.cs" />

src/GitHub.Api/Helpers/Progress.cs

@@ -0,0 +1,35 @@
+using System;
+
+namespace GitHub.Unity
+{
+    public interface IProgress
+    {
+        ITask Task { get; }
+        /// <summary>
+        /// From 0 to 1
+        /// </summary>
+        float Percentage { get; }
+        long Value { get; }
+        long Total { get; }
+    }
+
+    public class Progress : IProgress
+    {
+        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; }
+
+        private long previousValue;
+        private float averageSpeed = -1f;
+        private float lastSpeed = 0f;
+        private float smoothing = 0.005f;
+
+        public void UpdateProgress(long value, long total)
+        {
+            previousValue = Value;
+            Total = total;
+            Value = value;
+        }
+    }
+}

src/GitHub.Api/Helpers/ProgressReport.cs

@@ -175,30 +175,36 @@ public void SetupGitIfNeeded(ActionTask<NPath> onSuccess, ITask onFailure)
         private ITask CreateDownloadTask()
         {
             var tempZipPath = NPath.CreateTempDirectory("git_zip_paths");
-            gitArchiveFilePath = tempZipPath.Combine("git.zip");
-            gitLfsArchivePath = tempZipPath.Combine("git-lfs.zip");
-
-            var downloadGitMd5Task = new DownloadTextTask(CancellationToken.None,
-                "https://ghfvs-installer.github.com/unity/portable_git/git.zip.MD5.txt");
-
-            var downloadGitTask = new DownloadTask(CancellationToken.None, environment.FileSystem,
-                "https://ghfvs-installer.github.com/unity/portable_git/git.zip", gitArchiveFilePath, retryCount: 1);
-
-            var downloadGitLfsMd5Task = new DownloadTextTask(CancellationToken.None,
-                "https://ghfvs-installer.github.com/unity/portable_git/git-lfs.zip.MD5.txt");
-
-            var downloadGitLfsTask = new DownloadTask(CancellationToken.None, environment.FileSystem,
-                "https://ghfvs-installer.github.com/unity/portable_git/git-lfs.zip", gitLfsArchivePath, retryCount: 1);
-
-            return downloadGitMd5Task.Then((b, s) => {
-                                         downloadGitTask.ValidationHash = s;
-                                     })
-                                     .Then(downloadGitTask)
-                                     .Then(downloadGitLfsMd5Task)
-                                     .Then((b, s) => {
-                                         downloadGitLfsTask.ValidationHash = s;
-                                     })
-                                     .Then(downloadGitLfsTask);
+            gitArchiveFilePath = tempZipPath.Combine("git");
+            gitLfsArchivePath = tempZipPath.Combine("git-lfs");
+
+            var downloadGitMd5Task = new DownloadTextTask(TaskManager.Instance.Token,
+                environment.FileSystem,
+                "https://ghfvs-installer.github.com/unity/portable_git/git.zip.MD5.txt",
+                gitArchiveFilePath);
+
+            var downloadGitTask = new DownloadTask(TaskManager.Instance.Token, environment.FileSystem,
+                "https://ghfvs-installer.github.com/unity/portable_git/git.zip",
+                gitArchiveFilePath, retryCount: 1);
+
+            var downloadGitLfsMd5Task = new DownloadTextTask(TaskManager.Instance.Token, environment.FileSystem,
+                "https://ghfvs-installer.github.com/unity/portable_git/git-lfs.zip.MD5.txt",
+                gitLfsArchivePath);
+
+            var downloadGitLfsTask = new DownloadTask(TaskManager.Instance.Token, environment.FileSystem,
+                "https://ghfvs-installer.github.com/unity/portable_git/git-lfs.zip",
+                gitLfsArchivePath, retryCount: 1);
+
+            return downloadGitMd5Task
+                .Then((b, s) => {
+                    downloadGitTask.ValidationHash = s;
+                })
+                .Then(downloadGitTask)
+                .Then(downloadGitLfsMd5Task)
+                .Then((b, s) => {
+                    downloadGitLfsTask.ValidationHash = s;
+                })
+                .Then(downloadGitLfsTask);
         }
 
         private bool IsGitExtracted()

src/GitHub.Api/Installer/GitInstaller.cs

@@ -71,7 +71,8 @@ void SetUri(Uri uri)
             Host = uri.Host;
             if (uri.Segments.Any())
             {
-                RepositoryName = GetRepositoryName(uri.Segments.Last());
+                Filename = uri.Segments.Last();
+                RepositoryName = GetRepositoryName(Filename);
             }
 
             if (uri.Segments.Length > 2)
@@ -86,15 +87,17 @@ void SetFilePath(Uri uri)
         {
             Host = "";
             Owner = "";
-            RepositoryName = GetRepositoryName(uri.Segments.Last());
+            Filename = uri.Segments.Last();
+            RepositoryName = GetRepositoryName(Filename);
             IsFileUri = true;
         }
 
         void SetFilePath(string path)
         {
             Host = "";
             Owner = "";
-            RepositoryName = GetRepositoryName(path.Replace("/", @"\").RightAfterLast(@"\"));
+            Filename = path.Replace("/", @"\").RightAfterLast(@"\");
+            RepositoryName = GetRepositoryName(Filename);
             IsFileUri = true;
         }
 
@@ -131,6 +134,7 @@ bool ParseScpSyntax(string scpString)
 
         public bool IsValidUri => url != null;
         public string Protocol => url?.Scheme;
+        public string Filename { get; private set; }
 
         /// <summary>
         /// Attempts a best-effort to convert the remote origin to a GitHub Repository URL.