Using a single ZipHelper instance instead of delegate

Author: StanleyGoldman

src/GitHub.Api/Installer/GitInstaller.cs

@@ -18,28 +18,22 @@ class GitInstaller : IGitInstaller
         private readonly CancellationToken cancellationToken;
         private readonly IEnvironment environment;
         private readonly ILogging logger;
-
-        private delegate void ExtractZipFile(string archive, string outFolder, CancellationToken cancellationToken,
-            IProgress<float> zipFileProgress = null, IProgress<long> estimatedDurationProgress = null);
-        private ExtractZipFile extractCallback;
+        private readonly IZipHelper zipHelper;
 
         public GitInstaller(IEnvironment environment, CancellationToken cancellationToken)
-            : this(environment, null, cancellationToken)
+            : this(environment, ZipHelper.Instance, cancellationToken)
         {
         }
 
-        public GitInstaller(IEnvironment environment, IZipHelper sharpZipLibHelper, CancellationToken cancellationToken)
+        public GitInstaller(IEnvironment environment, IZipHelper zipHelper, CancellationToken cancellationToken)
         {
             Guard.ArgumentNotNull(environment, nameof(environment));
 
             logger = Logging.GetLogger(GetType());
             this.cancellationToken = cancellationToken;
 
             this.environment = environment;
-            this.extractCallback = sharpZipLibHelper != null
-                 ? (ExtractZipFile)sharpZipLibHelper.Extract
-                 : ZipHelper.ExtractZipFile;
-
+            this.zipHelper = zipHelper;
 
             GitInstallationPath = environment.GetSpecialFolder(Environment.SpecialFolder.LocalApplicationData)
                 .ToNPath().Combine(ApplicationInfo.ApplicationName, PackageNameWithVersion);
@@ -184,7 +178,7 @@ public Task<bool> SetupGitIfNeeded(NPath tempPath, IProgress<float> zipFileProgr
             {
                 logger.Trace("Extracting \"{0}\" to \"{1}\"", archiveFilePath, unzipPath);
 
-                extractCallback(archiveFilePath, unzipPath, cancellationToken, zipFileProgress,
+                zipHelper.Extract(archiveFilePath, unzipPath, cancellationToken, zipFileProgress,
                     estimatedDurationProgress);
             }
             catch (Exception ex)
@@ -249,7 +243,7 @@ public Task<bool> SetupGitLfsIfNeeded(NPath tempPath, IProgress<float> zipFilePr
             {
                 logger.Trace("Extracting \"{0}\" to \"{1}\"", archiveFilePath, unzipPath);
 
-                extractCallback(archiveFilePath, unzipPath, cancellationToken, zipFileProgress,
+                zipHelper.Extract(archiveFilePath, unzipPath, cancellationToken, zipFileProgress,
                     estimatedDurationProgress);
             }
             catch (Exception ex)

src/GitHub.Api/Installer/UnzipTask.cs

@@ -8,14 +8,23 @@ class UnzipTask: TaskBase
     {
         private readonly string archiveFilePath;
         private readonly string extractedPath;
+        private readonly IZipHelper zipHelper;
         private readonly IProgress<float> zipFileProgress;
         private readonly IProgress<long> estimatedDurationProgress;
 
-        public UnzipTask(CancellationToken token, string archiveFilePath, string extractedPath, IProgress<float> zipFileProgress = null, IProgress<long> estimatedDurationProgress = null)
+        public UnzipTask(CancellationToken token, string archiveFilePath, string extractedPath,
+            IProgress<float> zipFileProgress = null, IProgress<long> estimatedDurationProgress = null) :
+            this(token, archiveFilePath, extractedPath, ZipHelper.Instance, zipFileProgress, estimatedDurationProgress)
+        {
+            
+        }
+
+        public UnzipTask(CancellationToken token, string archiveFilePath, string extractedPath, IZipHelper zipHelper, IProgress<float> zipFileProgress = null, IProgress<long> estimatedDurationProgress = null)
             : base(token)
         {
             this.archiveFilePath = archiveFilePath;
             this.extractedPath = extractedPath;
+            this.zipHelper = zipHelper;
             this.zipFileProgress = zipFileProgress;
             this.estimatedDurationProgress = estimatedDurationProgress;
         }
@@ -32,7 +41,7 @@ private void UnzipArchive()
             Logger.Trace("Zip File: {0}", archiveFilePath);
             Logger.Trace("Target Path: {0}", extractedPath);
 
-            ZipHelper.ExtractZipFile(archiveFilePath, extractedPath, Token, zipFileProgress, estimatedDurationProgress);
+            zipHelper.Extract(archiveFilePath, extractedPath, Token, zipFileProgress, estimatedDurationProgress);
 
             Logger.Trace("Completed");
         }

src/GitHub.Api/Installer/ZipHelper.cs

@@ -8,6 +8,21 @@ namespace GitHub.Unity
 {
     class ZipHelper : IZipHelper
     {
+        private static IZipHelper instance;
+
+        public static IZipHelper Instance
+        {
+            get
+            {
+                if (instance == null)
+                {
+                    instance = new ZipHelper();
+                }
+
+                return instance;
+            }
+        }
+
         public static bool Copy(Stream source, Stream destination, int chunkSize, long totalSize,
             Func<long, long, bool> progress, int progressUpdateRate)
         {