From 21736f40291d5cdcfa3733c377ab7ad9b991d221 Mon Sep 17 00:00:00 2001
From: abraunegg <alex.braunegg@gmail.com>
Date: Tue, 8 Mar 2022 04:55:35 +1100
Subject: [PATCH] Enhance error handling of GitHub version check (#1866)

* Enhance error handling of GitHub version check when GitHub is unable to be reached
---
 src/util.d | 43 +++++++++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/util.d b/src/util.d
index f90d6a85..8e666fbc 100644
--- a/src/util.d
+++ b/src/util.d
@@ -355,19 +355,42 @@ string getFunctionName(alias func)() {
 string getLatestReleaseVersion() {
 	// Import curl just for this function
 	import std.net.curl;
-	auto content = get("https://api.github.com/repos/abraunegg/onedrive/releases/latest");
+	char[] content;
 	JSONValue json;
 	string latestTag;
-	json = content.parseJSON();
 	
-	if ("tag_name" in json) {
-		// use the provided tag
-		// "tag_name": "vA.B.CC" and strip 'v'
-		latestTag = strip(json["tag_name"].str, "v");
+	try {
+		content = get("https://api.github.com/repos/abraunegg/onedrive/releases/latest");
+	} catch (CurlException e) {
+		// 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 {
-		// 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";
 	}
+		
 	// return the latest github version
 	return latestTag;
 }
@@ -381,11 +404,7 @@ void checkApplicationVersion() {
 	
 	// display warning if not current
 	if (applicationVersion != latestVersion) {
-		// application version is not the latest version that is available ..
-		if (applicationVersion > latestVersion) {
-			// application version is newer than available release ...
-		}
-		// application version is older than available on GitHub
+		// is application version is older than available on GitHub
 		if (applicationVersion < latestVersion) {
 			// application version is obsolete and unsupported
 			writeln();