address changes

jeffvli · Feb 14, 2024 · 819fea5 · 819fea5
1 parent 634dd19
commit 819fea5
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/src/renderer/api/jellyfin/jellyfin-controller.ts b/src/renderer/api/jellyfin/jellyfin-controller.ts
@@ -954,7 +954,7 @@ const getServerInfo = async (args: ServerInfoArgs): Promise<ServerInfo> => {
     const res = await jfApiClient(apiClientProps).getServerInfo();
 
     if (res.status !== 200) {
-        throw new Error('Failed to get song detail');
+        throw new Error('Failed to get server info');
     }
 
     return { id: apiClientProps.server?.id, version: res.body.Version };

diff --git a/src/renderer/api/subsonic/subsonic-controller.ts b/src/renderer/api/subsonic/subsonic-controller.ts
@@ -411,7 +411,7 @@ export const getStructuredLyrics = async (
     });
 
     if (res.status !== 200) {
-        throw new Error('Failed to get server extensions');
+        throw new Error('Failed to get structured lyrics');
     }
 
     const lyrics = res.body.lyricsList?.structuredLyrics;

diff --git a/src/renderer/features/lyrics/lyrics-actions.tsx b/src/renderer/features/lyrics/lyrics-actions.tsx
@@ -1,4 +1,4 @@
-import { Box, Group } from '@mantine/core';
+import { Box, Center, Group, Select, SelectItem } from '@mantine/core';
 import isElectron from 'is-electron';
 import { useTranslation } from 'react-i18next';
 import { RiAddFill, RiSubtractFill } from 'react-icons/ri';
@@ -13,15 +13,22 @@ import {
 } from '/@/renderer/store';
 
 interface LyricsActionsProps {
+    index: number;
+    languages: SelectItem[];
+
     onRemoveLyric: () => void;
     onResetLyric: () => void;
     onSearchOverride: (params: LyricsOverride) => void;
+    setIndex: (idx: number) => void;
 }
 
 export const LyricsActions = ({
+    index,
+    languages,
     onRemoveLyric,
     onResetLyric,
     onSearchOverride,
+    setIndex,
 }: LyricsActionsProps) => {
     const { t } = useTranslation();
     const currentSong = useCurrentSong();
@@ -42,6 +49,18 @@ export const LyricsActions = ({
 
     return (
         <Box style={{ position: 'relative', width: '100%' }}>
+            {languages.length > 1 && (
+                <Center>
+                    <Select
+                        clearable={false}
+                        data={languages}
+                        style={{ bottom: 30, position: 'absolute' }}
+                        value={index.toString()}
+                        onChange={(value) => setIndex(parseInt(value!, 10))}
+                    />
+                </Center>
+            )}
+
             <Group position="center">
                 {isDesktop && sources.length ? (
                     <Button

diff --git a/src/renderer/features/lyrics/lyrics.tsx b/src/renderer/features/lyrics/lyrics.tsx
@@ -6,7 +6,7 @@ import { RiInformationFill } from 'react-icons/ri';
 import styled from 'styled-components';
 import { useSongLyricsByRemoteId, useSongLyricsBySong } from './queries/lyric-query';
 import { SynchronizedLyrics, SynchronizedLyricsProps } from './synchronized-lyrics';
-import { Select, Spinner, TextTitle } from '/@/renderer/components';
+import { Spinner, TextTitle } from '/@/renderer/components';
 import { ErrorFallback } from '/@/renderer/features/action-required';
 import {
     UnsynchronizedLyrics,
@@ -214,17 +214,10 @@ export const Lyrics = () => {
                     </AnimatePresence>
                 )}
                 <ActionsContainer>
-                    {languages.length > 1 && (
-                        <Select
-                            clearable={false}
-                            data={languages}
-                            style={{ bottom: 50, position: 'absolute' }}
-                            value={index.toString()}
-                            onChange={(value) => setIndex(parseInt(value!, 10))}
-                        />
-                    )}
-
                     <LyricsActions
+                        index={index}
+                        languages={languages}
+                        setIndex={setIndex}
                         onRemoveLyric={handleOnRemoveLyric}
                         onResetLyric={handleOnResetLyric}
                         onSearchOverride={handleOnSearchOverride}