Merge fixes/fix-download-location into enhancements/gitcheckout

Author: shana

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -72,8 +72,7 @@ public void Run(bool firstRun)
                         }
                     });
 
-                var applicationDataPath = Environment.GetSpecialFolder(System.Environment.SpecialFolder.LocalApplicationData).ToNPath();
-                var installDetails = new GitInstallDetails(applicationDataPath, true);
+                var installDetails = new GitInstallDetails(Environment.UserCachePath, true);
                 var gitInstaller = new GitInstaller(Environment, CancellationToken, installDetails);
 
                 // if successful, continue with environment initialization, otherwise try to find an existing git installation

src/GitHub.Api/Installer/GitInstaller.cs

@@ -14,20 +14,24 @@ class GitInstallDetails
         public const string GitExtractedMD5 = "e6cfc0c294a2312042f27f893dfc9c0a";
         public const string GitLfsExtractedMD5 = "36e3ae968b69fbf42dff72311040d24a";
 
+        public const string WindowsGitExecutableMD5 = "50570ed932559f294d1a1361801740b9";
+        public const string MacGitExecutableMD5 = "";
+
         public const string WindowsGitLfsExecutableMD5 = "177bb14d0c08f665a24f0d5516c3b080";
         public const string MacGitLfsExecutableMD5 = "f81a1a065a26a4123193e8fd96c561ad";
 
-        public const string FileListMD5 = "a152a216b2e76f6c127053251187a278";
-
         private const string PackageVersion = "f02737a78695063deace08e96d5042710d3e32db";
         private const string PackageName = "PortableGit";
 
         private readonly bool onWindows;
 
-        public GitInstallDetails(NPath targetInstallPath, bool onWindows)
+        public GitInstallDetails(NPath pluginDataPath, bool onWindows)
         {
             this.onWindows = onWindows;
-            var gitInstallPath = targetInstallPath.Combine(ApplicationInfo.ApplicationName, PackageNameWithVersion);
+
+            PluginDataPath = pluginDataPath;
+
+            var gitInstallPath = PluginDataPath.Combine(PackageNameWithVersion);
             GitInstallationPath = gitInstallPath;
 
             if (onWindows)
@@ -55,6 +59,7 @@ public NPath GetGitLfsExecutablePath(NPath gitInstallRoot)
                 : gitInstallRoot.Combine("libexec", "git-core", GitLfsExecutable);
         }
 
+        public NPath PluginDataPath { get; }
         public NPath GitInstallationPath { get; }
         public string GitExecutable { get; }
         public NPath GitExecutablePath { get; }
@@ -183,21 +188,20 @@ private NPath MoveGitAndLfs(NPath gitExtractPath, NPath gitLfsExtractPath, NPath
 
         private ITask CreateDownloadTask()
         {
-            var tempZipPath = NPath.CreateTempDirectory("git_zip_paths");
-            gitArchiveFilePath = tempZipPath.Combine("git.zip");
-            gitLfsArchivePath = tempZipPath.Combine("git-lfs.zip");
+            gitArchiveFilePath = installDetails.PluginDataPath.Combine("git.zip");
+            gitLfsArchivePath = installDetails.PluginDataPath.Combine("git-lfs.zip");
 
             var downloadGitMd5Task = new DownloadTextTask(TaskManager.Instance.Token, environment.FileSystem,
-                installDetails.GitZipMd5Url, tempZipPath);
+                installDetails.GitZipMd5Url, installDetails.PluginDataPath);
 
             var downloadGitTask = new DownloadTask(TaskManager.Instance.Token, environment.FileSystem,
-                installDetails.GitZipUrl, tempZipPath);
+                installDetails.GitZipUrl, installDetails.PluginDataPath);
 
             var downloadGitLfsMd5Task = new DownloadTextTask(TaskManager.Instance.Token, environment.FileSystem,
-                installDetails.GitLfsZipMd5Url, tempZipPath);
+                installDetails.GitLfsZipMd5Url, installDetails.PluginDataPath);
 
             var downloadGitLfsTask = new DownloadTask(TaskManager.Instance.Token, environment.FileSystem,
-                installDetails.GitLfsZipUrl, tempZipPath);
+                installDetails.GitLfsZipUrl, installDetails.PluginDataPath);
 
             return
                 downloadGitMd5Task.Then((b, s) => { downloadGitTask.ValidationHash = s; })
@@ -215,19 +219,21 @@ private bool IsGitExtracted()
                 return false;
             }
 
-            var fileListMD5 = environment.FileSystem.CalculateFolderMD5(installDetails.GitInstallationPath, false);
-            if (!fileListMD5.Equals(GitInstallDetails.FileListMD5, StringComparison.InvariantCultureIgnoreCase))
+            var gitExecutableMd5 = environment.FileSystem.CalculateFileMD5(installDetails.GitExecutablePath);
+            var expectedGitExecutableMd5 = environment.IsWindows ? GitInstallDetails.WindowsGitExecutableMD5 : GitInstallDetails.MacGitExecutableMD5;
+
+            if (!expectedGitExecutableMd5.Equals(gitExecutableMd5, StringComparison.InvariantCultureIgnoreCase))
             {
-                Logger.Warning($"Path {installDetails.GitInstallationPath} has MD5 {fileListMD5} expected {GitInstallDetails.FileListMD5}");
+                Logger.Warning($"Path {installDetails.GitExecutablePath} has MD5 {gitExecutableMd5} expected {expectedGitExecutableMd5}");
                 return false;
             }
 
-            var calculateMd5 = environment.FileSystem.CalculateFileMD5(installDetails.GitLfsExecutablePath);
-            var md5 = environment.IsWindows ? GitInstallDetails.WindowsGitLfsExecutableMD5 : GitInstallDetails.MacGitLfsExecutableMD5;
+            var gitLfsExecutableMd5 = environment.FileSystem.CalculateFileMD5(installDetails.GitLfsExecutablePath);
+            var expectedGitLfsExecutableMd5 = environment.IsWindows ? GitInstallDetails.WindowsGitLfsExecutableMD5 : GitInstallDetails.MacGitLfsExecutableMD5;
 
-            if (!md5.Equals(calculateMd5, StringComparison.InvariantCultureIgnoreCase))
+            if (!expectedGitLfsExecutableMd5.Equals(gitLfsExecutableMd5, StringComparison.InvariantCultureIgnoreCase))
             {
-                Logger.Warning($"Path {installDetails.GitLfsExecutablePath} has MD5 {calculateMd5} expected {md5}");
+                Logger.Warning($"Path {installDetails.GitLfsExecutablePath} has MD5 {gitLfsExecutableMd5} expected {expectedGitLfsExecutableMd5}");
                 return false;
             }
 

src/GitHub.Api/Tasks/DownloadTask.cs

@@ -99,30 +99,53 @@ protected virtual string RunDownload(bool success)
                 {
                     Logger.Trace($"Download of {Url} to {Destination} Attempt {attempts + 1} of {RetryCount + 1}");
 
-                    using (var destinationStream = fileSystem.OpenWrite(Destination, FileMode.Append))
+                    var fileExistsAndValid = false;
+                    if (Destination.FileExists())
                     {
-                        result = Utils.Download(Logger, Url, destinationStream,
-                            (value, total) =>
+                        if (ValidationHash == null)
+                        {
+                            Destination.Delete();
+                        }
+                        else
+                        {
+                            var md5 = fileSystem.CalculateFileMD5(Destination);
+                            result = md5.Equals(ValidationHash, StringComparison.CurrentCultureIgnoreCase);
+
+                            if (result)
                             {
-                                UpdateProgress(value, total);
-                                return !Token.IsCancellationRequested;
-                            });
+                                Logger.Trace($"Download previously exists & confirmed {md5}");
+                                fileExistsAndValid = true;
+                            }
+                        }
                     }
 
-                    if (result && ValidationHash != null)
+                    if (!fileExistsAndValid)
                     {
-                        var md5 = fileSystem.CalculateFileMD5(TargetDirectory);
-                        result = md5.Equals(ValidationHash, StringComparison.CurrentCultureIgnoreCase);
-
-                        if (!result)
+                        using (var destinationStream = fileSystem.OpenWrite(Destination, FileMode.Append))
                         {
-                            Logger.Warning($"Downloaded MD5 {md5} does not match {ValidationHash}. Deleting {TargetDirectory}.");
-                            fileSystem.FileDelete(TargetDirectory);
+                            result = Utils.Download(Logger, Url, destinationStream,
+                                (value, total) =>
+                                {
+                                    UpdateProgress(value, total);
+                                    return !Token.IsCancellationRequested;
+                                });
                         }
-                        else
+
+                        if (result && ValidationHash != null)
                         {
-                            Logger.Trace($"Download confirmed {md5}");
-                            break;
+                            var md5 = fileSystem.CalculateFileMD5(Destination);
+                            result = md5.Equals(ValidationHash, StringComparison.CurrentCultureIgnoreCase);
+
+                            if (!result)
+                            {
+                                Logger.Warning($"Downloaded MD5 {md5} does not match {ValidationHash}. Deleting {Destination}.");
+                                fileSystem.FileDelete(TargetDirectory);
+                            }
+                            else
+                            {
+                                Logger.Trace($"Download confirmed {md5}");
+                                break;
+                            }
                         }
                     }
                 }

src/tests/IntegrationTests/Installer/GitInstallerTests.cs

@@ -35,6 +35,7 @@ public override void TestFixtureTearDown()
         }
 
         [Test]
+        [Category("DoNotRunOnAppVeyor")]
         public void GitInstallTest()
         {
             var gitInstallationPath = TestBasePath.Combine("GitInstall").CreateDirectory();