vanja/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2026-05-07 04:20:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

use tags list for Navidrome genres to support counts

Browse Source
This commit is contained in:
jeffvli
2025-12-02 18:37:31 -08:00
parent 854a26e3f4
commit f84506ce01
11 changed files with 100 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/api/jellyfin/jellyfin-controller.ts
+1 -1
View File
@@ -853,7 +853,7 @@ export const JellyfinController: InternalControllerEndpoint = {
return url;
},
getTags: async (args) => {
getTagList: async (args) => {
const { apiClientProps, query } = args;
if (!hasFeature(apiClientProps.server, ServerFeature.TAGS)) {
src/renderer/api/navidrome/navidrome-api.ts
+3 -2
View File
@@ -140,11 +140,12 @@ export const contract = c.router({
500: resultWithHeaders(ndType._response.error),
},
},
getTags: {
getTagList: {
method: 'GET',
path: 'tag',
query: ndType._parameters.tagList,
responses: {
200: resultWithHeaders(ndType._response.tags),
200: resultWithHeaders(ndType._response.tagList),
500: resultWithHeaders(ndType._response.error),
},
},
src/renderer/api/navidrome/navidrome-controller.ts
+39 -2
View File
@@ -18,6 +18,7 @@ import {
Song,
songListSortMap,
sortOrderMap,
tagListSortMap,
userListSortMap,
} from '/@/shared/types/domain-types';
import { ServerFeature } from '/@/shared/types/features-types';
@@ -395,6 +396,40 @@ export const NavidromeController: InternalControllerEndpoint = {
getGenreList: async (args) => {
const { apiClientProps, query } = args;
if (hasFeature(apiClientProps.server, ServerFeature.BFR)) {
const res = await ndApiClient(apiClientProps).getTagList({
query: {
_end: query.startIndex + (query.limit || 0),
_order: sortOrderMap.navidrome[query.sortOrder],
_sort: tagListSortMap.navidrome[query.sortBy],
_start: query.startIndex,
library_id: getLibraryId(query.musicFolderId),
tag_name: 'genre',
tag_value: query.searchTerm,
},
});
if (res.status !== 200) {
throw new Error('Failed to get genre list');
}
return {
items: res.body.data.map((genre) =>
ndNormalize.genre(
{
albumCount: genre.albumCount,
id: genre.id,
name: genre.tagValue,
songCount: genre.songCount,
},
apiClientProps.server,
),
),
startIndex: query.startIndex || 0,
totalRecordCount: Number(res.body.headers.get('x-total-count') || 0),
};
}
const res = await ndApiClient(apiClientProps).getGenreList({
query: {
_end: query.startIndex + (query.limit || 0),
@@ -637,14 +672,16 @@ export const NavidromeController: InternalControllerEndpoint = {
}).then((result) => result!.totalRecordCount!),
getStreamUrl: SubsonicController.getStreamUrl,
getStructuredLyrics: SubsonicController.getStructuredLyrics,
getTags: async (args) => {
getTagList: async (args) => {
const { apiClientProps } = args;
if (!hasFeature(apiClientProps.server, ServerFeature.TAGS)) {
return { boolTags: undefined, enumTags: undefined, excluded: { album: [], song: [] } };
}
const res = await ndApiClient(apiClientProps).getTags();
const res = await ndApiClient(apiClientProps).getTagList({
query: {},
});
if (res.status !== 200) {
throw new Error('failed to get tags');
src/renderer/features/albums/components/jellyfin-album-filters.tsx
+1 -1
View File
@@ -67,7 +67,7 @@ export const JellyfinAlbumFilters = ({ disableArtistFilter }: JellyfinAlbumFilte
}, [genreListQuery.data]);
const tagsQuery = useQuery(
sharedQueries.tags({
sharedQueries.tagList({
options: {
gcTime: 1000 * 60 * 2,
staleTime: 1000 * 60 * 1,
src/renderer/features/albums/components/navidrome-album-filters.tsx
+1 -1
View File
@@ -243,7 +243,7 @@ const TagFilters = () => {
const serverId = useCurrentServerId();
const tagsQuery = useSuspenseQuery(
sharedQueries.tags({
sharedQueries.tagList({
options: {
gcTime: 1000 * 60 * 60,
staleTime: 1000 * 60 * 60,
src/renderer/features/shared/api/shared-api.ts
+3 -3
View File
@@ -3,7 +3,7 @@ import { queryOptions } from '@tanstack/react-query';
import { api } from '/@/renderer/api';
import { queryKeys } from '/@/renderer/api/query-keys';
import { QueryHookArgs } from '/@/renderer/lib/react-query';
import { MusicFolderListQuery, TagQuery, UserListQuery } from '/@/shared/types/domain-types';
import { MusicFolderListQuery, TagListQuery, UserListQuery } from '/@/shared/types/domain-types';
export const sharedQueries = {
musicFolders: (args: QueryHookArgs<MusicFolderListQuery>) => {
@@ -28,11 +28,11 @@ export const sharedQueries = {
...args.options,
});
},
tags: (args: QueryHookArgs<TagQuery>) => {
tagList: (args: QueryHookArgs<TagListQuery>) => {
return queryOptions({
gcTime: 1000 * 60,
queryFn: ({ signal }) => {
return api.controller.getTags({
return api.controller.getTagList({
apiClientProps: { serverId: args.serverId, signal },
query: args.query,
});
src/renderer/features/songs/components/jellyfin-song-filters.tsx
+1 -1
View File
@@ -38,7 +38,7 @@ export const JellyfinSongFilters = () => {
}, [genreListQuery.data]);
const tagsQuery = useQuery(
sharedQueries.tags({
sharedQueries.tagList({
query: {
type: LibraryItem.SONG,
},
src/renderer/features/songs/components/navidrome-song-filters.tsx
+1 -1
View File
@@ -151,7 +151,7 @@ const TagFilters = () => {
const serverId = useCurrentServerId();
const tagsQuery = useSuspenseQuery(
sharedQueries.tags({
sharedQueries.tagList({
query: { type: LibraryItem.SONG },
serverId,
}),
src/shared/api/navidrome/navidrome-normalize.ts
+3 -3
View File
@@ -442,18 +442,18 @@ const normalizePlaylist = (
};
const normalizeGenre = (
item: z.infer<typeof ndType._response.genre>,
item: z.infer<typeof ndType._response.genre> & { albumCount?: number; songCount?: number },
server: null | ServerListItem,
): Genre => {
return {
_itemType: LibraryItem.GENRE,
_serverId: server?.id || 'unknown',
_serverType: ServerType.NAVIDROME,
albumCount: null,
albumCount: item.albumCount ?? null,
id: item.id,
imageUrl: null,
name: item.name,
songCount: null,
songCount: item.songCount ?? null,
};
};
src/shared/api/navidrome/navidrome-types.ts
+17 -2
View File
@@ -235,6 +235,8 @@ const paginationParameters = z.object({
_start: z.number().optional(),
});
const optionalPaginationParameters = paginationParameters.partial();
const authenticate = z.object({
id: z.string(),
isAdmin: z.boolean(),
@@ -578,7 +580,18 @@ const tag = z.object({
tagValue: z.string(),
});
const tags = z.array(tag);
const tagList = z.array(tag);
export enum NDTagListSort {
TAG_VALUE = 'tagValue',
}
const tagListParameters = optionalPaginationParameters.extend({
_sort: z.nativeEnum(NDTagListSort).optional(),
library_id: z.array(z.string()).optional(),
tag_name: z.string().optional(),
tag_value: z.string().optional(), // Search
});
export const ndType = {
_enum: {
@@ -587,6 +600,7 @@ export const ndType = {
genreList: genreListSort,
playlistList: NDPlaylistListSort,
songList: NDSongListSort,
tagList: NDTagListSort,
userList: ndUserListSort,
},
_parameters: {
@@ -601,6 +615,7 @@ export const ndType = {
removeFromPlaylist: removeFromPlaylistParameters,
shareItem: shareItemParameters,
songList: songListParameters,
tagList: tagListParameters,
updatePlaylist: updatePlaylistParameters,
userList: userListParameters,
},
@@ -625,7 +640,7 @@ export const ndType = {
shareItem,
song,
songList,
tags,
tagList,
updatePlaylist,
user,
userList,
src/shared/types/domain-types.ts
+30 -6
View File
@@ -14,6 +14,7 @@ import {
NDPlaylistListSort,
NDSongListSort,
NDSortOrder,
NDTagListSort,
NDUserListSort,
} from '/@/shared/api/navidrome/navidrome-types';
import { ServerFeatures } from '/@/shared/types/features-types';
@@ -159,6 +160,10 @@ export enum ImageType {
SCREENSHOT = 'SCREENSHOT',
}
export enum TagListSort {
TAG_VALUE = 'tagValue',
}
export type Album = {
_itemType: LibraryItem.ALBUM;
_serverId: string;
@@ -399,6 +404,24 @@ export const genreListSortMap: GenreListSortMap = {
},
};
type TagListSortMap = {
jellyfin: Record<TagListSort, undefined>;
navidrome: Record<TagListSort, NDTagListSort | undefined>;
subsonic: Record<TagListSort, undefined>;
};
export const tagListSortMap: TagListSortMap = {
jellyfin: {
tagValue: undefined,
},
navidrome: {
tagValue: NDTagListSort.TAG_VALUE,
},
subsonic: {
tagValue: undefined,
},
};
export enum AlbumListSort {
ALBUM_ARTIST = 'albumArtist',
ARTIST = 'artist',
@@ -1224,7 +1247,7 @@ export type ControllerEndpoint = {
getSongListCount: (args: SongListCountArgs) => Promise<number>;
getStreamUrl: (args: StreamArgs) => string;
getStructuredLyrics?: (args: StructuredLyricsArgs) => Promise<StructuredLyric[]>;
getTags?: (args: TagArgs) => Promise<TagsResponse>;
getTagList?: (args: TagListArgs) => Promise<TagListResponse>;
getTopSongs: (args: TopSongListArgs) => Promise<TopSongListResponse>;
getUserList?: (args: UserListArgs) => Promise<UserListResponse>;
movePlaylistItem?: (args: MoveItemArgs) => Promise<void>;
@@ -1316,7 +1339,7 @@ export type InternalControllerEndpoint = {
getStructuredLyrics?: (
args: ReplaceApiClientProps<StructuredLyricsArgs>,
) => Promise<StructuredLyric[]>;
getTags?: (args: ReplaceApiClientProps<TagArgs>) => Promise<TagsResponse>;
getTagList?: (args: ReplaceApiClientProps<TagListArgs>) => Promise<TagListResponse>;
getTopSongs: (args: ReplaceApiClientProps<TopSongListArgs>) => Promise<TopSongListResponse>;
getUserList?: (args: ReplaceApiClientProps<UserListArgs>) => Promise<UserListResponse>;
movePlaylistItem?: (args: ReplaceApiClientProps<MoveItemArgs>) => Promise<void>;
@@ -1413,16 +1436,17 @@ export type Tag = {
options: { id: string; name: string }[];
};
export type TagArgs = BaseEndpointArgs & {
query: TagQuery;
export type TagListArgs = BaseEndpointArgs & {
query: TagListQuery;
};
export type TagQuery = {
export type TagListQuery = {
folder?: string;
tagName?: string;
type: LibraryItem.ALBUM | LibraryItem.SONG;
};
export type TagsResponse = {
export type TagListResponse = {
boolTags?: string[];
enumTags?: { name: string; options: { id: string; name: string }[] }[];
excluded: {