mirror of
https://github.com/austinried/subtracks.git
synced 2026-02-10 06:52:43 +01:00
remove old artistInfo
This commit is contained in:
@@ -6,13 +6,6 @@ export interface Artist {
|
||||
coverArt?: string
|
||||
}
|
||||
|
||||
export interface ArtistInfo extends Artist {
|
||||
albums: Album[]
|
||||
smallImageUrl?: string
|
||||
largeImageUrl?: string
|
||||
topSongs: Song[]
|
||||
}
|
||||
|
||||
export interface AlbumListItem {
|
||||
itemType: 'album'
|
||||
id: string
|
||||
|
||||
@@ -2,7 +2,6 @@ import {
|
||||
AlbumListItem,
|
||||
AlbumWithSongs,
|
||||
Artist,
|
||||
ArtistInfo,
|
||||
HomeLists,
|
||||
PlaylistListItem,
|
||||
PlaylistWithSongs,
|
||||
@@ -18,9 +17,6 @@ export type MusicSlice = {
|
||||
//
|
||||
// family-style state
|
||||
//
|
||||
artistInfo: { [id: string]: ArtistInfo }
|
||||
fetchArtistInfo: (id: string) => Promise<ArtistInfo | undefined>
|
||||
|
||||
albumsWithSongs: { [id: string]: AlbumWithSongs }
|
||||
fetchAlbumWithSongs: (id: string) => Promise<AlbumWithSongs | undefined>
|
||||
|
||||
@@ -60,7 +56,6 @@ export type MusicSlice = {
|
||||
}
|
||||
|
||||
export const selectMusic = {
|
||||
fetchArtistInfo: (state: Store) => state.fetchArtistInfo,
|
||||
fetchAlbumWithSongs: (state: Store) => state.fetchAlbumWithSongs,
|
||||
fetchPlaylistWithSongs: (state: Store) => state.fetchPlaylistWithSongs,
|
||||
|
||||
@@ -91,41 +86,6 @@ function reduceStarred(
|
||||
}
|
||||
|
||||
export const createMusicSlice = (set: SetState<Store>, get: GetState<Store>): MusicSlice => ({
|
||||
artistInfo: {},
|
||||
|
||||
fetchArtistInfo: async id => {
|
||||
const client = get().client
|
||||
if (!client) {
|
||||
return undefined
|
||||
}
|
||||
|
||||
try {
|
||||
const [artistResponse, artistInfoResponse] = await Promise.all([
|
||||
client.getArtist({ id }),
|
||||
client.getArtistInfo2({ id }),
|
||||
])
|
||||
const topSongsResponse = await client.getTopSongs({ artist: artistResponse.data.artist.name, count: 50 })
|
||||
const artistInfo = await get().mapArtistInfo(
|
||||
artistResponse.data,
|
||||
artistInfoResponse.data.artistInfo,
|
||||
topSongsResponse.data.songs,
|
||||
)
|
||||
|
||||
set(
|
||||
produce<MusicSlice>(state => {
|
||||
state.artistInfo[id] = artistInfo
|
||||
|
||||
state.starredSongs = reduceStarred(state.starredSongs, artistInfo.topSongs)
|
||||
state.starredArtists = reduceStarred(state.starredArtists, [artistInfo])
|
||||
state.starredAlbums = reduceStarred(state.starredAlbums, artistInfo.albums)
|
||||
}),
|
||||
)
|
||||
return artistInfo
|
||||
} catch {
|
||||
return undefined
|
||||
}
|
||||
},
|
||||
|
||||
albumsWithSongs: {},
|
||||
|
||||
fetchAlbumWithSongs: async id => {
|
||||
|
||||
@@ -1,21 +1,11 @@
|
||||
import {
|
||||
AlbumListItem,
|
||||
AlbumWithSongs,
|
||||
Artist,
|
||||
ArtistInfo,
|
||||
PlaylistListItem,
|
||||
PlaylistWithSongs,
|
||||
Song,
|
||||
} from '@app/models/music'
|
||||
import { AlbumListItem, AlbumWithSongs, Artist, PlaylistListItem, PlaylistWithSongs, Song } from '@app/models/music'
|
||||
import {
|
||||
AlbumID3Element,
|
||||
ArtistID3Element,
|
||||
ArtistInfo2Element,
|
||||
ChildElement,
|
||||
PlaylistElement,
|
||||
PlaylistWithSongsElement,
|
||||
} from '@app/subsonic/elements'
|
||||
import { GetArtistResponse } from '@app/subsonic/responses'
|
||||
import { GetState, SetState } from 'zustand'
|
||||
import { Store } from './store'
|
||||
|
||||
@@ -23,11 +13,6 @@ export type MusicMapSlice = {
|
||||
mapChildToSong: (child: ChildElement, coverArt?: string) => Promise<Song>
|
||||
mapChildrenToSongs: (children: ChildElement[], coverArt?: string) => Promise<Song[]>
|
||||
mapArtistID3toArtist: (artist: ArtistID3Element) => Artist
|
||||
mapArtistInfo: (
|
||||
artistResponse: GetArtistResponse,
|
||||
info: ArtistInfo2Element,
|
||||
topSongs: ChildElement[],
|
||||
) => Promise<ArtistInfo>
|
||||
mapAlbumID3toAlbumListItem: (album: AlbumID3Element) => AlbumListItem
|
||||
mapAlbumID3toAlbum: (album: AlbumID3Element) => AlbumListItem
|
||||
mapAlbumID3WithSongstoAlbumWithSongs: (album: AlbumID3Element, songs: ChildElement[]) => Promise<AlbumWithSongs>
|
||||
@@ -81,20 +66,6 @@ export const createMusicMapSlice = (set: SetState<Store>, get: GetState<Store>):
|
||||
}
|
||||
},
|
||||
|
||||
mapArtistInfo: async (artistResponse, info, topSongs) => {
|
||||
const { artist, albums } = artistResponse
|
||||
|
||||
const mappedAlbums = albums.map(get().mapAlbumID3toAlbum)
|
||||
|
||||
return {
|
||||
...get().mapArtistID3toArtist(artist),
|
||||
albums: mappedAlbums,
|
||||
smallImageUrl: info.smallImageUrl,
|
||||
largeImageUrl: info.largeImageUrl,
|
||||
topSongs: (await get().mapChildrenToSongs(topSongs)).slice(0, 5),
|
||||
}
|
||||
},
|
||||
|
||||
mapAlbumID3toAlbumListItem: album => {
|
||||
return {
|
||||
itemType: 'album',
|
||||
|
||||
Reference in New Issue
Block a user