From 26bb6b5bdfa7d35198bd0bef058a605dbdca6cda Mon Sep 17 00:00:00 2001
From: alikia2x <ziwen243@outlook.com>
Date: Fri, 2 Aug 2024 19:26:01 +0800
Subject: [PATCH] ref: optimize project structure

---
 src/index.test.js                            |  2 +-
 src/lib/components/background.svelte         |  2 +-
 src/lib/components/database/songCard.svelte  |  4 ++--
 src/lib/components/import/fileList.svelte    | 12 ++++++------
 src/lib/components/interactiveBox.svelte     |  4 ++--
 src/lib/components/lyrics.svelte             |  2 +-
 src/lib/{ => utils}/convertCoverData.ts      |  0
 src/lib/{ => utils}/extractFileName.ts       |  0
 src/lib/{ => utils}/formatDuration.ts        |  0
 src/lib/{ => utils}/formatText.ts            |  0
 src/lib/{ => utils}/formatViews.ts           |  0
 src/lib/{ => utils}/getAudioCoverURL.ts      |  0
 src/lib/{ => utils}/getVersion.ts            |  2 +-
 src/lib/{ => utils}/humanSize.ts             |  0
 src/lib/{ => utils}/songUpdateTime.ts        |  0
 src/lib/{ => utils}/storage.ts               |  0
 src/lib/{ => utils}/truncate.ts              |  0
 src/routes/+page.svelte                      |  8 ++++----
 src/routes/api/database/song/[id]/+server.ts |  2 +-
 src/routes/database/submit/+page.svelte      |  2 +-
 src/routes/import/[id]/lyric/+page.svelte    |  2 +-
 src/routes/import/local/+page.svelte         |  2 +-
 src/routes/play/[id]/+page.svelte            |  2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)
 rename src/lib/{ => utils}/convertCoverData.ts (100%)
 rename src/lib/{ => utils}/extractFileName.ts (100%)
 rename src/lib/{ => utils}/formatDuration.ts (100%)
 rename src/lib/{ => utils}/formatText.ts (100%)
 rename src/lib/{ => utils}/formatViews.ts (100%)
 rename src/lib/{ => utils}/getAudioCoverURL.ts (100%)
 rename src/lib/{ => utils}/getVersion.ts (57%)
 rename src/lib/{ => utils}/humanSize.ts (100%)
 rename src/lib/{ => utils}/songUpdateTime.ts (100%)
 rename src/lib/{ => utils}/storage.ts (100%)
 rename src/lib/{ => utils}/truncate.ts (100%)

diff --git a/src/index.test.js b/src/index.test.js
index 120ad17..371f9e7 100644
--- a/src/index.test.js
+++ b/src/index.test.js
@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import formatDuration from '$lib/formatDuration';
+import formatDuration from '$lib/utils/formatDuration.js';
 import { safePath } from '$lib/server/safePath';
 
 describe('formatDuration test', () => {
diff --git a/src/lib/components/background.svelte b/src/lib/components/background.svelte
index 9203538..4152518 100644
--- a/src/lib/components/background.svelte
+++ b/src/lib/components/background.svelte
@@ -2,7 +2,7 @@
     import { processImage } from '$lib/graphics';
     import blobToImageData from '$lib/graphics/blob2imageData';
     import imageDataToBlob from '$lib/graphics/imageData2blob';
-    import localforage from '$lib/storage';
+    import localforage from '$lib/utils/storage';
     export let coverId: string;
     let canvas: HTMLCanvasElement;
 
diff --git a/src/lib/components/database/songCard.svelte b/src/lib/components/database/songCard.svelte
index a702ce7..6cae97b 100644
--- a/src/lib/components/database/songCard.svelte
+++ b/src/lib/components/database/songCard.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import formatDuration from "$lib/formatDuration";
-    import { formatViews } from "$lib/formatViews";
+    import formatDuration from "$lib/utils/formatDuration";
+    import { formatViews } from "$lib/utils/formatViews";
 
     export let songData: MusicMetadata;
 </script>
diff --git a/src/lib/components/import/fileList.svelte b/src/lib/components/import/fileList.svelte
index cd121b9..ea0f424 100644
--- a/src/lib/components/import/fileList.svelte
+++ b/src/lib/components/import/fileList.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
     import { useAtom } from 'jotai-svelte';
     import { fileListState, finalFileListState } from '$lib/state/fileList.state';
-    import toHumanSize from '$lib/humanSize';
-    import formatText from '$lib/formatText';
-    import extractFileName from '$lib/extractFileName';
-    import getAudioMeta from '$lib/getAudioCoverURL';
-    import convertCoverData from '$lib/convertCoverData';
+    import toHumanSize from '$lib/utils/humanSize';
+    import formatText from '$lib/utils/formatText';
+    import extractFileName from '$lib/utils/extractFileName';
+    import getAudioMeta from '$lib/utils/getAudioCoverURL';
+    import convertCoverData from '$lib/utils/convertCoverData';
     import type { IAudioMetadata } from 'music-metadata-browser';
-    import formatDuration from '$lib/formatDuration';
+    import formatDuration from '$lib/utils/formatDuration';
     const items = useAtom(fileListState);
     const finalItems = useAtom(finalFileListState);
     let displayItems: any[] = [];
diff --git a/src/lib/components/interactiveBox.svelte b/src/lib/components/interactiveBox.svelte
index dad6789..1b42261 100644
--- a/src/lib/components/interactiveBox.svelte
+++ b/src/lib/components/interactiveBox.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-    import formatDuration from '$lib/formatDuration';
+    import formatDuration from '$lib/utils/formatDuration';
     import { onMount } from 'svelte';
     import userAdjustingProgress from '$lib/state/userAdjustingProgress';
     import progressBarSlideValue from '$lib/state/progressBarSlideValue';
-    import truncate from '$lib/truncate';
+    import truncate from '$lib/utils/truncate';
 
     export let name: string;
     export let singer: string = '';
diff --git a/src/lib/components/lyrics.svelte b/src/lib/components/lyrics.svelte
index d74354e..707bf21 100644
--- a/src/lib/components/lyrics.svelte
+++ b/src/lib/components/lyrics.svelte
@@ -5,7 +5,7 @@
     import type { LrcJsonData } from '$lib/lyrics/parser';
     import progressBarSlideValue from '$lib/state/progressBarSlideValue';
     import nextUpdate from '$lib/state/nextUpdate';
-    import truncate from '$lib/truncate';
+    import truncate from '$lib/utils/truncate';
 
     // Component input properties
     export let lyrics: string[];
diff --git a/src/lib/convertCoverData.ts b/src/lib/utils/convertCoverData.ts
similarity index 100%
rename from src/lib/convertCoverData.ts
rename to src/lib/utils/convertCoverData.ts
diff --git a/src/lib/extractFileName.ts b/src/lib/utils/extractFileName.ts
similarity index 100%
rename from src/lib/extractFileName.ts
rename to src/lib/utils/extractFileName.ts
diff --git a/src/lib/formatDuration.ts b/src/lib/utils/formatDuration.ts
similarity index 100%
rename from src/lib/formatDuration.ts
rename to src/lib/utils/formatDuration.ts
diff --git a/src/lib/formatText.ts b/src/lib/utils/formatText.ts
similarity index 100%
rename from src/lib/formatText.ts
rename to src/lib/utils/formatText.ts
diff --git a/src/lib/formatViews.ts b/src/lib/utils/formatViews.ts
similarity index 100%
rename from src/lib/formatViews.ts
rename to src/lib/utils/formatViews.ts
diff --git a/src/lib/getAudioCoverURL.ts b/src/lib/utils/getAudioCoverURL.ts
similarity index 100%
rename from src/lib/getAudioCoverURL.ts
rename to src/lib/utils/getAudioCoverURL.ts
diff --git a/src/lib/getVersion.ts b/src/lib/utils/getVersion.ts
similarity index 57%
rename from src/lib/getVersion.ts
rename to src/lib/utils/getVersion.ts
index 3aeac2c..2d1145d 100644
--- a/src/lib/getVersion.ts
+++ b/src/lib/utils/getVersion.ts
@@ -1,4 +1,4 @@
-import * as pjson from "../../package.json";
+import * as pjson from "../../../package.json";
 
 export default function getVersion(){
     return pjson.version;
diff --git a/src/lib/humanSize.ts b/src/lib/utils/humanSize.ts
similarity index 100%
rename from src/lib/humanSize.ts
rename to src/lib/utils/humanSize.ts
diff --git a/src/lib/songUpdateTime.ts b/src/lib/utils/songUpdateTime.ts
similarity index 100%
rename from src/lib/songUpdateTime.ts
rename to src/lib/utils/songUpdateTime.ts
diff --git a/src/lib/storage.ts b/src/lib/utils/storage.ts
similarity index 100%
rename from src/lib/storage.ts
rename to src/lib/utils/storage.ts
diff --git a/src/lib/truncate.ts b/src/lib/utils/truncate.ts
similarity index 100%
rename from src/lib/truncate.ts
rename to src/lib/utils/truncate.ts
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 003a8d2..0b7cfca 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-    import extractFileName from '$lib/extractFileName';
-    import getVersion from '$lib/getVersion';
-    import toHumanSize from '$lib/humanSize';
-    import localforage from '$lib/storage';
+    import extractFileName from '$lib/utils/extractFileName';
+    import getVersion from '$lib/utils/getVersion';
+    import toHumanSize from '$lib/utils/humanSize';
+    import localforage from '$lib/utils/storage';
     interface Song {
         name: string;
         singer?: string;
diff --git a/src/routes/api/database/song/[id]/+server.ts b/src/routes/api/database/song/[id]/+server.ts
index 7b03ee5..1545dc0 100644
--- a/src/routes/api/database/song/[id]/+server.ts
+++ b/src/routes/api/database/song/[id]/+server.ts
@@ -1,5 +1,5 @@
 import { safePath } from '$lib/server/safePath';
-import { getCurrentFormattedDateTime } from '$lib/songUpdateTime';
+import { getCurrentFormattedDateTime } from '$lib/utils/songUpdateTime';
 import { json, error } from '@sveltejs/kit';
 import fs from 'fs';
 import type { RequestHandler } from './$types';
diff --git a/src/routes/database/submit/+page.svelte b/src/routes/database/submit/+page.svelte
index f4b1ee9..7567b1f 100644
--- a/src/routes/database/submit/+page.svelte
+++ b/src/routes/database/submit/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { page } from '$app/stores';
-    import { getCurrentFormattedDateTime } from '$lib/songUpdateTime';
+    import { getCurrentFormattedDateTime } from '$lib/utils/songUpdateTime';
     let templateSongData: MusicMetadata = {
         id: '',
         name: '',
diff --git a/src/routes/import/[id]/lyric/+page.svelte b/src/routes/import/[id]/lyric/+page.svelte
index 192174c..671d785 100644
--- a/src/routes/import/[id]/lyric/+page.svelte
+++ b/src/routes/import/[id]/lyric/+page.svelte
@@ -2,7 +2,7 @@
     import { page } from '$app/stores';
     import FileList from '$lib/components/import/fileList.svelte';
     import FileSelector from '$lib/components/import/fileSelector.svelte';
-    import localforage from '$lib/storage';
+    import localforage from '$lib/utils/storage.js';
     import { fileListState } from '$lib/state/fileList.state';
     import { useAtom } from 'jotai-svelte';
     const fileList = useAtom(fileListState);
diff --git a/src/routes/import/local/+page.svelte b/src/routes/import/local/+page.svelte
index e672d26..f986f13 100644
--- a/src/routes/import/local/+page.svelte
+++ b/src/routes/import/local/+page.svelte
@@ -4,7 +4,7 @@
     import { fileListState, finalFileListState } from '$lib/state/fileList.state';
     import { localImportFailed, localImportSuccess } from '$lib/state/localImportStatus.state';
     import { useAtom } from 'jotai-svelte';
-    import localforage from '$lib/storage';
+    import localforage from '$lib/utils/storage.js';
     import { v1 as uuidv1 } from 'uuid';
     const fileList = useAtom(fileListState);
     const finalFiles = useAtom(finalFileListState);
diff --git a/src/routes/play/[id]/+page.svelte b/src/routes/play/[id]/+page.svelte
index a7ab0f2..d0b9166 100644
--- a/src/routes/play/[id]/+page.svelte
+++ b/src/routes/play/[id]/+page.svelte
@@ -4,7 +4,7 @@
     import Background from '$lib/components/background.svelte';
     import Cover from '$lib/components/cover.svelte';
     import InteractiveBox from '$lib/components/interactiveBox.svelte';
-    import extractFileName from '$lib/extractFileName';
+    import extractFileName from '$lib/utils/extractFileName';
     import localforage from 'localforage';
     import { writable } from 'svelte/store';
     import userAdjustingProgress from '$lib/state/userAdjustingProgress';