From f96d4ee37e1924a2f14d7d1c6809508123ea7c39 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Tue, 29 Dec 2020 11:10:15 -0800
Subject: [PATCH] More safety around listing operations

---
 MPF.Library/Web/RedumpWebClient.cs | 38 ++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/MPF.Library/Web/RedumpWebClient.cs b/MPF.Library/Web/RedumpWebClient.cs
index ec0fdd52..5c4f07a5 100644
--- a/MPF.Library/Web/RedumpWebClient.cs
+++ b/MPF.Library/Web/RedumpWebClient.cs
@@ -958,13 +958,20 @@ namespace MPF.Web
             query = query.ToLowerInvariant();
 
             // Keep getting quicksearch pages until there are none left
-            int pageNumber = 1;
-            while (true)
+            try
             {
-                List<int> pageIds = CheckSingleSitePage(string.Format(quickSearchUrl, query, pageNumber++));
-                ids.AddRange(pageIds);
-                if (pageIds.Count <= 1)
-                    break;
+                int pageNumber = 1;
+                while (true)
+                {
+                    List<int> pageIds = CheckSingleSitePage(string.Format(quickSearchUrl, query, pageNumber++));
+                    ids.AddRange(pageIds);
+                    if (pageIds.Count <= 1)
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"An exception occurred while trying to log in: {ex}");
             }
 
             return ids;
@@ -986,13 +993,20 @@ namespace MPF.Web
             }
 
             // Keep getting user pages until there are none left
-            int pageNumber = 1;
-            while (true)
+            try
             {
-                List<int> pageIds = CheckSingleSitePage(string.Format(userDumpsUrl, username, pageNumber++));
-                ids.AddRange(pageIds);
-                if (pageIds.Count <= 1)
-                    break;
+                int pageNumber = 1;
+                while (true)
+                {
+                    List<int> pageIds = wc.CheckSingleSitePage(string.Format(userDumpsUrl, username, pageNumber++));
+                    ids.AddRange(pageIds);
+                    if (pageIds.Count <= 1)
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"An exception occurred while trying to log in: {ex}");
             }
 
             return ids;