null songCount and albumCount in genre type

This commit is contained in:
jeffvli
2025-11-23 14:26:12 -08:00
parent a32f76720a
commit 7c71f1058d
4 changed files with 24 additions and 6 deletions
+10 -2
View File
@@ -269,9 +269,11 @@ const normalizeSong = (
_itemType: LibraryItem.GENRE, _itemType: LibraryItem.GENRE,
_serverId: server?.id || '', _serverId: server?.id || '',
_serverType: ServerType.JELLYFIN, _serverType: ServerType.JELLYFIN,
albumCount: null,
id: entry.Id, id: entry.Id,
imageUrl: null, imageUrl: null,
name: entry.Name, name: entry.Name,
songCount: null,
})), })),
id: item.Id, id: item.Id,
imagePlaceholderUrl: null, imagePlaceholderUrl: null,
@@ -333,9 +335,11 @@ const normalizeAlbum = (
_itemType: LibraryItem.GENRE, _itemType: LibraryItem.GENRE,
_serverId: server?.id || '', _serverId: server?.id || '',
_serverType: ServerType.JELLYFIN, _serverType: ServerType.JELLYFIN,
albumCount: null,
id: entry.Id, id: entry.Id,
imageUrl: null, imageUrl: null,
name: entry.Name, name: entry.Name,
songCount: null,
})), })),
id: item.Id, id: item.Id,
imagePlaceholderUrl: null, imagePlaceholderUrl: null,
@@ -398,9 +402,11 @@ const normalizeAlbumArtist = (
_itemType: LibraryItem.GENRE, _itemType: LibraryItem.GENRE,
_serverId: server?.id || '', _serverId: server?.id || '',
_serverType: ServerType.JELLYFIN, _serverType: ServerType.JELLYFIN,
albumCount: null,
id: entry.Id, id: entry.Id,
imageUrl: null, imageUrl: null,
name: entry.Name, name: entry.Name,
songCount: null,
})), })),
id: item.Id, id: item.Id,
imageUrl: getAlbumArtistCoverArtUrl({ imageUrl: getAlbumArtistCoverArtUrl({
@@ -442,9 +448,11 @@ const normalizePlaylist = (
_itemType: LibraryItem.GENRE, _itemType: LibraryItem.GENRE,
_serverId: server?.id || '', _serverId: server?.id || '',
_serverType: ServerType.JELLYFIN, _serverType: ServerType.JELLYFIN,
albumCount: null,
id: entry.Id, id: entry.Id,
imageUrl: null, imageUrl: null,
name: entry.Name, name: entry.Name,
songCount: null,
})), })),
id: item.Id, id: item.Id,
imagePlaceholderUrl, imagePlaceholderUrl,
@@ -515,11 +523,11 @@ const normalizeGenre = (
_itemType: LibraryItem.GENRE, _itemType: LibraryItem.GENRE,
_serverId: server?.id || '', _serverId: server?.id || '',
_serverType: ServerType.JELLYFIN, _serverType: ServerType.JELLYFIN,
albumCount: undefined, albumCount: null,
id: item.Id, id: item.Id,
imageUrl: getGenreCoverArtUrl({ baseUrl: server?.url || '', item, size: 200 }), imageUrl: getGenreCoverArtUrl({ baseUrl: server?.url || '', item, size: 200 }),
name: item.Name, name: item.Name,
songCount: undefined, songCount: null,
}; };
}; };
@@ -180,9 +180,11 @@ const normalizeSong = (
_itemType: LibraryItem.GENRE, _itemType: LibraryItem.GENRE,
_serverId: server?.id || 'unknown', _serverId: server?.id || 'unknown',
_serverType: ServerType.NAVIDROME, _serverType: ServerType.NAVIDROME,
albumCount: null,
id: genre.id, id: genre.id,
imageUrl: null, imageUrl: null,
name: genre.name, name: genre.name,
songCount: null,
})), })),
id, id,
imagePlaceholderUrl, imagePlaceholderUrl,
@@ -298,9 +300,11 @@ const normalizeAlbum = (
_itemType: LibraryItem.GENRE, _itemType: LibraryItem.GENRE,
_serverId: server?.id || 'unknown', _serverId: server?.id || 'unknown',
_serverType: ServerType.NAVIDROME, _serverType: ServerType.NAVIDROME,
albumCount: null,
id: genre.id, id: genre.id,
imageUrl: null, imageUrl: null,
name: genre.name, name: genre.name,
songCount: null,
})), })),
id: item.id, id: item.id,
imagePlaceholderUrl, imagePlaceholderUrl,
@@ -378,9 +382,11 @@ const normalizeAlbumArtist = (
_itemType: LibraryItem.GENRE, _itemType: LibraryItem.GENRE,
_serverId: server?.id || 'unknown', _serverId: server?.id || 'unknown',
_serverType: ServerType.NAVIDROME, _serverType: ServerType.NAVIDROME,
albumCount: null,
id: genre.id, id: genre.id,
imageUrl: null, imageUrl: null,
name: genre.name, name: genre.name,
songCount: null,
})), })),
id: item.id, id: item.id,
imageUrl: imageUrl || null, imageUrl: imageUrl || null,
@@ -444,11 +450,11 @@ const normalizeGenre = (
_itemType: LibraryItem.GENRE, _itemType: LibraryItem.GENRE,
_serverId: server?.id || 'unknown', _serverId: server?.id || 'unknown',
_serverType: ServerType.NAVIDROME, _serverType: ServerType.NAVIDROME,
albumCount: undefined, albumCount: null,
id: item.id, id: item.id,
imageUrl: null, imageUrl: null,
name: item.name, name: item.name,
songCount: undefined, songCount: null,
}; };
}; };
@@ -101,9 +101,11 @@ const getGenres = (
_itemType: LibraryItem.GENRE, _itemType: LibraryItem.GENRE,
_serverId: server?.id || 'unknown', _serverId: server?.id || 'unknown',
_serverType: ServerType.SUBSONIC, _serverType: ServerType.SUBSONIC,
albumCount: null,
id: genre.name, id: genre.name,
imageUrl: null, imageUrl: null,
name: genre.name, name: genre.name,
songCount: null,
})) }))
: item.genre : item.genre
? [ ? [
@@ -111,9 +113,11 @@ const getGenres = (
_itemType: LibraryItem.GENRE, _itemType: LibraryItem.GENRE,
_serverId: server?.id || 'unknown', _serverId: server?.id || 'unknown',
_serverType: ServerType.SUBSONIC, _serverType: ServerType.SUBSONIC,
albumCount: null,
id: item.genre, id: item.genre,
imageUrl: null, imageUrl: null,
name: item.genre, name: item.genre,
songCount: null,
}, },
] ]
: []; : [];
+2 -2
View File
@@ -265,11 +265,11 @@ export type Genre = {
_itemType: LibraryItem.GENRE; _itemType: LibraryItem.GENRE;
_serverId: string; _serverId: string;
_serverType: ServerType; _serverType: ServerType;
albumCount?: number; albumCount: null | number;
id: string; id: string;
imageUrl: null | string; imageUrl: null | string;
name: string; name: string;
songCount?: number; songCount: null | number;
}; };
export type GenreListArgs = BaseEndpointArgs & { query: GenreListQuery }; export type GenreListArgs = BaseEndpointArgs & { query: GenreListQuery };