Query for genres

This commit is contained in:
simojenki
2021-03-07 09:14:07 +11:00
parent 1e5d020a75
commit c5a085d667
5 changed files with 157 additions and 56 deletions

View File

@@ -25,17 +25,17 @@ export type AuthFailure = {
export type ArtistSummary = {
id: string;
name: string;
image: Images
}
image: Images;
};
export type Images = {
small: string | undefined,
medium: string | undefined,
large: string | undefined,
}
small: string | undefined;
medium: string | undefined;
large: string | undefined;
};
export type Artist = ArtistSummary & {
albums: Album[]
albums: Album[];
};
export type AlbumSummary = {
@@ -43,11 +43,10 @@ export type AlbumSummary = {
name: string;
year: string | undefined;
genre: string | undefined;
}
export type Album = AlbumSummary & {
};
export type Album = AlbumSummary & {};
export type Paging = {
_index: number;
_count: number;
@@ -70,30 +69,33 @@ export const asResult = <T>([results, total]: [T[], number]) => ({
total,
});
export type ArtistQuery = Paging
export type ArtistQuery = Paging;
export type AlbumQuery = Paging & {
artistId?: string
genre?: string
}
artistId?: string;
genre?: string;
};
export const artistToArtistSummary = (
it: Artist
): ArtistSummary => ({
export const artistToArtistSummary = (it: Artist): ArtistSummary => ({
id: it.id,
name: it.name,
image: it.image,
});
export const albumToAlbumSummary = (
it: Album
): AlbumSummary => ({
export const albumToAlbumSummary = (it: Album): AlbumSummary => ({
id: it.id,
name: it.name,
year: it.year,
genre: it.genre,
});
export const range = (size: number) => [...Array(size).keys()];
export const asArtistAlbumPairs = (artists: Artist[]): [Artist, Album][] =>
artists.flatMap((artist) =>
artist.albums.map((album) => [artist, album] as [Artist, Album])
);
export interface MusicService {
generateToken(credentials: Credentials): Promise<AuthSuccess | AuthFailure>;
login(authToken: string): Promise<MusicLibrary>;
@@ -104,4 +106,5 @@ export interface MusicLibrary {
artist(id: string): Promise<Artist>;
albums(q: AlbumQuery): Promise<Result<AlbumSummary>>;
album(id: string): Promise<Album>;
genres(): Promise<string[]>;
}

View File

@@ -1,4 +1,6 @@
import { option as O } from "fp-ts";
import * as A from "fp-ts/Array";
import { ordString } from "fp-ts/lib/Ord";
import { pipe } from "fp-ts/lib/function";
import { Md5 } from "ts-md5/dist/md5";
import {
@@ -21,7 +23,6 @@ import axios from "axios";
import { Encryption } from "./encryption";
import randomString from "./random_string";
export const t = (password: string, s: string) =>
Md5.hashStr(`${password}${s}`);
@@ -75,6 +76,18 @@ export type GetAlbumListResponse = SubsonicResponse & {
};
};
export type genre = {
_songCount: string;
_albumCount: string;
__text: string;
};
export type GenGenresResponse = SubsonicResponse & {
genres: {
genre: genre[];
};
};
export type SubsonicError = SubsonicResponse & {
error: {
_code: string;
@@ -115,13 +128,13 @@ export type IdName = {
};
export type getAlbumListParams = {
type: string,
type: string;
size?: number;
offet?: number;
fromYear?: string,
toYear?: string,
genre?: string
}
fromYear?: string;
toYear?: string;
genre?: string;
};
const MAX_ALBUM_LIST = 500;
@@ -258,10 +271,15 @@ export class Navidrome implements MusicService {
albums: (q: AlbumQuery): Promise<Result<AlbumSummary>> => {
const p = pipe(
O.fromNullable(q.genre),
O.map<string, getAlbumListParams>(genre => ({ type: "byGenre", genre })),
O.getOrElse<getAlbumListParams>(() => ({ type: "alphabeticalByArtist" })),
)
O.map<string, getAlbumListParams>((genre) => ({
type: "byGenre",
genre,
})),
O.getOrElse<getAlbumListParams>(() => ({
type: "alphabeticalByArtist",
}))
);
return navidrome
.get<GetAlbumListResponse>(credentials, "/rest/getAlbumList", {
...p,
@@ -286,6 +304,14 @@ export class Navidrome implements MusicService {
album: (_: string): Promise<Album> => {
return Promise.reject("not implemented");
},
genres: () =>
navidrome
.get<GenGenresResponse>(credentials, "/rest/getGenres")
.then((it) => pipe(
it.genres.genre,
A.map(it => it.__text),
A.sort(ordString)
)),
};
return Promise.resolve(musicLibrary);