Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clarify remote swinfo network errors #3843

Merged
merged 1 commit into from
May 21, 2023
Merged

Clarify remote swinfo network errors #3843

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions Netkan/Transformers/SpaceWarpInfoTransformer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;

using ICSharpCode.SharpZipLib.Zip;
using log4net;
Expand Down Expand Up @@ -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}");
}
}

Expand Down