- Fix waiting for GoIndex alternatives on errors

- Better error handling
KoalaBear84 · Dec 6, 2020 · 2976670 · 2976670
1 parent 2b5147c
commit 2976670
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 18 deletions.
diff --git a/OpenDirectoryDownloader.Shared/RateLimiter.cs b/OpenDirectoryDownloader.Shared/RateLimiter.cs
@@ -55,7 +55,7 @@ public async Task RateLimit()
         /// <param name="timeSpan">TimeSpan to add</param>
         public void AddDelay(TimeSpan timeSpan)
         {
-            LastRequest.Add(timeSpan);
+            LastRequest = LastRequest.Add(timeSpan);
         }
     }
 }
diff --git a/OpenDirectoryDownloader/Site/GoIndex/Go2IndexParser.cs b/OpenDirectoryDownloader/Site/GoIndex/Go2IndexParser.cs
@@ -71,18 +71,26 @@ public static async Task<WebDirectory> ParseIndex(HttpClient httpClient, WebDire
                         }
                     }
 
-                    if (indexResponse.Error == null)
+                    if (indexResponse is null)
                     {
-                        Console.WriteLine("Password OK!");
-                        Logger.Info("Password OK!");
-
-                        webDirectory = await ScanIndexAsync(httpClient, webDirectory);
+                        Console.WriteLine("Error. Invalid response. Stopping.");
+                        Logger.Error("Error. Invalid response. Stopping.");
                     }
                     else
                     {
-                        OpenDirectoryIndexer.Session.Parameters.Remove(Constants.Parameters_Password);
-                        Console.WriteLine($"Error. Code: {indexResponse.Error.Code}, Message: {indexResponse.Error.Message}. Stopping.");
-                        Logger.Error($"Error. Code: {indexResponse.Error.Code}, Message: {indexResponse.Error.Message}. Stopping.");
+                        if (indexResponse.Error == null)
+                        {
+                            Console.WriteLine("Password OK!");
+                            Logger.Info("Password OK!");
+
+                            webDirectory = await ScanIndexAsync(httpClient, webDirectory);
+                        }
+                        else
+                        {
+                            OpenDirectoryIndexer.Session.Parameters.Remove(Constants.Parameters_Password);
+                            Console.WriteLine($"Error. Code: {indexResponse.Error.Code}, Message: {indexResponse.Error.Message}. Stopping.");
+                            Logger.Error($"Error. Code: {indexResponse.Error.Code}, Message: {indexResponse.Error.Message}. Stopping.");
+                        }
                     }
                 }
                 else

diff --git a/OpenDirectoryDownloader/Site/GoIndex/GoIndexParser.cs b/OpenDirectoryDownloader/Site/GoIndex/GoIndexParser.cs
@@ -65,18 +65,26 @@ public static async Task<WebDirectory> ParseIndex(HttpClient httpClient, WebDire
                         }
                     }
 
-                    if (indexResponse.Error == null)
+                    if (indexResponse is null)
                     {
-                        Console.WriteLine("Password OK!");
-                        Logger.Info("Password OK!");
-
-                        webDirectory = await ScanIndexAsync(httpClient, webDirectory);
+                        Console.WriteLine("Error. Invalid response. Stopping.");
+                        Logger.Error("Error. Invalid response. Stopping.");
                     }
                     else
                     {
-                        OpenDirectoryIndexer.Session.Parameters.Remove(Constants.Parameters_Password);
-                        Console.WriteLine($"Error. Code: {indexResponse.Error.Code}, Message: {indexResponse.Error.Message}. Stopping.");
-                        Logger.Error($"Error. Code: {indexResponse.Error.Code}, Message: {indexResponse.Error.Message}. Stopping.");
+                        if (indexResponse.Error == null)
+                        {
+                            Console.WriteLine("Password OK!");
+                            Logger.Info("Password OK!");
+
+                            webDirectory = await ScanIndexAsync(httpClient, webDirectory);
+                        }
+                        else
+                        {
+                            OpenDirectoryIndexer.Session.Parameters.Remove(Constants.Parameters_Password);
+                            Console.WriteLine($"Error. Code: {indexResponse.Error.Code}, Message: {indexResponse.Error.Message}. Stopping.");
+                            Logger.Error($"Error. Code: {indexResponse.Error.Code}, Message: {indexResponse.Error.Message}. Stopping.");
+                        }
                     }
                 }
                 else
@@ -112,7 +120,7 @@ private static async Task<WebDirectory> ScanIndexAsync(HttpClient httpClient, We
             try
             {
                 await RateLimiter.RateLimit();
-                
+
                 if (!webDirectory.Url.EndsWith("/"))
                 {
                     webDirectory.Url += "/";