diff --git a/SwiftLeeds/Network/URLSession.swift b/SwiftLeeds/Network/URLSession.swift index 3244324..4f71849 100644 --- a/SwiftLeeds/Network/URLSession.swift +++ b/SwiftLeeds/Network/URLSession.swift @@ -24,7 +24,7 @@ public extension URLSession { let filename = filename ?? request.url.lastPathComponent let path = fileManager.temporaryDirectory.appendingPathComponent(filename) - guard let data = fileManager.contents(atPath: path.path.appending(".json")) else { throw NetworkError.cacheNotFound } + guard let data = fileManager.contents(atPath: path.appendingPathExtension("json").path) else { throw NetworkError.cacheNotFound } let decoded = Task.detached(priority: .userInitiated) { try Task.checkCancellation() @@ -39,7 +39,7 @@ public extension URLSession { dateDecodingStrategy: JSONDecoder.DateDecodingStrategy?, fileManager: FileManager = .default, filename: String? = nil) async throws -> Response { let filename = filename ?? request.url.lastPathComponent - let path = fileManager.temporaryDirectory.appendingPathComponent("\(filename).json") + let path = fileManager.temporaryDirectory.appendingPathComponent(filename).appendingPathExtension("json") let decoded = Task.detached(priority: .userInitiated) { do { diff --git a/SwiftLeeds/Views/Local/LocalViewModel.swift b/SwiftLeeds/Views/Local/LocalViewModel.swift index b7b1a58..3d36c65 100644 --- a/SwiftLeeds/Views/Local/LocalViewModel.swift +++ b/SwiftLeeds/Views/Local/LocalViewModel.swift @@ -26,7 +26,7 @@ class LocalViewModel: ObservableObject { func loadData() async { do { - let localResults = try await URLSession.awaitConnectivity.decode(Requests.local, dateDecodingStrategy: Requests.defaultDateDecodingStratergy) + let localResults = try await URLSession.shared.decode(Requests.local, dateDecodingStrategy: Requests.defaultDateDecodingStratergy) await updateLocal(localResults) } catch { if let cachedResponse = try? await URLSession.shared.cached(Requests.local, dateDecodingStrategy: Requests.defaultDateDecodingStratergy) { diff --git a/SwiftLeeds/Views/My Conference/MyConferenceViewModel.swift b/SwiftLeeds/Views/My Conference/MyConferenceViewModel.swift index 21b88bb..7ead480 100644 --- a/SwiftLeeds/Views/My Conference/MyConferenceViewModel.swift +++ b/SwiftLeeds/Views/My Conference/MyConferenceViewModel.swift @@ -22,6 +22,7 @@ class MyConferenceViewModel: ObservableObject { Requests.schedule, dateDecodingStrategy: Requests.scheduleDateDecodingStrategy ) + await updateSchedule(schedule) do { @@ -73,6 +74,7 @@ class MyConferenceViewModel: ObservableObject { dateDecodingStrategy: Requests.scheduleDateDecodingStrategy, filename: "schedule-\(currentEvent.id.uuidString)" ) + await updateSchedule(schedule) } diff --git a/SwiftLeeds/Views/Sponsors/SponsorsViewModel.swift b/SwiftLeeds/Views/Sponsors/SponsorsViewModel.swift index ede5fea..6503162 100644 --- a/SwiftLeeds/Views/Sponsors/SponsorsViewModel.swift +++ b/SwiftLeeds/Views/Sponsors/SponsorsViewModel.swift @@ -20,7 +20,7 @@ final class SponsorsViewModel: ObservableObject { func loadSponsors() async throws { do { - let sponsors = try await URLSession.awaitConnectivity.decode(Requests.sponsors, dateDecodingStrategy: Requests.defaultDateDecodingStratergy) + let sponsors = try await URLSession.shared.decode(Requests.sponsors, dateDecodingStrategy: Requests.defaultDateDecodingStratergy) await updateSponsors(sponsors) } catch { if let cachedResponse = try? await URLSession.shared.cached(Requests.sponsors, dateDecodingStrategy: Requests.defaultDateDecodingStratergy) {