ashikk
/
jellyflood
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consulting the `NextUp` endpoint for next episode in a season 

And fallback to the old mechanism if either the next episode in this
series doesn't match the current season or something goes wrong.
This commit is contained in:
Min-Yih Hsu 2022-02-08 19:42:51 +08:00
parent 909501b530
commit 41a3644417
1 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Shared/ViewModels/ItemViewModel/SeasonItemViewModel.swift
View File

@ -53,23 +53,42 @@ final class SeasonItemViewModel: ItemViewModel, EpisodesRowManager {
.sink(receiveCompletion: { [weak self] completion in .sink(receiveCompletion: { [weak self] completion in
self?.handleAPIRequestError(completion: completion) self?.handleAPIRequestError(completion: completion)
}, receiveValue: { [weak self] response in }, receiveValue: { [weak self] response in
self?.episodes = response.items ?? [] guard let self = self else { return }
LogManager.shared.log.debug("Retrieved \(String(self?.episodes.count ?? 0)) episodes") self.episodes = response.items ?? []
LogManager.shared.log.debug("Retrieved \(String(self.episodes.count)) episodes")
self?.setNextUpInSeason() self.setNextUpInSeason()
}) })
.store(in: &cancellables) .store(in: &cancellables)
} }
private func setNextUpInSeason() {
TvShowsAPI.getNextUp(userId: SessionManager.main.currentLogin.user.id,
fields: [.primaryImageAspectRatio, .seriesPrimaryImage, .seasonUserData, .overview, .genres, .people],
seriesId: item.seriesId ?? "", enableUserData: true)
.trackActivity(loading)
.sink(receiveCompletion: { [weak self] completion in
self?.handleAPIRequestError(completion: completion)
}, receiveValue: { [weak self] response in
guard let self = self else { return }
// Find the nextup item that belongs to current season.
if let nextUpItem = (response.items ?? []).first(where: { episode in
!episode.unaired && !episode.missing && episode.seasonId ?? "" == self.item.id!
}) {
self.playButtonItem = nextUpItem
LogManager.shared.log.debug("Nextup in season \(self.item.id!) (\(self.item.name!)): \(nextUpItem.id!)")
}
if self.playButtonItem == nil && !self.episodes.isEmpty {
// Fallback to the old mechanism:
// Sets the play button item to the "Next up" in the season based upon // Sets the play button item to the "Next up" in the season based upon
// the watched status of episodes in the season. // the watched status of episodes in the season.
// Default to the first episode of the season if all have been watched. // Default to the first episode of the season if all have been watched.
private func setNextUpInSeason() {
guard !episodes.isEmpty else { return }
var firstUnwatchedSearch: BaseItemDto? var firstUnwatchedSearch: BaseItemDto?
for episode in episodes { for episode in self.episodes {
guard let played = episode.userData?.played else { continue } guard let played = episode.userData?.played else { continue }
if !played { if !played {
firstUnwatchedSearch = episode firstUnwatchedSearch = episode
@ -78,12 +97,15 @@ final class SeasonItemViewModel: ItemViewModel, EpisodesRowManager {
} }
if let firstUnwatched = firstUnwatchedSearch { if let firstUnwatched = firstUnwatchedSearch {
playButtonItem = firstUnwatched self.playButtonItem = firstUnwatched
} else { } else {
guard let firstEpisode = episodes.first else { return } guard let firstEpisode = self.episodes.first else { return }
playButtonItem = firstEpisode self.playButtonItem = firstEpisode
} }
} }
})
.store(in: &cancellables)
}
private func getSeriesItem() { private func getSeriesItem() {
guard let seriesID = item.seriesId else { return } guard let seriesID = item.seriesId else { return }