refactor: displayName prop dupe

Author: Maikuh

src/fetcher.ts

@@ -91,9 +91,9 @@ async function fetchParallel(
 	const { signal } = controller
 
 	type Tagged = { task: Promise<Tagged>; attempt: Attempt }
-	let pending: Promise<Tagged>[] = entries.map(({ key, displayName }) => {
+	let pending: Promise<Tagged>[] = entries.map(({ key, fetcher }) => {
 		const p: Promise<Tagged> = fetchWithTimeout(
-			displayName,
+			fetcher.displayName,
 			key,
 			artist,
 			song,
@@ -238,7 +238,8 @@ export async function fetchLyricsController(
 	for (const key of fetcherKeys) {
 		const descriptor = SOURCE_BY_KEY.get(key)
 		if (!descriptor) continue
-		const { displayName, fetcher } = descriptor
+		const { fetcher } = descriptor
+		const { displayName } = fetcher
 		try {
 			const raw = await Promise.race<LyricResult | null>([
 				fetcher.fetch(artistName, songTitle, timestamps),

src/sources/base.ts

@@ -76,6 +76,7 @@ export function parseLrc(lrcText: string, totalDurationMs?: number): TimedLine[]
 }
 
 export interface Fetcher {
+	displayName: string
 	fetch(
 		artist: string,
 		song: string,
@@ -98,6 +99,7 @@ export interface FetcherDef {
 export function defineFetcher(def: FetcherDef): Fetcher {
 	const log = getLogger(`fetcher/${def.source}`)
 	return {
+		displayName: def.displayName,
 		async fetch(artist, song, timestamps, signal) {
 			try {
 				log.debug(`${def.displayName}: fetching '${artist} – ${song}'`)

src/sources/index.ts

@@ -11,20 +11,19 @@ import { youtubeFetcher } from './youtube'
 
 export interface SourceDescriptor {
 	key: string
-	displayName: string
 	fetcher: Fetcher
 }
 
 export const SOURCES: readonly SourceDescriptor[] = [
-	{ key: 'genius', displayName: 'Genius', fetcher: geniusFetcher },
-	{ key: 'lrclib', displayName: 'LRCLIB', fetcher: lrclibFetcher },
-	{ key: 'mxm', displayName: 'Musixmatch', fetcher: mxmFetcher },
-	{ key: 'simpmusic', displayName: 'SimpMusic', fetcher: simpmusicFetcher },
-	{ key: 'youtube', displayName: 'YouTube Music', fetcher: youtubeFetcher },
-	{ key: 'lyricsovh', displayName: 'Lyrics.ovh', fetcher: lyricsovhFetcher },
-	{ key: 'chartlyrics', displayName: 'ChartLyrics', fetcher: chartlyricsFetcher },
-	{ key: 'letras', displayName: 'Letras', fetcher: letrasFetcher },
-	{ key: 'lyricsfreek', displayName: 'LyricsFreek', fetcher: lyricsfreekFetcher },
+	{ key: 'genius', fetcher: geniusFetcher },
+	{ key: 'lrclib', fetcher: lrclibFetcher },
+	{ key: 'mxm', fetcher: mxmFetcher },
+	{ key: 'simpmusic', fetcher: simpmusicFetcher },
+	{ key: 'youtube', fetcher: youtubeFetcher },
+	{ key: 'lyricsovh', fetcher: lyricsovhFetcher },
+	{ key: 'chartlyrics', fetcher: chartlyricsFetcher },
+	{ key: 'letras', fetcher: letrasFetcher },
+	{ key: 'lyricsfreek', fetcher: lyricsfreekFetcher },
 ]
 
 export const SOURCE_BY_KEY = new Map(SOURCES.map((s) => [s.key, s]))