Calling UsageTracker from other threads

StanleyGoldman · StanleyGoldman · commit b69500eaff6b · 2018-05-04T13:09:26.000-04:00
diff --git a/src/GitHub.Api/Application/ApplicationManagerBase.cs b/src/GitHub.Api/Application/ApplicationManagerBase.cs
@@ -166,7 +166,7 @@ public ITask InitializeRepository()
                     Environment.InitializeRepository();
                     RestartRepository();
                 })
-                .ThenInUI(UsageTracker.IncrementNumberOfProjectsInitialized)
+                .Then(UsageTracker.IncrementNumberOfProjectsInitialized)
                 .ThenInUI(InitializeUI);
             return task;
         }
@@ -213,7 +213,7 @@ protected void SetupMetrics(string unityVersion, bool firstRun)
 
             if (firstRun)
             {
-                UsageTracker.IncrementNumberOfStartups();
+                TaskManager.Run(UsageTracker.IncrementNumberOfStartups);
             }
 #endif
         }
diff --git a/src/GitHub.Api/Tasks/ITaskManager.cs b/src/GitHub.Api/Tasks/ITaskManager.cs
@@ -13,6 +13,7 @@ public interface ITaskManager : IDisposable
 
         T Schedule<T>(T task) where T : ITask;
         Task Wait();
+        ITask Run(Action action);
         ITask RunInUI(Action action);
     }
 }
diff --git a/src/GitHub.Api/Tasks/TaskManager.cs b/src/GitHub.Api/Tasks/TaskManager.cs
@@ -51,6 +51,11 @@ public static TaskScheduler GetScheduler(TaskAffinity affinity)
             }
         }
 
+        public ITask Run(Action action)
+        {
+            return new ActionTask(Token, action).Start();
+        }
+
         public ITask RunInUI(Action action)
         {
             return new ActionTask(Token, action) { Affinity = TaskAffinity.UI }.Start();
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/AuthenticationView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/AuthenticationView.cs
@@ -214,7 +214,7 @@ private void DoResult(bool success, string msg)
 
             if (success)
             {
-                Manager.UsageTracker.IncrementNumberOfAuthentications();
+                TaskManager.Run(UsageTracker.IncrementNumberOfAuthentications);
 
                 Clear();
                 Finish(true);
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
@@ -305,11 +305,11 @@ private void OnButtonBarGUI()
                     if (createBranch)
                     {
                         GitClient.CreateBranch(newBranchName, treeLocals.SelectedNode.Path)
+                            .Then(UsageTracker.IncrementNumberOfLocalBranchCreations)
                             .FinallyInUI((success, e) =>
                             {
                                 if (success)
                                 {
-                                    Manager.UsageTracker.IncrementNumberOfLocalBranchCreations();
                                     Redraw();
                                 }
                                 else
@@ -474,18 +474,20 @@ private void CheckoutRemoteBranch(string branch)
 
                 if (confirmCheckout)
                 {
-                    GitClient.CreateBranch(branchName, branch).FinallyInUI((success, e) => {
-                        if (success)
+                    GitClient.CreateBranch(branchName, branch)
+                        .Then(UsageTracker.IncrementNumberOfRemoteBranchCheckouts)
+                        .FinallyInUI((success, e) =>
                         {
-                            Manager.UsageTracker.IncrementNumberOfRemoteBranchCheckouts();
-                            Redraw();
-                        }
-                        else
-                        {
-                            EditorUtility.DisplayDialog(Localization.SwitchBranchTitle,
-                                String.Format(Localization.SwitchBranchFailedDescription, branch), Localization.Ok);
-                        }
-                    }).Start();
+                            if (success)
+                            {
+                                Redraw();
+                            }
+                            else
+                            {
+                                EditorUtility.DisplayDialog(Localization.SwitchBranchTitle,
+                                    String.Format(Localization.SwitchBranchFailedDescription, branch), Localization.Ok);
+                            }
+                        }).Start();
                 }
             }
         }
@@ -495,18 +497,20 @@ private void SwitchBranch(string branch)
             if (EditorUtility.DisplayDialog(ConfirmSwitchTitle, String.Format(ConfirmSwitchMessage, branch), ConfirmSwitchOK,
                 ConfirmSwitchCancel))
             {
-                GitClient.SwitchBranch(branch).FinallyInUI((success, e) => {
-                    if (success)
+                GitClient.SwitchBranch(branch)
+                    .Then(UsageTracker.IncrementNumberOfLocalBranchCheckouts)
+                    .FinallyInUI((success, e) =>
                     {
-                        Manager.UsageTracker.IncrementNumberOfLocalBranchCheckouts();
-                        Redraw();
-                    }
-                    else
-                    {
-                        EditorUtility.DisplayDialog(Localization.SwitchBranchTitle,
-                            String.Format(Localization.SwitchBranchFailedDescription, branch), Localization.Ok);
-                    }
-                }).Start();
+                        if (success)
+                        {
+                            Redraw();
+                        }
+                        else
+                        {
+                            EditorUtility.DisplayDialog(Localization.SwitchBranchTitle,
+                                String.Format(Localization.SwitchBranchFailedDescription, branch), Localization.Ok);
+                        }
+                    }).Start();
             }
         }
 
@@ -517,7 +521,7 @@ private void DeleteLocalBranch(string branch)
             {
                 GitClient
                     .DeleteBranch(branch, true)
-                    .ThenInUI(Manager.UsageTracker.IncrementNumberOfLocalBranchDeletions)
+                    .Then(UsageTracker.IncrementNumberOfLocalBranchDeletions)
                     .Start();
             }
         }
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs
@@ -353,13 +353,9 @@ private void Commit()
             }
 
             addTask
+                .Then(UsageTracker.IncrementNumberOfCommits)
                 .FinallyInUI((b, exception) => 
                     {
-                        if (b)
-                        {
-                            EntryPoint.ApplicationManager.UsageTracker.IncrementNumberOfCommits();
-                        }
-
                         commitMessage = "";
                         commitBody = "";
                     }).Start();
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs
@@ -702,11 +702,10 @@ private void Pull()
                             // (either git rebase --abort or git merge --abort)
                         }
                     }, runOptions: TaskRunOptions.OnAlways)
+                    .Then(UsageTracker.IncrementNumberOfPulls)
                     .FinallyInUI((success, e) => {
                         if (success)
                         {
-                            EntryPoint.ApplicationManager.UsageTracker.IncrementNumberOfPulls();
-
                             EditorUtility.DisplayDialog(Localization.PullActionTitle,
                                 String.Format(Localization.PullSuccessDescription, currentRemoteName),
                             Localization.Ok);
@@ -726,11 +725,10 @@ private void Push()
         {
             Repository
                 .Push()
+                .Then(UsageTracker.IncrementNumberOfPushes)
                 .FinallyInUI((success, e) => {
                     if (success)
                     {
-                        EntryPoint.ApplicationManager.UsageTracker.IncrementNumberOfPushes();
-
                         EditorUtility.DisplayDialog(Localization.PushActionTitle,
                             String.Format(Localization.PushSuccessDescription, currentRemoteName),
                         Localization.Ok);
@@ -749,9 +747,8 @@ private void Fetch()
         {
             Repository
                 .Fetch()
+                .Then(UsageTracker.IncrementNumberOfFetches)
                 .FinallyInUI((success, e) => {
-                    EntryPoint.ApplicationManager.UsageTracker.IncrementNumberOfFetches();
-
                     if (!success)
                     {
                         EditorUtility.DisplayDialog(FetchActionTitle, FetchFailureDescription,
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Subview.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Subview.cs
@@ -68,6 +68,7 @@ public virtual bool IsBusy
         protected IGitClient GitClient { get { return Manager.GitClient; } }
         protected IEnvironment Environment { get { return Manager.Environment; } }
         protected IPlatform Platform { get { return Manager.Platform; } }
+        protected IUsageTracker UsageTracker { get { return Manager.UsageTracker; } }
         public Rect Position { get { return Parent.Position; } }
         public string Title { get; protected set; }
         public Vector2 Size { get; protected set; }

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ public ITask InitializeRepository()`
`166`	`166`	`Environment.InitializeRepository();`
`167`	`167`	`RestartRepository();`
`168`	`168`	`})`
`169`		`- .ThenInUI(UsageTracker.IncrementNumberOfProjectsInitialized)`
	`169`	`+ .Then(UsageTracker.IncrementNumberOfProjectsInitialized)`
`170`	`170`	`.ThenInUI(InitializeUI);`
`171`	`171`	`return task;`
`172`	`172`	`}`
`@@ -213,7 +213,7 @@ protected void SetupMetrics(string unityVersion, bool firstRun)`
`213`	`213`
`214`	`214`	`if (firstRun)`
`215`	`215`	`{`
`216`		`- UsageTracker.IncrementNumberOfStartups();`
	`216`	`+ TaskManager.Run(UsageTracker.IncrementNumberOfStartups);`
`217`	`217`	`}`
`218`	`218`	`#endif`
`219`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ public interface ITaskManager : IDisposable`
`13`	`13`
`14`	`14`	`T Schedule<T>(T task) where T : ITask;`
`15`	`15`	`Task Wait();`
	`16`	`+ ITask Run(Action action);`
`16`	`17`	`ITask RunInUI(Action action);`
`17`	`18`	`}`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,11 @@ public static TaskScheduler GetScheduler(TaskAffinity affinity)`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
	`54`	`+ public ITask Run(Action action)`
	`55`	`+ {`
	`56`	`+ return new ActionTask(Token, action).Start();`
	`57`	`+ }`
	`58`	`+`
`54`	`59`	`public ITask RunInUI(Action action)`
`55`	`60`	`{`
`56`	`61`	`return new ActionTask(Token, action) { Affinity = TaskAffinity.UI }.Start();`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ private void DoResult(bool success, string msg)`
`214`	`214`
`215`	`215`	`if (success)`
`216`	`216`	`{`
`217`		`- Manager.UsageTracker.IncrementNumberOfAuthentications();`
	`217`	`+ TaskManager.Run(UsageTracker.IncrementNumberOfAuthentications);`
`218`	`218`
`219`	`219`	`Clear();`
`220`	`220`	`Finish(true);`
Original file line number	Diff line number	Diff line change
`@@ -305,11 +305,11 @@ private void OnButtonBarGUI()`
`305`	`305`	`if (createBranch)`
`306`	`306`	`{`
`307`	`307`	`GitClient.CreateBranch(newBranchName, treeLocals.SelectedNode.Path)`
	`308`	`+ .Then(UsageTracker.IncrementNumberOfLocalBranchCreations)`
`308`	`309`	`.FinallyInUI((success, e) =>`
`309`	`310`	`{`
`310`	`311`	`if (success)`
`311`	`312`	`{`
`312`		`- Manager.UsageTracker.IncrementNumberOfLocalBranchCreations();`
`313`	`313`	`Redraw();`
`314`	`314`	`}`
`315`	`315`	`else`
`@@ -474,18 +474,20 @@ private void CheckoutRemoteBranch(string branch)`
`474`	`474`
`475`	`475`	`if (confirmCheckout)`
`476`	`476`	`{`
`477`		`- GitClient.CreateBranch(branchName, branch).FinallyInUI((success, e) => {`
`478`		`- if (success)`
	`477`	`+ GitClient.CreateBranch(branchName, branch)`
	`478`	`+ .Then(UsageTracker.IncrementNumberOfRemoteBranchCheckouts)`
	`479`	`+ .FinallyInUI((success, e) =>`
`479`	`480`	`{`
`480`		`- Manager.UsageTracker.IncrementNumberOfRemoteBranchCheckouts();`
`481`		`- Redraw();`
`482`		`- }`
`483`		`- else`
`484`		`- {`
`485`		`- EditorUtility.DisplayDialog(Localization.SwitchBranchTitle,`
`486`		`- String.Format(Localization.SwitchBranchFailedDescription, branch), Localization.Ok);`
`487`		`- }`
`488`		`- }).Start();`
	`481`	`+ if (success)`
	`482`	`+ {`
	`483`	`+ Redraw();`
	`484`	`+ }`
	`485`	`+ else`
	`486`	`+ {`
	`487`	`+ EditorUtility.DisplayDialog(Localization.SwitchBranchTitle,`
	`488`	`+ String.Format(Localization.SwitchBranchFailedDescription, branch), Localization.Ok);`
	`489`	`+ }`
	`490`	`+ }).Start();`
`489`	`491`	`}`
`490`	`492`	`}`
`491`	`493`	`}`
`@@ -495,18 +497,20 @@ private void SwitchBranch(string branch)`
`495`	`497`	`if (EditorUtility.DisplayDialog(ConfirmSwitchTitle, String.Format(ConfirmSwitchMessage, branch), ConfirmSwitchOK,`
`496`	`498`	`ConfirmSwitchCancel))`
`497`	`499`	`{`
`498`		`- GitClient.SwitchBranch(branch).FinallyInUI((success, e) => {`
`499`		`- if (success)`
	`500`	`+ GitClient.SwitchBranch(branch)`
	`501`	`+ .Then(UsageTracker.IncrementNumberOfLocalBranchCheckouts)`
	`502`	`+ .FinallyInUI((success, e) =>`
`500`	`503`	`{`
`501`		`- Manager.UsageTracker.IncrementNumberOfLocalBranchCheckouts();`
`502`		`- Redraw();`
`503`		`- }`
`504`		`- else`
`505`		`- {`
`506`		`- EditorUtility.DisplayDialog(Localization.SwitchBranchTitle,`
`507`		`- String.Format(Localization.SwitchBranchFailedDescription, branch), Localization.Ok);`
`508`		`- }`
`509`		`- }).Start();`
	`504`	`+ if (success)`
	`505`	`+ {`
	`506`	`+ Redraw();`
	`507`	`+ }`
	`508`	`+ else`
	`509`	`+ {`
	`510`	`+ EditorUtility.DisplayDialog(Localization.SwitchBranchTitle,`
	`511`	`+ String.Format(Localization.SwitchBranchFailedDescription, branch), Localization.Ok);`
	`512`	`+ }`
	`513`	`+ }).Start();`
`510`	`514`	`}`
`511`	`515`	`}`
`512`	`516`
`@@ -517,7 +521,7 @@ private void DeleteLocalBranch(string branch)`
`517`	`521`	`{`
`518`	`522`	`GitClient`
`519`	`523`	`.DeleteBranch(branch, true)`
`520`		`- .ThenInUI(Manager.UsageTracker.IncrementNumberOfLocalBranchDeletions)`
	`524`	`+ .Then(UsageTracker.IncrementNumberOfLocalBranchDeletions)`
`521`	`525`	`.Start();`
`522`	`526`	`}`
`523`	`527`	`}`
Original file line number	Diff line number	Diff line change
`@@ -353,13 +353,9 @@ private void Commit()`
`353`	`353`	`}`
`354`	`354`
`355`	`355`	`addTask`
	`356`	`+ .Then(UsageTracker.IncrementNumberOfCommits)`
`356`	`357`	`.FinallyInUI((b, exception) =>`
`357`	`358`	`{`
`358`		`- if (b)`
`359`		`- {`
`360`		`- EntryPoint.ApplicationManager.UsageTracker.IncrementNumberOfCommits();`
`361`		`- }`
`362`		`-`
`363`	`359`	`commitMessage = "";`
`364`	`360`	`commitBody = "";`
`365`	`361`	`}).Start();`