deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2024-05-17 21:26:41 +02:00
Code Issues Projects Releases Wiki Activity

Enhance error handling of GitHub version check (#1866)

Browse source 
* Enhance error handling of GitHub version check when GitHub is unable to be reached
This commit is contained in:
abraunegg 2022-03-08 04:55:35 +11:00 committed by GitHub
parent 8687deec18
commit 21736f4029
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/util.d
View file

@ -355,19 +355,42 @@ string getFunctionName(alias func)() {
string getLatestReleaseVersion() { string getLatestReleaseVersion() {
// Import curl just for this function // Import curl just for this function
import std.net.curl; import std.net.curl;
auto content = get("https://api.github.com/repos/abraunegg/onedrive/releases/latest"); char[] content;
JSONValue json; JSONValue json;
string latestTag; string latestTag;
json = content.parseJSON();
if ("tag_name" in json) { try {
// use the provided tag content = get("https://api.github.com/repos/abraunegg/onedrive/releases/latest");
// "tag_name": "vA.B.CC" and strip 'v' } catch (CurlException e) {
latestTag = strip(json["tag_name"].str, "v"); // curl generated an error - meaning we could not query GitHub
log.vdebug("Unable to query GitHub for latest release");
}
try {
json = content.parseJSON();
} catch (JSONException e) {
// unable to parse the content JSON, set to blank JSON
log.vdebug("Unable to parse GitHub JSON response");
json = parseJSON("{}");
}
// json has to be a valid JSON object
if (json.type() == JSONType.object){
if ("tag_name" in json) {
// use the provided tag
// "tag_name": "vA.B.CC" and strip 'v'
latestTag = strip(json["tag_name"].str, "v");
} else {
// set to latestTag zeros
log.vdebug("'tag_name' unavailable in JSON response. Setting latest GitHub release version to 0.0.0");
latestTag = "0.0.0";
}
} else { } else {
// set to zeros // JSONValue is not an object
log.vdebug("Invalid JSON Object. Setting latest GitHub release version to 0.0.0");
latestTag = "0.0.0"; latestTag = "0.0.0";
} }
// return the latest github version // return the latest github version
return latestTag; return latestTag;
} }
@ -381,11 +404,7 @@ void checkApplicationVersion() {
// display warning if not current // display warning if not current
if (applicationVersion != latestVersion) { if (applicationVersion != latestVersion) {
// application version is not the latest version that is available .. // is application version is older than available on GitHub
if (applicationVersion > latestVersion) {
// application version is newer than available release ...
}
// application version is older than available on GitHub
if (applicationVersion < latestVersion) { if (applicationVersion < latestVersion) {
// application version is obsolete and unsupported // application version is obsolete and unsupported
writeln(); writeln();