Merge pull request #442 from github-for-unity/enhancements/repository-watcher-refactor

Refactoring RepositoryWatcher

Author: StanleyGoldman

appveyor.yml

@@ -56,7 +56,6 @@ test:
   categories:
     except:
     - DoNotRunOnAppVeyor
-    - TimeSensitive
 artifacts:
 - path: unity\PackageProject
   type: zip

src/GitHub.Api/Events/RepositoryWatcher.cs

@@ -14,12 +14,10 @@ interface IRepositoryWatcher : IDisposable
         event Action HeadChanged;
         event Action IndexChanged;
         event Action ConfigChanged;
-        event Action<string> LocalBranchChanged;
-        event Action<string> LocalBranchCreated;
-        event Action<string> LocalBranchDeleted;
+        event Action RepositoryCommitted;
         event Action RepositoryChanged;
-        event Action<string, string> RemoteBranchCreated;
-        event Action<string, string> RemoteBranchDeleted;
+        event Action LocalBranchesChanged;
+        event Action RemoteBranchesChanged;
         void Initialize();
         int CheckAndProcessEvents();
     }
@@ -39,12 +37,10 @@ class RepositoryWatcher : IRepositoryWatcher
         public event Action HeadChanged;
         public event Action IndexChanged;
         public event Action ConfigChanged;
-        public event Action<string> LocalBranchChanged;
-        public event Action<string> LocalBranchCreated;
-        public event Action<string> LocalBranchDeleted;
+        public event Action RepositoryCommitted;
         public event Action RepositoryChanged;
-        public event Action<string, string> RemoteBranchCreated;
-        public event Action<string, string> RemoteBranchDeleted;
+        public event Action LocalBranchesChanged;
+        public event Action RemoteBranchesChanged;
 
         public RepositoryWatcher(IPlatform platform, RepositoryPathConfiguration paths, CancellationToken cancellationToken)
         {
@@ -193,118 +189,17 @@ private int ProcessEvents(Event[] fileEvents)
                     {
                         events.Add(EventType.IndexChanged, null);
                     }
-                    else if (fileA.IsChildOf(paths.RemotesPath))
+                    else if (!events.ContainsKey(EventType.RemoteBranchesChanged) && fileA.IsChildOf(paths.RemotesPath))
                     {
-                        var relativePath = fileA.RelativeTo(paths.RemotesPath);
-                        var relativePathElements = relativePath.Elements.ToArray();
-
-                        if (!relativePathElements.Any())
-                        {
-                            continue;
-                        }
-
-                        var origin = relativePathElements[0];
-
-                        if (fileEvent.Type == sfw.net.EventType.DELETED)
-                        {
-                            if (fileA.ExtensionWithDot == ".lock")
-                            {
-                                continue;
-                            }
-
-                            var branch = string.Join(@"/", relativePathElements.Skip(1).ToArray());
-                            AddOrUpdateEventData(events, EventType.RemoteBranchDeleted, new EventData { Origin = origin, Branch = branch });
-                        }
-                        else if (fileEvent.Type == sfw.net.EventType.RENAMED)
-                        {
-                            if (fileA.ExtensionWithDot != ".lock")
-                            {
-                                continue;
-                            }
-
-                            if (fileB != null && fileB.FileExists())
-                            {
-                                if (fileA.FileNameWithoutExtension == fileB.FileNameWithoutExtension)
-                                {
-                                    var branchPathElement = relativePathElements
-                                        .Skip(1).Take(relativePathElements.Length - 2)
-                                        .Union(new[] { fileA.FileNameWithoutExtension }).ToArray();
-
-                                    var branch = string.Join(@"/", branchPathElement);
-                                    AddOrUpdateEventData(events, EventType.RemoteBranchCreated, new EventData { Origin = origin, Branch = branch });
-                                }
-                            }
-                        }
+                        events.Add(EventType.RemoteBranchesChanged, null);
                     }
-                    else if (fileA.IsChildOf(paths.BranchesPath))
+                    else if (!events.ContainsKey(EventType.LocalBranchesChanged) && fileA.IsChildOf(paths.BranchesPath))
                     {
-                        if (fileEvent.Type == sfw.net.EventType.MODIFIED)
-                        {
-                            if (fileA.DirectoryExists())
-                            {
-                                continue;
-                            }
-
-                            if (fileA.ExtensionWithDot == ".lock")
-                            {
-                                continue;
-                            }
-
-                            var relativePath = fileA.RelativeTo(paths.BranchesPath);
-                            var relativePathElements = relativePath.Elements.ToArray();
-
-                            if (!relativePathElements.Any())
-                            {
-                                continue;
-                            }
-
-                            var branch = string.Join(@"/", relativePathElements.ToArray());
-
-                            AddOrUpdateEventData(events, EventType.LocalBranchChanged, new EventData { Branch = branch });
-
-                        }
-                        else if (fileEvent.Type == sfw.net.EventType.DELETED)
-                        {
-                            if (fileA.ExtensionWithDot == ".lock")
-                            {
-                                continue;
-                            }
-
-                            var relativePath = fileA.RelativeTo(paths.BranchesPath);
-                            var relativePathElements = relativePath.Elements.ToArray();
-
-                            if (!relativePathElements.Any())
-                            {
-                                continue;
-                            }
-
-                            var branch = string.Join(@"/", relativePathElements.ToArray());
-                            AddOrUpdateEventData(events, EventType.LocalBranchDeleted, new EventData { Branch = branch });
-                        }
-                        else if (fileEvent.Type == sfw.net.EventType.RENAMED)
-                        {
-                            if (fileA.ExtensionWithDot != ".lock")
-                            {
-                                continue;
-                            }
-
-                            if (fileB != null && fileB.FileExists())
-                            {
-                                if (fileA.FileNameWithoutExtension == fileB.FileNameWithoutExtension)
-                                {
-                                    var relativePath = fileB.RelativeTo(paths.BranchesPath);
-                                    var relativePathElements = relativePath.Elements.ToArray();
-
-                                    if (!relativePathElements.Any())
-                                    {
-                                        continue;
-                                    }
-
-                                    var branch = string.Join(@"/", relativePathElements.ToArray());
-                                    AddOrUpdateEventData(events, EventType.LocalBranchCreated, new EventData { Branch = branch });
-                                }
-                            }
-                        }
+                        events.Add(EventType.LocalBranchesChanged, null);
+                    }
+                    else if (!events.ContainsKey(EventType.RepositoryCommitted) && fileA.IsChildOf(paths.DotGitCommitEditMsg))
+                    {
+                        events.Add(EventType.RepositoryCommitted, null);
                     }
                 }
                 else
@@ -320,13 +215,6 @@ private int ProcessEvents(Event[] fileEvents)
             return FireEvents(events);
         }
 
-        private void AddOrUpdateEventData(Dictionary<EventType, List<EventData>> events, EventType type, EventData data)
-        {
-            if (!events.ContainsKey(type))
-                events.Add(type, new List<EventData>());
-            events[type].Add(data);
-        }
-
         private int FireEvents(Dictionary<EventType, List<EventData>> events)
         {
             int eventsProcessed = 0;
@@ -344,74 +232,41 @@ private int FireEvents(Dictionary<EventType, List<EventData>> events)
                 eventsProcessed++;
             }
 
-            if (events.ContainsKey(EventType.IndexChanged))
+            if (events.ContainsKey(EventType.LocalBranchesChanged))
             {
-                Logger.Trace("IndexChanged");
-                IndexChanged?.Invoke();
+                Logger.Trace("LocalBranchesChanged");
+                LocalBranchesChanged?.Invoke();
                 eventsProcessed++;
             }
 
-            if (events.ContainsKey(EventType.RepositoryChanged))
+            if (events.ContainsKey(EventType.RemoteBranchesChanged))
             {
-                Logger.Trace("RepositoryChanged");
-                RepositoryChanged?.Invoke();
+                Logger.Trace("RemoteBranchesChanged");
+                RemoteBranchesChanged?.Invoke();
                 eventsProcessed++;
             }
 
-            List<EventData> localBranchesCreated;
-            if (events.TryGetValue(EventType.LocalBranchCreated, out localBranchesCreated))
-            {
-                foreach (var evt in localBranchesCreated)
-                {
-                    Logger.Trace($"LocalBranchCreated: {evt.Branch}");
-                    LocalBranchCreated?.Invoke(evt.Branch);
-                    eventsProcessed++;
-                }
-            }
-
-            List<EventData> localBranchesChanged;
-            if (events.TryGetValue(EventType.LocalBranchChanged, out localBranchesChanged))
+            if (events.ContainsKey(EventType.IndexChanged))
             {
-                foreach (var evt in localBranchesChanged)
-                {
-                    Logger.Trace($"LocalBranchChanged: {evt.Branch}");
-                    LocalBranchChanged?.Invoke(evt.Branch);
-                    eventsProcessed++;
-                }
+                Logger.Trace("IndexChanged");
+                IndexChanged?.Invoke();
+                eventsProcessed++;
             }
 
-            List<EventData> localBranchesDeleted;
-            if (events.TryGetValue(EventType.LocalBranchDeleted, out localBranchesDeleted))
+            if (events.ContainsKey(EventType.RepositoryChanged))
             {
-                foreach (var evt in localBranchesDeleted)
-                {
-                    Logger.Trace($"LocalBranchDeleted: {evt.Branch}");
-                    LocalBranchDeleted?.Invoke(evt.Branch);
-                    eventsProcessed++;
-                }
+                Logger.Trace("RepositoryChanged");
+                RepositoryChanged?.Invoke();
+                eventsProcessed++;
             }
 
-            List<EventData> remoteBranchesCreated;
-            if (events.TryGetValue(EventType.RemoteBranchCreated, out remoteBranchesCreated))
+            if (events.ContainsKey(EventType.RepositoryCommitted))
             {
-                foreach (var evt in remoteBranchesCreated)
-                {
-                    Logger.Trace($"RemoteBranchCreated: {evt.Origin}/{evt.Branch}");
-                    RemoteBranchCreated?.Invoke(evt.Origin, evt.Branch);
-                    eventsProcessed++;
-                }
+                Logger.Trace("RepositoryCommitted");
+                RepositoryCommitted?.Invoke();
+                eventsProcessed++;
             }
 
-            List<EventData> remoteBranchesDeleted;
-            if (events.TryGetValue(EventType.RemoteBranchDeleted, out remoteBranchesDeleted))
-            {
-                foreach (var evt in remoteBranchesDeleted)
-                {
-                    Logger.Trace($"RemoteBranchDeleted: {evt.Origin}/{evt.Branch}");
-                    RemoteBranchDeleted?.Invoke(evt.Origin, evt.Branch);
-                    eventsProcessed++;
-                }
-            }
             return eventsProcessed;
         }
 
@@ -445,13 +300,11 @@ private enum EventType
             None,
             ConfigChanged,
             HeadChanged,
-            RepositoryChanged,
             IndexChanged,
-            RemoteBranchDeleted,
-            RemoteBranchCreated,
-            LocalBranchDeleted,
-            LocalBranchCreated,
-            LocalBranchChanged
+            LocalBranchesChanged,
+            RemoteBranchesChanged,
+            RepositoryChanged,
+            RepositoryCommitted
         }
 
         private class EventData