Fix initialization sequence and cache invalidation on startup

Author: shana

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -47,7 +47,7 @@ public void Run(bool firstRun)
         {
             Logger.Trace("Run - CurrentDirectory {0}", NPath.CurrentDirectory);
 
-            var gitExecutablePath = SystemSettings.Get(Constants.GitInstallPathKey)?.ToNPath();            
+            var gitExecutablePath = SystemSettings.Get(Constants.GitInstallPathKey)?.ToNPath();
             if (gitExecutablePath != null && gitExecutablePath.FileExists()) // we have a git path
             {
                 Logger.Trace("Using git install path from settings: {0}", gitExecutablePath);
@@ -57,7 +57,10 @@ public void Run(bool firstRun)
             {
                 Logger.Trace("No git path found in settings");
 
-                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) => {
                         if (b && path != null)
@@ -72,8 +75,7 @@ public void Run(bool firstRun)
                         }
                     });
 
-                var installDetails = new GitInstallDetails(Environment.UserCachePath, true);
-                var gitInstaller = new GitInstaller(Environment, CancellationToken, installDetails);
+                var gitInstaller = new GitInstaller(Environment, CancellationToken);
 
                 // if successful, continue with environment initialization, otherwise try to find an existing git installation
                 gitInstaller.SetupGitIfNeeded(initEnvironmentTask, findExecTask);
@@ -171,34 +173,34 @@ protected void SetupMetrics(string unityVersion, bool firstRun)
         /// <param name="gitExecutablePath"></param>
         private void InitializeEnvironment(NPath gitExecutablePath)
         {
-            var afterGitSetup = new ActionTask(CancellationToken, RestartRepository)
-                .ThenInUI(InitializeUI);
-
             Environment.GitExecutablePath = gitExecutablePath;
             Environment.User.Initialize(GitClient);
 
+            var afterGitSetup = new ActionTask(CancellationToken, RestartRepository)
+                .ThenInUI(InitializeUI);
+
+            ITask task = afterGitSetup;
             if (Environment.IsWindows)
             {
-                var task = GitClient
-                    .GetConfig("credential.helper", GitConfigSource.Global)
-                    .Then((b, credentialHelper) => {
-                        if (string.IsNullOrEmpty(credentialHelper))
+                var credHelperTask = GitClient.GetConfig("credential.helper", GitConfigSource.Global);
+                credHelperTask.OnEnd += (thisTask, credentialHelper, success, exception) =>
+                    {
+                        if (!success || string.IsNullOrEmpty(credentialHelper))
                         {
                             Logger.Warning("No Windows CredentialHelper found: Setting to wincred");
-                            throw new ArgumentNullException(nameof(credentialHelper));
+                            thisTask
+                                .Then(GitClient.SetConfig("credential.helper", "wincred", GitConfigSource.Global))
+                                .Then(afterGitSetup);
                         }
-                    });
-                // if there's no credential helper, set it before restarting the repository
-                task.Then(GitClient.SetConfig("credential.helper", "wincred", GitConfigSource.Global), TaskRunOptions.OnFailure)
-                    .Then(afterGitSetup, taskIsTopOfChain: true);
-
-                // if there's a credential helper, we're good, restart the repository
-                task.Then(afterGitSetup, TaskRunOptions.OnSuccess, taskIsTopOfChain: true);
+                        else
+                            thisTask.Then(afterGitSetup);
+                    };
+                task = credHelperTask;
             }
-
-            afterGitSetup.Start();
+            task.Start();
         }
 
+
         private bool disposed = false;
         protected virtual void Dispose(bool disposing)
         {

src/GitHub.Api/Git/Repository.cs

@@ -298,6 +298,7 @@ private void CacheContainer_OnCacheInvalidated(CacheType cacheType)
                     break;
 
                 case CacheType.RepositoryInfoCache:
+                    repositoryManager?.UpdateRepositoryInfo();
                     break;
 
                 case CacheType.GitStatusEntriesCache:

src/GitHub.Api/Git/RepositoryManager.cs

@@ -46,6 +46,7 @@ public interface IRepositoryManager : IDisposable
         IGitConfig Config { get; }
         IGitClient GitClient { get; }
         bool IsBusy { get; }
+        void UpdateRepositoryInfo();
     }
 
     interface IRepositoryPathConfiguration
@@ -443,7 +444,7 @@ private void SetupWatcher()
         private void UpdateHead()
         {
             Logger.Trace("UpdateHead");
-            UpdateCurrentBranchAndRemote();
+            UpdateRepositoryInfo();
             UpdateGitLog();
         }
 
@@ -452,7 +453,7 @@ private string GetCurrentHead()
             return repositoryPaths.DotGitHead.ReadAllLines().FirstOrDefault();
         }
 
-        private void UpdateCurrentBranchAndRemote()
+        public void UpdateRepositoryInfo()
         {
             ConfigBranch? branch;
             ConfigRemote? remote;

src/GitHub.Api/Installer/GitInstaller.cs

@@ -86,23 +86,12 @@ class GitInstaller
         private NPath gitLfsArchivePath;
 
         public GitInstaller(IEnvironment environment, CancellationToken cancellationToken,
-            GitInstallDetails installDetails)
-            : this(environment, ZipHelper.Instance, cancellationToken, installDetails, null, null)
-        {}
-
-        public GitInstaller(IEnvironment environment, CancellationToken cancellationToken,
-            GitInstallDetails installDetails, NPath gitArchiveFilePath, NPath gitLfsArchivePath)
-            : this(environment, ZipHelper.Instance, cancellationToken, installDetails,
-                gitArchiveFilePath, gitLfsArchivePath)
-        {}
-
-        public GitInstaller(IEnvironment environment, IZipHelper sharpZipLibHelper, CancellationToken cancellationToken,
-            GitInstallDetails installDetails, NPath gitArchiveFilePath, NPath gitLfsArchivePath)
+            GitInstallDetails installDetails = null, NPath gitArchiveFilePath = null, NPath gitLfsArchivePath = null)
         {
             this.environment = environment;
-            this.sharpZipLibHelper = sharpZipLibHelper;
+            this.sharpZipLibHelper = ZipHelper.Instance;
             this.cancellationToken = cancellationToken;
-            this.installDetails = installDetails;
+            this.installDetails = installDetails ?? new GitInstallDetails(environment.UserCachePath, environment.IsWindows);
             this.gitArchiveFilePath = gitArchiveFilePath;
             this.gitLfsArchivePath = gitLfsArchivePath;
         }

src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs

@@ -151,13 +151,10 @@ protected ManagedCacheBase(bool invalidOnFirstRun)
         public void ValidateData()
         {
             var initialized = ValidateInitialized();
-            if (initialized)
+            if (!initialized || DateTimeOffset.Now - LastUpdatedAt > DataTimeout)
             {
-                if (DateTimeOffset.Now - LastUpdatedAt > DataTimeout)
-                {
-                    Logger.Trace("Timeout Invalidation");
-                    InvalidateData();
-                }
+                Logger.Trace("Timeout Invalidation");
+                InvalidateData();
             }
         }