Handle remote provider errors gracefully

Scepheo · Jun 17, 2019 · 0dd2757 · 0dd2757
1 parent 65bb325
commit 0dd2757
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 20 deletions.
diff --git a/src/GitMan/Context.cs b/src/GitMan/Context.cs
@@ -1,5 +1,5 @@
 using GitMan.Actions;
-using GitMan.Clients;
+using GitMan.Providers;
 using GitMan.Config;
 using System;
 using System.Collections.Generic;

diff --git a/src/GitMan/Providers/AzureProvider.cs b/src/GitMan/Providers/AzureProvider.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Text.Json;
 
-namespace GitMan.Clients
+namespace GitMan.Providers
 {
     internal class AzureProvider : RemoteProvider
     {
@@ -94,7 +94,20 @@ private JsonDocument GetResponse(string path)
             using var response = client.GetAsync(uri).Result;
             var json = response.Content.ReadAsStringAsync().Result;
             var document = JsonDocument.Parse(json);
-            return document;
+
+            if (response.IsSuccessStatusCode)
+            {
+                return document;
+            }
+            else
+            {
+                var statusCode = response.StatusCode;
+                var message = document.RootElement.TryGetProperty("message", out var messageProperty)
+                    ? messageProperty.GetString()
+                    : "An unknown error occurred";
+                var exception = new RemoteProviderException(statusCode, message);
+                throw exception;
+            }
         }
 
         public override RemoteRepository[] GetRepositories()
@@ -105,7 +118,7 @@ public override RemoteRepository[] GetRepositories()
             var count = repositories.GetArrayLength();
             var azureRepos = new RemoteRepository[count];
             var index = 0;
-            
+
             foreach (var repository in repositories.EnumerateArray())
             {
                 var name = repository.GetProperty("name").GetString();

diff --git a/src/GitMan/Providers/GitHubProvider.cs b/src/GitMan/Providers/GitHubProvider.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Text.Json;
 
-namespace GitMan.Clients
+namespace GitMan.Providers
 {
     internal class GitHubProvider : RemoteProvider
     {
@@ -65,7 +65,20 @@ private JsonDocument GetResponse(string path)
             using var response = client.GetAsync(uri).Result;
             var json = response.Content.ReadAsStringAsync().Result;
             var document = JsonDocument.Parse(json);
-            return document;
+
+            if (response.IsSuccessStatusCode)
+            {
+                return document;
+            }
+            else
+            {
+                var statusCode = response.StatusCode;
+                var message = document.RootElement.TryGetProperty("message", out var messageProperty)
+                    ? messageProperty.GetString()
+                    : "An unknown error occurred";
+                var exception = new RemoteProviderException(statusCode, message);
+                throw exception;
+            }
         }
 
         public override RemoteRepository[] GetRepositories()

diff --git a/src/GitMan/Providers/RemoteProvider.cs b/src/GitMan/Providers/RemoteProvider.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Windows.Forms;
 
-namespace GitMan.Clients
+namespace GitMan.Providers
 {
     internal abstract class RemoteProvider
     {
@@ -22,8 +22,10 @@ public MenuItem MakeRemoteProviderItem(
             string repositoryFolder,
             RepositoryDirectory existingRepositories)
         {
-            var loadItem = new MenuItem("Loading...");
-            var dummyItems = new[] { loadItem };
+            // This _should_ never be shown to the user, and is only here to
+            // ensure the little drop-down arrow shows up
+            var dummyItem = new MenuItem("<DUMMY>");
+            var dummyItems = new[] { dummyItem };
 
             MenuItem menuItem = default;
 
@@ -36,18 +38,44 @@ void onPopup(object sender, EventArgs eventArgs)
                 var originalCursor = Cursor.Current;
                 Cursor.Current = Cursors.WaitCursor;
 
-                var repositories = GetRepositories()
-                    .Where(repository => !existingRepositories.Any(existing => existing.Name == repository.Name))
-                    .OrderBy(repository => repository.Name);
+                var trying = true;
 
-                var menuItems = repositories
-                    .Select(repository => repository.GetMenuItem(
-                        repositoryFolder,
-                        DefaultConfig))
-                    .ToArray();
+                while (trying)
+                {
+                    try
+                    {
+                        var repositories = GetRepositories()
+                            .Where(repository => !existingRepositories.Any(existing => existing.Name == repository.Name))
+                            .OrderBy(repository => repository.Name);
 
-                menuItem.MenuItems.Clear();
-                menuItem.MenuItems.AddRange(menuItems);
+                        var menuItems = repositories
+                            .Select(repository => repository.GetMenuItem(
+                                repositoryFolder,
+                                DefaultConfig))
+                            .ToArray();
+
+                        menuItem.MenuItems.Clear();
+                        menuItem.MenuItems.AddRange(menuItems);
+                    }
+                    catch (Exception exception)
+                    {
+                        var text = exception.Message;
+                        const string caption = "An error occurred";
+                        var buttons = MessageBoxButtons.RetryCancel;
+                        var icon = MessageBoxIcon.Error;
+
+                        var response = MessageBox.Show(text, caption, buttons, icon);
+
+                        if (response == DialogResult.Retry)
+                        {
+                            continue;
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
+                }
 
                 Cursor.Current = originalCursor;
             }

diff --git a/src/GitMan/Providers/RemoteProviderException.cs b/src/GitMan/Providers/RemoteProviderException.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Net;
+
+namespace GitMan.Providers
+{
+    internal class RemoteProviderException : Exception
+    {
+        public RemoteProviderException(HttpStatusCode statusCode, string message)
+            : base($"Remove provider returned {(int)statusCode} - {statusCode}:\n{message}")
+        { }
+    }
+}
diff --git a/src/GitMan/Providers/RemoteRepository.cs b/src/GitMan/Providers/RemoteRepository.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Windows.Forms;
 
-namespace GitMan.Clients
+namespace GitMan.Providers
 {
     internal class RemoteRepository
     {