Refactory remote repository menu item creation

Scepheo · Jun 5, 2019 · 9bdaf25 · 9bdaf25
1 parent 9087910
commit 9bdaf25
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 68 deletions.
diff --git a/src/GitMan/Clients/AzureClient.cs b/src/GitMan/Clients/AzureClient.cs
@@ -94,20 +94,20 @@ private JsonDocument GetResponse(string path)
             }
         }
 
-        public AzureRepository[] GetRepositories()
+        public RemoteRepository[] GetRepositories()
         {
             var document = GetResponse("git/repositories");
             var repositories = document.RootElement.GetProperty("value");
 
             var count = repositories.GetArrayLength();
-            var azureRepos = new AzureRepository[count];
+            var azureRepos = new RemoteRepository[count];
             var index = 0;
 
             foreach (var repository in repositories.EnumerateArray())
             {
                 var name = repository.GetProperty("name").GetString();
-                var remoteUrl = repository.GetProperty("remoteUrl").GetString();
-                var azureRepo = new AzureRepository(name, remoteUrl);
+                var cloneUrl = repository.GetProperty("remoteUrl").GetString();
+                var azureRepo = new RemoteRepository(name, cloneUrl);
                 azureRepos[index] = azureRepo;
                 index++;
             }

diff --git a/src/GitMan/Clients/AzureRepository.cs b/src/GitMan/Clients/AzureRepository.cs
diff --git a/src/GitMan/Clients/GitHubClient.cs b/src/GitMan/Clients/GitHubClient.cs
@@ -66,21 +66,21 @@ private JsonDocument GetResponse(string path)
             }
         }
 
-        public GitHubRepository[] GetRepositories()
+        public RemoteRepository[] GetRepositories()
         {
             var document = GetResponse("user/repos");
             var repositories = document.RootElement;
 
             var count = repositories.GetArrayLength();
-            var GitHubRepos = new GitHubRepository[count];
+            var GitHubRepos = new RemoteRepository[count];
             var index = 0;
 
             foreach (var repository in repositories.EnumerateArray())
             {
                 var name = repository.GetProperty("name").GetString();
                 var fullName = repository.GetProperty("full_name").GetString();
-                var remoteUrl = repository.GetProperty("clone_url").GetString();
-                var GitHubRepo = new GitHubRepository(name, fullName, remoteUrl);
+                var cloneUrl = repository.GetProperty("clone_url").GetString();
+                var GitHubRepo = new RemoteRepository(name, fullName, cloneUrl);
                 GitHubRepos[index] = GitHubRepo;
                 index++;
             }

diff --git a/src/GitMan/Clients/GitHubRepository.cs b/src/GitMan/Clients/GitHubRepository.cs
diff --git a/src/GitMan/Clients/RemoteRepository.cs b/src/GitMan/Clients/RemoteRepository.cs
@@ -0,0 +1,20 @@
+namespace GitMan.Clients
+{
+    internal class RemoteRepository
+    {
+        public string Name { get; set; }
+        public string DisplayName { get; set; }
+        public string CloneUrl { get; set; }
+
+        public RemoteRepository(string name, string cloneUrl)
+            : this(name, name, cloneUrl)
+        { }
+
+        public RemoteRepository(string name, string displayName, string cloneUrl)
+        {
+            Name = name;
+            DisplayName = displayName;
+            CloneUrl = cloneUrl;
+        }
+    }
+}
diff --git a/src/GitMan/Context.cs b/src/GitMan/Context.cs
@@ -166,7 +166,7 @@ void onPopup(object sender, EventArgs eventArgs)
                     .OrderBy(repository => repository.Name);
 
                 var menuItems = repositories
-                    .Select(repository => MakeAzureRepositoryItem(repository, provider))
+                    .Select(repository => MakeRemoteRepositoryItem(repository, provider.DefaultConfig))
                     .ToArray();
 
                 menuItem.MenuItems.Clear();
@@ -190,30 +190,6 @@ void onSelect(object sender, EventArgs eventArgs) { }
             return menuItem;
         }
 
-        private MenuItem MakeAzureRepositoryItem(AzureRepository repository, AzureProvider provider)
-        {
-            var name = repository.Name;
-
-            void onClick(object sender, EventArgs eventArgs)
-            {
-                var configs = provider.DefaultConfig.Select(pair => $"--config \"{pair.Key}={pair.Value}\"");
-                var argument = $"clone \"{repository.RemoteUrl}\" {string.Join(' ', configs)}";
-
-                var startInfo = new ProcessStartInfo
-                {
-                    FileName = "git",
-                    Arguments = argument,
-                    UseShellExecute = true,
-                    WorkingDirectory = _settings.RepositoryFolder,
-                };
-
-                Process.Start(startInfo);
-            }
-
-            var menuItem = new MenuItem(name, onClick);
-            return menuItem;
-        }
-
         private MenuItem MakeGitHubProviderItem(
             RepositoryList existingRepositories,
             GitHubProvider provider)
@@ -248,7 +224,7 @@ void onPopup(object sender, EventArgs eventArgs)
                     .OrderBy(repository => repository.Name);
 
                 var menuItems = repositories
-                    .Select(repository => MakeGitHubRepositoryItem(repository, provider))
+                    .Select(repository => MakeRemoteRepositoryItem(repository, provider.DefaultConfig))
                     .ToArray();
 
                 menuItem.MenuItems.Clear();
@@ -272,14 +248,14 @@ void onSelect(object sender, EventArgs eventArgs) { }
             return menuItem;
         }
 
-        private MenuItem MakeGitHubRepositoryItem(GitHubRepository repository, GitHubProvider provider)
+        private MenuItem MakeRemoteRepositoryItem(RemoteRepository repository, Dictionary<string, string> defaultConfig)
         {
-            var name = repository.Name;
+            var name = repository.DisplayName;
 
             void onClick(object sender, EventArgs eventArgs)
             {
-                var configs = provider.DefaultConfig.Select(pair => $"--config \"{pair.Key}={pair.Value}\"");
-                var argument = $"clone \"{repository.RemoteUrl}\" {string.Join(' ', configs)}";
+                var configs = defaultConfig.Select(pair => $"--config \"{pair.Key}={pair.Value}\"");
+                var argument = $"clone \"{repository.CloneUrl}\" {string.Join(' ', configs)}";
 
                 var startInfo = new ProcessStartInfo
                 {