Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Event hero / live event improvements #712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
insidegui merged 2 commits into from
Jun 4, 2024
Merged

Event hero / live event improvements #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5323553
Improved reliability of configuration fetch and event hero storage
insidegui Jun 4, 2024
df24553
Require remote live session record to have overrideState=1 in order t…
insidegui Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Packages/ConfCore/ConfCore/AppleAPIClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public final class AppleAPIClient: Logging, Signposting {
}

currentConfigRequest?.cancel()
currentConfigRequest = configResource.loadIfNeeded()
currentConfigRequest = configResource.load()
}

}
Expand Down
22 changes: 13 additions & 9 deletions Packages/ConfCore/ConfCore/Storage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
}

Expand Down
29 changes: 25 additions & 4 deletions WWDC/LiveObserver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
}
}
}
Expand Down