Merge #3843 Clarify remote swinfo network errors

KSP-CKAN · May 21, 2023 · 4beea0f · 4beea0f
2 parents 351fa35 + fc5f379
commit 4beea0f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@ All notable changes to this project will be documented in this file.
 - [Netkan] Warnings for missing swinfo.json deps (#3827 by: HebaruSan)
 - [Build] Stop building on Mono 6.6 and earlier (#3832 by: HebaruSan)
 - [Netkan] Add download link to staging PRs (#3831 by: HebaruSan)
+- [Netkan] Clarify remote swinfo network errors (#3843 by: HebaruSan; reviewed: )
 
 ## v1.32.0 (Kepler)
 

diff --git a/Netkan/Transformers/SpaceWarpInfoTransformer.cs b/Netkan/Transformers/SpaceWarpInfoTransformer.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 
 using ICSharpCode.SharpZipLib.Zip;
 using log4net;
@@ -54,14 +55,21 @@ public IEnumerable<Metadata> Transform(Metadata metadata, TransformOptions opts)
                         }
                         resourcesJson.SafeAdd("remote-swinfo", swinfo.version_check.OriginalString);
 
-                        var remoteInfo = modSvc.ParseSpaceWarpJson(
-                            githubApi?.DownloadText(swinfo.version_check)
-                            ?? httpSvc.DownloadText(swinfo.version_check));
-                        if (swinfo.version == remoteInfo?.version)
+                        try
                         {
-                            log.InfoFormat("Using remote swinfo.json file: {0}",
-                                           swinfo.version_check);
-                            swinfo = remoteInfo;
+                            var remoteInfo = modSvc.ParseSpaceWarpJson(
+                                githubApi?.DownloadText(swinfo.version_check)
+                                ?? httpSvc.DownloadText(swinfo.version_check));
+                            if (swinfo.version == remoteInfo?.version)
+                            {
+                                log.InfoFormat("Using remote swinfo.json file: {0}",
+                                               swinfo.version_check);
+                                swinfo = remoteInfo;
+                            }
+                        }
+                        catch (Exception exc)
+                        {
+                            throw new Kraken($"Error fetching remote swinfo {swinfo.version_check}: {exc.Message}");
                         }
                     }