Merge pull request #270 from github-for-unity/enhancements/user-settings-view

Isolating the git user and email into a UserSettingsView

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj

@@ -102,6 +102,7 @@
     <Compile Include="UI\IView.cs" />
     <Compile Include="UI\LoadingView.cs" />
     <Compile Include="UI\PublishView.cs" />
+    <Compile Include="UI\UserSettingsView.cs" />
     <Compile Include="UI\GitPathView.cs" />
     <Compile Include="UI\SettingsView.cs" />
     <Compile Include="UI\Subview.cs" />

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

@@ -113,11 +113,6 @@ public override void OnDestroy()
             OnClose = null;
         }
 
-        public override bool IsBusy
-        {
-            get { return ActiveView.IsBusy; }
-        }
-
         private Subview ActiveView
         {
             get
@@ -146,5 +141,10 @@ private PopupViewType ActiveViewType
                 }
             }
         }
+
+        public override bool IsBusy
+        {
+            get { return ActiveView.IsBusy; }
+        }
     }
 }

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

@@ -12,10 +12,6 @@ namespace GitHub.Unity
     class SettingsView : Subview
     {
         private const string GitInstallTitle = "Git installation";
-        private const string GitConfigTitle = "Git Configuration";
-        private const string GitConfigNameLabel = "Name";
-        private const string GitConfigEmailLabel = "Email";
-        private const string GitConfigUserSave = "Save User";
         private const string GitRepositoryTitle = "Repository Configuration";
         private const string GitRepositoryRemoteLabel = "Remote";
         private const string GitRepositorySave = "Save Repository";
@@ -31,9 +27,6 @@ class SettingsView : Subview
         [NonSerialized] private int newGitIgnoreRulesSelection = -1;
         [NonSerialized] private bool isBusy;
 
-        [SerializeField] private string gitName;
-        [SerializeField] private string gitEmail;
-
         [SerializeField] private int gitIgnoreRulesSelection = 0;
         [SerializeField] private string initDirectory;
         [SerializeField] private List<GitLock> lockedFiles = new List<GitLock>();
@@ -44,7 +37,6 @@ class SettingsView : Subview
         [SerializeField] private int lockedFileSelection = -1;
         [SerializeField] private bool hasRemote;
         [NonSerialized] private bool remoteHasChanged;
-        [NonSerialized] private bool userDataHasChanged;
         [NonSerialized] private bool locksHaveChanged;
 
         [SerializeField] private string newGitName;
@@ -57,17 +49,21 @@ class SettingsView : Subview
 
         [SerializeField] private GitPathView gitPathView = new GitPathView();
 
+        [SerializeField] private UserSettingsView userSettingsView = new UserSettingsView();
+
         public override void InitializeView(IView parent)
         {
             base.InitializeView(parent);
             gitPathView.InitializeView(this);
+            userSettingsView.InitializeView(this);
         }
 
 
         public override void OnEnable()
         {
             base.OnEnable();
             gitPathView.OnEnable();
+            userSettingsView.OnEnable();
             AttachHandlers(Repository);
 
             remoteHasChanged = true;
@@ -79,20 +75,24 @@ public override void OnDisable()
         {
             base.OnDisable();
             gitPathView.OnDisable();
+            userSettingsView.OnDisable();
             DetachHandlers(Repository);
         }
 
         public override void OnDataUpdate()
         {
             base.OnDataUpdate();
+            userSettingsView.OnDataUpdate();
             gitPathView.OnDataUpdate();
+
             MaybeUpdateData();
         }
 
         public override void OnRepositoryChanged(IRepository oldRepository)
         {
             base.OnRepositoryChanged(oldRepository);
             gitPathView.OnRepositoryChanged(oldRepository);
+            userSettingsView.OnRepositoryChanged(oldRepository);
 
             DetachHandlers(oldRepository);
             AttachHandlers(Repository);
@@ -102,15 +102,11 @@ public override void OnRepositoryChanged(IRepository oldRepository)
             Refresh();
         }
 
-        public override bool IsBusy
-        {
-            get { return isBusy || gitPathView.IsBusy; }
-        }
-
         public override void Refresh()
         {
             base.Refresh();
             gitPathView.Refresh();
+            userSettingsView.Refresh();
             if (Repository != null && Repository.CurrentRemote.HasValue)
             {
                 Repository.ListLocks().Start();
@@ -139,7 +135,7 @@ public override void OnGUI()
         {
             scroll = GUILayout.BeginScrollView(scroll);
             {
-                OnUserSettingsGUI();
+                userSettingsView.OnGUI();
 
                 GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
 
@@ -174,48 +170,11 @@ private void MaybeUpdateData()
                 lockedFiles = new List<GitLock>();
 
             if (Repository == null)
-            {
-                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) =>
-                    {
-                        if (success && !String.IsNullOrEmpty(user.Name))
-                        {
-                            cachedUser = user;
-                            userDataHasChanged = true;
-                            Redraw();
-                        }
-                    })
-                    .Start();
-                }
-
-                if (userDataHasChanged)
-                {
-                    newGitName = gitName = cachedUser.Name;
-                    newGitEmail = gitEmail = cachedUser.Email;
-                    userDataHasChanged = false;
-                }
-
                 return;
-            }
 
-            userDataHasChanged = Repository.User.Name != gitName || Repository.User.Email != gitEmail;
-
-            if (!remoteHasChanged && !userDataHasChanged && !locksHaveChanged)
+            if (!remoteHasChanged && !locksHaveChanged)
                 return;
 
-            if (userDataHasChanged)
-            {
-                userDataHasChanged = false;
-                newGitName = gitName = Repository.User.Name;
-                newGitEmail = gitEmail = Repository.User.Email;
-            }
-
             if (remoteHasChanged)
             {
                 remoteHasChanged = false;
@@ -268,71 +227,6 @@ private void OnLocksUpdate(IEnumerable<GitLock> update)
             Redraw();
         }
 
-        private void OnUserSettingsGUI()
-        {
-            GUILayout.Label(GitConfigTitle, EditorStyles.boldLabel);
-
-            EditorGUI.BeginDisabledGroup(isBusy);
-            {
-                newGitName = EditorGUILayout.TextField(GitConfigNameLabel, newGitName);
-                newGitEmail = EditorGUILayout.TextField(GitConfigEmailLabel, newGitEmail);
-
-                var needsSaving = newGitName != gitName || newGitEmail != gitEmail;
-                EditorGUI.BeginDisabledGroup(!needsSaving);
-                {
-                    if (GUILayout.Button(GitConfigUserSave, GUILayout.ExpandWidth(false)))
-                    {
-                        GitClient.SetConfig("user.name", newGitName, GitConfigSource.User)
-                            .Then((success, value) =>
-                            {
-                                if (success)
-                                {
-                                    if (Repository != null)
-                                    {
-                                        Repository.User.Name = newGitName;
-                                    }
-                                    else
-                                    {
-                                        if (cachedUser == null)
-                                        {
-                                            cachedUser = new User();
-                                        }
-                                        cachedUser.Name = newGitName;
-                                    }
-                                }
-                            })
-                            .Then(
-                        GitClient.SetConfig("user.email", newGitEmail, GitConfigSource.User)
-                            .Then((success, value) =>
-                            {
-                                if (success)
-                                {
-                                    if (Repository != null)
-                                    {
-                                        Repository.User.Email = newGitEmail;
-                                    }
-                                    else
-                                    {
-                                        cachedUser.Email = newGitEmail;
-                                    }
-
-                                    userDataHasChanged = true;
-                                }
-                            }))
-                        .FinallyInUI((_, __) =>
-                        {
-                            isBusy = false;
-                            Redraw();
-                        })
-                        .Start();
-                        isBusy = true;
-                    }
-                }
-                EditorGUI.EndDisabledGroup();
-            }
-            EditorGUI.EndDisabledGroup();
-        }
-
         private void OnRepositorySettingsGUI()
         {
             GUILayout.Label(GitRepositoryTitle, EditorStyles.boldLabel);
@@ -475,5 +369,10 @@ private void OnLoggingSettingsGui()
             }
             EditorGUI.EndDisabledGroup();
         }
+
+        public override bool IsBusy
+        {
+            get { return isBusy || userSettingsView.IsBusy || gitPathView.IsBusy; }
+        }
     }
 }