fix all imports for new structure

src/main/features/core/lyrics/index.ts

@@ -1,6 +1,6 @@
 import { ipcMain } from 'electron';
 
-import { store } from '../settings/index';
+import { store } from '../settings';
 import {
     getLyricsBySongId as getGenius,
     query as queryGenius,
@@ -17,6 +17,8 @@ import {
     getSearchResults as searchNetease,
 } from './netease';
 
+import { Song } from '/@/shared/types/domain-types';
+
 export enum LyricSource {
     GENIUS = 'Genius',
     LRCLIB = 'lrclib.net',
@@ -94,10 +96,10 @@ const MAX_CACHED_ITEMS = 10;
 
 const lyricCache = new Map<string, CachedLyrics>();
 
-const getRemoteLyrics = async (song: any) => {
+const getRemoteLyrics = async (song: Song) => {
     const sources = store.get('lyrics', []) as LyricSource[];
 
-    const cached = lyricCache.get(song.id);
+    const cached = lyricCache.get(song.id.toString());
 
     if (cached) {
         for (const source of sources) {
@@ -106,16 +108,16 @@ const getRemoteLyrics = async (song: any) => {
         }
     }
 
-    let lyricsFromSource = null;
+    let lyricsFromSource: InternetProviderLyricResponse | null = null;
 
     for (const source of sources) {
         const params = {
             album: song.album || song.name,
-            artist: song.artistName,
+            artist: song.artists[0].name,
             duration: song.duration / 1000.0,
             name: song.name,
         };
-        const response = await FETCHERS[source](params);
+        const response = await FETCHERS[source](params as unknown as LyricSearchQuery);
 
         if (response) {
             const newResult = cached
@@ -127,10 +129,12 @@ const getRemoteLyrics = async (song: any) => {
 
             if (lyricCache.size === MAX_CACHED_ITEMS && cached === undefined) {
                 const toRemove = lyricCache.keys().next().value;
-                lyricCache.delete(toRemove);
+                if (toRemove) {
+                    lyricCache.delete(toRemove);
+                }
             }
 
-            lyricCache.set(song.id, newResult);
+            lyricCache.set(song.id.toString(), newResult);
 
             lyricsFromSource = response;
             break;

src/main/features/core/lyrics/netease.ts

@@ -13,37 +13,6 @@ const LYRICS_URL = 'https://music.163.com/api/song/lyric';
 
 // Adapted from https://github.com/NyaomiDEV/Sunamu/blob/master/src/main/lyricproviders/netease.ts
 
-export interface Album {
-    artist: Artist;
-    copyrightId: number;
-    id: number;
-    mark: number;
-    name: string;
-    picId: number;
-    publishTime: number;
-    size: number;
-    status: number;
-    transNames?: string[];
-}
-
-export interface Artist {
-    albumSize: number;
-    alias: any[];
-    fansGroup: null;
-    id: number;
-    img1v1: number;
-    img1v1Url: string;
-    name: string;
-    picId: number;
-    picUrl: null;
-    trans: null;
-}
-
-export interface NetEaseResponse {
-    code: number;
-    result: Result;
-}
-
 export interface Result {
     hasMore: boolean;
     songCount: number;
@@ -68,6 +37,37 @@ export interface Song {
     transNames?: string[];
 }
 
+interface Album {
+    artist: Artist;
+    copyrightId: number;
+    id: number;
+    mark: number;
+    name: string;
+    picId: number;
+    publishTime: number;
+    size: number;
+    status: number;
+    transNames?: string[];
+}
+
+interface Artist {
+    albumSize: number;
+    alias: any[];
+    fansGroup: null;
+    id: number;
+    img1v1: number;
+    img1v1Url: string;
+    name: string;
+    picId: number;
+    picUrl: null;
+    trans: null;
+}
+
+interface NetEaseResponse {
+    code: number;
+    result: Result;
+}
+
 export async function getLyricsBySongId(songId: string): Promise<null | string> {
     let result: AxiosResponse<any, any>;
     try {

src/main/features/core/lyrics/shared.ts

@@ -3,7 +3,7 @@ import Fuse from 'fuse.js';
 import {
     InternetProviderLyricSearchResponse,
     LyricSearchQuery,
-} from '../../../../renderer/api/types';
+} from '/@/shared/types/domain-types';
 
 export const orderSearchResults = (args: {
     params: LyricSearchQuery;