support .txt

src/renderer/api/controller.ts

@@ -47,7 +47,7 @@ import type {
   SearchArgs,
   SearchResponse,
   LyricsArgs,
-  SynchronizedLyricsArray,
+  LyricsResponse,
 } from '/@/renderer/api/types';
 import { ServerType } from '/@/renderer/types';
 import { DeletePlaylistResponse, RandomSongListArgs } from './types';
@@ -78,7 +78,7 @@ export type ControllerEndpoint = Partial<{
   getFolderList: () => void;
   getFolderSongs: () => void;
   getGenreList: (args: GenreListArgs) => Promise<GenreListResponse>;
-  getLyrics: (args: LyricsArgs) => Promise<SynchronizedLyricsArray>;
+  getLyrics: (args: LyricsArgs) => Promise<LyricsResponse>;
   getMusicFolderList: (args: MusicFolderListArgs) => Promise<MusicFolderListResponse>;
   getPlaylistDetail: (args: PlaylistDetailArgs) => Promise<PlaylistDetailResponse>;
   getPlaylistList: (args: PlaylistListArgs) => Promise<PlaylistListResponse>;

src/renderer/api/jellyfin/jellyfin-controller.ts

@@ -45,7 +45,7 @@ import {
   RandomSongListResponse,
   RandomSongListArgs,
   LyricsArgs,
-  SynchronizedLyricsArray,
+  LyricsResponse,
 } from '/@/renderer/api/types';
 import { jfApiClient } from '/@/renderer/api/jellyfin/jellyfin-api';
 import { jfNormalize } from './jellyfin-normalize';
@@ -849,7 +849,7 @@ const getRandomSongList = async (args: RandomSongListArgs): Promise<RandomSongLi
   };
 };
 
-const getLyrics = async (args: LyricsArgs): Promise<SynchronizedLyricsArray> => {
+const getLyrics = async (args: LyricsArgs): Promise<LyricsResponse> => {
   const { query, apiClientProps } = args;
 
   if (!apiClientProps.server?.userId) {
@@ -867,7 +867,11 @@ const getLyrics = async (args: LyricsArgs): Promise<SynchronizedLyricsArray> =>
     throw new Error('Failed to get lyrics');
   }
 
-  return res.body.Lyrics.map((lyric) => [lyric.Start / 1e4, lyric.Text]);
+  if (res.body.Lyrics.length > 0 && res.body.Lyrics[0].Start === undefined) {
+    return res.body.Lyrics[0].Text;
+  }
+
+  return res.body.Lyrics.map((lyric) => [lyric.Start! / 1e4, lyric.Text]);
 };
 
 export const jfController = {

src/renderer/api/jellyfin/jellyfin-types.ts

@@ -632,7 +632,7 @@ const searchParameters = paginationParameters.merge(baseParameters);
 const search = z.any();
 
 const lyricText = z.object({
-  Start: z.number(),
+  Start: z.number().optional(),
   Text: z.string(),
 });
 

src/renderer/api/types.ts

@@ -1027,6 +1027,8 @@ export type LyricsArgs = {
 
 export type SynchronizedLyricsArray = Array<[number, string]>;
 
+export type LyricsResponse = SynchronizedLyricsArray | string;
+
 export const instanceOfCancellationError = (error: any) => {
   return 'revert' in error;
 };

src/renderer/features/lyrics/lyrics.tsx

@@ -9,7 +9,7 @@ import { LyricLine } from '/@/renderer/features/lyrics/lyric-line';
 import { Center, Group } from '@mantine/core';
 import { RiInformationFill } from 'react-icons/ri';
 import { TextTitle } from '/@/renderer/components';
-import { SynchronizedLyricsArray } from '/@/renderer/api/types';
+import { LyricsResponse, SynchronizedLyricsArray } from '/@/renderer/api/types';
 import { useSongLyrics } from '/@/renderer/features/lyrics/queries/lyric-query';
 
 const lyrics = isElectron() ? window.electron.lyrics : null;
@@ -25,7 +25,7 @@ export const Lyrics = () => {
 
   const [override, setOverride] = useState<string | null>(null);
   const [source, setSource] = useState<string | null>(null);
-  const [songLyrics, setSongLyrics] = useState<SynchronizedLyricsArray | string | null>(null);
+  const [songLyrics, setSongLyrics] = useState<LyricsResponse | null>(null);
 
   const remoteLyrics = useSongLyrics({
     query: { songId: currentSong?.id ?? '' },
@@ -48,7 +48,7 @@ export const Lyrics = () => {
   }, []);
 
   useEffect(() => {
-    if (currentSong && !currentSong.lyrics && !remoteLyrics.isLoading && !remoteLyrics.isSuccess) {
+    if (currentSong && !currentSong.lyrics && !remoteLyrics.isLoading && !remoteLyrics.data) {
       lyrics?.fetchLyrics(currentSong);
     }
 
@@ -56,7 +56,7 @@ export const Lyrics = () => {
 
     setOverride(null);
     setSource(null);
-  }, [currentSong, remoteLyrics.isLoading, remoteLyrics.isSuccess]);
+  }, [currentSong, remoteLyrics.isLoading, remoteLyrics.data]);
 
   useEffect(() => {
     let lyrics: string | null = null;
@@ -67,9 +67,10 @@ export const Lyrics = () => {
       setSource(currentServer?.name ?? 'music server');
     } else if (override) {
       lyrics = override;
-    } else if (remoteLyrics.isSuccess) {
+    } else if (remoteLyrics.data) {
+      console.log(remoteLyrics.data);
       setSource(currentServer?.name ?? 'music server');
-      setSongLyrics(remoteLyrics.data!);
+      setSongLyrics(remoteLyrics.data);
       return;
     }
 
@@ -96,7 +97,7 @@ export const Lyrics = () => {
     } else {
       setSongLyrics(null);
     }
-  }, [currentServer?.name, currentSong, override, remoteLyrics.data, remoteLyrics.isSuccess]);
+  }, [currentServer?.name, currentSong, override, remoteLyrics.data]);
 
   return (
     <ErrorBoundary FallbackComponent={ErrorFallback}>