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

Reverting itemContextMenu changes to support folder/playlist ordering with the "Play" action

Code cleanup
This commit is contained in:
MrK 2023-09-23 22:50:57 +01:00
parent c935ba9a20
commit 5d20523616
3 changed files with 35 additions and 2 deletions

View file

@ -9,6 +9,8 @@ import itemHelper from './itemHelper';
import { playbackManager } from './playback/playbackmanager';
import ServerConnections from './ServerConnections';
import toast from './toast/toast';
import * as userSettings from '../scripts/settings/userSettings';
import libraryMenu from '../scripts/libraryMenu';
export function getCommands(options) {
const item = options.item;
@ -567,6 +569,29 @@ function deleteSeriesTimer(apiClient, item, resolve, command) {
});
}
function getSettingsKey(item) {
if (item.IsFolder) {
return 'Folder';
}
const itemType = item.MediaType;
switch (itemType) {
case 'Movie':
case 'BoxSet':
case 'Video':
return 'movies';
case 'Audio':
return 'songs';
case 'MusicAlbum':
return 'musicalbums';
case 'MusicArtist':
return 'musicartists';
case 'MusicGenre':
return 'genres';
case 'MusicPlaylist':
return 'musicplaylists';
}
}
function play(item, resume, queue, queueNext) {
let method = 'play';
if (queue) {
@ -589,9 +614,16 @@ function play(item, resume, queue, queueNext) {
serverId: item.ServerId
});
} else {
const sortParentId = item.IsFolder ? ('items-' + item.Id) : libraryMenu.getTopParentId() + '-' + getSettingsKey(item);
const sortValues = userSettings.getSortValues(sortParentId);
playbackManager[method]({
items: [item],
startPositionTicks: startPosition
startPositionTicks: startPosition,
queryOptions: {
SortBy: sortValues.sortBy,
SortOrder: sortValues.sortOrder
}
});
}
}