Add progress reporting to the locks view and cleanup the code

shana · shana · commit c14943c4ab9c · 2018-05-18T20:39:28.000+02:00
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BaseWindow.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BaseWindow.cs
@@ -65,9 +65,6 @@ public virtual void OnDataUpdate()
         public virtual void OnRepositoryChanged(IRepository oldRepository)
         {}
 
-        public virtual void DoEmptyGUI()
-        {}
-
         // OnGUI calls this everytime, so override it to render as you would OnGUI
         public virtual void OnUI() {}
 
@@ -120,6 +117,13 @@ public virtual void DoneRefreshing()
             IsRefreshing = false;
         }
 
+        public virtual void DoEmptyGUI()
+        {}
+        public virtual void DoProgressGUI()
+        {}
+        public virtual void UpdateProgress(IProgress progress)
+        {}
+
         public Rect Position { get { return position; } }
         public IApplicationManager Manager { get; private set; }
         public abstract bool IsBusy { get; }
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
@@ -221,8 +221,7 @@ private void Render()
                     Redraw();
                 }
             }
-            if (ProgressRenderer != null)
-                ProgressRenderer.DoProgressGUI();
+            DoProgressGUI();
         }
 
         private void BuildTree()
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs
@@ -92,8 +92,7 @@ public override void OnGUI()
             }
             EditorGUI.BeginDisabledGroup(isBusy);
 
-            if (ProgressRenderer != null)
-                ProgressRenderer.DoProgressGUI();
+            DoProgressGUI();
 
             // Do the commit details area
             DoCommitGUI();
@@ -381,6 +380,7 @@ private void SelectNone()
 
         private void Commit()
         {
+            isBusy = true;
             var files = treeChanges.GetCheckedFiles().ToList();
             ITask addTask;
 
@@ -403,6 +403,7 @@ private void Commit()
                             commitMessage = "";
                             commitBody = "";
                         }
+                        isBusy = false;
                     }).Start();
         }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs
@@ -268,7 +268,7 @@ private void ValidateAndSetGitInstallPath()
                 newState.GitExecutablePath = gitPath.ToNPath();
                 newState.GitLfsExecutablePath = gitLfsPath.ToNPath();
                 var installer = new GitInstaller(Environment, Manager.ProcessManager, TaskManager.Token);
-                installer.Progress.OnProgress += ProgressRenderer.UpdateProgress;
+                installer.Progress.OnProgress += UpdateProgress;
 
                 new FuncTask<GitInstaller.GitInstallationState>(TaskManager.Token, () =>
                     {
@@ -285,7 +285,7 @@ private void ValidateAndSetGitInstallPath()
                     })
                     .FinallyInUI((success, ex, state) =>
                     {
-                        installer.Progress.OnProgress -= ProgressRenderer.UpdateProgress;
+                        installer.Progress.OnProgress -= UpdateProgress;
                         if (!success)
                         {
                             Logger.Error(ex, ErrorValidatingGitPath);
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs
@@ -391,8 +391,7 @@ public override void OnGUI()
                     Redraw();
             }
 
-            if (ProgressRenderer != null)
-                ProgressRenderer.DoProgressGUI();
+            DoProgressGUI();
 
             if (!selectedEntry.Equals(GitLogEntry.Default))
             {
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/IView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/IView.cs
@@ -3,7 +3,7 @@
 
 namespace GitHub.Unity
 {
-    interface IView : ICanRenderEmpty
+    interface IView : IUIEmpty, IUIProgress
     {
         void OnEnable();
         void OnDisable();
@@ -23,8 +23,14 @@ interface IView : ICanRenderEmpty
         bool HasFocus { get; }
     }
 
-    interface ICanRenderEmpty
+    interface IUIEmpty
     {
         void DoEmptyGUI();
     }
+
+    interface IUIProgress
+    {
+        void DoProgressGUI();
+        void UpdateProgress(IProgress progress);
+    }
 }
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/LocksView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/LocksView.cs
@@ -429,10 +429,8 @@ public override void OnGUI()
                 var lockControlRect = new Rect(rect.x, rect.y, Position.width, Position.height - rect.height);
 
                 var requiresRepaint = locksControl.Render(lockControlRect,
-                    entry =>
-                    {
-                    },
-                    entry => { },
+                    entry => {},
+                    entry => {},
                     entry =>
                     {
                         var menu = new GenericMenu();
@@ -453,6 +451,7 @@ public override void OnGUI()
             }
 
             EditorGUI.EndDisabledGroup();
+            DoProgressGUI();
         }
 
         private void UnlockSelectedEntry()
@@ -464,7 +463,7 @@ private void UnlockSelectedEntry()
                 {
                     if (success)
                     {
-                        TaskManager.Run(EntryPoint.ApplicationManager.UsageTracker.IncrementUnityProjectViewContextLfsUnlock);
+                        TaskManager.Run(EntryPoint.ApplicationManager.UsageTracker.IncrementUnityProjectViewContextLfsUnlock, null);
                     }
                     else
                     {
@@ -487,7 +486,7 @@ private void ForceUnlockSelectedEntry()
                 {
                     if (success)
                     {
-                        TaskManager.Run(EntryPoint.ApplicationManager.UsageTracker.IncrementUnityProjectViewContextLfsUnlock);
+                        TaskManager.Run(EntryPoint.ApplicationManager.UsageTracker.IncrementUnityProjectViewContextLfsUnlock, null);
                     }
                     else
                     {
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs
@@ -210,7 +210,7 @@ private static void ContextMenu_UnlockForce()
                 {
                     if (success)
                     {
-                        EntryPoint.ApplicationManager.TaskManager.Run(EntryPoint.ApplicationManager.UsageTracker.IncrementUnityProjectViewContextLfsUnlock);
+                        EntryPoint.ApplicationManager.TaskManager.Run(EntryPoint.ApplicationManager.UsageTracker.IncrementUnityProjectViewContextLfsUnlock, null);
                     }
                     else
                     {
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs
@@ -107,8 +107,7 @@ public override void OnGUI()
 
             GUILayout.EndScrollView();
 
-            if (ProgressRenderer != null)
-                ProgressRenderer.DoProgressGUI();
+            DoProgressGUI();
         }
 
         private void AttachHandlers(IRepository repository)
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Subview.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Subview.cs
@@ -56,6 +56,16 @@ public void DoEmptyGUI()
             Parent.DoEmptyGUI();
         }
 
+        public void DoProgressGUI()
+        {
+            Parent.DoProgressGUI();
+        }
+
+        public void UpdateProgress(IProgress progress)
+        {
+            Parent.UpdateProgress(progress);
+        }
+
         protected void Refresh(CacheType type)
         {
             if (Repository == null)
@@ -87,7 +97,6 @@ public void DoneRefreshing()
         }
 
         protected IView Parent { get; private set; }
-        protected IUIProgress ProgressRenderer { get { return Parent is Subview ? ((Subview)Parent).ProgressRenderer : Parent as IUIProgress; } }
         public IApplicationManager Manager { get { return Parent.Manager; } }
         public IRepository Repository { get { return Parent.Repository; } }
         public bool HasRepository { get { return Parent.HasRepository; } }
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs
@@ -5,14 +5,8 @@
 
 namespace GitHub.Unity
 {
-    interface IUIProgress
-    {
-        void DoProgressGUI();
-        void UpdateProgress(IProgress progress);
-    }
-
     [Serializable]
-    class Window : BaseWindow, IUIProgress, ICanRenderEmpty
+    class Window : BaseWindow
     {
         private const float DefaultNotificationTimeout = 2f;
         private const string Title = "GitHub";
@@ -407,7 +401,7 @@ private void RepositoryOnStatusEntriesChanged(CacheUpdateEvent cacheUpdateEvent)
         }
 
         private static object lck = new object();
-        public void UpdateProgress(IProgress progress)
+        public override void UpdateProgress(IProgress progress)
         {
             lock (lck)
             {
@@ -484,7 +478,7 @@ public override void Update()
             }
         }
 
-        public void DoProgressGUI()
+        public override void DoProgressGUI()
         {
             Rect rect1 = GUILayoutUtility.GetRect(position.width, 20);
             if (Event.current.GetTypeForControl(GUIUtility.GetControlID("ghu_ProgressBar".GetHashCode(), FocusType.Keyboard, position)) == EventType.Repaint)

Original file line number	Diff line number	Diff line change
`@@ -221,8 +221,7 @@ private void Render()`
`221`	`221`	`Redraw();`
`222`	`222`	`}`
`223`	`223`	`}`
`224`		`- if (ProgressRenderer != null)`
`225`		`- ProgressRenderer.DoProgressGUI();`
	`224`	`+ DoProgressGUI();`
`226`	`225`	`}`
`227`	`226`
`228`	`227`	`private void BuildTree()`
Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,7 @@ public override void OnGUI()`
`92`	`92`	`}`
`93`	`93`	`EditorGUI.BeginDisabledGroup(isBusy);`
`94`	`94`
`95`		`- if (ProgressRenderer != null)`
`96`		`- ProgressRenderer.DoProgressGUI();`
	`95`	`+ DoProgressGUI();`
`97`	`96`
`98`	`97`	`// Do the commit details area`
`99`	`98`	`DoCommitGUI();`
`@@ -381,6 +380,7 @@ private void SelectNone()`
`381`	`380`
`382`	`381`	`private void Commit()`
`383`	`382`	`{`
	`383`	`+ isBusy = true;`
`384`	`384`	`var files = treeChanges.GetCheckedFiles().ToList();`
`385`	`385`	`ITask addTask;`
`386`	`386`
`@@ -403,6 +403,7 @@ private void Commit()`
`403`	`403`	`commitMessage = "";`
`404`	`404`	`commitBody = "";`
`405`	`405`	`}`
	`406`	`+ isBusy = false;`
`406`	`407`	`}).Start();`
`407`	`408`	`}`
`408`	`409`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ private void ValidateAndSetGitInstallPath()`
`268`	`268`	`newState.GitExecutablePath = gitPath.ToNPath();`
`269`	`269`	`newState.GitLfsExecutablePath = gitLfsPath.ToNPath();`
`270`	`270`	`var installer = new GitInstaller(Environment, Manager.ProcessManager, TaskManager.Token);`
`271`		`- installer.Progress.OnProgress += ProgressRenderer.UpdateProgress;`
	`271`	`+ installer.Progress.OnProgress += UpdateProgress;`
`272`	`272`
`273`	`273`	`new FuncTask<GitInstaller.GitInstallationState>(TaskManager.Token, () =>`
`274`	`274`	`{`
`@@ -285,7 +285,7 @@ private void ValidateAndSetGitInstallPath()`
`285`	`285`	`})`
`286`	`286`	`.FinallyInUI((success, ex, state) =>`
`287`	`287`	`{`
`288`		`- installer.Progress.OnProgress -= ProgressRenderer.UpdateProgress;`
	`288`	`+ installer.Progress.OnProgress -= UpdateProgress;`
`289`	`289`	`if (!success)`
`290`	`290`	`{`
`291`	`291`	`Logger.Error(ex, ErrorValidatingGitPath);`
Original file line number	Diff line number	Diff line change
`@@ -391,8 +391,7 @@ public override void OnGUI()`
`391`	`391`	`Redraw();`
`392`	`392`	`}`
`393`	`393`
`394`		`- if (ProgressRenderer != null)`
`395`		`- ProgressRenderer.DoProgressGUI();`
	`394`	`+ DoProgressGUI();`
`396`	`395`
`397`	`396`	`if (!selectedEntry.Equals(GitLogEntry.Default))`
`398`	`397`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace GitHub.Unity`
`5`	`5`	`{`
`6`		`- interface IView : ICanRenderEmpty`
	`6`	`+ interface IView : IUIEmpty, IUIProgress`
`7`	`7`	`{`
`8`	`8`	`void OnEnable();`
`9`	`9`	`void OnDisable();`
`@@ -23,8 +23,14 @@ interface IView : ICanRenderEmpty`
`23`	`23`	`bool HasFocus { get; }`
`24`	`24`	`}`
`25`	`25`
`26`		`- interface ICanRenderEmpty`
	`26`	`+ interface IUIEmpty`
`27`	`27`	`{`
`28`	`28`	`void DoEmptyGUI();`
`29`	`29`	`}`
	`30`	`+`
	`31`	`+ interface IUIProgress`
	`32`	`+ {`
	`33`	`+ void DoProgressGUI();`
	`34`	`+ void UpdateProgress(IProgress progress);`
	`35`	`+ }`
`30`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -429,10 +429,8 @@ public override void OnGUI()`
`429`	`429`	`var lockControlRect = new Rect(rect.x, rect.y, Position.width, Position.height - rect.height);`
`430`	`430`
`431`	`431`	`var requiresRepaint = locksControl.Render(lockControlRect,`
`432`		`- entry =>`
`433`		`- {`
`434`		`- },`
`435`		`- entry => { },`
	`432`	`+ entry => {},`
	`433`	`+ entry => {},`
`436`	`434`	`entry =>`
`437`	`435`	`{`
`438`	`436`	`var menu = new GenericMenu();`
`@@ -453,6 +451,7 @@ public override void OnGUI()`
`453`	`451`	`}`
`454`	`452`
`455`	`453`	`EditorGUI.EndDisabledGroup();`
	`454`	`+ DoProgressGUI();`
`456`	`455`	`}`
`457`	`456`
`458`	`457`	`private void UnlockSelectedEntry()`
`@@ -464,7 +463,7 @@ private void UnlockSelectedEntry()`
`464`	`463`	`{`
`465`	`464`	`if (success)`
`466`	`465`	`{`
`467`		`- TaskManager.Run(EntryPoint.ApplicationManager.UsageTracker.IncrementUnityProjectViewContextLfsUnlock);`
	`466`	`+ TaskManager.Run(EntryPoint.ApplicationManager.UsageTracker.IncrementUnityProjectViewContextLfsUnlock, null);`
`468`	`467`	`}`
`469`	`468`	`else`
`470`	`469`	`{`
`@@ -487,7 +486,7 @@ private void ForceUnlockSelectedEntry()`
`487`	`486`	`{`
`488`	`487`	`if (success)`
`489`	`488`	`{`
`490`		`- TaskManager.Run(EntryPoint.ApplicationManager.UsageTracker.IncrementUnityProjectViewContextLfsUnlock);`
	`489`	`+ TaskManager.Run(EntryPoint.ApplicationManager.UsageTracker.IncrementUnityProjectViewContextLfsUnlock, null);`
`491`	`490`	`}`
`492`	`491`	`else`
`493`	`492`	`{`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ private static void ContextMenu_UnlockForce()`
`210`	`210`	`{`
`211`	`211`	`if (success)`
`212`	`212`	`{`
`213`		`- EntryPoint.ApplicationManager.TaskManager.Run(EntryPoint.ApplicationManager.UsageTracker.IncrementUnityProjectViewContextLfsUnlock);`
	`213`	`+ EntryPoint.ApplicationManager.TaskManager.Run(EntryPoint.ApplicationManager.UsageTracker.IncrementUnityProjectViewContextLfsUnlock, null);`
`214`	`214`	`}`
`215`	`215`	`else`
`216`	`216`	`{`
Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,7 @@ public override void OnGUI()`
`107`	`107`
`108`	`108`	`GUILayout.EndScrollView();`
`109`	`109`
`110`		`- if (ProgressRenderer != null)`
`111`		`- ProgressRenderer.DoProgressGUI();`
	`110`	`+ DoProgressGUI();`
`112`	`111`	`}`
`113`	`112`
`114`	`113`	`private void AttachHandlers(IRepository repository)`