mirror of
https://github.com/Psychotoxical/psysonic.git
synced 2026-07-22 07:15:47 +00:00
6f8dd73448
Four-cut cluster closing out the NowPlaying decomposition. 715 → 391 LOC (−324). TourCard — Bandsintown tour-dates card with the privacy-prompt gate (shown before the user opts in), loading state, empty state, 5-item show-more list with date / venue / place, and the "Tour data via Bandsintown" credit footer. DiscographyCard — chronological album grid (10×2 = 20 tiles initial, show-more for the rest), each tile a cached cover-art thumbnail with a tooltip and click-through to the album page. useNowPlayingFetchers — the eight cached fetch effects that drove the page: song meta / artist info / album / top songs / Bandsintown tour events (+ loading state) / discography / Last.fm track stats / Last.fm artist stats. Each effect follows the same pattern (cache hit → seed state, cache miss → fetch + setCache + setState, cancellation flag on cleanup). All eight makeCache<…> instances move into the hook module too. useNowPlayingStarLove — local starred + lfmLoved booleans seeded from songMeta.starred and lfmTrack.userLoved respectively, plus toggleStar (star/unstar Subsonic API) and toggleLfmLove (lastfmLove/Unlove with the session key). NowPlaying drops the now-unused imports: star/unstar (Subsonic), getArtist/getArtistInfo/getTopSongs/getSong/getAlbum, the entire '../api/lastfm' line, fetchBandsintownEvents + BandsintownEvent, makeCache (was passing through to the page only for cache instantiation), plus SubsonicAlbum (only the type is still used inside the hook). The radio + dashboard JSX in the body still references everything via the hook returns. Pure code move otherwise.
156 lines
7.8 KiB
TypeScript
156 lines
7.8 KiB
TypeScript
import { useEffect, useState } from 'react';
|
|
import { getArtist, getArtistInfo, getTopSongs } from '../api/subsonicArtists';
|
|
import { getAlbum, getSong } from '../api/subsonicLibrary';
|
|
import type { SubsonicAlbum, SubsonicArtistInfo, SubsonicSong } from '../api/subsonicTypes';
|
|
import { fetchBandsintownEvents, type BandsintownEvent } from '../api/bandsintown';
|
|
import {
|
|
lastfmGetArtistStats, lastfmGetTrackInfo, lastfmIsConfigured,
|
|
type LastfmArtistStats, type LastfmTrackInfo,
|
|
} from '../api/lastfm';
|
|
import { makeCache } from '../utils/nowPlayingCache';
|
|
|
|
// Module-level TTL caches (shared across mounts)
|
|
const songMetaCache = makeCache<SubsonicSong | null>();
|
|
const artistInfoCache = makeCache<SubsonicArtistInfo | null>();
|
|
const albumCache = makeCache<{ album: SubsonicAlbum; songs: SubsonicSong[] } | null>();
|
|
const topSongsCache = makeCache<SubsonicSong[]>();
|
|
const tourCache = makeCache<BandsintownEvent[]>();
|
|
const discographyCache = makeCache<SubsonicAlbum[]>();
|
|
const lfmTrackCache = makeCache<LastfmTrackInfo | null>();
|
|
const lfmArtistCache = makeCache<LastfmArtistStats | null>();
|
|
|
|
export interface NowPlayingFetchersDeps {
|
|
songId: string | undefined;
|
|
artistId: string | undefined;
|
|
albumId: string | undefined;
|
|
artistName: string;
|
|
enableBandsintown: boolean;
|
|
audiomuseNavidromeEnabled: boolean;
|
|
lastfmUsername: string;
|
|
currentTrack: { artist: string; title: string } | null;
|
|
}
|
|
|
|
export interface NowPlayingFetchersResult {
|
|
songMeta: SubsonicSong | null;
|
|
artistInfo: SubsonicArtistInfo | null;
|
|
albumData: { album: SubsonicAlbum; songs: SubsonicSong[] } | null;
|
|
topSongs: SubsonicSong[];
|
|
tourEvents: BandsintownEvent[];
|
|
tourLoading: boolean;
|
|
discography: SubsonicAlbum[];
|
|
lfmTrack: LastfmTrackInfo | null;
|
|
lfmArtist: LastfmArtistStats | null;
|
|
}
|
|
|
|
export function useNowPlayingFetchers(deps: NowPlayingFetchersDeps): NowPlayingFetchersResult {
|
|
const { songId, artistId, albumId, artistName, enableBandsintown, audiomuseNavidromeEnabled, lastfmUsername, currentTrack } = deps;
|
|
|
|
// Entity state, seeded from TTL cache so same-artist song switches are instant
|
|
const [songMeta, setSongMeta] = useState<SubsonicSong | null>(() => songId ? songMetaCache.get(songId) ?? null : null);
|
|
const [artistInfo, setArtistInfo] = useState<SubsonicArtistInfo | null>(() => artistId ? artistInfoCache.get(artistId) ?? null : null);
|
|
const [albumData, setAlbumData] = useState<{ album: SubsonicAlbum; songs: SubsonicSong[] } | null>(() => albumId ? albumCache.get(albumId) ?? null : null);
|
|
const [topSongs, setTopSongs] = useState<SubsonicSong[]>(() => artistName ? topSongsCache.get(artistName) ?? [] : []);
|
|
const [tourEvents, setTourEvents] = useState<BandsintownEvent[]>(() => artistName ? tourCache.get(artistName) ?? [] : []);
|
|
const [tourLoading, setTourLoading] = useState(false);
|
|
const [discography, setDiscography] = useState<SubsonicAlbum[]>(() => artistId ? discographyCache.get(artistId) ?? [] : []);
|
|
const [lfmTrack, setLfmTrack] = useState<LastfmTrackInfo | null>(null);
|
|
const [lfmArtist, setLfmArtist] = useState<LastfmArtistStats | null>(null);
|
|
|
|
// Fetch batch per entity change (not per song switch — same-artist songs share artist/top/tour fetches)
|
|
useEffect(() => {
|
|
if (!songId) { setSongMeta(null); return; }
|
|
const cached = songMetaCache.get(songId);
|
|
if (cached !== undefined) { setSongMeta(cached); return; }
|
|
let cancelled = false;
|
|
getSong(songId)
|
|
.then(v => { if (!cancelled) { songMetaCache.set(songId, v ?? null); setSongMeta(v ?? null); } })
|
|
.catch(() => { if (!cancelled) { songMetaCache.set(songId, null); setSongMeta(null); } });
|
|
return () => { cancelled = true; };
|
|
}, [songId]);
|
|
|
|
useEffect(() => {
|
|
if (!artistId) { setArtistInfo(null); return; }
|
|
const cached = artistInfoCache.get(artistId);
|
|
if (cached !== undefined) { setArtistInfo(cached); return; }
|
|
let cancelled = false;
|
|
getArtistInfo(artistId, { similarArtistCount: audiomuseNavidromeEnabled ? 24 : undefined })
|
|
.then(v => { if (!cancelled) { artistInfoCache.set(artistId, v ?? null); setArtistInfo(v ?? null); } })
|
|
.catch(() => { if (!cancelled) { artistInfoCache.set(artistId, null); setArtistInfo(null); } });
|
|
return () => { cancelled = true; };
|
|
}, [artistId, audiomuseNavidromeEnabled]);
|
|
|
|
useEffect(() => {
|
|
if (!albumId) { setAlbumData(null); return; }
|
|
const cached = albumCache.get(albumId);
|
|
if (cached !== undefined) { setAlbumData(cached); return; }
|
|
let cancelled = false;
|
|
getAlbum(albumId)
|
|
.then(v => { if (!cancelled) { albumCache.set(albumId, v); setAlbumData(v); } })
|
|
.catch(() => { if (!cancelled) { albumCache.set(albumId, null); setAlbumData(null); } });
|
|
return () => { cancelled = true; };
|
|
}, [albumId]);
|
|
|
|
useEffect(() => {
|
|
if (!artistName) { setTopSongs([]); return; }
|
|
const cached = topSongsCache.get(artistName);
|
|
if (cached !== undefined) { setTopSongs(cached); return; }
|
|
let cancelled = false;
|
|
getTopSongs(artistName)
|
|
.then(v => { if (!cancelled) { topSongsCache.set(artistName, v); setTopSongs(v); } })
|
|
.catch(() => { if (!cancelled) { topSongsCache.set(artistName, []); setTopSongs([]); } });
|
|
return () => { cancelled = true; };
|
|
}, [artistName]);
|
|
|
|
useEffect(() => {
|
|
if (!enableBandsintown || !artistName) { setTourEvents([]); return; }
|
|
const cached = tourCache.get(artistName);
|
|
if (cached !== undefined) { setTourEvents(cached); setTourLoading(false); return; }
|
|
let cancelled = false;
|
|
setTourLoading(true);
|
|
fetchBandsintownEvents(artistName)
|
|
.then(v => { if (!cancelled) { tourCache.set(artistName, v); setTourEvents(v); } })
|
|
.finally(() => { if (!cancelled) setTourLoading(false); });
|
|
return () => { cancelled = true; };
|
|
}, [enableBandsintown, artistName]);
|
|
|
|
// Discography via getArtist
|
|
useEffect(() => {
|
|
if (!artistId) { setDiscography([]); return; }
|
|
const cached = discographyCache.get(artistId);
|
|
if (cached !== undefined) { setDiscography(cached); return; }
|
|
let cancelled = false;
|
|
getArtist(artistId)
|
|
.then(v => { if (!cancelled) { discographyCache.set(artistId, v.albums); setDiscography(v.albums); } })
|
|
.catch(() => { if (!cancelled) { discographyCache.set(artistId, []); setDiscography([]); } });
|
|
return () => { cancelled = true; };
|
|
}, [artistId]);
|
|
|
|
// Last.fm track info (per-track)
|
|
const lfmTrackKey = currentTrack ? `${currentTrack.artist} ${currentTrack.title} ${lastfmUsername}` : '';
|
|
useEffect(() => {
|
|
if (!lastfmIsConfigured() || !currentTrack) { setLfmTrack(null); return; }
|
|
const cached = lfmTrackCache.get(lfmTrackKey);
|
|
if (cached !== undefined) { setLfmTrack(cached); return; }
|
|
let cancelled = false;
|
|
lastfmGetTrackInfo(currentTrack.artist, currentTrack.title, lastfmUsername || undefined)
|
|
.then(v => { if (!cancelled) { lfmTrackCache.set(lfmTrackKey, v); setLfmTrack(v); } })
|
|
.catch(() => { if (!cancelled) { lfmTrackCache.set(lfmTrackKey, null); setLfmTrack(null); } });
|
|
return () => { cancelled = true; };
|
|
}, [lfmTrackKey, currentTrack, lastfmUsername]);
|
|
|
|
// Last.fm artist stats (per-artist — shared across same-artist tracks)
|
|
const lfmArtistKey = artistName ? `${artistName} ${lastfmUsername}` : '';
|
|
useEffect(() => {
|
|
if (!lastfmIsConfigured() || !artistName) { setLfmArtist(null); return; }
|
|
const cached = lfmArtistCache.get(lfmArtistKey);
|
|
if (cached !== undefined) { setLfmArtist(cached); return; }
|
|
let cancelled = false;
|
|
lastfmGetArtistStats(artistName, lastfmUsername || undefined)
|
|
.then(v => { if (!cancelled) { lfmArtistCache.set(lfmArtistKey, v); setLfmArtist(v); } })
|
|
.catch(() => { if (!cancelled) { lfmArtistCache.set(lfmArtistKey, null); setLfmArtist(null); } });
|
|
return () => { cancelled = true; };
|
|
}, [lfmArtistKey, artistName, lastfmUsername]);
|
|
|
|
return { songMeta, artistInfo, albumData, topSongs, tourEvents, tourLoading, discography, lfmTrack, lfmArtist };
|
|
}
|