From fb36719aad413e59bf3896c9cf2637b5abd94aaa Mon Sep 17 00:00:00 2001
From: alikia2x <alikia2x@outlook.com>
Date: Thu, 24 Oct 2024 05:06:51 +0800
Subject: [PATCH] fix: incorrect import path

---
 package.json                            |  2 +-
 src/lib/components/lyrics/lyrics.svelte |  4 +---
 src/routes/play/[id]/+page.svelte       | 15 +++++----------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 237679c..54fbdd9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aquavox",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "private": false,
   "scripts": {
     "dev": "vite dev",
diff --git a/src/lib/components/lyrics/lyrics.svelte b/src/lib/components/lyrics/lyrics.svelte
index a115667..d09937f 100644
--- a/src/lib/components/lyrics/lyrics.svelte
+++ b/src/lib/components/lyrics/lyrics.svelte
@@ -3,10 +3,8 @@
     import createLyricsSearcher from '$lib/lyrics/lyricSearcher';
     import progressBarRaw from '$lib/state/progressBarRaw';
     import type { LrcJsonData } from '$lib/lyrics/type';
-    import progressBarSlideValue from '$lib/state/progressBarSlideValue';
     import nextUpdate from '$lib/state/nextUpdate';
-    import truncate from '$lib/truncate';
-    import { blur } from 'svelte/transition';
+    import truncate from '$lib/utils/truncate';
 
     // Component input properties
     export let lyrics: string[];
diff --git a/src/routes/play/[id]/+page.svelte b/src/routes/play/[id]/+page.svelte
index 20f42ad..c07a216 100644
--- a/src/routes/play/[id]/+page.svelte
+++ b/src/routes/play/[id]/+page.svelte
@@ -4,15 +4,14 @@
     import Background from '$lib/components/background.svelte';
     import Cover from '$lib/components/cover.svelte';
     import InteractiveBox from '$lib/components/interactiveBox.svelte';
-    import Lyrics from '$lib/components/lyrics/lyrics.svelte';
-    import extractFileName from '$lib/extractFileName';
+    import extractFileName from '$lib/utils/extractFileName';
     import localforage from 'localforage';
     import { writable } from 'svelte/store';
     import lrcParser from '$lib/lyrics/lrc/parser';
     import type { LrcJsonData } from '$lib/lyrics/type';
     import userAdjustingProgress from '$lib/state/userAdjustingProgress';
     import type { IAudioMetadata } from 'music-metadata-browser';
-    import { onDestroy, onMount } from 'svelte';
+    import { onMount } from 'svelte';
     import progressBarRaw from '$lib/state/progressBarRaw';
     import { parseTTML, type LyricLine } from '$lib/lyrics/ttml';
     import NewLyrics from '$lib/components/lyrics/newLyrics.svelte';
@@ -28,9 +27,9 @@
     let paused: boolean = true;
     let launched = false;
     let prepared: string[] = [];
-    let lyricLines: LyricLine[];
+    let originalLyrics: LrcJsonData;
+    let lyricsText: string[] = [];
     let hasLyrics: boolean;
-    let lyricPlayer: LyricPlayer = new CoreLyricPlayer();
     const coverPath = writable('');
     let mainInterval: ReturnType<typeof setInterval>;
 
@@ -151,7 +150,6 @@
         if (audioPlayer) {
             audioPlayer.currentTime = duration * progress;
             currentProgress = duration * progress;
-            lyricPlayer.calcLayout(false, true);
         }
     }
 
@@ -188,10 +186,7 @@
         }
     }
 
-    function onLyricLineClick(e: LyricLineMouseEvent) {
-        lyricPlayer.resetScroll();
-        adjustProgress(lyricLines[e.lineIndex].startTime / 1000 / duration);
-    }
+    $: hasLyrics = !!originalLyrics;
 
     readDB();
 </script>