Files
Psychotoxical-psysonic/src/cover/resolveEntry.ts
T
cucadmuh 42aec6720c fix(cover): stop per-song over-fetch + log failed cover downloads (#944)
* fix(cover): stop per-song cover over-fetch (album/mf-* explosion)

album_has_distinct_disc_covers returned true as soon as two tracks on the same
disc had different cover ids. On Navidrome every song has its own mf-<id>
coverArt, so almost every album was flagged "distinct disc covers" and backfill
warmed one cover per track (~520k for ~170k tracks), filling album/ with mf-*
dirs instead of ~one cover per album.

Treat a release as having distinct disc covers only when each disc has a single
consistent cover that differs across discs (genuine box set); per-song ids now
collapse to one cover per album. Mirror the same fix in the TS
albumHasDistinctDiscCovers used by on-demand warming. Adds regression tests on
both sides.

* docs(changelog): record per-song cover over-fetch fix (PR #944)

Give the album/mf-* over-fetch fix its own [1.47.0] Fixed entry and a
settingsCredits line under PR #944.

* feat(cover): log failed cover downloads with album/artist name

A non-200 (or network-failed) getCoverArt download was swallowed silently. Now
the failure is logged with the resolved album/artist name and the server error,
so a server refusing covers under backfill load (5xx/429/timeouts) is visible.

- cover_resolve: describe_cover_entity() resolves a human label from the local
  index (album "Name" — Artist / artist "Name"), best-effort with id fallback.
- cover_cache: log_cover_fetch_failure() in ensure_inner logs on the download
  error path; threads optional library_server_id through CoverCacheEnsureArgs so
  the name lookup happens only on failure. Backfill logs at normal level,
  on-demand misses at debug level.
2026-06-02 10:58:39 +03:00

147 lines
5.2 KiB
TypeScript

/**
* Single source of truth for cover cache keys and HTTP fetch ids.
*
* Entities: **artist**, **album**, **track-on-album** (track art is always album-scoped
* unless the album has distinct per-CD covers).
*
* Disk path shape is Rust-only (`psysonic_core::cover_cache_layout`); this module must
* stay in sync with `resolve_album_cover` / `resolve_artist_cover` there.
*/
import type { SubsonicAlbum, SubsonicSong } from '../api/subsonicTypes';
import type { CoverArtRef, CoverCacheKind, CoverServerScope } from './types';
/** Resolved cover identity — maps 1:1 to Rust `CoverEntry`. */
export type CoverEntry = {
cacheKind: CoverCacheKind;
cacheEntityId: string;
fetchCoverArtId: string;
};
export type CoverArtResolvableSong = Pick<SubsonicSong, 'id' | 'coverArt'> & {
albumId?: string | null;
};
/** Navidrome `getCoverArt` id for a song row (ignores echo of track id with no art). */
export function resolveSongFetchCoverArtId(song: CoverArtResolvableSong): string | undefined {
const albumId = song.albumId?.trim();
const cover = song.coverArt?.trim();
const songId = song.id?.trim();
if (cover && (!songId || cover !== songId)) return cover;
if (albumId) return albumId;
if (cover) return cover;
return undefined;
}
/**
* True only for genuine per-disc artwork: a multi-disc release where each disc
* has ONE consistent cover and those covers differ between discs (e.g. a box
* set). It must NOT be tripped by per-song cover ids — Navidrome (and other
* OpenSubsonic servers) give every track its own `mf-<id>` coverArt, so a disc
* whose tracks carry many different ids is per-song art, not per-disc art, and
* treating it as distinct would warm one cover per track instead of per album.
*
* Mirrors `album_has_distinct_disc_covers` in `psysonic-library/cover_resolve.rs`.
*/
export function albumHasDistinctDiscCovers(
songs: ReadonlyArray<Pick<SubsonicSong, 'discNumber' | 'coverArt' | 'id' | 'albumId'>>,
): boolean {
const artByDisc = new Map<number, Set<string>>();
for (const song of songs) {
const disc = song.discNumber ?? 1;
const artId = resolveSongFetchCoverArtId(song);
if (!artId) continue;
let set = artByDisc.get(disc);
if (!set) {
set = new Set<string>();
artByDisc.set(disc, set);
}
set.add(artId);
}
if (artByDisc.size <= 1) return false;
const discCovers = new Set<string>();
for (const covers of artByDisc.values()) {
// Tracks within a disc disagree → per-song ids, not a shared disc cover.
if (covers.size !== 1) return false;
for (const cover of covers) discCovers.add(cover);
}
return discCovers.size > 1;
}
/** Album entity — one cache slot per album unless `distinctDiscCovers`. */
export function resolveAlbumCoverEntry(
albumId: string,
coverArtId?: string | null,
distinctDiscCovers = false,
): CoverEntry | undefined {
const album = albumId.trim();
if (!album) return undefined;
const fetch = (coverArtId?.trim() || album);
const cacheEntityId =
distinctDiscCovers && fetch !== album ? fetch : album;
return { cacheKind: 'album', cacheEntityId, fetchCoverArtId: fetch };
}
/** Artist entity — one cache slot per artist. */
export function resolveArtistCoverEntry(
artistId: string,
coverArtId?: string | null,
): CoverEntry | undefined {
const artist = artistId.trim();
if (!artist) return undefined;
const fetch = coverArtId?.trim() || artist;
return { cacheKind: 'artist', cacheEntityId: artist, fetchCoverArtId: fetch };
}
/** Track on an album — album cache by default; per-disc fetch id when `distinctDiscCovers`. */
export function resolveTrackCoverEntry(
song: Pick<SubsonicSong, 'albumId' | 'coverArt' | 'id' | 'discNumber'>,
distinctDiscCovers = false,
): CoverEntry | undefined {
const albumId = song.albumId?.trim();
if (!albumId) return undefined;
const fetch = resolveSongFetchCoverArtId(song) ?? albumId;
return resolveAlbumCoverEntry(albumId, fetch, distinctDiscCovers);
}
export function coverEntryToRef(
entry: CoverEntry,
serverScope: CoverServerScope = { kind: 'active' },
): CoverArtRef {
return {
cacheKind: entry.cacheKind,
cacheEntityId: entry.cacheEntityId,
fetchCoverArtId: entry.fetchCoverArtId,
serverScope,
};
}
/** @deprecated Alias for {@link resolveSongFetchCoverArtId}. */
export const resolveSubsonicSongCoverArtId = resolveSongFetchCoverArtId;
/** @deprecated Top tracks use album row `id` + `coverArt` like AlbumCard. */
export function resolveArtistPageSongFetchCoverArtId(
song: Pick<SubsonicSong, 'id' | 'coverArt' | 'albumId' | 'album' | 'discNumber'>,
albums: ReadonlyArray<Pick<SubsonicAlbum, 'id' | 'name' | 'coverArt'>>,
): string | undefined {
const songArt = resolveSongFetchCoverArtId(song);
const album = song.albumId
? albums.find(a => a.id === song.albumId)
: albums.find(a => a.name === song.album);
const albumCover = album?.coverArt?.trim();
const songId = song.id?.trim();
const songRowArt = song.coverArt?.trim();
const perDiscArt =
Boolean(songArt && albumCover && songArt !== albumCover)
&& Boolean(
(songRowArt && songRowArt !== songId)
|| (songArt?.startsWith('mf-') ?? false),
);
if (perDiscArt && songArt) return songArt;
if (albumCover && (!songId || albumCover !== songId)) return albumCover;
return songArt;
}