admin/jellyfin-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Restore promise rejects

Browse Source
This commit is contained in:
Bill Thornton
2024-05-21 12:08:21 -04:00
parent 70b9aa4611
commit 2280d98785
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/playback/playbackmanager.js
View File

@@ -2267,7 +2267,7 @@ class PlaybackManager {
if (item.IsPlaceHolder) {
loading.hide();
showPlaybackInfoErrorMessage(self, 'PlaybackErrorPlaceHolder');
return Promise.resolve();
return Promise.reject();
}
// Normalize defaults to simplfy checks throughout the process
@@ -2284,16 +2284,17 @@ class PlaybackManager {
// TODO: This should be the media type requested, not the original media type
const mediaType = item.MediaType;
if (playOptions.fullscreen) {
loading.show();
}
return runInterceptors(item, playOptions)
.catch(onInterceptorRejection)
.then(() => detectBitrate(apiClient, item, mediaType, playOptions))
.then(() => detectBitrate(apiClient, item, mediaType))
.then((bitrate) => {
return playAfterBitrateDetect(bitrate, item, playOptions, onPlaybackStartedFn, prevSource)
.catch(onPlaybackRejection);
})
.catch(() => {
/* NOTE: Any errors should already be handled, but interceptors will reject to prevent playback. */
})
.finally(() => {
if (playOptions.fullscreen) {
loading.hide();
@@ -2333,7 +2334,7 @@ class PlaybackManager {
showPlaybackInfoErrorMessage(self, displayErrorCode);
return Promise.resolve();
return Promise.reject();
}
function destroyPlayer(player) {
@@ -2492,14 +2493,10 @@ class PlaybackManager {
}
}
function detectBitrate(apiClient, item, mediaType, playOptions) {
function detectBitrate(apiClient, item, mediaType) {
// FIXME: This is gnarly, but don't want to change too much here in a bugfix
return Promise.resolve()
.then(() => {
if (playOptions.fullscreen) {
loading.show();
}
if (!isServerItem(item) || itemHelper.isLocalItem(item)) {
return Promise.reject('skip bitrate detection');
}