Combined function to retrieve git name and email

Author: StanleyGoldman

src/GitHub.Api/Git/GitClient.cs

@@ -23,6 +23,8 @@ ITask<string> GetConfig(string key, GitConfigSource configSource,
         ITask<string> SetConfig(string key, string value, GitConfigSource configSource,
             IOutputProcessor<string> processor = null);
 
+        ITask<string[]> GetConfigUserAndEmail();
+
         ITask<List<GitLock>> ListLocks(bool local,
             BaseOutputListProcessor<GitLock> processor = null);
 
@@ -256,6 +258,27 @@ public ITask<string> SetConfig(string key, string value, GitConfigSource configS
                 .Configure(processManager);
         }
 
+        public ITask<string[]> GetConfigUserAndEmail()
+        {
+            string username = null;
+            string email = null;
+
+            return GetConfig("user.name", GitConfigSource.User).Then((success, value) => {
+                Logger.Trace("Return success:{0} user.name", success, value);
+                if (success)
+                {
+                    username = value;
+                }
+
+            }).Then(GetConfig("user.email", GitConfigSource.User).Then((success, value) => {
+                Logger.Trace("Return success:{0} user.email", success, value);
+                if (success)
+                {
+                    email = value;
+                }
+            })).Then(success => new[] { username, email });
+        }
+
         public ITask<List<GitLock>> ListLocks(bool local, BaseOutputListProcessor<GitLock> processor = null)
         {
             Logger.Trace("ListLocks");

src/GitHub.Api/Git/RepositoryManager.cs

@@ -318,16 +318,20 @@ public ITask UnlockFile(string file, bool force)
 
         private void LoadGitUser()
         {
-            var user = new User();
-            GitClient.GetConfig("user.name", GitConfigSource.User)
-                .Then((success, value) => user.Name = value).Then(
-            GitClient.GetConfig("user.email", GitConfigSource.User)
-                .Then((success, value) => user.Email = value))
-            .Then(() => {
-                        Logger.Trace("OnGitUserLoaded: {0}", user);
-                        OnGitUserLoaded?.Invoke(user);
-                     })
-            .Start();
+            GitClient.GetConfigUserAndEmail()
+                .Then((success, strings) => {
+                    var username = strings[0];
+                    var email = strings[1];
+
+                    var user = new User {
+                        Name = username,
+                        Email = email
+                    };
+
+                    Logger.Trace("OnGitUserLoaded: {0}", user);
+                    OnGitUserLoaded?.Invoke(user);
+
+                }).Start();
         }
 
         private void SetupWatcher()

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs

@@ -138,22 +138,10 @@ private void CheckForUser()
         {
             isBusy = true;
 
-            string username = null;
-            string email = null;
+            GitClient.GetConfigUserAndEmail().FinallyInUI((success, ex, strings) => {
+                var username = strings[0];
+                var email = strings[1];
 
-            GitClient.GetConfig("user.name", GitConfigSource.User).Then((success, value) => {
-                Logger.Trace("Return success:{0} user.name", success, value);
-                if (success)
-                {
-                    username = value;
-                }
-            }).Then(GitClient.GetConfig("user.email", GitConfigSource.User).Then((success, value) => {
-                Logger.Trace("Return success:{0} user.email", success, value);
-                if (success)
-                {
-                    email = value;
-                }
-            })).FinallyInUI((success, ex) => {
                 Logger.Trace("Return success:{0} name:{1} email:{2}", success, username, email);
 
                 isBusy = false;

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs

@@ -115,21 +115,21 @@ private void MaybeUpdateData()
                 {
                     if ((cachedUser == null || String.IsNullOrEmpty(cachedUser.Name)) && GitClient != null)
                     {
-                        var user = new User();
-                        GitClient.GetConfig("user.name", GitConfigSource.User)
-                            .Then((success, value) => user.Name = value).Then(
-                        GitClient.GetConfig("user.email", GitConfigSource.User)
-                            .Then((success, value) => user.Email = value))
-                            .FinallyInUI((success, ex) =>
+                        GitClient.GetConfigUserAndEmail().FinallyInUI((success, ex, strings) => {
+                            var username = strings[0];
+                            var email = strings[1];
+
+                            if (success && !String.IsNullOrEmpty(username) && !String.IsNullOrEmpty(email))
                             {
-                                if (success && !String.IsNullOrEmpty(user.Name))
-                                {
-                                    cachedUser = user;
-                                    userDataHasChanged = true;
-                                    Redraw();
-                                }
-                            })
-                            .Start();
+                                cachedUser = new User {
+                                    Name = username,
+                                    Email = email
+                                };
+
+                                userDataHasChanged = true;
+                                Redraw();
+                            }
+                        }).Start();
                     }
                 }