#198 increase logging verbosity and fix fallback to DataDragon

floh22 · Nov 3, 2022 · a1e6bb9 · a1e6bb9
1 parent 81bfbce
commit a1e6bb9
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/LeagueBroadcast/Common/Data/Provider/DataDragon.cs b/LeagueBroadcast/Common/Data/Provider/DataDragon.cs
@@ -145,12 +145,19 @@ private static async Task GetLatestGameVersion()
             GetInstance()._startupContext.Status = "Retrieving latest patch info";
             Log.Info("[CDrag] Retrieving latest patch info");
 
-            string? rawCDragVersionResponse = JsonDocument.Parse(await RestRequester.GetRaw($"{ConfigController.Component.DataDragon.CDragonRaw}/latest/content-metadata.json")).RootElement.GetProperty("version").GetString();
+            string? rawCDragVersionResponse = JsonDocument.Parse(await RestRequester.GetRaw($"{ConfigController.Component.DataDragon.CDragonRaw}/latest/content-metadata.json")??"").RootElement.GetProperty("version").GetString();
             if (rawCDragVersionResponse is null)
             {
+                Log.Warn($"[CDrag] {$"{ConfigController.Component.DataDragon.CDragonRaw}/latest/content-metadata.json"} unreachable. Is your internet connection working?");
                 Log.Warn($"[CDrag] Could not get latest CDragon version. Falling back to latest DDrag version");
-                using JsonDocument response = JsonDocument.Parse(await RestRequester.GetRaw($"https://ddragon.leagueoflegends.com/realms/{ConfigController.Component.DataDragon.Region}.json"), new JsonDocumentOptions { AllowTrailingCommas = true, CommentHandling = JsonCommentHandling.Skip });
+                using JsonDocument response = JsonDocument.Parse(await RestRequester.GetRaw($"https://ddragon.leagueoflegends.com/realms/{ConfigController.Component.DataDragon.Region}.json")??"", new JsonDocumentOptions { AllowTrailingCommas = true, CommentHandling = JsonCommentHandling.Skip });
                 rawCDragVersionResponse = response.RootElement.GetProperty("n").GetProperty("champion").ToString();
+
+                if(rawCDragVersionResponse is null)
+                {
+                    Log.Warn($"[CDrag] DDrag not reachable. Assuming internet connection issues. Cannot retrieve data");
+                    return;
+                }
             }
             StringVersion localVersion = StringVersion.Parse(rawCDragVersionResponse.Split("+")[0]);
             version.localVersion = localVersion;