summaryrefslogtreecommitdiff
path: root/services/Weather.qml
diff options
context:
space:
mode:
Diffstat (limited to 'services/Weather.qml')
-rw-r--r--services/Weather.qml39
1 files changed, 14 insertions, 25 deletions
diff --git a/services/Weather.qml b/services/Weather.qml
index 998fdb8..ad80e48 100644
--- a/services/Weather.qml
+++ b/services/Weather.qml
@@ -3,7 +3,6 @@ pragma Singleton
import "root:/config"
import "root:/utils"
import Quickshell
-import Quickshell.Io
import QtQuick
Singleton {
@@ -17,33 +16,23 @@ Singleton {
function reload(): void {
if (Config.dashboard.weatherLocation)
loc = Config.dashboard.weatherLocation;
- else
- ipProc.running = true;
+ else if (!loc || timer.elapsed() > 900)
+ Requests.get("https://ipinfo.io/json", text => {
+ loc = JSON.parse(text).loc ?? "";
+ timer.restart();
+ });
}
- onLocChanged: wttrProc.running = true
- Component.onCompleted: reload()
-
- Process {
- id: ipProc
+ onLocChanged: Requests.get(`https://wttr.in/${loc}?format=j1`, text => {
+ const json = JSON.parse(text).current_condition[0];
+ icon = Icons.getWeatherIcon(json.weatherCode);
+ description = json.weatherDesc[0].value;
+ temperature = parseFloat(json.temp_C);
+ })
- command: ["curl", "ipinfo.io"]
- stdout: StdioCollector {
- onStreamFinished: root.loc = JSON.parse(text).loc ?? ""
- }
- }
-
- Process {
- id: wttrProc
+ Component.onCompleted: reload()
- command: ["curl", `https://wttr.in/${root.loc}?format=j1`]
- stdout: StdioCollector {
- onStreamFinished: {
- const json = JSON.parse(text).current_condition[0];
- root.icon = Icons.getWeatherIcon(json.weatherCode);
- root.description = json.weatherDesc[0].value;
- root.temperature = parseFloat(json.temp_C);
- }
- }
+ ElapsedTimer {
+ id: timer
}
}