Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-08-06 10:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix player instance setting (fix #260)

Browse Source
This commit is contained in:
Arkadiusz Fal
2022-08-16 23:16:35 +02:00
parent 30889619fd
commit 3a508b98ab
10 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Model/Player/PlayerModel.swift
View File

@@ -651,7 +651,7 @@ final class PlayerModel: ObservableObject {
DispatchQueue.main.asyncAfter(deadline: .now() + 3) { [weak self] in
guard let self = self else { return }
self.accounts.api.loadDetails(item, completionHandler: { newItem in
self.playerAPI.loadDetails(item, completionHandler: { newItem in
guard newItem.videoID == self.autoplayItem?.videoID else { return }
self.autoplayItem = newItem
self.updateRemoteCommandCenter()

30
Model/Player/PlayerQueue.swift
View File

@@ -56,20 +56,32 @@ extension PlayerModel {
preservedTime = currentItem.playbackTime
DispatchQueue.main.async { [weak self] in
guard let video = self?.currentVideo else {
guard let self = self else { return }
guard let video = self.currentVideo else {
return
}
self?.videoBeingOpened = nil
if video.streams.isEmpty {
self?.loadAvailableStreams(video)
self.videoBeingOpened = nil
guard let playerInstance = self.playerInstance else { return }
let streamsInstance = video.streams.compactMap(\.instance).first
if video.streams.isEmpty || streamsInstance != playerInstance {
self.loadAvailableStreams(video)
} else {
guard let instance = self?.accounts.current?.instance ?? InstancesModel.forPlayer ?? InstancesModel.all.first else { return }
self?.availableStreams = self?.streamsWithInstance(instance: instance, streams: video.streams) ?? video.streams
self.availableStreams = self.streamsWithInstance(instance: playerInstance, streams: video.streams)
}
}
}
var playerInstance: Instance? {
InstancesModel.forPlayer ?? accounts.current?.instance ?? InstancesModel.all.first
}
var playerAPI: VideosAPI {
playerInstance?.anonymous ?? accounts.api
}
var qualityProfile: QualityProfile? {
qualityProfileSelection ?? QualityProfilesModel.shared.automaticProfile
}
@@ -135,7 +147,7 @@ extension PlayerModel {
currentItem.playbackTime = time
let playTime = currentItem.shouldRestartPlaying ? CMTime.zero : time
accounts.api.loadDetails(currentItem, failureHandler: videoLoadFailureHandler) { newItem in
playerAPI.loadDetails(currentItem, failureHandler: videoLoadFailureHandler) { newItem in
self.playItem(newItem, at: playTime)
}
}
@@ -178,7 +190,7 @@ extension PlayerModel {
}
if loadDetails {
accounts.api.loadDetails(item, failureHandler: videoLoadFailureHandler) { [weak self] newItem in
playerAPI.loadDetails(item, failureHandler: videoLoadFailureHandler) { [weak self] newItem in
guard let self = self else { return }
videoDetailsLoadHandler(newItem.video, newItem)
@@ -239,7 +251,7 @@ extension PlayerModel {
func loadQueueVideoDetails(_ item: PlayerQueueItem) {
guard !accounts.current.isNil, !item.hasDetailsLoaded else { return }
accounts.api.loadDetails(item, completionHandler: { newItem in
playerAPI.loadDetails(item, completionHandler: { newItem in
if let index = self.queue.firstIndex(where: { $0.id == item.id }) {
self.queue[index] = newItem
}

7
Model/Player/PlayerStreams.swift
View File

@@ -18,13 +18,10 @@ extension PlayerModel {
func loadAvailableStreams(_ video: Video) {
availableStreams = []
guard let playerInstance = InstancesModel.forPlayer ?? InstancesModel.all.first else {
return
}
guard let playerInstance = playerInstance else { return }
logger.info("loading streams from \(playerInstance.description)")
fetchStreams(playerInstance.anonymous.video(video.videoID), instance: playerInstance, video: video)
fetchStreams(playerAPI.video(video.videoID), instance: playerInstance, video: video)
}
private func fetchStreams(