pogmommy/feishin
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add ND playlist song type

Browse source
This commit is contained in:
jeffvli 2022-12-31 20:08:39 -08:00
parent 5cef23944f
commit 78a30c2db4
2 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/renderer/api/navidrome.api.ts
View file

@ -34,6 +34,9 @@ import type {
NDPlaylist, NDPlaylist,
NDUpdatePlaylistParams, NDUpdatePlaylistParams,
NDUpdatePlaylistResponse, NDUpdatePlaylistResponse,
NDPlaylistSongListResponse,
NDPlaylistSongList,
NDPlaylistSong,
} from '/@/renderer/api/navidrome.types'; } from '/@/renderer/api/navidrome.types';
import { NDPlaylistListSort, NDSongListSort, NDSortOrder } from '/@/renderer/api/navidrome.types'; import { NDPlaylistListSort, NDSongListSort, NDSortOrder } from '/@/renderer/api/navidrome.types';
import type { import type {
@ -391,7 +394,7 @@ const getPlaylistDetail = async (args: PlaylistDetailArgs): Promise<NDPlaylistDe
return data; return data;
}; };
const getPlaylistSongList = async (args: PlaylistSongListArgs): Promise<NDSongList> => { const getPlaylistSongList = async (args: PlaylistSongListArgs): Promise<NDPlaylistSongList> => {
const { query, server, signal } = args; const { query, server, signal } = args;
const searchParams: NDSongListParams & { playlist_id: string } = { const searchParams: NDSongListParams & { playlist_id: string } = {
@ -409,7 +412,7 @@ const getPlaylistSongList = async (args: PlaylistSongListArgs): Promise<NDSongLi
signal, signal,
}); });
const data = await res.json<NDSongListResponse>(); const data = await res.json<NDPlaylistSongListResponse>();
const itemCount = res.headers.get('x-total-count'); const itemCount = res.headers.get('x-total-count');
return { return {
@ -442,7 +445,7 @@ const getCoverArtUrl = (args: {
}; };
const normalizeSong = ( const normalizeSong = (
item: NDSong, item: NDSong | NDPlaylistSong,
server: ServerListItem, server: ServerListItem,
deviceId: string, deviceId: string,
imageSize?: number, imageSize?: number,
@ -453,6 +456,14 @@ const normalizeSong = (
credential: server.credential, credential: server.credential,
size: imageSize || 300, size: imageSize || 300,
}); });
let id;
// Dynamically determine the id field based on whether or not the item is a playlist song
if ('mediaFileId' in item) {
id = item.mediaFileId;
} else {
id = item.id;
}
return { return {
album: item.album, album: item.album,
@ -469,7 +480,7 @@ const normalizeSong = (
discNumber: item.discNumber, discNumber: item.discNumber,
duration: item.duration, duration: item.duration,
genres: item.genres, genres: item.genres,
id: item.id, id,
imageUrl, imageUrl,
isFavorite: item.starred, isFavorite: item.starred,
lastPlayedAt: item.playDate ? item.playDate : null, lastPlayedAt: item.playDate ? item.playDate : null,
@ -481,7 +492,7 @@ const normalizeSong = (
releaseYear: String(item.year), releaseYear: String(item.year),
serverId: server.id, serverId: server.id,
size: item.size, size: item.size,
streamUrl: `${server.url}/rest/stream.view?id=${item.id}&v=1.13.0&c=feishin_${deviceId}&${server.credential}`, streamUrl: `${server.url}/rest/stream.view?id=${id}&v=1.13.0&c=feishin_${deviceId}&${server.credential}`,
trackNumber: item.trackNumber, trackNumber: item.trackNumber,
type: ServerType.NAVIDROME, type: ServerType.NAVIDROME,
uniqueId: nanoid(), uniqueId: nanoid(),

13
src/renderer/api/navidrome.types.ts
View file

@ -325,3 +325,16 @@ export type NDPlaylistListParams = {
owner_id?: string; owner_id?: string;
} & NDPagination & } & NDPagination &
NDOrder; NDOrder;
export type NDPlaylistSong = NDSong & {
mediaFileId: string;
playlistId: string;
};
export type NDPlaylistSongListResponse = NDPlaylistSong[];
export type NDPlaylistSongList = {
items: NDPlaylistSong[];
startIndex: number;
totalRecordCount: number;
};