CaZzzer/amqtrain
1
0
Fork 0
Code Issues 13 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

song type schema stuff

Browse Source
This commit is contained in:
Yura
2026-02-06 11:37:39 -08:00
parent f63841e69f
commit 8cb04e0295
3 changed files with 57 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/routes/songs/+page.svelte
View File

@@ -15,9 +15,9 @@
import { addAllToQueue, playAllNext } from "$lib/player/player.svelte"; import { addAllToQueue, playAllNext } from "$lib/player/player.svelte";
import { trackFromSongRow } from "$lib/player/types"; import { trackFromSongRow } from "$lib/player/types";
import type { PageData } from "./$types"; import type { PageData } from "./$types";
import { SearchParamsSchema } from "./schema"; import { SearchParamsSchemaClient } from "./schema";
const params = useSearchParams(SearchParamsSchema, { const params = useSearchParams(SearchParamsSchemaClient, {
pushHistory: false, pushHistory: false,
showDefaults: false, showDefaults: false,
}); });
@@ -135,49 +135,54 @@
</form> </form>
{#if data.songRows.length > 0} {#if data.songRows.length > 0}
<div class="mt-6 flex flex-wrap gap-2"> <div class="mt-6 flex flex-col gap-2">
<Button <div class="flex flex-wrap gap-2">
variant="outline" <Button
class="cursor-pointer" variant="outline"
onclick={() => addAllToQueue(tracksFromResults)} class="cursor-pointer"
disabled={tracksFromResults.length === 0} onclick={() => addAllToQueue(tracksFromResults)}
> disabled={tracksFromResults.length === 0}
Add all to queue >
</Button> Add all to queue
</Button>
<Button <Button
variant="outline" variant="outline"
class="cursor-pointer" class="cursor-pointer"
onclick={() => playAllNext(tracksFromResults)} onclick={() => playAllNext(tracksFromResults)}
disabled={tracksFromResults.length === 0} disabled={tracksFromResults.length === 0}
> >
Play all next Play all next
</Button> </Button>
{#if tracksFromResults.length !== data.songRows.length} {#if tracksFromResults.length !== data.songRows.length}
<span class="self-center text-sm text-muted-foreground"> <span class="self-center text-sm text-muted-foreground">
({tracksFromResults.length} playable) ({tracksFromResults.length} playable)
</span> </span>
{/if} {/if}
</div>
<div class="flex items-center gap-4">
<h2 class="text-lg font-semibold">Songs</h2>
<span>{data.songRows.length}</span>
</div>
<ul class="space-y-2">
{#each data.songRows as r (r.annSongId)}
<li>
<SongEntry
annSongId={r.annSongId}
animeName={r.animeMainName}
type={r.type}
number={r.number}
songName={r.songName}
artistName={songArtistLabel(r)}
fileName={r.fileName}
/>
</li>
{/each}
</ul>
</div> </div>
<h2 class="mt-6 text-lg font-semibold">Songs</h2>
<ul class="mt-3 space-y-2">
{#each data.songRows as r (r.annSongId)}
<li>
<SongEntry
annSongId={r.annSongId}
animeName={r.animeMainName}
type={r.type}
number={r.number}
songName={r.songName}
artistName={songArtistLabel(r)}
fileName={r.fileName}
/>
</li>
{/each}
</ul>
{:else if Object.values(params).some((val) => (Array.isArray(val) && val.length > 0) || (typeof val === "string" && val.trim() !== "") || typeof val === "number")} {:else if Object.values(params).some((val) => (Array.isArray(val) && val.length > 0) || (typeof val === "string" && val.trim() !== "") || typeof val === "number")}
<p class="mt-4 text-sm text-muted-foreground"> <p class="mt-4 text-sm text-muted-foreground">
No songs found matching your criteria. No songs found matching your criteria.

4
src/routes/songs/+page.ts
View File

@@ -1,12 +1,12 @@
import type { SongFilters } from "$lib/db/client-db"; import type { SongFilters } from "$lib/db/client-db";
import { db, ensureSeeded, getSongsWithFilters } from "$lib/db/client-db"; import { db, ensureSeeded, getSongsWithFilters } from "$lib/db/client-db";
import type { PageLoad } from "./$types"; import type { PageLoad } from "./$types";
import { SearchParamsSchema } from "./schema"; import { SearchParamsSchemaServer } from "./schema";
export const load: PageLoad = async ({ url, fetch, depends }) => { export const load: PageLoad = async ({ url, fetch, depends }) => {
depends("clientdb:songs"); depends("clientdb:songs");
const parsed = SearchParamsSchema.safeParse( const parsed = SearchParamsSchemaServer.safeParse(
Object.fromEntries(url.searchParams.entries()), Object.fromEntries(url.searchParams.entries()),
); );

9
src/routes/songs/schema.ts
View File

@@ -6,5 +6,12 @@ export const SearchParamsSchema = z.object({
anime: z.string().optional().default(""), anime: z.string().optional().default(""),
gpm: z.coerce.number().int().optional().default(0), gpm: z.coerce.number().int().optional().default(0),
gpx: z.coerce.number().int().optional().default(100), gpx: z.coerce.number().int().optional().default(100),
songType: z.coerce.number().int().optional().default(0), });
export const SearchParamsSchemaClient = SearchParamsSchema.extend({
songType: z.string().optional().default("0"),
});
export const SearchParamsSchemaServer = SearchParamsSchema.extend({
songType: z.coerce.number().int().optional(),
}); });