diff --git a/arm/GridTracker.desktop b/arm/GridTracker.desktop index d7eb4ac..b0be15b 100644 --- a/arm/GridTracker.desktop +++ b/arm/GridTracker.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=GridTracker Comment=GridTracker -GenericName=GridTracker, An Amateur Radio Companion +GenericName=GridTracker: An Amateur Radio Companion Exec=/home/pi/Downloads/GridTracker/GridTracker Icon=/home/pi/Downloads/GridTracker/gridtracker.png Path=/home/pi/Downloads/GridTracker diff --git a/debian/arm/GridTracker.desktop b/debian/arm/GridTracker.desktop index d89f977..56542c1 100644 --- a/debian/arm/GridTracker.desktop +++ b/debian/arm/GridTracker.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=GridTracker Comment=GridTracker -GenericName=GridTracker, An Amateur Radio Companion +GenericName=GridTracker: An Amateur Radio Companion Exec=/home/mchambers/Downloads/GridTracker/GridTracker Icon=/home/mchambers/Downloads/GridTracker/gridtracker.png Path=/home/mchambers/Downloads/GridTracker diff --git a/debian/changelog b/debian/changelog index 474bf96..f74403f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,7 @@ +gridtracker (1.23.1019) unstable; urgency=low + - HTTP - Removed timeouts on transactions affecting log downloading and uploading +-- Tag Loomis Thu, 19 Oct 2023 00:00:00 -0000 + gridtracker (1.23.1015) unstable; urgency=low - ADIF – Fixed record loading failure for PSK-Reporter if FREQ present - WSPR – Fixed decodes not appearing diff --git a/gridtracker.1 b/gridtracker.1 index 14e15db..bd6656a 100644 --- a/gridtracker.1 +++ b/gridtracker.1 @@ -2,7 +2,7 @@ .SH NAME .B gridtracker -- an amateur radio companion +- An Amateur Radio Companion .SH SYNOPSIS .B gridtracker diff --git a/gridtracker.desktop b/gridtracker.desktop index bd71089..f04230d 100644 --- a/gridtracker.desktop +++ b/gridtracker.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=GridTracker Comment=GridTracker -GenericName=GridTracker, an Amateur Radio Companion +GenericName=GridTracker: An Amateur Radio Companion Exec=gridtracker Icon=/usr/share/gridtracker/gridview.png Encoding=UTF-8 diff --git a/gridtracker.spec b/gridtracker.spec index 1cef8d8..eaebcfd 100644 --- a/gridtracker.spec +++ b/gridtracker.spec @@ -1,6 +1,6 @@ Name: {{{ git_name name=gridtracker }}} Summary: GridTracker: An Amateur Radio Companion -Version: 1.23.1015 +Version: 1.23.1019 Release: 1%{?dist} BuildArch: noarch Source0: {{{ git_dir_pack }}} @@ -40,6 +40,8 @@ DESTDIR=${RPM_BUILD_ROOT} make clean %license %{_docdir}/%{name}/ %changelog +* Thu Oct 19 2023 Tag Loomis - 1.23.1019-1 + - HTTP - Removed timeouts on transactions affecting log downloading and uploading * Sun Oct 15 2023 Tag Loomis - 1.23.1015-1 - ADIF - Fixed record loading failure for PSK-Reporter if FREQ present - WSPR - Fixed decodes not appearing diff --git a/package.nw/gt_update.odt b/package.nw/gt_update.odt index e882ce6..1690adf 100644 Binary files a/package.nw/gt_update.odt and b/package.nw/gt_update.odt differ diff --git a/package.nw/gt_update.pdf b/package.nw/gt_update.pdf index 28dc92f..2fa0f78 100644 Binary files a/package.nw/gt_update.pdf and b/package.nw/gt_update.pdf differ diff --git a/package.nw/lib/adif.js b/package.nw/lib/adif.js index f95e937..98c44d7 100644 --- a/package.nw/lib/adif.js +++ b/package.nw/lib/adif.js @@ -1470,8 +1470,7 @@ function getABuffer(file_url, callback, flag, mode, port, imgToGray, stringOfFla host: url.parse(file_url).host, // eslint-disable-line node/no-deprecated-api port: port, path: url.parse(file_url).path, // eslint-disable-line node/no-deprecated-api - method: "get", - timeout: 15000 + method: "get" }; if (typeof stringOfFlag != "undefined") window[stringOfFlag] = true; @@ -1585,7 +1584,6 @@ function getAPostBuffer( port: port, path: url.parse(file_url).path, // eslint-disable-line node/no-deprecated-api method: "post", - timeout: 15000, headers: { "Content-Type": "application/x-www-form-urlencoded", "Content-Length": postData.length @@ -2560,8 +2558,25 @@ function qrzSendLogResult(buffer, flag) var split = kv[x].split("="); arrData[split[0]] = split[1]; } - if (typeof arrData.RESULT == "undefined" || arrData.RESULT != "OK") + if (!("RESULT" in arrData)) { + addLastTraffic("(Unknown Response)"); + addLastTraffic("Fail log to QRZ.com"); + } + else if (arrData.RESULT != "OK") + { + if (arrData.RESULT == "FAIL" && "REASON" in arrData) + { + addLastTraffic("(" + arrData.REASON + ")"); + } + else if (arrData.RESULT == "AUTH") + { + addLastTraffic("(Invalid Auth)"); + } + else + { + addLastTraffic("Unknown Result (" + arrData.RESULT + ")"); + } addLastTraffic("Fail log to QRZ.com"); } else @@ -2569,9 +2584,15 @@ function qrzSendLogResult(buffer, flag) addLastTraffic("Logged to QRZ.com"); } } + else + { + addLastTraffic("(Missing Response)"); + addLastTraffic("Fail log to QRZ.com"); + } } else { + addLastTraffic("(No Response)"); addLastTraffic("Fail log to QRZ.com"); } } diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js index db66f82..3886142 100644 --- a/package.nw/lib/gt.js +++ b/package.nw/lib/gt.js @@ -12393,7 +12393,6 @@ function getBuffer(file_url, callback, flag, mode, port, cache = null) host: url.parse(file_url).host, // eslint-disable-line node/no-deprecated-api port: port, followAllRedirects: true, - timeout: 15000, path: url.parse(file_url).path, // eslint-disable-line node/no-deprecated-api headers: { "User-Agent": gtUserAgent, "x-user-agent": gtUserAgent } }; @@ -12451,8 +12450,7 @@ function getPostBuffer( "Content-Length": postData.length, "User-Agent": gtUserAgent, "x-user-agent": gtUserAgent - }, - timeout: 15000 + } }; var req = http.request(options, function (res) { diff --git a/package.nw/lib/roster.js b/package.nw/lib/roster.js index 828c7b3..5f99086 100644 --- a/package.nw/lib/roster.js +++ b/package.nw/lib/roster.js @@ -1221,8 +1221,7 @@ function getBuffer(file_url, callback, flag, mode, port, cookie) path: url.parse(file_url).path, // eslint-disable-line node/no-deprecated-api headers: { Cookie: cookie - }, - timeout: 15000 + } }; } else @@ -1230,8 +1229,7 @@ function getBuffer(file_url, callback, flag, mode, port, cookie) options = { host: url.parse(file_url).host, // eslint-disable-line node/no-deprecated-api port: port, - path: url.parse(file_url).path, // eslint-disable-line node/no-deprecated-api - timeout: 15000 + path: url.parse(file_url).path // eslint-disable-line node/no-deprecated-api }; } http.get(options, function (res) diff --git a/package.nw/package.json b/package.nw/package.json index 85669c0..6ab0dd9 100644 --- a/package.nw/package.json +++ b/package.nw/package.json @@ -1,9 +1,9 @@ { "name": "GridTracker", "product_string_do_not_use": "gridtracker", - "version": "1.23.1015", + "version": "1.23.1019", "betaVersion": "", - "description": "GridTracker, an amateur radio companion", + "description": "GridTracker: An Amateur Radio Companion", "author": "GridTracker.org", "license": "BSD-3-Clause", "main": "GridTracker.html",