Squashed commits '${title}'

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

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

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 <n0ttl@gridtracker.org>  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

gridtracker.1

@@ -2,7 +2,7 @@
 
 .SH NAME
 .B gridtracker
-- an amateur radio companion
+- An Amateur Radio Companion
 
 .SH SYNOPSIS
 .B gridtracker

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

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 <n0ttl@gridtracker.org> - 1.23.1019-1
+ - HTTP - Removed timeouts on transactions affecting log downloading and uploading
 * Sun Oct 15 2023 Tag Loomis <n0ttl@gridtracker.org> - 1.23.1015-1
  - ADIF - Fixed record loading failure for PSK-Reporter if FREQ present
  - WSPR - Fixed decodes not appearing

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("<font style='color:red'>(Unknown Response)</font>");
+        addLastTraffic("<font style='color:red'>Fail log to QRZ.com</font>");
+      }
+      else if (arrData.RESULT != "OK")
+      {
+        if (arrData.RESULT == "FAIL" && "REASON" in arrData)
+        {
+          addLastTraffic("<font style='color:red'>(" + arrData.REASON + ")</font>");
+        }
+        else if (arrData.RESULT == "AUTH")
+        {
+          addLastTraffic("<font style='color:red'>(Invalid Auth)</font>");
+        }
+        else
+        {
+          addLastTraffic("<font style='color:red'>Unknown Result (" + arrData.RESULT + ")</font>");
+        }
         addLastTraffic("<font style='color:red'>Fail log to QRZ.com</font>");
       }
       else
@@ -2569,9 +2584,15 @@ function qrzSendLogResult(buffer, flag)
         addLastTraffic("<font style='color:white'>Logged to QRZ.com</font>");
       }
     }
+    else
+    {
+      addLastTraffic("<font style='color:red'>(Missing Response)</font>");
+      addLastTraffic("<font style='color:red'>Fail log to QRZ.com</font>");
+    }
   }
   else
   {
+    addLastTraffic("<font style='color:red'>(No Response)</font>");
     addLastTraffic("<font style='color:red'>Fail log to QRZ.com</font>");
   }
 }

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)
   {

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)

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",