From 7782e636e5653e9fb8e9f223637ed94d6e10489f Mon Sep 17 00:00:00 2001 From: WardPearce Date: Wed, 18 Feb 2026 03:11:43 +1300 Subject: [PATCH] Restructure --- materialious/src/lib/api/youtubejs/video.ts | 2 - .../{ => layout}/ContentColumn.svelte | 0 .../components/{ => layout}/ItemsList.svelte | 16 ++++---- .../lib/components/{ => player}/Player.svelte | 14 +++---- .../{ => thumbnail}/ChannelThumbnail.svelte | 6 +-- .../{ => thumbnail}/HashtagThumbnail.svelte | 4 +- .../{ => thumbnail}/PlaylistThumbnail.svelte | 6 +-- .../VideoThumbnail.svelte} | 10 ++--- .../components/{ => watch}/Transcript.svelte | 9 ++-- .../{ => player}/sabr/ShakaPlayerAdapter.ts | 3 +- .../src/lib/{ => player}/sabr/helpers.ts | 0 .../src/lib/{ => player}/sabr/index.ts | 2 - .../thumbnails.ts} | 6 +-- materialious/src/routes/(app)/+layout.svelte | 4 +- materialious/src/routes/(app)/+page.svelte | 2 +- .../routes/(app)/channel/[slug]/+page.svelte | 2 +- .../routes/(app)/hashtag/[slug]/+page.svelte | 2 +- .../routes/(app)/playlist/[slug]/+page.svelte | 2 +- .../routes/(app)/search/[slug]/+page.svelte | 2 +- .../routes/(app)/subscriptions/+page.svelte | 2 +- .../routes/(app)/watch/[slug]/+page.svelte | 4 +- .../(no-layout)/embed/[slug]/+page@.svelte | 2 +- .../routes/(no-layout)/tv/[slug]/+page.svelte | 4 +- .../routes/api/proxy/[urlToProxy]/+server.ts | 41 +++++++++++++++++-- .../static/localApi/ghContributors.json | 2 +- 25 files changed, 90 insertions(+), 57 deletions(-) rename materialious/src/lib/components/{ => layout}/ContentColumn.svelte (100%) rename materialious/src/lib/components/{ => layout}/ItemsList.svelte (94%) rename materialious/src/lib/components/{ => player}/Player.svelte (99%) rename materialious/src/lib/components/{ => thumbnail}/ChannelThumbnail.svelte (88%) rename materialious/src/lib/components/{ => thumbnail}/HashtagThumbnail.svelte (88%) rename materialious/src/lib/components/{ => thumbnail}/PlaylistThumbnail.svelte (91%) rename materialious/src/lib/components/{Thumbnail.svelte => thumbnail/VideoThumbnail.svelte} (97%) rename materialious/src/lib/components/{ => watch}/Transcript.svelte (95%) rename materialious/src/lib/{ => player}/sabr/ShakaPlayerAdapter.ts (99%) rename materialious/src/lib/{ => player}/sabr/helpers.ts (100%) rename materialious/src/lib/{ => player}/sabr/index.ts (98%) rename materialious/src/lib/{timelineThumbnails.ts => player/thumbnails.ts} (96%) diff --git a/materialious/src/lib/api/youtubejs/video.ts b/materialious/src/lib/api/youtubejs/video.ts index 7e638ff9..f9d89d3e 100644 --- a/materialious/src/lib/api/youtubejs/video.ts +++ b/materialious/src/lib/api/youtubejs/video.ts @@ -100,8 +100,6 @@ export async function getVideoYTjs(videoId: string): Promise { video.streaming_data.adaptive_formats = video.streaming_data.adaptive_formats.filter( (format) => format.xtags !== 'CgcKAnZiEgEx' ); - } else { - throw new Error('Video did not provide streaming data.'); } const adaptiveFormats: AdaptiveFormats[] = []; diff --git a/materialious/src/lib/components/ContentColumn.svelte b/materialious/src/lib/components/layout/ContentColumn.svelte similarity index 100% rename from materialious/src/lib/components/ContentColumn.svelte rename to materialious/src/lib/components/layout/ContentColumn.svelte diff --git a/materialious/src/lib/components/ItemsList.svelte b/materialious/src/lib/components/layout/ItemsList.svelte similarity index 94% rename from materialious/src/lib/components/ItemsList.svelte rename to materialious/src/lib/components/layout/ItemsList.svelte index 4d8c99f2..e161549f 100644 --- a/materialious/src/lib/components/ItemsList.svelte +++ b/materialious/src/lib/components/layout/ItemsList.svelte @@ -1,16 +1,16 @@ diff --git a/materialious/src/routes/(app)/search/[slug]/+page.svelte b/materialious/src/routes/(app)/search/[slug]/+page.svelte index 86086d34..1907e015 100644 --- a/materialious/src/routes/(app)/search/[slug]/+page.svelte +++ b/materialious/src/routes/(app)/search/[slug]/+page.svelte @@ -4,7 +4,7 @@ import { searchCacheStore } from '$lib/store'; import { _ } from '$lib/i18n'; import InfiniteLoading, { type InfiniteEvent } from 'svelte-infinite-loading'; - import ItemsList from '$lib/components/ItemsList.svelte'; + import ItemsList from '$lib/components/layout/ItemsList.svelte'; import type { SearchOptions, SearchResults } from '$lib/api/model'; let { data } = $props(); diff --git a/materialious/src/routes/(app)/subscriptions/+page.svelte b/materialious/src/routes/(app)/subscriptions/+page.svelte index 48de51ca..0576b495 100644 --- a/materialious/src/routes/(app)/subscriptions/+page.svelte +++ b/materialious/src/routes/(app)/subscriptions/+page.svelte @@ -3,7 +3,7 @@ import type { PlaylistPageVideo, Video, VideoBase } from '$lib/api/model'; import { feedCacheStore, feedLoadingStore } from '$lib/store'; import InfiniteLoading, { type InfiniteEvent } from 'svelte-infinite-loading'; - import ItemsList from '$lib/components/ItemsList.svelte'; + import ItemsList from '$lib/components/layout/ItemsList.svelte'; import { resolve } from '$app/paths'; import { _ } from '$lib/i18n'; import PageLoading from '$lib/components/PageLoading.svelte'; diff --git a/materialious/src/routes/(app)/watch/[slug]/+page.svelte b/materialious/src/routes/(app)/watch/[slug]/+page.svelte index 24bddf7a..a3cd4841 100644 --- a/materialious/src/routes/(app)/watch/[slug]/+page.svelte +++ b/materialious/src/routes/(app)/watch/[slug]/+page.svelte @@ -8,8 +8,8 @@ } from '$lib/api/index'; import type { Comments, PlaylistPage } from '$lib/api/model'; import ShareVideo from '$lib/components/ShareVideo.svelte'; - import Thumbnail from '$lib/components/Thumbnail.svelte'; - import Transcript from '$lib/components/Transcript.svelte'; + import Thumbnail from '$lib/components/thumbnail/VideoThumbnail.svelte'; + import Transcript from '$lib/components/watch/Transcript.svelte'; import { getBestThumbnail } from '$lib/images'; import { letterCase } from '$lib/letterCasing'; import { cleanNumber, numberWithCommas } from '$lib/numbers'; diff --git a/materialious/src/routes/(no-layout)/embed/[slug]/+page@.svelte b/materialious/src/routes/(no-layout)/embed/[slug]/+page@.svelte index 9c6d2b15..d441a8c0 100644 --- a/materialious/src/routes/(no-layout)/embed/[slug]/+page@.svelte +++ b/materialious/src/routes/(no-layout)/embed/[slug]/+page@.svelte @@ -1,5 +1,5 @@ diff --git a/materialious/src/routes/(no-layout)/tv/[slug]/+page.svelte b/materialious/src/routes/(no-layout)/tv/[slug]/+page.svelte index 5fac02d1..379c0e1c 100644 --- a/materialious/src/routes/(no-layout)/tv/[slug]/+page.svelte +++ b/materialious/src/routes/(no-layout)/tv/[slug]/+page.svelte @@ -1,6 +1,6 @@