Merge branch 'master' into rambo/new-download-manager

insidegui · insidegui · commit 1da75914cbf8 · 2024-06-04T12:47:22.000-03:00
diff --git a/Packages/ConfCore/ConfCore/AppleAPIClient.swift b/Packages/ConfCore/ConfCore/AppleAPIClient.swift
@@ -196,7 +196,7 @@ public final class AppleAPIClient: Logging, Signposting {
         }
 
         currentConfigRequest?.cancel()
-        currentConfigRequest = configResource.loadIfNeeded()
+        currentConfigRequest = configResource.load()
     }
 
 }
diff --git a/Packages/ConfCore/ConfCore/Environment.swift b/Packages/ConfCore/ConfCore/Environment.swift
@@ -105,7 +105,7 @@ extension Environment {
                                          liveVideosPath: "/videos_live.json",
                                          featuredSectionsPath: "/explore.json")
 
-    public static let production = Environment(baseURL: "https://api2021.wwdc.io",
+    public static let production = Environment(baseURL: "https://api2024.wwdc.io",
                                                configPath: "/config.json",
                                                sessionsPath: "/contents.json",
                                                newsPath: "/news.json",
diff --git a/Packages/ConfCore/ConfCore/Storage.swift b/Packages/ConfCore/ConfCore/Storage.swift
@@ -332,19 +332,23 @@ public final class Storage: Logging, Signposting {
             return
         }
         
-        performSerializedBackgroundWrite(disableAutorefresh: false, completionBlock: completion) { backgroundRealm in
+        performSerializedBackgroundWrite(disableAutorefresh: false, completionBlock: completion) { [weak self] backgroundRealm in
+            guard let self else { return }
+
             // We currently only care about whatever the latest event hero is.
             let existingHeroData = backgroundRealm.objects(EventHero.self)
-            backgroundRealm.delete(existingHeroData)
-        }
+            if !existingHeroData.isEmpty {
+                self.log.info("Removing existing event hero")
+                backgroundRealm.delete(existingHeroData)
+            }
 
-        guard let hero = response.eventHero else {
-            log.debug("Config response didn't contain an event hero")
-            return
-        }
+            if let hero = response.eventHero {
+                self.log.info("Storing event hero \(hero.identifier, privacy: .public)")
 
-        performSerializedBackgroundWrite(disableAutorefresh: false, completionBlock: completion) { backgroundRealm in
-            backgroundRealm.add(hero, update: .modified)
+                backgroundRealm.add(hero, update: .modified)
+            } else {
+                self.log.info("Config response had no event hero")
+            }
         }
     }
 
diff --git a/WWDC/LiveObserver.swift b/WWDC/LiveObserver.swift
@@ -254,22 +254,43 @@ private final class CloudKitLiveObserver: Logging {
     private func store(_ records: [CKRecord]) {
         log.debug("Storing live records")
 
-        storage.backgroundUpdate { realm in
+        storage.backgroundUpdate { [weak self] realm in
+            guard let self else { return }
+
             records.forEach { record in
                 guard let asset = SessionAsset(record: record) else { return }
                 guard let session = realm.object(ofType: Session.self, forPrimaryKey: asset.sessionId) else { return }
                 guard let instance = session.instances.first else { return }
 
+                /// Allow record to override state from the backend API only if the record's `overrideState` is set to `1`,
+                /// otherwise existing local data from Apple's backend always wins.
+                let canOverrideExistingState = record["overrideState"] as? Int == 1
+
                 if let existingAsset = realm.object(ofType: SessionAsset.self, forPrimaryKey: asset.identifier) {
-                    // update existing asset hls URL if appropriate
-                    existingAsset.remoteURL = asset.remoteURL
+                    /// Update existing asset hls URL if appropriate
+                    if canOverrideExistingState {
+                        existingAsset.remoteURL = asset.remoteURL
+                    } else {
+                        self.log.info("Ignoring remoteURL override from record for \(asset.sessionId, privacy: .public) because overrideState is not 1")
+                    }
                 } else {
                     // add new live asset to corresponding session
                     session.assets.append(asset)
                 }
 
                 instance.isForcedLive = (record["isLive"] as? Int == 1)
-                instance.isCurrentlyLive = instance.isForcedLive
+
+                /// Allow record to override live state from not live to live, but not the other way around.
+                if !instance.isCurrentlyLive {
+                    instance.isCurrentlyLive = instance.isForcedLive
+                } else {
+                    /// Allow record to override live state however it wants if record's `overrideState` is `1`.
+                    if canOverrideExistingState {
+                        instance.isCurrentlyLive = instance.isForcedLive
+                    } else {
+                        self.log.info("Ignoring live state override from record for \(asset.sessionId, privacy: .public) because overrideState is not 1")
+                    }
+                }
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public final class AppleAPIClient: Logging, Signposting {`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`currentConfigRequest?.cancel()`
`199`		`- currentConfigRequest = configResource.loadIfNeeded()`
	`199`	`+ currentConfigRequest = configResource.load()`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`}`