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

Merge pull request #369 from mshockwave/dev-season-play-button

This commit is contained in:
Ethan Pippin 2022-02-11 19:26:58 -08:00 committed by GitHub
parent 8be6da74f5 41a3644417
commit d000c2b4dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 63 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ final class SeasonItemViewModel: ItemViewModel, EpisodesRowManager {
getSeriesItem()
selectedSeason = item
retrieveSeasons()
requestEpisodes()
}
override func playButtonText() -> String {
@ -38,56 +39,73 @@ final class SeasonItemViewModel: ItemViewModel, EpisodesRowManager {
return L10n.unaired
}
if item.missing {
return L10n.missing
}
guard let playButtonItem = playButtonItem, let episodeLocator = playButtonItem.getEpisodeLocator() else { return L10n.play }
return episodeLocator
}
// private func requestEpisodes() {
// LogManager.shared.log
// .debug("Getting episodes in season \(item.id!) (\(item.name!)) of show \(item.seriesId!) (\(item.seriesName!))")
// TvShowsAPI.getEpisodes(seriesId: item.seriesId ?? "", userId: SessionManager.main.currentLogin.user.id,
// fields: [.primaryImageAspectRatio, .seriesPrimaryImage, .seasonUserData, .overview, .genres, .people],
// seasonId: item.id ?? "")
// .trackActivity(loading)
// .sink(receiveCompletion: { [weak self] completion in
// self?.handleAPIRequestError(completion: completion)
// }, receiveValue: { [weak self] response in
// self?.episodes = response.items ?? []
// LogManager.shared.log.debug("Retrieved \(String(self?.episodes.count ?? 0)) episodes")
//
// self?.setNextUpInSeason()
// })
// .store(in: &cancellables)
// }
private func requestEpisodes() {
LogManager.shared.log
.debug("Getting episodes in season \(item.id!) (\(item.name!)) of show \(item.seriesId!) (\(item.seriesName!))")
TvShowsAPI.getEpisodes(seriesId: item.seriesId ?? "", userId: SessionManager.main.currentLogin.user.id,
fields: [.primaryImageAspectRatio, .seriesPrimaryImage, .seasonUserData, .overview, .genres, .people],
seasonId: item.id ?? "")
.trackActivity(loading)
.sink(receiveCompletion: { [weak self] completion in
self?.handleAPIRequestError(completion: completion)
}, receiveValue: { [weak self] response in
guard let self = self else { return }
self.episodes = response.items ?? []
LogManager.shared.log.debug("Retrieved \(String(self.episodes.count)) episodes")
// Sets the play button item to the "Next up" in the season based upon
// the watched status of episodes in the season.
// Default to the first episode of the season if all have been watched.
// private func setNextUpInSeason() {
// guard !item.missing else { return }
// guard !episodes.isEmpty else { return }
//
// var firstUnwatchedSearch: BaseItemDto?
//
// for episode in episodes {
// guard let played = episode.userData?.played else { continue }
// if !played {
// firstUnwatchedSearch = episode
// break
// }
// }
//
// if let firstUnwatched = firstUnwatchedSearch {
// playButtonItem = firstUnwatched
// } else {
// guard let firstEpisode = episodes.first else { return }
// playButtonItem = firstEpisode
// }
// }
self.setNextUpInSeason()
})
.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
// the watched status of episodes in the season.
// Default to the first episode of the season if all have been watched.
var firstUnwatchedSearch: BaseItemDto?
for episode in self.episodes {
guard let played = episode.userData?.played else { continue }
if !played {
firstUnwatchedSearch = episode
break
}
}
if let firstUnwatched = firstUnwatchedSearch {
self.playButtonItem = firstUnwatched
} else {
guard let firstEpisode = self.episodes.first else { return }
self.playButtonItem = firstEpisode
}
}
})
.store(in: &cancellables)
}
private func getSeriesItem() {
guard let seriesID = item.seriesId else { return }