Merge pull request #230 from lovegaoshi/dev

fix: append writing to lrc

src/components/player/Lyric.tsx

@@ -98,44 +98,45 @@ export const LyricView = ({
   const setLyricMapping = useNoxSetting(state => state.setLyricMapping);
 
   useEffect(() => {
-    if (track !== undefined && track.title !== '') {
-      logger.log('Initiating Lyric with new track...');
-      setCurrentTimeOffset(0);
-      setLrcOption(null);
-      setLrc('正在加载歌词...');
-      setSearchText(track.title || '');
-      const lrcOptionPromise = fetchAndSetLyricOptions();
-      // Initialize from storage if not new
-      // HACK: probably needs to be refactored because teh state updates
-      // but if it works it works
-      if (hasLrcFromLocal()) {
-        logger.log('[lyric] Loading Lrc from localStorage...');
-        const lrcDetail = lyricMapping.get(track?.song.id);
-        if (lrcDetail === undefined) return;
-        setLrcOption({ key: lrcDetail?.lyricKey });
-        setCurrentTimeOffset(lrcDetail!.lyricOffset);
-        readTxtFile(lrcDetail.lyric, 'lrc/').then(readlrc => {
-          if (readlrc) {
-            logger.debug('[lrc] read local lrc and loading...');
-            setLrc(readlrc);
-          } else if (lrcDetail.lyric.endsWith('.txt')) {
-            logger.debug('[lrc] local lrc no longer exists, fetching new...');
-            lrcOptionPromise.then(
-              val => val && searchAndSetCurrentLyric(undefined, val)
-            );
-          } else {
-            logger.debug(
-              '[lrc] local lrc seems to be the content itself, loading that...'
-            );
-            setLrc(lrcDetail.lyric);
-          }
-        });
-      } else {
+    if (track === undefined || track.title === '') return;
+    logger.log('Initiating Lyric with new track...');
+    setCurrentTimeOffset(0);
+    setLrcOption(null);
+    setLrc('正在加载歌词...');
+    setSearchText(track.title || '');
+    const lrcOptionPromise = fetchAndSetLyricOptions();
+    const loadLocalLrc = async () => {
+      if (!hasLrcFromLocal()) return false;
+      logger.log('[lyric] Loading Lrc from localStorage...');
+      const lrcDetail = lyricMapping.get(track?.song.id);
+      if (lrcDetail === undefined) return false;
+      setLrcOption({ key: lrcDetail?.lyricKey });
+      setCurrentTimeOffset(lrcDetail!.lyricOffset);
+      if (lrcDetail.lyric.endsWith('.txt')) {
+        const readlrc = await readTxtFile(lrcDetail.lyric, 'lrc/');
+        if (readlrc) {
+          logger.debug('[lrc] read local lrc and loading...');
+          setLrc(readlrc);
+          return true;
+        } else if (lrcDetail.lyric.endsWith('.txt')) {
+          logger.debug('[lrc] local lrc no longer exists, fetching new...');
+        }
+        return false;
+      }
+      logger.debug(
+        '[lrc] local lrc seems to be the content itself, loading that...'
+      );
+      setLrc(lrcDetail.lyric);
+      return true;
+    };
+    // Initialize from storage if not new
+    loadLocalLrc().then(
+      localLrcLoaded =>
+        !localLrcLoaded &&
         lrcOptionPromise.then(
           val => val && searchAndSetCurrentLyric(undefined, val)
-        );
-      }
-    }
+        )
+    );
   }, [track]);
 
   useEffect(() => {

src/utils/fs.ts

@@ -13,7 +13,7 @@ export const writeTxtFile = async (
       // encoding, should be one of `base64`, `utf8`, `ascii`
       'utf8',
       // should data append to existing content ?
-      true
+      false
     )
     .then(stream => Promise.all(content.map(val => stream.write(val))))
     // Use array destructuring to get the stream object from the first item of the array we get from Promise.all()