Responding to RepositoryManager events

Author: StanleyGoldman

src/GitHub.Api/Git/Repository.cs

@@ -47,9 +47,11 @@ public void Initialize(IRepositoryManager initRepositoryManager)
             Guard.ArgumentNotNull(initRepositoryManager, nameof(initRepositoryManager));
 
             repositoryManager = initRepositoryManager;
-            repositoryManager.OnCurrentBranchAndRemoteUpdated += RepositoryManager_OnCurrentBranchAndRemoteUpdated;
-            repositoryManager.OnLocalBranchListUpdated += RepositoryManager_OnLocalBranchListUpdated;
-            repositoryManager.OnRemoteBranchListUpdated += RepositoryManager_OnRemoteBranchListUpdated;
+            repositoryManager.CurrentBranchUpdated += RepositoryManagerOnCurrentBranchUpdated;
+            repositoryManager.GitStatusUpdated += RepositoryManagerOnGitStatusUpdated;
+            repositoryManager.GitLogUpdated += RepositoryManagerOnGitLogUpdated;
+            repositoryManager.LocalBranchesUpdated += RepositoryManagerOnLocalBranchesUpdated;
+            repositoryManager.RemoteBranchesUpdated += RepositoryManagerOnRemoteBranchesUpdated;
         }
 
         public ITask SetupRemote(string remote, string remoteUrl)
@@ -343,7 +345,7 @@ private void HandleBranchCacheUpdatedEvent(CacheUpdateEvent cacheUpdateEvent)
             LocalAndRemoteBranchListChanged?.Invoke(cacheUpdateEvent);
         }
 
-        private void RepositoryManager_OnCurrentBranchAndRemoteUpdated(ConfigBranch? branch, ConfigRemote? remote)
+        private void RepositoryManagerOnCurrentBranchUpdated(ConfigBranch? branch, ConfigRemote? remote)
         {
             new ActionTask(CancellationToken.None, () => {
                 if (!Nullable.Equals(CurrentConfigBranch, branch))
@@ -364,23 +366,31 @@ private void RepositoryManager_OnCurrentBranchAndRemoteUpdated(ConfigBranch? bra
             }) { Affinity = TaskAffinity.UI }.Start();
         }
 
-        private void RepositoryManager_OnRemoteBranchListUpdated(Dictionary<string, ConfigRemote> remotes,
-            Dictionary<string, Dictionary<string, ConfigBranch>> branches)
+        private void RepositoryManagerOnGitStatusUpdated(GitStatus gitStatus)
         {
             new ActionTask(CancellationToken.None, () => {
-                cacheContainer.BranchCache.SetRemotes(remotes, branches);
-                UpdateRemoteAndRemoteBranches();
+                CurrentStatus = gitStatus;
             }) { Affinity = TaskAffinity.UI }.Start();
         }
 
-        private void UpdateRemoteAndRemoteBranches()
+        private void RepositoryManagerOnGitLogUpdated(List<GitLogEntry> gitLogEntries)
         {
-            Remotes = ConfigRemotes.Values.Select(GetGitRemote).ToArray();
+            new ActionTask(CancellationToken.None, () => {
+                CurrentLog = gitLogEntries;
+            }) { Affinity = TaskAffinity.UI }.Start();
+        }
 
-            RemoteBranches = RemoteConfigBranches.Values.SelectMany(x => x.Values).Select(GetRemoteGitBranch).ToArray();
+        private void RepositoryManagerOnRemoteBranchesUpdated(Dictionary<string, ConfigRemote> remotes,
+            Dictionary<string, Dictionary<string, ConfigBranch>> branches)
+        {
+            new ActionTask(CancellationToken.None, () => {
+                cacheContainer.BranchCache.SetRemotes(remotes, branches);
+                Remotes = ConfigRemotes.Values.Select(GetGitRemote).ToArray();
+                RemoteBranches = RemoteConfigBranches.Values.SelectMany(x => x.Values).Select(GetRemoteGitBranch).ToArray();
+            }) { Affinity = TaskAffinity.UI }.Start();
         }
 
-        private void RepositoryManager_OnLocalBranchListUpdated(Dictionary<string, ConfigBranch> branches)
+        private void RepositoryManagerOnLocalBranchesUpdated(Dictionary<string, ConfigBranch> branches)
         {
             new ActionTask(CancellationToken.None, () => {
                 cacheContainer.BranchCache.SetLocals(branches);

src/GitHub.Api/Git/RepositoryManager.cs

@@ -7,12 +7,12 @@ namespace GitHub.Unity
 {
     public interface IRepositoryManager : IDisposable
     {
-        event Action<ConfigBranch?, ConfigRemote?> OnCurrentBranchAndRemoteUpdated;
-        event Action<bool> OnIsBusyChanged;
+        event Action<bool> IsBusyChanged;
+        event Action<ConfigBranch?, ConfigRemote?> CurrentBranchUpdated;
         event Action<GitStatus> GitStatusUpdated;
         event Action<List<GitLogEntry>> GitLogUpdated;
-        event Action<Dictionary<string, ConfigBranch>> OnLocalBranchListUpdated;
-        event Action<Dictionary<string, ConfigRemote>, Dictionary<string, Dictionary<string, ConfigBranch>>> OnRemoteBranchListUpdated;
+        event Action<Dictionary<string, ConfigBranch>> LocalBranchesUpdated;
+        event Action<Dictionary<string, ConfigRemote>, Dictionary<string, Dictionary<string, ConfigBranch>>> RemoteBranchesUpdated;
 
         void Initialize();
         void Start();
@@ -96,12 +96,12 @@ class RepositoryManager : IRepositoryManager
 
         private bool isBusy;
 
-        public event Action<ConfigBranch?, ConfigRemote?> OnCurrentBranchAndRemoteUpdated;
-        public event Action<bool> OnIsBusyChanged;
+        public event Action<ConfigBranch?, ConfigRemote?> CurrentBranchUpdated;
+        public event Action<bool> IsBusyChanged;
         public event Action<GitStatus> GitStatusUpdated;
         public event Action<List<GitLogEntry>> GitLogUpdated;
-        public event Action<Dictionary<string, ConfigBranch>> OnLocalBranchListUpdated;
-        public event Action<Dictionary<string, ConfigRemote>, Dictionary<string, Dictionary<string, ConfigBranch>>> OnRemoteBranchListUpdated;
+        public event Action<Dictionary<string, ConfigBranch>> LocalBranchesUpdated;
+        public event Action<Dictionary<string, ConfigRemote>, Dictionary<string, Dictionary<string, ConfigBranch>>> RemoteBranchesUpdated;
 
         public RepositoryManager(IPlatform platform, IGitConfig gitConfig,
             IRepositoryWatcher repositoryWatcher, IGitClient gitClient,
@@ -342,7 +342,7 @@ private void UpdateCurrentBranchAndRemote(string head)
 
             Logger.Trace("CurrentBranch: {0}", branch.HasValue ? branch.Value.ToString() : "[NULL]");
             Logger.Trace("CurrentRemote: {0}", remote.HasValue ? remote.Value.ToString() : "[NULL]");
-            OnCurrentBranchAndRemoteUpdated?.Invoke(branch, remote);
+            CurrentBranchUpdated?.Invoke(branch, remote);
         }
 
         private ITask HookupHandlers(ITask task, bool disableWatcher = false)
@@ -456,7 +456,7 @@ private void UpdateLocalBranches()
             UpdateLocalBranches(branches, repositoryPaths.BranchesPath, config.GetBranches().Where(x => x.IsTracking), "");
 
             Logger.Trace("OnLocalBranchListUpdated {0} branches", branches.Count);
-            OnLocalBranchListUpdated?.Invoke(branches);
+            LocalBranchesUpdated?.Invoke(branches);
         }
 
         private void UpdateLocalBranches(Dictionary<string, ConfigBranch> branches, NPath path, IEnumerable<ConfigBranch> configBranches, string prefix)
@@ -505,7 +505,7 @@ private void UpdateRemoteBranches()
             }
 
             Logger.Trace("OnRemoteBranchListUpdated {0} remotes", remotes.Count);
-            OnRemoteBranchListUpdated?.Invoke(remotes, remoteBranches);
+            RemoteBranchesUpdated?.Invoke(remotes, remoteBranches);
         }
 
         private bool disposed;
@@ -541,7 +541,7 @@ private set
                 {
                     Logger.Trace("IsBusyChanged Value:{0}", value);
                     isBusy = value;
-                    OnIsBusyChanged?.Invoke(isBusy);
+                    IsBusyChanged?.Invoke(isBusy);
                 }
             }
         }