mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge pull request #5402 from dmitrylyzo/fix-livetv-loading

Browse source 
Show error message on playback failure
This commit is contained in:
Bill Thornton 2024-05-01 02:35:21 -04:00 • committed by GitHub
commit 1b2c99a4ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 47 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

74
src/components/playback/playbackmanager.js
View file

@ -2279,35 +2279,42 @@ class PlaybackManager {
playOptions.isFirstItem = true; playOptions.isFirstItem = true;
} }
return runInterceptors(item, playOptions).then(function () { const apiClient = ServerConnections.getApiClient(item.ServerId);
if (playOptions.fullscreen) {
loading.show();
}
// TODO: This should be the media type requested, not the original media type // TODO: This should be the media type requested, not the original media type
const mediaType = item.MediaType; const mediaType = item.MediaType;
const onBitrateDetectionFailure = function () { return runInterceptors(item, playOptions)
return playAfterBitrateDetect(getSavedMaxStreamingBitrate(ServerConnections.getApiClient(item.ServerId), mediaType), item, playOptions, onPlaybackStartedFn, prevSource); .then(() => {
}; if (playOptions.fullscreen) {
loading.show();
if (!isServerItem(item) || itemHelper.isLocalItem(item)) {
return onBitrateDetectionFailure();
}
const apiClient = ServerConnections.getApiClient(item.ServerId);
apiClient.getEndpointInfo().then(function (endpointInfo) {
if ((mediaType === 'Video' || mediaType === 'Audio') && appSettings.enableAutomaticBitrateDetection(endpointInfo.IsInNetwork, mediaType)) {
return apiClient.detectBitrate().then(function (bitrate) {
appSettings.maxStreamingBitrate(endpointInfo.IsInNetwork, mediaType, bitrate);
return playAfterBitrateDetect(bitrate, item, playOptions, onPlaybackStartedFn, prevSource);
}, onBitrateDetectionFailure);
} else {
onBitrateDetectionFailure();
} }
}, onBitrateDetectionFailure);
}, onInterceptorRejection); if (!isServerItem(item) || itemHelper.isLocalItem(item)) {
return Promise.reject('skip bitrate detection');
}
return apiClient.getEndpointInfo().then((endpointInfo) => {
if ((mediaType === 'Video' || mediaType === 'Audio') && appSettings.enableAutomaticBitrateDetection(endpointInfo.IsInNetwork, mediaType)) {
return apiClient.detectBitrate().then((bitrate) => {
appSettings.maxStreamingBitrate(endpointInfo.IsInNetwork, mediaType, bitrate);
return bitrate;
});
}
return Promise.reject('skip bitrate detection');
});
})
.catch(() => getSavedMaxStreamingBitrate(apiClient, mediaType))
.then((bitrate) => {
return playAfterBitrateDetect(bitrate, item, playOptions, onPlaybackStartedFn, prevSource);
})
.catch(onInterceptorRejection)
.finally(() => {
if (playOptions.fullscreen) {
loading.hide();
}
});
} }
function cancelPlayback() { function cancelPlayback() {
@ -2321,8 +2328,21 @@ class PlaybackManager {
Events.trigger(self, 'playbackcancelled'); Events.trigger(self, 'playbackcancelled');
} }
function onInterceptorRejection() { function onInterceptorRejection(e) {
cancelPlayback(); cancelPlayback();
let displayErrorCode = 'ErrorDefault';
if (e instanceof Response) {
if (e.status >= 500) {
displayErrorCode = `PlaybackError.${MediaError.SERVER_ERROR}`;
} else if (e.status >= 400) {
displayErrorCode = `PlaybackError.${MediaError.NO_MEDIA_ERROR}`;
}
}
showPlaybackInfoErrorMessage(self, displayErrorCode);
return Promise.reject(); return Promise.reject();
} }