Merge branch 'master' of https://gitlab.com/gridtracker.org/gridtracker

package.nw/lib/adif.js

@@ -86,6 +86,36 @@ function onAdiLoadComplete(adiBuffer, saveAdifFile, adifFileName, newFile)
   {
     let finalMode = "";
 
+    let appLoTW_RXQSO = findAdiField(
+      activeAdifArray[x],
+      "APP_LoTW_RXQSO"
+    );
+
+    if (appLoTW_RXQSO != "")
+    {
+      let dRXQSO = Date.parse(appLoTW_RXQSO);
+      let dLastLOTW_QSO = Date.parse(g_adifLogSettings.lastFetch.lotw_qso);
+      if ((isNaN(dRXQSO) == false) && (isNaN(dLastLOTW_QSO) == false) && (dRXQSO > dLastLOTW_QSO))
+      {
+        g_adifLogSettings.lastFetch.lotw_qso = appLoTW_RXQSO;
+      }
+    }
+
+    let appLoTW_RXQSL = findAdiField(
+      activeAdifArray[x],
+      "APP_LoTW_RXQSL"
+    );
+
+    if (appLoTW_RXQSL != "")
+    {
+      let dRXQSL = Date.parse(appLoTW_RXQSL);
+      let dLastLOTW_QSL = Date.parse(g_adifLogSettings.lastFetch.lotw_qsl);
+      if ((isNaN(dRXQSL) == false) && (isNaN(dLastLOTW_QSL) == false) && (dRXQSL > dLastLOTW_QSL))
+      {
+        g_adifLogSettings.lastFetch.lotw_qsl = appLoTW_RXQSL;
+      }
+    }
+
     if (activeAdifArray[x].length > 3)
     {
       if (activeAdifLogMode)
@@ -572,6 +602,20 @@ function lotwCallback(buffer, flag)
       var shouldAppend = false;
       g_fromDirectCallNoFileDialog = true;
 
+      // Extract header showing last fetched date from call
+      var lotwQSHeader = rawAdiBuffer.match(/^<APP_LoTW_LAST(QSL|QSORX):\d+>(\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2})/m);
+      if (lotwQSHeader !== null)
+      {
+        if (lotwQSHeader[1].toUpperCase() == "QSORX")
+        {
+          g_adifLogSettings.lastFetch.lotw_qso = lotwQSHeader[2]
+        }
+        else if (lotwQSHeader[1].toUpperCase() == "QSL")
+        {
+          g_adifLogSettings.lastFetch.lotw_qsl = lotwQSHeader[2];
+        }
+      }
+
       rawAdiBuffer = cleanAndPrepADIF(
         "lotw.adif",
         rawAdiBuffer,
@@ -623,16 +667,14 @@ var g_isGettingLOTW = false;
 
 function grabLOtWLog(test)
 {
-  if (g_isGettingLOTW == false)
+  var lastQSLDateString = "";
-  {
+
-    var lastQSLDateString =
+  if (test == true && g_isGettingLOTW == false)
-      "&qso_qsorxsince=1945-01-01&qso_qslsince=1945-01-01";
-    if (test == true)
   {
     lotwTestResult.innerHTML = "Testing";
     lastQSLDateString = "&qso_qsosince=2100-01-01";
-    }
 
+    // Fetch Test Results
     getABuffer(
       "https://lotw.arrl.org/lotwuser/lotwreport.adi?login=" +
       lotwLogin.value +
@@ -646,6 +688,65 @@ function grabLOtWLog(test)
       443,
       lotwLogImg,
       "g_isGettingLOTW",
+      150000
+    );
+  }
+
+  if (test == false)
+  {
+    setTimeout(grabLoTWQSO, 500);
+    setTimeout(grabLoTWQSL, 10000);
+  }
+}
+
+function grabLoTWQSO()
+{
+  var dLoTWQSO = Date.parse(dateToISO8601(g_adifLogSettings.lastFetch.lotw_qso, "Z"));
+  var tmpDate = ((new Date().getTime()) - 300);
+
+  if ((g_isGettingLOTW == false) && ((isNaN(dLoTWQSO) == false) && (dLoTWQSO < tmpDate)))
+  {
+    // Fetch QSOs
+    lastQSLDateString = "&qso_qsorxsince=" + g_adifLogSettings.lastFetch.lotw_qso;
+    getABuffer(
+      "https://lotw.arrl.org/lotwuser/lotwreport.adi?login=" +
+      lotwLogin.value +
+      "&password=" +
+      encodeURIComponent(lotwPassword.value) +
+      "&qso_query=1&qso_qsl=no&qso_qsldetail=yes&qso_withown=yes" +
+      lastQSLDateString,
+      lotwCallback,
+      false,
+      "https",
+      443,
+      lotwLogImg,
+      "g_isGettingLOTW",
+      120000
+    );
+  }
+}
+
+function grabLoTWQSL()
+{
+  var dLoTWQSL = Date.parse(dateToISO8601(g_adifLogSettings.lastFetch.lotw_qsl, "Z"));
+  var tmpDate = ((new Date().getTime()) - 300);
+
+  if ((g_isGettingLOTW == false) && ((isNaN(dLoTWQSL) == false) && (dLoTWQSL < tmpDate)))
+  {
+    lastQSLDateString = "&qso_qslsince=" + g_adifLogSettings.lastFetch.lotw_qsl;
+    getABuffer(
+      "https://lotw.arrl.org/lotwuser/lotwreport.adi?login=" +
+      lotwLogin.value +
+      "&password=" +
+      encodeURIComponent(lotwPassword.value) +
+      "&qso_query=1&qso_qsl=yes&qso_qsldetail=yes&qso_withown=yes" +
+      lastQSLDateString,
+      lotwCallback,
+      false,
+      "https",
+      443,
+      lotwLogImg,
+      "g_isGettingLOTW",
       120000
     );
   }
@@ -1005,6 +1106,22 @@ function loadGtQSOLogFile()
   }
 }
 
+var lotwLogLoaded = false;
+function loadLoTWLogFile()
+{
+  var fs = require("fs");
+
+  if (fs.existsSync(g_LoTWLogFile))
+  {
+    var rawAdiBuffer = fs.readFileSync(g_LoTWLogFile);
+
+    g_fromDirectCallNoFileDialog = true;
+
+    onAdiLoadComplete(rawAdiBuffer, false);
+    lotwLogLoaded = true;
+  }
+}
+
 function loadWsjtLogFile()
 {
   var fs = require("fs");
@@ -1297,8 +1414,11 @@ function startupAdifLoadCheck()
   {
     if (g_appSettings.gtFlagImgSrc == 1) showGtFlags();
 
-    // Commented out to stop execution on startup
+    if (loadLOTWCheckBox.checked == true)
-    // if (loadLOTWCheckBox.checked == true) grabLOtWLog(false);
+    {
+      loadLoTWLogFile();
+      grabLOtWLog(false);
+    }
 
     if (loadQRZCheckBox.checked == true) grabQrzComLog(false);
 
@@ -1367,11 +1487,6 @@ function getABuffer(
       })
       .on("end", function ()
       {
-        if (typeof callback === "function")
-        {
-          // Call it, since we have confirmed it is callable
-          callback(fileBuffer, flag, cookies);
-        }
         if (typeof stringOfFlag != "undefined")
         {
           window[stringOfFlag] = false;
@@ -1381,6 +1496,11 @@ function getABuffer(
           imgToGray.parentNode.style.background = "";
           imgToGray.style.webkitFilter = "";
         }
+        if (typeof callback === "function")
+        {
+          // Call it, since we have confirmed it is callable
+          callback(fileBuffer, flag, cookies);
+        }
       })
       .on("error", function ()
       {

package.nw/lib/defaults.js

@@ -175,7 +175,11 @@ var def_adifLogSettings = {
     eQSLPassword: "",
     eQSLNickname: ""
   },
-  downloads: {}
+  downloads: {},
+  lastFetch: {
+    lotw_qso: "1970-01-01",
+    lotw_qsl: "1970-01-01"
+  }
 };
 
 var def_msgSettings = {