From d38c846e807faafb504ce9210eb8a0e755f9c4d9 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Mon, 5 Jun 2023 02:42:25 -0700
Subject: [PATCH] Update lyric fetcher return types

---
 src/main/features/core/lyrics/genius.ts                | 8 +++++---
 src/main/features/core/lyrics/netease.ts               | 8 +++++---
 src/renderer/api/types.ts                              | 3 ++-
 src/renderer/features/lyrics/synchronized-lyrics.tsx   | 2 +-
 src/renderer/features/lyrics/unsynchronized-lyrics.tsx | 2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/features/core/lyrics/genius.ts b/src/main/features/core/lyrics/genius.ts
index c5851d05..1abaa3cd 100644
--- a/src/main/features/core/lyrics/genius.ts
+++ b/src/main/features/core/lyrics/genius.ts
@@ -1,6 +1,7 @@
 import axios, { AxiosResponse } from 'axios';
 import { load } from 'cheerio';
 import type { InternetProviderLyricResponse, QueueSong } from '/@/renderer/api/types';
+import { LyricSource } from '../../../../renderer/types';
 
 const SEARCH_URL = 'https://genius.com/api/search/song';
 
@@ -8,7 +9,7 @@ const SEARCH_URL = 'https://genius.com/api/search/song';
 
 interface GeniusResponse {
   artist: string;
-  title: string;
+  name: string;
   url: string;
 }
 
@@ -34,7 +35,7 @@ async function getSongURL(metadata: QueueSong): Promise<GeniusResponse | undefin
 
   return {
     artist: hit.artist_names,
-    title: hit.full_title,
+    name: hit.full_title,
     url: hit.url,
   };
 }
@@ -76,6 +77,7 @@ export async function query(metadata: QueueSong): Promise<InternetProviderLyricR
   return {
     artist: response.artist,
     lyrics,
-    title: response.title,
+    name: response.name,
+    source: LyricSource.GENIUS,
   };
 }
diff --git a/src/main/features/core/lyrics/netease.ts b/src/main/features/core/lyrics/netease.ts
index 231cf1dc..40dd819e 100644
--- a/src/main/features/core/lyrics/netease.ts
+++ b/src/main/features/core/lyrics/netease.ts
@@ -1,5 +1,6 @@
 import axios, { AxiosResponse } from 'axios';
 import type { InternetProviderLyricResponse, QueueSong } from '/@/renderer/api/types';
+import { LyricSource } from '../../../../renderer/types';
 
 const SEARCH_URL = 'https://music.163.com/api/search/get';
 const LYRICS_URL = 'https://music.163.com/api/song/lyric';
@@ -9,7 +10,7 @@ const LYRICS_URL = 'https://music.163.com/api/song/lyric';
 interface NetEaseResponse {
   artist: string;
   id: string;
-  title: string;
+  name: string;
 }
 
 async function getSongId(metadata: QueueSong): Promise<NetEaseResponse | undefined> {
@@ -37,7 +38,7 @@ async function getSongId(metadata: QueueSong): Promise<NetEaseResponse | undefin
   return {
     artist,
     id: song.id,
-    title: song.name,
+    name: song.name,
   };
 }
 
@@ -75,6 +76,7 @@ export async function query(metadata: QueueSong): Promise<InternetProviderLyricR
   return {
     artist: response.artist,
     lyrics,
-    title: response.title,
+    name: response.name,
+    source: LyricSource.NETEASE,
   };
 }
diff --git a/src/renderer/api/types.ts b/src/renderer/api/types.ts
index 18ba6b3e..e1086131 100644
--- a/src/renderer/api/types.ts
+++ b/src/renderer/api/types.ts
@@ -1032,7 +1032,8 @@ export type LyricsResponse = SynchronizedLyricsArray | string;
 export type InternetProviderLyricResponse = {
   artist: string;
   lyrics: string;
-  title: string;
+  name: string;
+  source: string;
 };
 
 export type LyricOverride = Omit<InternetProviderLyricResponse, 'lyrics'>;
diff --git a/src/renderer/features/lyrics/synchronized-lyrics.tsx b/src/renderer/features/lyrics/synchronized-lyrics.tsx
index d7e542f4..8342b897 100644
--- a/src/renderer/features/lyrics/synchronized-lyrics.tsx
+++ b/src/renderer/features/lyrics/synchronized-lyrics.tsx
@@ -279,7 +279,7 @@ export const SynchronizedLyrics = ({
         <>
           <LyricLine
             className="lyric-credit"
-            text={`(Matched as ${override.title} by ${override.artist})`}
+            text={`(Matched as ${override.name} by ${override.artist})`}
           />
           <LyricSkip onClick={removeLyric} />
         </>
diff --git a/src/renderer/features/lyrics/unsynchronized-lyrics.tsx b/src/renderer/features/lyrics/unsynchronized-lyrics.tsx
index d5780097..8a95b6b7 100644
--- a/src/renderer/features/lyrics/unsynchronized-lyrics.tsx
+++ b/src/renderer/features/lyrics/unsynchronized-lyrics.tsx
@@ -37,7 +37,7 @@ export const UnsynchronizedLyrics = ({
         <>
           <LyricLine
             className="lyric-credit"
-            text={`(Matched as ${override.title} by ${override.artist})`}
+            text={`(Matched as ${override.name} by ${override.artist})`}
           />
           <LyricSkip onClick={onRemoveLyric} />
         </>