Merge branch 'enhancements/repository-watcher-refactor-rollup' into enhancements/repository-watcher-refactor

Author: StanleyGoldman

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -78,6 +78,7 @@ private async Task SetupGit()
                 }
             }
 
+            Environment.User.Initialize(GitClient);
         }
 
         public ITask InitializeRepository()

src/GitHub.Api/Cache/CacheInterfaces.cs

@@ -49,7 +49,8 @@ public interface IGitLocksCache : IManagedCache
 
     public interface IGitUserCache : IManagedCache
     {
-        User User { get; set; }
+        string Name { get; set; }
+        string Email { get; set; }
     }
 
     public interface IGitStatusCache : IManagedCache

src/GitHub.Api/Git/GitClient.cs

@@ -8,8 +8,6 @@ namespace GitHub.Unity
 {
     public interface IGitClient
     {
-        event Action<CacheUpdateEvent> CurrentUserChanged;
-
         Task<NPath> FindGitInstallation();
         ITask<ValidateGitInstallResult> ValidateGitInstall(NPath path);
 
@@ -25,6 +23,8 @@ ITask<string> GetConfig(string key, GitConfigSource configSource,
         ITask<string> SetConfig(string key, string value, GitConfigSource configSource,
             IOutputProcessor<string> processor = null);
 
+        ITask<GitUser> GetConfigUserAndEmail();
+
         ITask<List<GitLock>> ListLocks(bool local,
             BaseOutputListProcessor<GitLock> processor = null);
 
@@ -84,11 +84,7 @@ ITask<string> Unlock(string file, bool force,
 
         ITask<Version> LfsVersion(IOutputProcessor<Version> processor = null);
 
-        void SetConfigUserAndEmail(string username, string email);
-
-        void CheckUserChangedEvent(CacheUpdateEvent gitLogCacheUpdateEvent);
-
-        User CurrentUser { get; }
+        ITask<GitUser> SetConfigNameAndEmail(string username, string email);
     }
 
     class GitClient : IGitClient
@@ -100,51 +96,14 @@ class GitClient : IGitClient
         private readonly ITaskManager taskManager;
         private readonly CancellationToken cancellationToken;
 
-        public event Action<CacheUpdateEvent> CurrentUserChanged;
-        private bool cacheInitialized;
-
         public GitClient(IEnvironment environment, IProcessManager processManager, ITaskManager taskManager)
         {
-            Logger.Trace("Constructed");
-
             this.environment = environment;
             this.processManager = processManager;
             this.taskManager = taskManager;
             this.cancellationToken = taskManager.Token;
         }
 
-        public void CheckUserChangedEvent(CacheUpdateEvent cacheUpdateEvent)
-        {
-            var managedCache = environment.CacheContainer.GitUserCache;
-            var raiseEvent = managedCache.ShouldRaiseCacheEvent(cacheUpdateEvent);
-
-            Logger.Trace("Check GitUserCache CacheUpdateEvent Current:{0} Check:{1} Result:{2}", managedCache.LastUpdatedAt,
-                cacheUpdateEvent.UpdatedTimeString ?? "[NULL]", raiseEvent);
-
-            if (raiseEvent)
-            {
-                var dateTimeOffset = managedCache.LastUpdatedAt;
-                var updateEvent = new CacheUpdateEvent { UpdatedTimeString = dateTimeOffset.ToString() };
-                HandleGitLogCacheUpdatedEvent(updateEvent);
-            }
-        }
-
-        public User CurrentUser
-        {
-            get
-            {
-                if (!cacheInitialized)
-                {
-                    cacheInitialized = true;
-                    environment.CacheContainer.GitUserCache.CacheInvalidated += GitUserCacheOnCacheInvalidated;
-                    environment.CacheContainer.GitUserCache.CacheUpdated += GitUserCacheOnCacheUpdated;
-                }
-
-                return environment.CacheContainer.GitUserCache.User;
-            }
-            private set { environment.CacheContainer.GitUserCache.User = value; }
-        }
-
         public async Task<NPath> FindGitInstallation()
         {
             if (!String.IsNullOrEmpty(environment.GitExecutablePath))
@@ -300,12 +259,35 @@ public ITask<string> SetConfig(string key, string value, GitConfigSource configS
                 .Configure(processManager);
         }
 
-        public void SetConfigUserAndEmail(string username, string email)
+        public ITask<GitUser> GetConfigUserAndEmail()
+        {
+            string username = null;
+            string email = null;
+
+            return GetConfig(UserNameConfigKey, GitConfigSource.User)
+                .Then((success, value) => {
+                    if (success)
+                    {
+                        username = value;
+                    }
+                })
+                .Then(GetConfig(UserEmailConfigKey, GitConfigSource.User)
+                .Then((success, value) => {
+                    if (success)
+                    {
+                        email = value;
+                    }
+                })).Then(success => {
+                Logger.Trace("{0}:{1} {2}:{3}", UserNameConfigKey, username, UserEmailConfigKey, email);
+                return new GitUser(username, email);
+            });
+        }
+
+        public ITask<GitUser> SetConfigNameAndEmail(string username, string email)
         {
-            SetConfig(UserNameConfigKey, username, GitConfigSource.User)
+            return SetConfig(UserNameConfigKey, username, GitConfigSource.User)
                 .Then(SetConfig(UserEmailConfigKey, email, GitConfigSource.User))
-                .Then(UpdateUserAndEmail)
-                .Start();
+                .Then(b => new GitUser(username, email));
         }
 
         public ITask<List<GitLock>> ListLocks(bool local, BaseOutputListProcessor<GitLock> processor = null)
@@ -480,54 +462,28 @@ public ITask<string> Unlock(string file, bool force,
                 .Configure(processManager);
         }
 
-        private void GitUserCacheOnCacheUpdated(DateTimeOffset timeOffset)
-        {
-            HandleGitLogCacheUpdatedEvent(new CacheUpdateEvent
-            {
-                UpdatedTimeString = timeOffset.ToString()
-            });
-        }
+        protected static ILogging Logger { get; } = Logging.GetLogger<GitClient>();
+    }
 
-        private void GitUserCacheOnCacheInvalidated()
-        {
-            Logger.Trace("GitUserCache Invalidated");
-            UpdateUserAndEmail();
-        }
-        
-        private void HandleGitLogCacheUpdatedEvent(CacheUpdateEvent cacheUpdateEvent)
-        {
-            Logger.Trace("GitUserCache Updated {0}", cacheUpdateEvent.UpdatedTimeString);
-            CurrentUserChanged?.Invoke(cacheUpdateEvent);
-        }
+    public struct GitUser
+    {
+        public static GitUser Default = new GitUser();
 
-        private void UpdateUserAndEmail()
-        {
-            Logger.Trace("UpdateUserAndEmail");
+        public string name;
+        public string email;
 
-            string username = null;
-            string email = null;
+        public string Name { get { return name; } }
+        public string Email { get { return email; } }
 
-            GetConfig(UserNameConfigKey, GitConfigSource.User)
-                .Then((success, value) => {
-                    if (success)
-                    {
-                        username = value;
-                    }
-                })
-                .Then(GetConfig(UserEmailConfigKey, GitConfigSource.User)
-                .Then((success, value) => {
-                    if (success)
-                    {
-                        email = value;
-                    }
-                })).ThenInUI(success => {
-                    CurrentUser = new User {
-                        Name = username,
-                        Email = email
-                    };
-                }).Start();
+        public GitUser(string name, string email)
+        {
+            this.name = name;
+            this.email = email;
         }
 
-        protected static ILogging Logger { get; } = Logging.GetLogger<GitClient>();
+        public override string ToString()
+        {
+            return $"Name:\"{Name}\" Email:\"{Email}\"";
+        }
     }
 }

src/GitHub.Api/Git/ManagedCacheExtensions.cs

@@ -4,18 +4,18 @@ namespace GitHub.Unity
 {
     static class ManagedCacheExtensions
     {
-        public static bool ShouldRaiseCacheEvent(this IManagedCache managedCache, CacheUpdateEvent cacheUpdateEvent)
+        public static bool IsLastUpdatedTimeDifferent(this IManagedCache managedCache, CacheUpdateEvent cacheUpdateEvent)
         {
-            bool raiseEvent;
+            bool isDifferent;
             if (cacheUpdateEvent.UpdatedTimeString == null)
             {
-                raiseEvent = managedCache.LastUpdatedAt != DateTimeOffset.MinValue;
+                isDifferent = managedCache.LastUpdatedAt != DateTimeOffset.MinValue;
             }
             else
             {
-                raiseEvent = managedCache.LastUpdatedAt.ToString() != cacheUpdateEvent.UpdatedTimeString;
+                isDifferent = managedCache.LastUpdatedAt.ToString() != cacheUpdateEvent.UpdatedTimeString;
             }
-            return raiseEvent;
+            return isDifferent;
         }
     }
 }