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

Fix playing episodes when additional parts exist

Browse source
This commit is contained in:
Bill Thornton 2024-10-23 17:13:16 -04:00
parent 9f8905989f
commit 6530d2d7d8
1 changed files with 33 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2039,12 +2039,12 @@ export class PlaybackManager {
self.translateItemsForPlayback = translateItemsForPlayback; self.translateItemsForPlayback = translateItemsForPlayback;
self.getItemsForPlayback = getItemsForPlayback; self.getItemsForPlayback = getItemsForPlayback;
self.play = function (options) { self.play = async function (options) {
normalizePlayOptions(options); normalizePlayOptions(options);
if (self._currentPlayer) { if (self._currentPlayer) {
if (options.enableRemotePlayers === false && !self._currentPlayer.isLocalPlayer) { if (options.enableRemotePlayers === false && !self._currentPlayer.isLocalPlayer) {
return Promise.reject(); throw new Error('Remote players are disabled');
} }
if (!self._currentPlayer.isLocalPlayer) { if (!self._currentPlayer.isLocalPlayer) {
@ -2056,29 +2056,35 @@ export class PlaybackManager {
loading.show(); loading.show();
} }
if (options.items) { let { items } = options;
return translateItemsForPlayback(options.items, options) // If items were not passed directly, fetch them by ID
.then((items) => getAdditionalParts(items)) if (!items) {
.then(function (allItems) {
const flattened = allItems.flatMap(i => i);
return playWithIntros(flattened, options);
});
} else {
if (!options.serverId) { if (!options.serverId) {
throw new Error('serverId required!'); throw new Error('serverId required!');
} }
return getItemsForPlayback(options.serverId, { items = (await getItemsForPlayback(options.serverId, {
Ids: options.ids.join(',') Ids: options.ids.join(',')
}).then(function (result) { })).Items;
return translateItemsForPlayback(result.Items, options)
.then((items) => getAdditionalParts(items))
.then(function (allItems) {
const flattened = allItems.flatMap(i => i);
return playWithIntros(flattened, options);
});
});
} }
// Prepare the list of items
items = await translateItemsForPlayback(items, options);
// Add any additional parts for movies or episodes
items = await getAdditionalParts(items);
// Adjust the start index for additional parts added to the queue
if (options.startIndex) {
let adjustedStartIndex = 0;
for (let i = 0; i < options.startIndex; i++) {
adjustedStartIndex += items[i].length;
}
options.startIndex = adjustedStartIndex;
}
// getAdditionalParts returns an array of arrays of items, so flatten it
items = items.flat();
return playWithIntros(items, options);
}; };
function getPlayerData(player) { function getPlayerData(player) {
@ -2217,20 +2223,22 @@ export class PlaybackManager {
} }
const getAdditionalParts = async (items) => { const getAdditionalParts = async (items) => {
const getOneAdditionalPart = async function (item) { const getItemAndParts = async function (item) {
let retVal = [item]; if (
if (item.PartCount && item.PartCount > 1 && (item.Type === 'Movie' || item.Type === 'Episode')) { item.PartCount && item.PartCount > 1
&& [ BaseItemKind.Episode, BaseItemKind.Movie ].includes(item.Type)
) {
const client = ServerConnections.getApiClient(item.ServerId); const client = ServerConnections.getApiClient(item.ServerId);
const user = await client.getCurrentUser(); const user = await client.getCurrentUser();
const additionalParts = await client.getAdditionalVideoParts(user.Id, item.Id); const additionalParts = await client.getAdditionalVideoParts(user.Id, item.Id);
if (additionalParts.Items.length) { if (additionalParts.Items.length) {
retVal = [item, ...additionalParts.Items]; return [ item, ...additionalParts.Items ];
} }
} }
return retVal; return [ item ];
}; };
return Promise.all(items.flatMap(async (item) => getOneAdditionalPart(item))); return Promise.all(items.map(getItemAndParts));
}; };
function playWithIntros(items, options) { function playWithIntros(items, options) {