vanja/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2026-06-16 16:34:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

use batched fetching for nd song list

Browse Source 
- albumIds get culled from query parameters after a certain number, resulting in not all items fetched
This commit is contained in:
jeffvli
2026-03-11 20:46:49 -07:00
parent d78ea440cc
commit 5b4da3bc29
1 changed files with 65 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/api/navidrome/navidrome-controller.ts
+65 -33
View File
@@ -744,46 +744,78 @@ export const NavidromeController: InternalControllerEndpoint = {
args.context?.pathReplaceWith, args.context?.pathReplaceWith,
); );
}, },
getSongList: async (args) => { getSongList: async (args) => {
const { apiClientProps, query } = args; const { apiClientProps, query } = args;
const res = await ndApiClient(apiClientProps).getSongList({ const ALBUM_IDS_BATCH_SIZE = 500;
query: { const albumIds = query.albumIds;
_end: query.startIndex + (query.limit || -1), const shouldBatch = albumIds && albumIds.length > ALBUM_IDS_BATCH_SIZE;
_order: sortOrderMap.navidrome[query.sortOrder],
_sort: songListSortMap.navidrome[query.sortBy],
_start: query.startIndex,
album_id: query.albumIds,
genre_id: query.genreIds,
[getArtistSongKey(apiClientProps.server)]: query.artistIds ?? query.albumArtistIds,
...(hasFeature(apiClientProps.server, ServerFeature.TRACK_YES_NO_RATING_FILTER) &&
query.hasRating !== undefined
? { has_rating: query.hasRating }
: {}),
library_id: getLibraryId(query.musicFolderId),
starred: query.favorite,
title: query.searchTerm,
year: query.maxYear || query.minYear,
...query._custom,
...excludeMissing(apiClientProps.server),
},
});
if (res.status !== 200) { const fetchAlbums = async (albumIdBatch: string[] | undefined) => {
throw new Error('Failed to get song list'); const res = await ndApiClient(apiClientProps).getSongList({
query: {
_end: query.startIndex + (query.limit || -1),
_order: sortOrderMap.navidrome[query.sortOrder],
_sort: songListSortMap.navidrome[query.sortBy],
_start: query.startIndex,
album_id: albumIdBatch ?? query.albumIds,
genre_id: query.genreIds,
[getArtistSongKey(apiClientProps.server)]:
query.artistIds ?? query.albumArtistIds,
...(hasFeature(
apiClientProps.server,
ServerFeature.TRACK_YES_NO_RATING_FILTER,
) && query.hasRating !== undefined
? { has_rating: query.hasRating }
: {}),
library_id: getLibraryId(query.musicFolderId),
starred: query.favorite,
title: query.searchTerm,
year: query.maxYear || query.minYear,
...query._custom,
...excludeMissing(apiClientProps.server),
},
});
if (res.status !== 200) {
throw new Error('Failed to get song list');
}
return {
items: res.body.data.map((song) =>
ndNormalize.song(
song,
apiClientProps.server,
args.context?.pathReplace,
args.context?.pathReplaceWith,
),
),
totalRecordCount: Number(res.body.headers.get('x-total-count') || 0),
};
};
if (shouldBatch && albumIds) {
const batches: string[][] = [];
for (let i = 0; i < albumIds.length; i += ALBUM_IDS_BATCH_SIZE) {
batches.push(albumIds.slice(i, i + ALBUM_IDS_BATCH_SIZE));
}
const results = await Promise.all(batches.map((batch) => fetchAlbums(batch)));
return {
items: results.flatMap((r) => r.items),
startIndex: query?.startIndex ?? 0,
totalRecordCount: results.reduce((sum, r) => sum + r.totalRecordCount, 0),
};
} }
const albums = await fetchAlbums(undefined);
return { return {
items: res.body.data.map((song) => items: albums.items,
ndNormalize.song( startIndex: query?.startIndex ?? 0,
song, totalRecordCount: albums.totalRecordCount,
apiClientProps.server,
args.context?.pathReplace,
args.context?.pathReplaceWith,
),
),
startIndex: query?.startIndex || 0,
totalRecordCount: Number(res.body.headers.get('x-total-count') || 0),
}; };
}, },
getSongListCount: async ({ apiClientProps, query }) => getSongListCount: async ({ apiClientProps, query }) =>