use tags list for Navidrome genres to support counts

src/renderer/api/jellyfin/jellyfin-controller.ts

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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,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

@@ -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

@@ -151,7 +151,7 @@ const TagFilters = () => {
     const serverId = useCurrentServerId();
 
     const tagsQuery = useSuspenseQuery(
-        sharedQueries.tags({
+        sharedQueries.tagList({
             query: { type: LibraryItem.SONG },
             serverId,
         }),