fix music folder selection for jellyfin (#1319)

This commit is contained in:
jeffvli
2025-12-04 18:45:58 -08:00
parent 845b678e18
commit 9004485aa9
@@ -212,9 +212,9 @@ export const JellyfinController: InternalControllerEndpoint = {
const res = await jfApiClient(apiClientProps).getAlbumArtistList({ const res = await jfApiClient(apiClientProps).getAlbumArtistList({
query: { query: {
Fields: 'Genres, DateCreated, ExternalUrls, Overview', Fields: 'Genres, DateCreated, ExternalUrls, Overview',
FolderId: getLibraryId(query.musicFolderId),
ImageTypeLimit: 1, ImageTypeLimit: 1,
Limit: query.limit, Limit: query.limit,
ParentId: getLibraryId(query.musicFolderId),
Recursive: true, Recursive: true,
SearchTerm: query.searchTerm, SearchTerm: query.searchTerm,
SortBy: albumArtistListSortMap.jellyfin[query.sortBy] || 'SortName,Name', SortBy: albumArtistListSortMap.jellyfin[query.sortBy] || 'SortName,Name',
@@ -322,11 +322,11 @@ export const JellyfinController: InternalControllerEndpoint = {
query: { query: {
...artistQuery, ...artistQuery,
Fields: 'People, Tags', Fields: 'People, Tags',
FolderId: getLibraryId(query.musicFolderId),
GenreIds: query.genreIds ? query.genreIds.join(',') : undefined, GenreIds: query.genreIds ? query.genreIds.join(',') : undefined,
IncludeItemTypes: 'MusicAlbum', IncludeItemTypes: 'MusicAlbum',
IsFavorite: query.favorite, IsFavorite: query.favorite,
Limit: query.limit, Limit: query.limit,
ParentId: getLibraryId(query.musicFolderId),
Recursive: true, Recursive: true,
SearchTerm: query.searchTerm, SearchTerm: query.searchTerm,
SortBy: albumListSortMap.jellyfin[query.sortBy] || 'SortName', SortBy: albumListSortMap.jellyfin[query.sortBy] || 'SortName',
@@ -358,9 +358,9 @@ export const JellyfinController: InternalControllerEndpoint = {
const res = await jfApiClient(apiClientProps).getArtistList({ const res = await jfApiClient(apiClientProps).getArtistList({
query: { query: {
Fields: 'Genres, DateCreated, ExternalUrls, Overview', Fields: 'Genres, DateCreated, ExternalUrls, Overview',
FolderId: getLibraryId(query.musicFolderId),
ImageTypeLimit: 1, ImageTypeLimit: 1,
Limit: query.limit, Limit: query.limit,
ParentId: getLibraryId(query.musicFolderId),
Recursive: true, Recursive: true,
SearchTerm: query.searchTerm, SearchTerm: query.searchTerm,
SortBy: albumArtistListSortMap.jellyfin[query.sortBy] || 'SortName,Name', SortBy: albumArtistListSortMap.jellyfin[query.sortBy] || 'SortName,Name',
@@ -610,8 +610,8 @@ export const JellyfinController: InternalControllerEndpoint = {
query: { query: {
EnableTotalRecordCount: true, EnableTotalRecordCount: true,
Fields: 'ItemCounts', Fields: 'ItemCounts',
FolderId: getLibraryId(query.musicFolderId),
Limit: query.limit === -1 ? undefined : query.limit, Limit: query.limit === -1 ? undefined : query.limit,
ParentId: getLibraryId(query.musicFolderId),
Recursive: true, Recursive: true,
SearchTerm: query?.searchTerm, SearchTerm: query?.searchTerm,
SortBy: genreListSortMap.jellyfin[query.sortBy] || 'SortName', SortBy: genreListSortMap.jellyfin[query.sortBy] || 'SortName',
@@ -792,7 +792,6 @@ export const JellyfinController: InternalControllerEndpoint = {
}, },
query: { query: {
Fields: 'Genres, DateCreated, MediaSources, ParentId, People, Tags', Fields: 'Genres, DateCreated, MediaSources, ParentId, People, Tags',
FolderId: getLibraryId(query.musicFolderId),
GenreIds: query.genre ? query.genre : undefined, GenreIds: query.genre ? query.genre : undefined,
IncludeItemTypes: 'Audio', IncludeItemTypes: 'Audio',
IsPlayed: IsPlayed:
@@ -802,6 +801,7 @@ export const JellyfinController: InternalControllerEndpoint = {
? true ? true
: undefined, : undefined,
Limit: query.limit, Limit: query.limit,
ParentId: getLibraryId(query.musicFolderId),
Recursive: true, Recursive: true,
SortBy: JFSongListSort.RANDOM, SortBy: JFSongListSort.RANDOM,
SortOrder: JFSortOrder.ASC, SortOrder: JFSortOrder.ASC,
@@ -951,11 +951,11 @@ export const JellyfinController: InternalControllerEndpoint = {
AlbumIds: albumIdsFilter, AlbumIds: albumIdsFilter,
ArtistIds: artistIdsFilter, ArtistIds: artistIdsFilter,
Fields: 'Genres, DateCreated, MediaSources, ParentId, People, Tags', Fields: 'Genres, DateCreated, MediaSources, ParentId, People, Tags',
FolderId: getLibraryId(query.musicFolderId),
GenreIds: query.genreIds?.join(','), GenreIds: query.genreIds?.join(','),
IncludeItemTypes: 'Audio', IncludeItemTypes: 'Audio',
IsFavorite: query.favorite, IsFavorite: query.favorite,
Limit: query.limit, Limit: query.limit,
ParentId: getLibraryId(query.musicFolderId),
Recursive: true, Recursive: true,
SearchTerm: query.searchTerm, SearchTerm: query.searchTerm,
SortBy: songListSortMap.jellyfin[query.sortBy] || 'Album,SortName', SortBy: songListSortMap.jellyfin[query.sortBy] || 'Album,SortName',