(spotify) implement limit for artist lookups

This commit is contained in:
hazycora
2023-09-17 08:47:14 -04:00
parent 0b45994b50
commit 8c03a113b6

View File

@@ -1,7 +1,6 @@
import Librespot, { LibrespotOptions } from 'librespot' import Librespot, { LibrespotOptions } from 'librespot'
import { parseArtist, parseAlbum, parseTrack } from './parse.js' import { parseArtist, parseAlbum, parseTrack } from './parse.js'
import { GetByUrlResponse, SearchResults, StreamerWithLogin } from '../../types.js' import { GetByUrlResponse, SearchResults, StreamerWithLogin } from '../../types.js'
import { SpotifyAlbum, SpotifyArtist } from 'librespot/types'
class Spotify implements StreamerWithLogin { class Spotify implements StreamerWithLogin {
client: Librespot client: Librespot
@@ -25,46 +24,51 @@ class Spotify implements StreamerWithLogin {
getTypeFromUrl(url: string) { getTypeFromUrl(url: string) {
return this.#getUrlParts(url)[0] return this.#getUrlParts(url)[0]
} }
async getByUrl(url: string): Promise<GetByUrlResponse> { async getByUrl(url: string, limit = 0): Promise<GetByUrlResponse> {
const [type, id] = this.#getUrlParts(url) const [type, id] = this.#getUrlParts(url)
if (type == 'track') {
const metadata = await this.client.get.trackMetadata(id)
return {
type,
getStream: async () => {
const streamData = await this.client.get.trackStream(id)
return {
mimeType: 'audio/ogg',
sizeBytes: streamData.sizeBytes,
stream: streamData.stream
}
},
metadata: parseTrack(metadata)
}
}
const data = await this.client.get.byUrl(url)
let metadata
switch (type) { switch (type) {
case 'artist': case 'track': {
metadata = parseArtist(<SpotifyArtist>data) const metadata = await this.client.get.trackMetadata(id)
return { return {
type, type,
metadata getStream: async () => {
const streamData = await this.client.get.trackStream(id)
return {
mimeType: 'audio/ogg',
sizeBytes: streamData.sizeBytes,
stream: streamData.stream
}
},
metadata: parseTrack(metadata)
} }
case 'album': }
metadata = parseAlbum(<SpotifyAlbum>data) case 'artist': {
if ((<SpotifyAlbum>data).tracks) { const metadata = await this.client.get.artistMetadata(id)
const albums = await this.client.get.artistAlbums(id, limit)
return {
type,
metadata: {
...parseArtist(metadata),
albums: albums.map((e) => parseAlbum(e))
}
}
}
case 'album': {
const metadata = await this.client.get.albumMetadata(id)
const tracks = await this.client.get.albumTracks(id)
if (tracks) {
return { return {
type, type,
metadata, metadata: parseAlbum(metadata),
tracks: (<SpotifyAlbum>data).tracks?.map((e) => parseTrack(e)) ?? [] tracks: tracks?.map((e) => parseTrack(e)) ?? []
} }
} }
return { return {
type, type,
metadata, metadata: parseAlbum(metadata),
tracks: [] tracks: []
} }
}
} }
} }
async search(query: string): Promise<SearchResults> { async search(query: string): Promise<SearchResults> {