go away from latin-only notation without translations in the timetable

CMakeLists.txt

@@ -1,20 +1,24 @@
 cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR)
-project(org.kde.weatherWidget-2)
+project(plasma-weather-widget)
 
-set(QT_MIN_VERSION "5.4.0")
-set(KF5_MIN_VERSION "5.0.0")
+set(QT_MAJOR_VERSION 6)
+set(QT_MIN_VERSION "6.0.0")
+set(KF6_MIN_VERSION "6.0.0")
+set(PLASMA_MIN_VERSION "6.0.0")
 
-find_package(ECM 0.0.11 REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+find_package(ECM REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings)
 
-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Quick)
-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Plasma)
+find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Quick)
+find_package(KF6 ${KF6_MIN_VERSION} REQUIRED)
+find_package(Plasma ${PLASMA_MIN_VERSION} REQUIRED)
+find_package(Plasma5Support ${PLASMA_MIN_VERSION} REQUIRED)
 
 add_subdirectory(plugin)
 add_subdirectory(translations)
 
-plasma_install_package(package org.kde.weatherWidget-2)
+plasma_install_package(package org.kde.weatherWidget-3)

README.md

@@ -1,6 +1,6 @@
-## Quick update.
-Apologies for not being very active on here recently - I've just got a new job and the training is very intense, so I haven't had time to spend on this recently. When my training finishes, I will have a lot more time free to spend on this widget!
-
+## Apologies (again)
+Laptop issues, Covid, and overtime meant I've not been able to do much development on this widget recently.
+At some point the laptop will need to go away for repair, so it might go very quiet around here for a while...
 
 ## About this widget
 This is an updated version of the "plasma-applet-weather-widget" by Kotelnik, but using the Met.No API instead of the Yr.No API which is no longer operational.

create-plasmoid-package.sh

@@ -14,7 +14,10 @@ popd
 cd package
 
 
-VERSION="$( grep -i PluginInfo-Version ./metadata.desktop | cut -d'=' -f 2 )"
+VERSION=$(cat ./metadata.json | jq -r '.KPlugin.Version')
+#  )
+#
+# ( grep \"Version\" ./metadata.json | cut -d':' -f 2 )"
 echo $VERSION
 
 zip  -r "../buildWidget/weather-widget-$VERSION.plasmoid" * --exclude \.git\* --exclude *.bak

dev-build.sh

@@ -18,6 +18,9 @@ pushd  ./build
 
 cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DKDE_INSTALL_LIBDIR=lib -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
 make
-sudo make install
-
+if [ $? -eq 0 ]; then
+  sudo make install
+else
+  echo "ERROR: One of the CMake commands failed. Installation will not proceed."
+fi
 popd

package/contents/code/data-loader.js

@@ -32,7 +32,11 @@ function getReloadedAgoMs(lastReloaded) {
 }
 
 function getPlasmoidStatus(lastReloaded, inTrayActiveTimeoutSec) {
+    dbgprint2("getPlasmoidStatus")
+    dbgprint("lastReloaded=" + lastReloaded)
+    dbgprint("inTrayActiveTimeoutSec=" + inTrayActiveTimeoutSec)
     var reloadedAgoMs = getReloadedAgoMs(lastReloaded)
+    dbgprint("reloadedAgoMs=" + reloadedAgoMs)
     if (reloadedAgoMs < inTrayActiveTimeoutSec * 1000) {
         return PlasmaCore.Types.ActiveStatus
     } else {
@@ -87,43 +91,51 @@ function fetchXmlFromInternet(getUrl, successCallback, failureCallback) {
 }
 
 function fetchJsonFromInternet(getUrl, successCallback, failureCallback) {
+    dbgprint2("fetchJsonFromInternet")
     var xhr = new XMLHttpRequest()
-    xhr.onreadystatechange = function () {
-        if (xhr.readyState !== XMLHttpRequest.DONE) {
-            return
-        }
+    xhr.timeout = loadingData.loadingDataTimeoutMs;
+    dbgprint('GET url opening: ' + getUrl)
+    xhr.open('GET', getUrl)
+    xhr.setRequestHeader("User-Agent","Mozilla/5.0 (X11; Linux x86_64) Gecko/20100101 ")
+    dbgprint('GET url sending: ' + getUrl)
+    xhr.send()
 
-        if (xhr.status !== 200) {
-            dbgprint('ERROR - status: ' + xhr.status)
-            dbgprint('ERROR - responseText: ' + xhr.responseText)
-            failureCallback()
-            return
-        }
+    xhr.ontimeout = () => {
+        dbgprint('ERROR - timeout: ' + xhr.status)
+        failureCallback()
+    }
 
-        // success
+    xhr.onerror = (event) => {
+        dbgprint('ERROR - status: ' + xhr.status)
+        dbgprint('ERROR - responseText: ' + xhr.responseText)
+        failureCallback()
+    }
+
+    xhr.onload =  (event) => {
+        dbgprint('status: ' + xhr.status)
+        // dbgprint('responseText: ' + xhr.responseText)
+    };
+
+    // success
+    xhr.onload = () => {
         dbgprint('successfully loaded from the internet')
         dbgprint('successfully of url-call: ' + getUrl)
-//        dbgprint('responseText: ' + xhr.responseText)
+        // dbgprint('responseText: ' + xhr.responseText)
 
         var jsonString = xhr.responseText
-        if (!DataLoader.IsJsonString(jsonString)) {
+        if (!DataLoader.isJsonString(jsonString)) {
             dbgprint('incoming jsonString is not valid: ' + jsonString)
             return
         }
         dbgprint('incoming text seems to be valid')
 
         successCallback(jsonString)
     }
-    dbgprint('GET url opening: ' + getUrl)
-    xhr.open('GET', getUrl)
-    dbgprint('GET url sending: ' + getUrl)
-    xhr.send()
-
     dbgprint('GET called for url: ' + getUrl)
     return xhr
 }
 
-function IsJsonString(str) {
+function isJsonString(str) {
     try {
         JSON.parse(str)
     } catch (e) {

package/contents/code/icons.js

@@ -192,6 +192,8 @@ var WeatherFont = {
 }
 
 function getIconCode(iconName, providerId, partOfDay) {
+    // dbgprint2("getIconCode")
+    // dbgprint("iconName:" + iconName + "\tproviderId:" + providerId + "\tpartOfDay:" + partOfDay)
     var iconCodeParts = null
     if (providerId === 'yrno') {
         iconCodeParts = WeatherFont.iconNameByYrNoCode[iconName]

package/contents/code/placesearch-helpers.js

@@ -1,4 +1,4 @@
-.import "./db/timezoneData.js" as TZData
+.import "./timezoneData.js" as TZData
 var countries = Array(
             {shortCode: "AD" , displayName: "Andorra"},
             {shortCode: "AE" , displayName: "United Arab Emirates"},
@@ -270,27 +270,34 @@ function getDisplayName(shortCode) {
 }
 function updateListView(filter) {
     filteredCSVData.clear()
-    for (var f = 0; f < myCSVData.rowCount(); f++) {
-        let lc = myCSVData.get(f).locationName.toLowerCase()
-        if (myCSVData.get(f).locationName.toLowerCase().indexOf(filter.toLowerCase()) === 0) {
-            filteredCSVData.append(myCSVData.get(f))
+    for (var f = 0; f < myCSVData.rowCount; f++) {
+        let lc = myCSVData.getRow(f).Location.toLowerCase()
+        if (myCSVData.getRow(f).Location.toLowerCase().indexOf(filter.toLowerCase()) === 0) {
+            filteredCSVData.appendRow(myCSVData.getRow(f))
         }
     }
+    dbgprint("filteredCSVData.rowCount=" + filteredCSVData.rowCount)
 }
 function loadCSVDatabase(countryName) {
+    dbgprint("Entered loadCSVDatabase")
+    dbgprint("QML_XHR_ALLOW_FILE_READ = 1 : " + env_QML_XHR_ALLOW_FILE_READ)
     if (countryName.length === 0) {
         return
     }
     myCSVData.clear()
-    let filename = Qt.resolvedUrl("./db/" + getshortCode(countryName) + ".csv")
+    var URL = ("http://weatherwidgetqt6.000webhostapp.com/" + getshortCode(countryName) + ".csv") // LIVE ONLY
+    if (env_QML_XHR_ALLOW_FILE_READ) {
+        URL =  Qt.resolvedUrl("./db/" + getshortCode(countryName) + ".csv")   // DEBUGGING ONLY
+    }
+    dbgprint("URL = " + URL)
     var xhr = new XMLHttpRequest
-    xhr.open("GET", filename)
+    xhr.open("GET", URL)
     xhr.onreadystatechange = function() {
         if (xhr.readyState === XMLHttpRequest.DONE) {
             var response = xhr.responseText
             var tmpDB = response.split(/\r?\n/)
             for (var i = 0; i < tmpDB.length - 1; i++) {
-                myCSVData.append(parseCSVLine(tmpDB[i]))
+                myCSVData.appendRow(parseCSVLine(tmpDB[i]))
             }
             updateListView(locationEdit.text)
         }
@@ -301,15 +308,15 @@ function parseCSVLine(csvLine) {
     function stripquotes(str) {
         return str.replace(/['"]+/g, '')
     }
-
+// dbgprint(csvLine)
     var items = csvLine.split(/\t/)
     return ({
-                region: stripquotes((items[0])),
-                locationName: stripquotes(items[1]),
-                latitude: parseFloat(items[2]),
-                longitude: parseFloat(items[3]),
-                altitude: parseInt(items[4]),
+                Area: stripquotes((items[0])),
+                Location: stripquotes(items[1]),
+                Latitude: parseFloat(items[2]).toFixed(3),
+                Longitude: parseFloat(items[3]).toFixed(3),
+                Altitude: parseInt(items[4]),
                 timezoneId: parseInt(items[5]),
-                timezoneName: TZData.TZData[items[5]].displayName
+                Timezone: TZData.TZData[items[5]].displayName
             })
 }