zoriya/noctalia-shell
1
0
Fork 0
mirror of https://github.com/zoriya/noctalia-shell.git synced 2026-08-15 18:43:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into auto-night-mode

Browse Source
This commit is contained in:
Leopold Luley
2025-10-16 17:42:47 +02:00
parent b82cdefd97 838491ba33
commit 4bd550c585
67 changed files with 372 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Services/LocationService.qml
+11 -11
View File
@@ -28,14 +28,14 @@ Singleton {
printErrors: false
onAdapterUpdated: saveTimer.start()
onLoaded: {
Logger.log("Location", "Loaded cached data")
Logger.d("Location", "Loaded cached data")
// Initialize stable properties on load
if (adapter.latitude !== "" && adapter.longitude !== "" && adapter.weatherLastFetch > 0) {
root.stableLatitude = adapter.latitude
root.stableLongitude = adapter.longitude
root.stableName = adapter.name
root.coordinatesReady = true
Logger.log("Location", "Coordinates ready")
Logger.i("Location", "Coordinates ready")
}
updateWeather()
}
@@ -87,12 +87,12 @@ Singleton {
function init() {
// does nothing but ensure the singleton is created
// do not remove
Logger.log("Location", "Service started")
Logger.i("Location", "Service started")
}
// --------------------------------
function resetWeather() {
Logger.log("Location", "Resetting weather data")
Logger.i("Location", "Resetting weather data")
// Mark as changing to prevent UI updates
root.coordinatesReady = false
@@ -119,7 +119,7 @@ Singleton {
}
if (isFetchingWeather) {
Logger.warn("Location", "Weather is still fetching")
Logger.w("Location", "Weather is still fetching")
return
}
@@ -136,13 +136,13 @@ Singleton {
const locationChanged = data.name !== Settings.data.location.name
if (locationChanged) {
root.coordinatesReady = false
Logger.log("Location", "Location changed from", adapter.name, "to", Settings.data.location.name)
Logger.d("Location", "Location changed from", adapter.name, "to", Settings.data.location.name)
}
if ((adapter.latitude === "") || (adapter.longitude === "") || locationChanged) {
_geocodeLocation(Settings.data.location.name, function (latitude, longitude, name, country) {
Logger.log("Location", "Geocoded", Settings.data.location.name, "to:", latitude, "/", longitude)
Logger.d("Location", "Geocoded", Settings.data.location.name, "to:", latitude, "/", longitude)
// Save location name
adapter.name = Settings.data.location.name
@@ -162,7 +162,7 @@ Singleton {
// --------------------------------
function _geocodeLocation(locationName, callback, errorCallback) {
Logger.log("Location", "Geocoding location name")
Logger.d("Location", "Geocoding location name")
var geoUrl = "https://assets.noctalia.dev/geocode.php?city=" + encodeURIComponent(locationName) + "&language=en&format=json"
var xhr = new XMLHttpRequest()
xhr.onreadystatechange = function () {
@@ -189,7 +189,7 @@ Singleton {
// --------------------------------
function _fetchWeather(latitude, longitude, errorCallback) {
Logger.log("Location", "Fetching weather from api.open-meteo.com")
Logger.d("Location", "Fetching weather from api.open-meteo.com")
var url = "https://api.open-meteo.com/v1/forecast?latitude=" + latitude + "&longitude=" + longitude + "&current_weather=true&current=relativehumidity_2m,surface_pressure&daily=temperature_2m_max,temperature_2m_min,weathercode,sunset,sunrise&timezone=auto"
var xhr = new XMLHttpRequest()
xhr.onreadystatechange = function () {
@@ -209,7 +209,7 @@ Singleton {
root.coordinatesReady = true
isFetchingWeather = false
Logger.log("Location", "Cached weather to disk - stable coordinates updated")
Logger.i("Location", "Cached weather to disk - stable coordinates updated")
} catch (e) {
errorCallback("Location", "Failed to parse weather data")
}
@@ -224,7 +224,7 @@ Singleton {
// --------------------------------
function errorCallback(module, message) {
Logger.error(module, message)
Logger.e(module, message)
isFetchingWeather = false
}