bekucera/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2025-09-10 22:43:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7104 from thornbill/fix-duped-music-videos

Browse Source 
Refactor music video section handling for artists
This commit is contained in:
Bill Thornton
2025-08-19 15:43:21 -04:00
committed by GitHub
parent 25481cae7e c965b6169d
commit 6d11d4ab40
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/controllers/itemDetails/index.js
View File

@@ -854,7 +854,7 @@ function setInitialCollapsibleState(page, item, apiClient, context, user) {
page.querySelector('#additionalPartsCollapsible').classList.add('hide');
}
if (item.Type == 'MusicAlbum' || item.Type == 'MusicArtist') {
if (item.Type == BaseItemKind.MusicAlbum) {
renderMusicVideos(page, item, user);
} else {
page.querySelector('#musicVideosCollapsible').classList.add('hide');
@@ -1764,15 +1764,10 @@ function renderMusicVideos(page, item, user) {
SortOrder: 'Ascending',
IncludeItemTypes: 'MusicVideo',
Recursive: true,
Fields: 'PrimaryImageAspectRatio,CanDelete,MediaSourceCount'
Fields: 'PrimaryImageAspectRatio,CanDelete,MediaSourceCount',
AlbumIds: item.Id
};
if (item.Type == 'MusicAlbum') {
request.AlbumIds = item.Id;
} else {
request.ArtistIds = item.Id;
}
ServerConnections.getApiClient(item.ServerId).getItems(user.Id, request).then(function (result) {
if (result.Items.length) {
page.querySelector('#musicVideosCollapsible').classList.remove('hide');

31
src/scripts/itemsByName.js
View File

@@ -1,3 +1,5 @@
import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
import listView from 'components/listview/listview';
import cardBuilder from 'components/cardbuilder/cardBuilder';
import imageLoader from 'components/images/imageLoader';
@@ -326,16 +328,25 @@ function getMoreItemsHref(item, type) {
}
function addCurrentItemToQuery(query, item) {
if (item.Type === 'Person') {
query.PersonIds = item.Id;
} else if (item.Type === 'Genre') {
query.Genres = item.Name;
} else if (item.Type === 'MusicGenre') {
query.Genres = item.Name;
} else if (item.Type === 'Studio') {
query.StudioIds = item.Id;
} else if (item.Type === 'MusicArtist') {
query.AlbumArtistIds = item.Id;
switch (item.Type) {
case BaseItemKind.Person:
query.PersonIds = item.Id;
break;
case BaseItemKind.Genre:
query.Genres = item.Name;
break;
case BaseItemKind.MusicGenre:
query.Genres = item.Name;
break;
case BaseItemKind.Studio:
query.StudioIds = item.Id;
break;
case BaseItemKind.MusicArtist:
if (query.IncludeItemTypes === BaseItemKind.MusicVideo) {
query.ArtistIds = item.Id;
} else {
query.AlbumArtistIds = item.Id;
}
}
}