From f9592f2d82191a873c93aab90359ad64f06a202f Mon Sep 17 00:00:00 2001
From: Eclypsed <nicholas.tamassia@gmail.com>
Date: Mon, 15 Apr 2024 22:26:38 -0400
Subject: [PATCH] Changed currentlyPlaying to queue

---
 src/lib/components/media/mediaCard.svelte   | 15 +++++++-------
 src/lib/components/media/mediaPlayer.svelte | 23 ++++++++++++---------
 src/lib/stores.ts                           |  2 +-
 src/routes/(app)/search/+page.svelte        | 16 ++++++++++++--
 4 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/lib/components/media/mediaCard.svelte b/src/lib/components/media/mediaCard.svelte
index 7c7b0bd..af76632 100644
--- a/src/lib/components/media/mediaCard.svelte
+++ b/src/lib/components/media/mediaCard.svelte
@@ -3,15 +3,9 @@
 
     import IconButton from '$lib/components/util/iconButton.svelte'
     import { goto } from '$app/navigation'
-    import { currentlyPlaying } from '$lib/stores'
+    import { queue } from '$lib/stores'
 
     let image: HTMLImageElement, captionText: HTMLDivElement
-
-    const setCurrentlyPlaying = () => {
-        if (mediaItem.type === 'song') {
-            $currentlyPlaying = mediaItem
-        }
-    }
 </script>
 
 <div id="card-wrapper" class="flex-shrink-0">
@@ -31,7 +25,12 @@
             </div>
         {/if}
         <span id="play-button" class="absolute left-1/2 top-1/2 h-12 -translate-x-1/2 -translate-y-1/2 opacity-0 transition-opacity duration-200 ease-out">
-            <IconButton halo={true} on:click={setCurrentlyPlaying}>
+            <IconButton
+                halo={true}
+                on:click={() => {
+                    if (mediaItem.type === 'song') $queue.push(mediaItem)
+                }}
+            >
                 <i slot="icon" class="fa-solid fa-play text-xl" />
             </IconButton>
         </span>
diff --git a/src/lib/components/media/mediaPlayer.svelte b/src/lib/components/media/mediaPlayer.svelte
index 8a3c2a3..658d12e 100644
--- a/src/lib/components/media/mediaPlayer.svelte
+++ b/src/lib/components/media/mediaPlayer.svelte
@@ -1,10 +1,13 @@
 <script lang="ts">
     import { onMount } from 'svelte'
     import { fade, slide } from 'svelte/transition'
-    import { currentlyPlaying } from '$lib/stores'
+    import { queue } from '$lib/stores'
     // import { FastAverageColor } from 'fast-average-color'
     import Slider from '$lib/components/util/slider.svelte'
 
+    let queuePosition = 0
+    $: currentlyPlaying = $queue[queuePosition]
+
     let paused = true,
         shuffle = false,
         repeat = false
@@ -46,17 +49,17 @@
     $: if (!seeking && durationTimestamp) durationTimestamp.innerText = formatTime(duration)
 </script>
 
-{#if $currentlyPlaying}
+{#if currentlyPlaying}
     <main transition:slide class="relative m-4 grid h-20 grid-cols-[minmax(auto,_20rem)_auto_minmax(auto,_20rem)] gap-4 overflow-clip rounded-xl bg-neutral-925 text-white transition-colors duration-1000">
         <section class="flex gap-3">
             <div class="relative h-full w-20 min-w-20">
-                {#key $currentlyPlaying}
-                    <div transition:fade={{ duration: 500 }} class="absolute h-full w-full bg-cover bg-center bg-no-repeat" style="background-image: url(/api/remoteImage?url={$currentlyPlaying.thumbnail});" />
+                {#key currentlyPlaying}
+                    <div transition:fade={{ duration: 500 }} class="absolute h-full w-full bg-cover bg-center bg-no-repeat" style="background-image: url(/api/remoteImage?url={currentlyPlaying.thumbnail});" />
                 {/key}
             </div>
             <section class="flex flex-col justify-center gap-1">
-                <div class="line-clamp-2 text-sm">{$currentlyPlaying.name}</div>
-                <div class="text-xs">{$currentlyPlaying.artists?.map((artist) => artist.name).join(', ') || $currentlyPlaying.createdBy?.name}</div>
+                <div class="line-clamp-2 text-sm">{currentlyPlaying.name}</div>
+                <div class="text-xs">{currentlyPlaying.artists?.map((artist) => artist.name).join(', ') || currentlyPlaying.createdBy?.name}</div>
             </section>
         </section>
         <section class="flex min-w-max flex-col items-center justify-center gap-1">
@@ -78,7 +81,7 @@
                 </button>
             </div>
             <div class="flex items-center justify-items-center gap-2">
-                <span bind:this={currentTimeTimestamp} class="w-8 text-right" />
+                <span bind:this={currentTimeTimestamp} class="w-16 text-right" />
                 <div class="w-72">
                     <Slider
                         bind:this={progressBar}
@@ -93,7 +96,7 @@
                         }}
                     />
                 </div>
-                <span bind:this={durationTimestamp} class="w-8 text-left" />
+                <span bind:this={durationTimestamp} class="w-16 text-left" />
             </div>
         </section>
         <section class="flex items-center justify-end pr-2 text-lg">
@@ -105,11 +108,11 @@
                     <Slider bind:value={volume} max={1} />
                 </div>
             </div>
-            <button class="aspect-square h-8" on:click={() => ($currentlyPlaying = null)}>
+            <button class="aspect-square h-8" on:click={() => ($queue = [])}>
                 <i class="fa-solid fa-xmark" />
             </button>
         </section>
-        <audio bind:paused bind:volume bind:currentTime bind:duration on:ended={() => ($currentlyPlaying = null)} src="/api/audio?connection={$currentlyPlaying.connection}&id={$currentlyPlaying.id}" />
+        <audio bind:paused bind:volume bind:currentTime bind:duration on:ended={() => queuePosition++} src="/api/audio?connection={currentlyPlaying.connection}&id={currentlyPlaying.id}" />
     </main>
 {/if}
 
diff --git a/src/lib/stores.ts b/src/lib/stores.ts
index e8c32c4..7961b87 100644
--- a/src/lib/stores.ts
+++ b/src/lib/stores.ts
@@ -5,7 +5,7 @@ export const pageWidth: Writable<number> = writable()
 
 export const newestAlert: Writable<[AlertType, string]> = writable()
 
-export const currentlyPlaying: Writable<Song | null> = writable()
+export const queue: Writable<Song[]> = writable()
 
 const youtubeMusicBackground: string = 'https://www.gstatic.com/youtube/media/ytm/images/sbg/wsbg@4000x2250.png' // Default Youtube music background
 export const backgroundImage: Writable<string> = writable(youtubeMusicBackground)
diff --git a/src/routes/(app)/search/+page.svelte b/src/routes/(app)/search/+page.svelte
index e0da77f..7e2a4f8 100644
--- a/src/routes/(app)/search/+page.svelte
+++ b/src/routes/(app)/search/+page.svelte
@@ -1,8 +1,17 @@
 <script lang="ts">
-    import { currentlyPlaying } from '$lib/stores'
+    import { queue } from '$lib/stores'
     import type { PageServerData } from './$types'
 
     export let data: PageServerData
+
+    const formatTime = (seconds: number): string => {
+        seconds = Math.floor(seconds)
+        const hours = Math.floor(seconds / 3600)
+        seconds = seconds - hours * 3600
+        const minutes = Math.floor(seconds / 60)
+        seconds = seconds - minutes * 60
+        return hours > 0 ? `${hours}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}` : `${minutes}:${seconds.toString().padStart(2, '0')}`
+    }
 </script>
 
 {#if data.searchResults}
@@ -13,7 +22,7 @@
                     <button
                         id="searchResult"
                         on:click={() => {
-                            if (searchResult.type === 'song') $currentlyPlaying = searchResult
+                            if (searchResult.type === 'song') $queue.push(searchResult)
                         }}
                         class="grid aspect-square h-full place-items-center bg-cover bg-center bg-no-repeat"
                         style="--thumbnail: url('/api/remoteImage?url={searchResult.thumbnail}')"
@@ -28,6 +37,9 @@
                             <div>{searchResult.createdBy?.name}</div>
                         {/if}
                     </div>
+                    {#if 'duration' in searchResult && searchResult.duration}
+                        <span class="justify-self-end">{formatTime(searchResult.duration)}</span>
+                    {/if}
                 </div>
             {/each}
         </section>