From ef74dd14d7e47f8f8e45655e59589aa6b8369443 Mon Sep 17 00:00:00 2001
From: ward <ward@localhost.localdomain>
Date: Mon, 23 Jun 2025 13:02:52 +1200
Subject: [PATCH] Improvements to playlist page

---
 .../src/lib/components/ContentColumn.svelte   |  2 +-
 materialious/src/lib/components/Player.svelte |  4 +-
 .../src/lib/components/Thumbnail.svelte       |  4 +-
 materialious/src/lib/patches/youtubejs.ts     |  2 +-
 .../routes/(app)/playlist/[slug]/+page.svelte | 51 +++++++------------
 .../src/routes/(app)/playlist/[slug]/+page.ts |  4 +-
 6 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/materialious/src/lib/components/ContentColumn.svelte b/materialious/src/lib/components/ContentColumn.svelte
index 556588c7..54016dce 100644
--- a/materialious/src/lib/components/ContentColumn.svelte
+++ b/materialious/src/lib/components/ContentColumn.svelte
@@ -10,7 +10,7 @@
 
 	async function checkWidth() {
 		if ($isAndroidTvStore) {
-			mediumCol = '3';
+			mediumCol = '4';
 		} else if (innerWidth <= 1750) {
 			largeCol = '4';
 		} else {
diff --git a/materialious/src/lib/components/Player.svelte b/materialious/src/lib/components/Player.svelte
index 9e554104..654a4f97 100644
--- a/materialious/src/lib/components/Player.svelte
+++ b/materialious/src/lib/components/Player.svelte
@@ -493,7 +493,7 @@
 
 		updateSeekBarTheme();
 
-		player.addEventListener('error', async (event) => {
+		player.addEventListener('error', (event) => {
 			const error = (event as CustomEvent).detail as shaka.util.Error;
 			console.error('Player error:', error);
 		});
@@ -759,7 +759,7 @@
 		controls={false}
 		autoplay={$playerAutoPlayStore}
 		id="player"
-		poster={getBestThumbnail(data.video.videoThumbnails, 1251, 781)}
+		poster={getBestThumbnail(data.video.videoThumbnails, 9999, 9999)}
 	></video>
 	{#if isEmbed}
 		<div class="chip blur embed" style="position: absolute;top: 10px;left: 10px;font-size: 18px;">
diff --git a/materialious/src/lib/components/Thumbnail.svelte b/materialious/src/lib/components/Thumbnail.svelte
index 9640615a..efd285d5 100644
--- a/materialious/src/lib/components/Thumbnail.svelte
+++ b/materialious/src/lib/components/Thumbnail.svelte
@@ -139,7 +139,7 @@
 
 	function calcThumbnailPlaceholderHeight() {
 		if ($isAndroidTvStore) {
-			placeholderHeight = innerWidth / 3;
+			placeholderHeight = 400;
 			return;
 		}
 		if (!sideways) {
@@ -164,7 +164,7 @@
 	role="button"
 	onclick={async () => {
 		if ($isAndroidTvStore) {
-			goto(`${location.origin}/embed/${video.videoId}`);
+			goto(`${location.origin}/tv/${video.videoId}`);
 		}
 	}}
 >
diff --git a/materialious/src/lib/patches/youtubejs.ts b/materialious/src/lib/patches/youtubejs.ts
index 5a079d96..9389950c 100644
--- a/materialious/src/lib/patches/youtubejs.ts
+++ b/materialious/src/lib/patches/youtubejs.ts
@@ -81,7 +81,7 @@ export async function patchYoutubeJs(videoId: string): Promise<VideoPlay> {
 	let dashUri: string | undefined;
 
 	if (video.streaming_data) {
-		video.streaming_data.adaptive_formats = video.streaming_data.adaptive_formats.map((format) => {
+		video.streaming_data.adaptive_formats.forEach((format) => {
 			const formatKey = fromFormat(format) || '';
 			format.url = `https://sabr?___key=${formatKey}`;
 			format.signature_cipher = undefined;
diff --git a/materialious/src/routes/(app)/playlist/[slug]/+page.svelte b/materialious/src/routes/(app)/playlist/[slug]/+page.svelte
index 1adfe044..c62a1730 100644
--- a/materialious/src/routes/(app)/playlist/[slug]/+page.svelte
+++ b/materialious/src/routes/(app)/playlist/[slug]/+page.svelte
@@ -1,43 +1,24 @@
 <script lang="ts">
-	import type { PlaylistPageVideo } from '$lib/api/model';
 	import VideoList from '$lib/components/VideoList.svelte';
 	import { unsafeRandomItem } from '$lib/misc';
 	import { cleanNumber } from '$lib/numbers';
 	import { isAndroidTvStore, playlistSettingsStore } from '$lib/store';
 	import { Clipboard } from '@capacitor/clipboard';
 	import { Capacitor } from '@capacitor/core';
-	import { onMount } from 'svelte';
 	import { _ } from '$lib/i18n';
-	import { loadEntirePlaylist } from '$lib/playlist.js';
 
 	let { data } = $props();
-
-	let videos: PlaylistPageVideo[] | undefined = $state();
-
-	if (data.playlist.videos.length > 0) {
-		videos = data.playlist.videos
-			.sort((a: PlaylistPageVideo, b: PlaylistPageVideo) => {
-				return a.index < b.index ? -1 : 1;
-			})
-			.filter((playlistVideo) => {
-				return playlistVideo.lengthSeconds > 0;
-			});
-
-		onMount(async () => {
-			videos = (await loadEntirePlaylist(data.playlist.playlistId)).videos;
-		});
-	}
 </script>
 
 <div class="space"></div>
 
 <article>
-	{#if videos}
+	{#if data.playlist.videos}
 		<nav>
 			<a
 				href={!$isAndroidTvStore
-					? `/watch/${videos[0].videoId}?playlist=${data.playlist.playlistId}`
-					: `/embed/${videos[0].videoId}?playlist=${data.playlist.playlistId}`}
+					? `/watch/${data.playlist.videos[0].videoId}?playlist=${data.playlist.info.playlistId}`
+					: `/tv/${data.playlist.videos[0].videoId}?playlist=${data.playlist.info.playlistId}`}
 				class="button circle extra no-margin"
 			>
 				<i>play_arrow</i>
@@ -48,10 +29,12 @@
 
 			<a
 				href={!$isAndroidTvStore
-					? `/watch/${unsafeRandomItem(videos).videoId}?playlist=${data.playlist.playlistId}`
-					: `/embed/${unsafeRandomItem(videos).videoId}?playlist=${data.playlist.playlistId}`}
+					? `/watch/${unsafeRandomItem(data.playlist.videos).videoId}?playlist=${data.playlist.info.playlistId}`
+					: `/tv/${unsafeRandomItem(data.playlist.videos).videoId}?playlist=${data.playlist.info.playlistId}`}
 				onclick={() =>
-					playlistSettingsStore.set({ [data.playlist.playlistId]: { shuffle: true, loop: false } })}
+					playlistSettingsStore.set({
+						[data.playlist.info.playlistId]: { shuffle: true, loop: false }
+					})}
 				class="button circle extra no-margin border"
 			>
 				<i>shuffle</i>
@@ -61,16 +44,16 @@
 			</a>
 		</nav>
 	{/if}
-	<h3>{data.playlist.title}</h3>
+	<h3>{data.playlist.info.title}</h3>
 	<p>
-		{cleanNumber(data.playlist.viewCount)}
-		{$_('views')} • {data.playlist.videoCount}
+		{cleanNumber(data.playlist.info.viewCount)}
+		{$_('views')} • {data.playlist.info.videoCount}
 		{$_('videos')}
 	</p>
 	<div class="divider" style="margin-bottom: 1em;"></div>
 
 	<article style="max-height: 200px;" class="scroll no-padding no-elevate no-round">
-		<p style="white-space: pre-line;word-wrap: break-word;">{data.playlist.description}</p>
+		<p style="white-space: pre-line;word-wrap: break-word;">{data.playlist.info.description}</p>
 	</article>
 
 	<div class="space"></div>
@@ -96,7 +79,7 @@
 				role="presentation"
 				onclick={async () => {
 					await Clipboard.write({
-						string: `https://www.youtube.com/playlist?list=${data.playlist.playlistId}`
+						string: `https://www.youtube.com/playlist?list=${data.playlist.info.playlistId}`
 					});
 					(document.activeElement as HTMLElement)?.blur();
 				}}
@@ -107,6 +90,10 @@
 	</button>
 </article>
 
-{#if videos}
-	<VideoList {videos} playlistAuthor={data.playlist.author} playlistId={data.playlist.playlistId} />
+{#if data.playlist.videos}
+	<VideoList
+		videos={data.playlist.videos}
+		playlistAuthor={data.playlist.info.author}
+		playlistId={data.playlist.info.playlistId}
+	/>
 {/if}
diff --git a/materialious/src/routes/(app)/playlist/[slug]/+page.ts b/materialious/src/routes/(app)/playlist/[slug]/+page.ts
index c87433bf..20422000 100644
--- a/materialious/src/routes/(app)/playlist/[slug]/+page.ts
+++ b/materialious/src/routes/(app)/playlist/[slug]/+page.ts
@@ -1,11 +1,11 @@
-import { getPlaylist } from '$lib/api/index';
+import { loadEntirePlaylist } from '$lib/playlist.js';
 import { error } from '@sveltejs/kit';
 
 export async function load({ params }) {
 	let playlist;
 
 	try {
-		playlist = await getPlaylist(params.slug);
+		playlist = await loadEntirePlaylist(params.slug);
 	} catch (errorMessage: any) {
 		error(500, errorMessage);
 	}