Improve genres for jellyfin

- Support music folder
- Add images
- Fix genre filters on album/track filters

src/renderer/api/jellyfin.types.ts

@@ -16,7 +16,7 @@ export interface JFGenreListResponse extends JFBasePaginatedResponse {
 export type JFGenreList = JFGenreListResponse;
 
 export enum JFGenreListSort {
-    NAME = 'Name,SortName',
+    NAME = 'SortName',
 }
 
 export type JFAlbumArtistDetailResponse = JFAlbumArtist;

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

@@ -119,12 +119,20 @@ const getMusicFolderList = async (args: MusicFolderListArgs): Promise<MusicFolde
 const getGenreList = async (args: GenreListArgs): Promise<GenreListResponse> => {
     const { apiClientProps, query } = args;
 
+    if (!apiClientProps.server?.userId) {
+        throw new Error('No userId found');
+    }
+
     const res = await jfApiClient(apiClientProps).getGenreList({
         query: {
+            Fields: 'ItemCounts',
+            ParentId: query?.musicFolderId,
+            Recursive: true,
             SearchTerm: query?.searchTerm,
-            SortBy: genreListSortMap.jellyfin[query.sortBy] || 'Name,SortName',
+            SortBy: genreListSortMap.jellyfin[query.sortBy] || 'SortName',
             SortOrder: sortOrderMap.jellyfin[query.sortOrder],
             StartIndex: query.startIndex,
+            UserId: apiClientProps.server?.userId,
         },
     });
 
@@ -133,7 +141,7 @@ const getGenreList = async (args: GenreListArgs): Promise<GenreListResponse> =>
     }
 
     return {
-        items: res.body.Items.map(jfNormalize.genre),
+        items: res.body.Items.map((item) => jfNormalize.genre(item, apiClientProps.server)),
         startIndex: query.startIndex || 0,
         totalRecordCount: res.body?.TotalRecordCount || 0,
     };

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

@@ -357,11 +357,31 @@ const normalizeMusicFolder = (item: JFMusicFolder): MusicFolder => {
 //   };
 // };
 
-const normalizeGenre = (item: JFGenre): Genre => {
+const getGenreCoverArtUrl = (args: {
+    baseUrl: string;
+    item: z.infer<typeof jfType._response.genre>;
+    size: number;
+}) => {
+    const size = args.size ? args.size : 300;
+
+    if (!args.item.ImageTags?.Primary) {
+        return null;
+    }
+
+    return (
+        `${args.baseUrl}/Items` +
+        `/${args.item.Id}` +
+        '/Images/Primary' +
+        `?width=${size}&height=${size}` +
+        '&quality=96'
+    );
+};
+
+const normalizeGenre = (item: JFGenre, server: ServerListItem | null): Genre => {
     return {
         albumCount: undefined,
         id: item.Id,
-        imageUrl: null,
+        imageUrl: getGenreCoverArtUrl({ baseUrl: server?.url || '', item, size: 200 }),
         itemType: LibraryItem.GENRE,
         name: item.Name,
         songCount: undefined,

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

@@ -309,7 +309,7 @@ const genreList = pagination.extend({
 });
 
 const genreListSort = {
-    NAME: 'Name,SortName',
+    NAME: 'SortName',
 } as const;
 
 const genreListParameters = paginationParameters.merge(