fix furigana and romaji issues (#2219)

* fix furigana romaji not displaying

* fix lyrics export crash when generation is enabled

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

@@ -35,6 +35,10 @@ const getKuroshiro = async () => {
 };
 
 export const convertFurigana = async (text: string): Promise<string> => {
+    if (typeof text !== 'string' || !text) {
+        return text;
+    }
+
     const KuroshiroClass = (Kuroshiro as any).default || Kuroshiro;
 
     // check if the text contains any Japanese kana (to distinguish Japanese from Chinese text, which shares Kanji)
@@ -51,7 +55,11 @@ export const convertFurigana = async (text: string): Promise<string> => {
 };
 
 export const convertFuriganaFragment = async (text: string): Promise<string> => {
-    if (!text || !hasJapanese(text)) {
+    if (typeof text !== 'string' || !text) {
+        return text;
+    }
+
+    if (!hasJapanese(text)) {
         return text;
     }
 
@@ -65,6 +73,10 @@ export const convertFuriganaFragment = async (text: string): Promise<string> =>
 };
 
 export const convertRomaji = async (text: string): Promise<string> => {
+    if (typeof text !== 'string' || !text) {
+        return text;
+    }
+
     const KuroshiroClass = (Kuroshiro as any).default || Kuroshiro;
 
     if (!KuroshiroClass.Util.hasKana(text)) return '';
@@ -79,7 +91,7 @@ export const convertRomaji = async (text: string): Promise<string> => {
 };
 
 export const parseLyricsTextTokens = async (text: string): Promise<LyricTextToken[]> => {
-    if (!text || !hasJapanese(text)) {
+    if (typeof text !== 'string' || !text || !hasJapanese(text)) {
         return [];
     }
 
@@ -108,6 +120,10 @@ export const parseLyricsTextTokens = async (text: string): Promise<LyricTextToke
 };
 
 export const convertRomajiTokens = async (text: string): Promise<RomajiToken[]> => {
+    if (typeof text !== 'string' || !text) {
+        return [];
+    }
+
     const KuroshiroClass = (Kuroshiro as any).default || Kuroshiro;
 
     if (!KuroshiroClass.Util.hasKana(text)) {

src/renderer/features/lyrics/components/lyrics-export-form.tsx

@@ -4,6 +4,7 @@ import { useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import i18n from '/@/i18n/i18n';
+import { normalizeLyrics } from '/@/renderer/features/lyrics/api/lyrics-utils';
 import { Button } from '/@/shared/components/button/button';
 import { Checkbox } from '/@/shared/components/checkbox/checkbox';
 import { Code } from '/@/shared/components/code/code';
@@ -31,8 +32,14 @@ export const LyricsExportForm = ({ lyrics, offsetMs, synced }: LyricsExportFormP
     });
 
     const displayedLyrics = useMemo(() => {
-        if (form.values.synced && Array.isArray(lyrics.lyrics)) {
-            const contents = lyrics.lyrics
+        if (Array.isArray(lyrics.lyrics)) {
+            const normalizedLyrics = normalizeLyrics(lyrics.lyrics);
+
+            if (!form.values.synced) {
+                return normalizedLyrics.map((lyric) => lyric.text).join('\n') + '\n';
+            }
+
+            const contents = normalizedLyrics
                 .map(
                     (lyric) =>
                         `[${formatDuration(lyric.startMs, { leading: true, ms: true })}]${lyric.text}`,
@@ -44,12 +51,9 @@ export const LyricsExportForm = ({ lyrics, offsetMs, synced }: LyricsExportFormP
 [offset:${form.values.offsetMs + (lyrics.offsetMs ?? 0)}]
 ${contents}
 `;
-        } else {
-            if (Array.isArray(lyrics.lyrics)) {
-                return lyrics.lyrics.map((lyric) => lyric.text).join('\n') + '\n';
-            }
-            return lyrics.lyrics;
         }
+
+        return lyrics.lyrics;
     }, [
         form.values.offsetMs,
         form.values.synced,

src/renderer/features/lyrics/hooks/use-furigana-lyrics.ts

@@ -7,6 +7,7 @@ import {
     LyricTextToken,
     RomajiToken,
 } from '/@/renderer/features/lyrics/api/lyric-conversion';
+import { normalizeLyrics } from '/@/renderer/features/lyrics/api/lyrics-utils';
 import { LyricsResponse, SyncedCueLine, SynchronizedLyrics } from '/@/shared/types/domain-types';
 
 const lyricsApi = isElectron() ? window.api.lyrics : null;
@@ -19,7 +20,7 @@ const convertSyncedLyricsFurigana = async (
     }
 
     return Promise.all(
-        lyrics.map(async (line) => ({
+        normalizeLyrics(lyrics).map(async (line) => ({
             ...line,
             cueLines: line.cueLines
                 ? await Promise.all(
@@ -53,7 +54,7 @@ const convertSyncedLyricsRomaji = async (
     convert: (text: string) => Promise<string>,
 ): Promise<SynchronizedLyrics> =>
     Promise.all(
-        lyrics.map(async (line) => ({
+        normalizeLyrics(lyrics).map(async (line) => ({
             ...line,
             cueLines: line.cueLines
                 ? await Promise.all(