Fix Unzip task, it wasn't raising OnStart/OnEnd

Author: shana

src/GitHub.Api/Installer/UnzipTask.cs

@@ -32,47 +32,85 @@ public UnzipTask(CancellationToken token, string archiveFilePath, NPath extracte
             this.estimatedDurationProgress = estimatedDurationProgress;
         }
 
-        protected override void Run(bool success)
+        protected void BaseRun(bool success)
         {
             base.Run(success);
+        }
 
-            Logger.Trace("Unzip File: {0} to Path: {1}", archiveFilePath, extractedPath);
+        protected override void Run(bool success)
+        {
+            BaseRun(success);
+
+            RaiseOnStart();
 
             try
             {
-                zipHelper.Extract(archiveFilePath, extractedPath, Token, zipFileProgress, estimatedDurationProgress);
+                RunUnzip(success);
             }
             catch (Exception ex)
             {
-                var message = "Error Unzipping file";
-
-                Logger.Error(ex, message);
-                throw new UnzipTaskException(message);
+                Errors = ex.Message;
+                if (!RaiseFaultHandlers(ex))
+                    throw;
             }
+            finally
+            {
+                RaiseOnEnd();
+            }
+        }
 
-            if (expectedMD5 != null)
+        protected virtual void RunUnzip(bool success)
+        {
+            Logger.Trace("Unzip File: {0} to Path: {1}", archiveFilePath, extractedPath);
+
+            Exception exception = null;
+            var attempts = 0;
+            do
             {
-                var calculatedMD5 = fileSystem.CalculateFolderMD5(extractedPath);
-                if (!calculatedMD5.Equals(expectedMD5, StringComparison.InvariantCultureIgnoreCase))
+                if (Token.IsCancellationRequested)
+                    break;
+
+                exception = null;
+                try
                 {
-                    extractedPath.DeleteIfExists();
+                    zipHelper.Extract(archiveFilePath, extractedPath, Token, zipFileProgress, estimatedDurationProgress);
+
+                    if (expectedMD5 != null)
+                    {
+                        var calculatedMD5 = fileSystem.CalculateFolderMD5(extractedPath);
+                        success = !calculatedMD5.Equals(expectedMD5, StringComparison.InvariantCultureIgnoreCase);
+                        if (!success)
+                        {
+                            extractedPath.DeleteIfExists();
 
-                    var message = $"Extracted MD5: {calculatedMD5} Does not match expected: {expectedMD5}";
-                    Logger.Error(message);
+                            var message = $"Extracted MD5: {calculatedMD5} Does not match expected: {expectedMD5}";
+                            Logger.Error(message);
 
-                    throw new UnzipTaskException(message);
+                            exception = new UnzipException(message);
+                        }
+                    }
                 }
-            }
+                catch (Exception ex)
+                {
+                    exception = ex;
+                    success = false;
+                }
+            } while (attempts++ < RetryCount);
 
-            Logger.Trace("Completed Unzip");
+            if (!success)
+            {
+                Token.ThrowIfCancellationRequested();
+                throw new UnzipException("Error downloading file", exception);
+            }
         }
+        protected int RetryCount { get; }
     }
 
-    public class UnzipTaskException : Exception {
-        public UnzipTaskException(string message) : base(message)
+    public class UnzipException : Exception {
+        public UnzipException(string message) : base(message)
         { }
 
-        public UnzipTaskException(string message, Exception innerException) : base(message, innerException)
+        public UnzipException(string message, Exception innerException) : base(message, innerException)
         { }
     }
 }

src/tests/IntegrationTests/UnzipTaskTests.cs

@@ -71,7 +71,7 @@ public void TaskFailsWhenMD5Incorect()
             extractedPath.DirectoryExists().Should().BeFalse();
             failed.Should().BeTrue();
             exception.Should().NotBeNull();
-            exception.Should().BeOfType<UnzipTaskException>();
+            exception.Should().BeOfType<UnzipException>();
         }
     }
 }