From f63fdb15339de000d79d185de18d207466b87e1c Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Fri, 21 Nov 2025 14:01:29 +0800
Subject: [PATCH] [M] Move song

---
 src/routes/song/[id]/+page.server.ts         | 10 ----------
 src/routes/song/[id]/play/+page.server.ts    | 15 +++++++++++++++
 src/routes/song/[id]/{ => play}/+page.svelte | 16 ++++++++--------
 src/routes/song/[id]/{ => play}/IMEHelper.ts |  2 +-
 src/routes/song/[id]/{ => play}/animation.ts |  0
 5 files changed, 24 insertions(+), 19 deletions(-)
 delete mode 100644 src/routes/song/[id]/+page.server.ts
 create mode 100644 src/routes/song/[id]/play/+page.server.ts
 rename src/routes/song/[id]/{ => play}/+page.svelte (96%)
 rename src/routes/song/[id]/{ => play}/IMEHelper.ts (96%)
 rename src/routes/song/[id]/{ => play}/animation.ts (100%)

diff --git a/src/routes/song/[id]/+page.server.ts b/src/routes/song/[id]/+page.server.ts
deleted file mode 100644
index d4038ca..0000000
--- a/src/routes/song/[id]/+page.server.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { PageServerLoad } from './$types'
-import { getLyricsProcessed, getSongRaw, getSongUrl } from "$lib/server/songs.ts";
-
-export const load: PageServerLoad = async ({ params }) => {
-  const songId = +params.id
-  const song = await getSongRaw(songId)
-  const lrc = await getLyricsProcessed(songId)
-  // const audioUrl = await getSongUrl(songId)
-  return { song, lrc, audioUrl: undefined }
-}
\ No newline at end of file
diff --git a/src/routes/song/[id]/play/+page.server.ts b/src/routes/song/[id]/play/+page.server.ts
new file mode 100644
index 0000000..a95102a
--- /dev/null
+++ b/src/routes/song/[id]/play/+page.server.ts
@@ -0,0 +1,15 @@
+import type { PageServerLoad } from '../$types'
+import { getLyricsProcessed, getSongRaw, getSongUrl, checkLyricsProcessed } from "$lib/server/songs.ts";
+import { redirect } from '@sveltejs/kit';
+
+export const load: PageServerLoad = async ({ params }) => {
+  const songId = +params.id
+  const song = await getSongRaw(songId)
+  const hasLrc = await checkLyricsProcessed(songId)
+  
+  if (!hasLrc) throw redirect(302, `/song/${songId}/prepare`)
+
+  const lrc = await getLyricsProcessed(songId)
+  // const audioUrl = await getSongUrl(songId)
+  return { song, lrc, audioUrl: undefined }
+}
\ No newline at end of file
diff --git a/src/routes/song/[id]/+page.svelte b/src/routes/song/[id]/play/+page.svelte
similarity index 96%
rename from src/routes/song/[id]/+page.svelte
rename to src/routes/song/[id]/play/+page.svelte
index 3685ded..c1369e9 100644
--- a/src/routes/song/[id]/+page.svelte
+++ b/src/routes/song/[id]/play/+page.svelte
@@ -1,17 +1,18 @@
 <script lang="ts">
-  import AppBar from "../../../components/appbar/AppBar.svelte";
-  import type { PageProps } from "./$types"
+  import AppBar from "../../../../components/appbar/AppBar.svelte";
+  import type { PageProps } from "../$types"
   import { LinearProgress } from "m3-svelte";
   import { onMount, tick } from "svelte";
-  import { typingSettingsDefault, type LyricSegment } from "../../../shared/types.ts";
+  import { typingSettingsDefault, type LyricSegment } from "../../../../shared/types.ts";
   import { isKana, isKanji, toHiragana, toKatakana, toRomaji } from "wanakana";
   import { composeList, fuzzyEquals, processLrcLine, dedupLines, type ProcLrcLine, type ProcLrcSeg } from "./IMEHelper.ts";
-  import MenuItem from "../../../components/material3/MenuItem.svelte";
-  import "../../../shared/ext.ts"
+  import MenuItem from "../../../../components/material3/MenuItem.svelte";
+  import "../../../../shared/ext.ts"
   import { API } from "$lib/client.ts";
   import { animateCaret } from "./animation.ts";
   import { goto } from '$app/navigation';
-  import { artistAndAlbum } from "../../../shared/tools.ts";
+  import { artistAndAlbum } from "../../../../shared/tools.ts";
+  import Button from "../../../../components/Button.svelte";
 
   let { data }: PageProps = $props()
 
@@ -99,7 +100,7 @@
     function incr(cLine: ProcLrcLine) {
       wi += 1
       if (wi >= cLine.totalLen) {
-        li += 1;
+        li += 1
         wi = 0
         if (li >= processedLrc.length) submitResult()
       }
@@ -242,7 +243,6 @@
     <div class="h-30vh"></div>
   </div>
 </div>
-
 <style lang="sass">
   .lrc-wrapper
     *
diff --git a/src/routes/song/[id]/IMEHelper.ts b/src/routes/song/[id]/play/IMEHelper.ts
similarity index 96%
rename from src/routes/song/[id]/IMEHelper.ts
rename to src/routes/song/[id]/play/IMEHelper.ts
index eb289e7..8ec4472 100644
--- a/src/routes/song/[id]/IMEHelper.ts
+++ b/src/routes/song/[id]/play/IMEHelper.ts
@@ -1,5 +1,5 @@
 import { toHiragana } from "wanakana";
-import type { LyricLine, LyricSegment } from "../../../shared/types";
+import type { LyricLine, LyricSegment } from "../../../../shared/types";
 
 export type ProcLrcSeg = { swi: number, kanji?: string, kana: string }
 export type ProcLrcLine = { parts: ProcLrcSeg[], totalLen: number }
diff --git a/src/routes/song/[id]/animation.ts b/src/routes/song/[id]/play/animation.ts
similarity index 100%
rename from src/routes/song/[id]/animation.ts
rename to src/routes/song/[id]/play/animation.ts