bukovinafilip/Atoll
1
0
Fork 0
mirror of https://github.com/FBukovina/Atoll.git synced 2026-10-27 15:14:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Working with fallbacks

Browse source
This commit is contained in:
Hariharan Mudaliar 2025-11-03 01:28:33 +05:30
commit 2612cf9d7f
6 changed files with 63 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

34
DynamicIsland/managers/LockScreenWeatherManager.swift
View file

@ -17,6 +17,11 @@ final class LockScreenWeatherManager: ObservableObject {
private init() {
observeAccessoryChanges()
Task { @MainActor [weak self] in
guard let self else { return }
self.locationProvider.prepareAuthorization()
_ = await self.refresh(force: true)
}
}
func prepareLocationAccess() {
@ -73,7 +78,7 @@ final class LockScreenWeatherManager: ObservableObject {
do {
let location = await locationProvider.currentLocation()
let payload = try await provider.fetchSnapshot(location: location)
let payload = try await fetchWeatherPayload(location: location)
latestWeatherPayload = payload
if Defaults[.lockScreenWeatherShowsBluetooth] {
BluetoothAudioManager.shared.refreshConnectedDeviceBatteries()
@ -108,6 +113,25 @@ final class LockScreenWeatherManager: ObservableObject {
}
}
private func fetchWeatherPayload(location: CLLocation?) async throws -> LockScreenWeatherSnapshot {
let primarySource = Defaults[.lockScreenWeatherProviderSource]
do {
return try await provider.fetchSnapshot(location: location, source: primarySource)
} catch {
if primarySource == .openMeteo {
NSLog("LockScreenWeatherManager: Open Meteo fetch failed - %@. Falling back to wttr.in", error.localizedDescription)
do {
return try await provider.fetchSnapshot(location: location, source: .wttr)
} catch {
NSLog("LockScreenWeatherManager: wttr.in fallback also failed - %@", error.localizedDescription)
throw error
}
}
throw error
}
}
private func observeAccessoryChanges() {
let bluetoothManager = BluetoothAudioManager.shared
@ -198,11 +222,11 @@ final class LockScreenWeatherManager: ObservableObject {
}
private func makeSnapshot(from payload: LockScreenWeatherSnapshot) -> LockScreenWeatherSnapshot {
let locationName = payload.locationName
let shouldShowLocation = Defaults[.lockScreenWeatherShowsLocation] && !(locationName?.isEmpty ?? true)
let locationName = payload.locationName
let chargingInfo = Defaults[.lockScreenWeatherShowsCharging] ? makeChargingInfo() : nil
let bluetoothInfo = Defaults[.lockScreenWeatherShowsBluetooth] ? makeBluetoothInfo() : nil
let widgetStyle = Defaults[.lockScreenWeatherWidgetStyle]
let shouldShowLocation = widgetStyle == .inline && Defaults[.lockScreenWeatherShowsLocation] && !(locationName?.isEmpty ?? true)
let showsChargingPercentage = Defaults[.lockScreenWeatherShowsChargingPercentage]
let providerSource = Defaults[.lockScreenWeatherProviderSource]
let airQualityInfo = (Defaults[.lockScreenWeatherShowsAQI] && providerSource.supportsAirQuality) ? payload.airQuality : nil
@ -406,6 +430,10 @@ private actor LockScreenWeatherProvider {
func fetchSnapshot(location: CLLocation?) async throws -> LockScreenWeatherSnapshot {
let source = Defaults[.lockScreenWeatherProviderSource]
return try await fetchSnapshot(location: location, source: source)
}
func fetchSnapshot(location: CLLocation?, source: LockScreenWeatherProviderSource) async throws -> LockScreenWeatherSnapshot {
switch source {
case .wttr:
return try await fetchWttrSnapshot(location: location)