From bc50964521303a16cc1d597b8d290f41bceec5bc Mon Sep 17 00:00:00 2001 From: WardPearce Date: Thu, 29 May 2025 15:02:24 +1200 Subject: [PATCH 1/9] Bump version --- materialious/android/app/build.gradle | 4 +- .../electron/materialious.metainfo.xml | 6 ++- materialious/electron/package-lock.json | 10 ++--- materialious/electron/package.json | 2 +- materialious/package.json | 2 +- .../src/lib/components/ContentColumn.svelte | 5 +-- .../src/lib/components/VideoList.svelte | 37 +++++++++---------- materialious/src/lib/patches/youtubejs.ts | 4 ++ .../routes/(app)/watch/[slug]/+page.svelte | 2 +- update_versions.py | 2 +- 10 files changed, 38 insertions(+), 36 deletions(-) diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index c9508958..a0e89835 100644 --- a/materialious/android/app/build.gradle +++ b/materialious/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "us.materialio.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 107 - versionName "1.8.3" + versionCode 108 + versionName "1.8.4" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/materialious/electron/materialious.metainfo.xml b/materialious/electron/materialious.metainfo.xml index 621d82a0..77e5c853 100644 --- a/materialious/electron/materialious.metainfo.xml +++ b/materialious/electron/materialious.metainfo.xml @@ -68,7 +68,11 @@ - + + + https://github.com/Materialious/Materialious/releases/tag/1.8.4 + + https://github.com/Materialious/Materialious/releases/tag/1.8.3 diff --git a/materialious/electron/package-lock.json b/materialious/electron/package-lock.json index 8693089f..dab28881 100644 --- a/materialious/electron/package-lock.json +++ b/materialious/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "Materialious", - "version": "1.8.2", + "version": "1.8.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "Materialious", - "version": "1.8.2", + "version": "1.8.3", "license": "MIT", "dependencies": { "@capacitor-community/electron": "^5.0.0", @@ -2492,9 +2492,9 @@ } }, "node_modules/electron": { - "version": "35.2.1", - "resolved": "https://registry.npmjs.org/electron/-/electron-35.2.1.tgz", - "integrity": "sha512-LO4xXLpzkPPUVLvAbdHMlW7N9Z+Qqz+7QsmSWXluTIQMeJk+v7o36nUTZghyA2I1s//tlMvuaCtle6Qo2W0Ktg==", + "version": "35.5.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-35.5.0.tgz", + "integrity": "sha512-16ScwDuKgnuL7tSrEgBvQe1Hm4CSK0vbOusPFrDs4oIs3QOdEFtrP9i8+4yKQGXpszj4f4F0MQjKv1tu9E4Gvg==", "dev": true, "hasInstallScript": true, "license": "MIT", diff --git a/materialious/electron/package.json b/materialious/electron/package.json index 0cfbe989..6c2847c1 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.8.3", + "version": "1.8.4", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package.json b/materialious/package.json index 534b7dc9..16aa8645 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.8.3", + "version": "1.8.4", "private": true, "scripts": { "dev": "vite dev", diff --git a/materialious/src/lib/components/ContentColumn.svelte b/materialious/src/lib/components/ContentColumn.svelte index c229023e..9b5de488 100644 --- a/materialious/src/lib/components/ContentColumn.svelte +++ b/materialious/src/lib/components/ContentColumn.svelte @@ -1,10 +1,7 @@
-
+
search { showSearchBox = true; await tick(); @@ -112,14 +113,13 @@ }} /> {#if showSearchBox} - +
dispatch('searchCancelled')}>arrow_back Date: Thu, 29 May 2025 16:22:26 +1200 Subject: [PATCH 5/9] Minor changes --- materialious/src/lib/components/Player.svelte | 72 ++++++++++++------- materialious/src/lib/sabr/cacheManager.ts | 2 +- .../routes/(app)/watch/[slug]/+page.svelte | 6 +- 3 files changed, 53 insertions(+), 27 deletions(-) diff --git a/materialious/src/lib/components/Player.svelte b/materialious/src/lib/components/Player.svelte index 1cbcae5d..96e6a1f6 100644 --- a/materialious/src/lib/components/Player.svelte +++ b/materialious/src/lib/components/Player.svelte @@ -52,7 +52,7 @@ isSyncing?: boolean; isEmbed?: boolean; segments?: Segment[]; - playerElement: HTMLMediaElement; + playerElement: HTMLMediaElement | undefined; } let { @@ -126,6 +126,7 @@ } function saveVolumePreference() { + if (!playerElement) return; localStorage.setItem(STORAGE_KEY_VOLUME, playerElement.volume.toString()); } @@ -157,6 +158,7 @@ if (player) { const timeGivenUrl = page.url.searchParams.get('time'); if (timeGivenUrl && !isNaN(parseFloat(timeGivenUrl))) { + if (!playerElement) return false; playerElement.currentTime = Number(timeGivenUrl); return true; } @@ -178,6 +180,29 @@ HttpFetchPlugin.cacheManager.clearCache(); player = new shaka.Player(); + player.configure({ + abr: { + enabled: true, + restrictions: { + maxWidth: 1920, + maxHeight: 1080 + } + }, + streaming: { + bufferingGoal: 120, + rebufferingGoal: 0.01, + bufferBehind: 300, + retryParameters: { + maxAttempts: 30, + baseDelay: 1500, + backoffFactor: 2.5, + fuzzFactor: 0.7, + timeout: 120000 + }, + stallThreshold: 2, + stallSkip: 0.5 + } + }); playerElement = document.getElementById('player') as HTMLMediaElement; playerElementResizeObserver = new ResizeObserver(() => { @@ -195,7 +220,6 @@ playerElement.volume = parseFloat(savedVolume); } - await player.attach(playerElement); shakaUi = new shaka.ui.Overlay( player, document.getElementById('shaka-container') as HTMLElement, @@ -229,26 +253,6 @@ } }); - player.configure({ - abr: { - enabled: true - }, - streaming: { - bufferingGoal: 120, - rebufferingGoal: 0.01, - bufferBehind: 300, - retryParameters: { - maxAttempts: 30, - baseDelay: 1500, - backoffFactor: 2.5, - fuzzFactor: 0.7, - timeout: 120000 - }, - stallThreshold: 2, - stallSkip: 0.5 - } - }); - if (data.video.fallbackPatch === 'youtubejs' && data.video.ytjs) { isLive = !!data.video.ytjs.video.basic_info.is_live; isPostLiveDVR = !!data.video.ytjs.video.basic_info.is_post_live_dvr; @@ -635,6 +639,8 @@ }); } + await player.attach(playerElement); + if (!data.video.hlsUrl) { let dashUrl = data.video.dashUrl; @@ -701,6 +707,8 @@ playerElement.addEventListener('timeupdate', () => { segments.forEach((segment) => { + if (!playerElement) return; + if ( playerElement.currentTime >= segment.startTime && playerElement.currentTime <= segment.endTime @@ -813,6 +821,8 @@ } Mousetrap.bind('space', () => { + if (!playerElement) return; + if (playerElement.paused) { playerElement.play(); } else { @@ -822,11 +832,14 @@ }); Mousetrap.bind('right', () => { + if (!playerElement) return; playerElement.currentTime = playerElement.currentTime + 10; return false; }); Mousetrap.bind('left', () => { + if (!playerElement) return; + playerElement.currentTime = playerElement.currentTime - 10; return false; }); @@ -854,16 +867,22 @@ if (document.fullscreenElement) { document.exitFullscreen(); } else { + if (!playerElement) return; + playerElement.requestFullscreen(); } return false; }); Mousetrap.bind('shift+left', () => { + if (!playerElement) return; + playerElement.playbackRate = playerElement.playbackRate - 0.25; }); Mousetrap.bind('shift+right', () => { + if (!playerElement) return; + playerElement.playbackRate = playerElement.playbackRate + 0.25; }); }); @@ -891,13 +910,18 @@ } } - if (toSetTime > 0) playerElement.currentTime = toSetTime; + if (toSetTime > 0 && playerElement) playerElement.currentTime = toSetTime; } function savePlayerPos() { if (data.video.hlsUrl) return; - if (get(playerSavePlaybackPositionStore) && player && playerElement.currentTime) { + if ( + get(playerSavePlaybackPositionStore) && + player && + playerElement && + playerElement.currentTime + ) { if ( playerElement.currentTime < playerElement.duration - 10 && playerElement.currentTime > 10 diff --git a/materialious/src/lib/sabr/cacheManager.ts b/materialious/src/lib/sabr/cacheManager.ts index 6c6c11a0..d7a697dc 100644 --- a/materialious/src/lib/sabr/cacheManager.ts +++ b/materialious/src/lib/sabr/cacheManager.ts @@ -14,7 +14,7 @@ export class CacheManager { private readonly maxCacheSize: number; private readonly maxAge: number; - constructor(maxSizeMB = 100, maxAgeSeconds = 600) { + constructor(maxSizeMB = 50, maxAgeSeconds = 300) { this.maxCacheSize = maxSizeMB * 1024 * 1024; this.maxAge = maxAgeSeconds * 1000; this.startGarbageCollection(); diff --git a/materialious/src/routes/(app)/watch/[slug]/+page.svelte b/materialious/src/routes/(app)/watch/[slug]/+page.svelte index 167083de..dd7ff7df 100644 --- a/materialious/src/routes/(app)/watch/[slug]/+page.svelte +++ b/materialious/src/routes/(app)/watch/[slug]/+page.svelte @@ -598,7 +598,9 @@
Chapters
{#each data.content.timestamps as timestamp}
{#if !theatreMode}
- {#if showTranscript} + {#if showTranscript && playerElement} {/if} {#if playlist} From dbf92ce19f3a586450a994a71d3f16bf5bed057c Mon Sep 17 00:00:00 2001 From: WardPearce Date: Thu, 29 May 2025 16:34:01 +1200 Subject: [PATCH 6/9] Possible fix to buffering issue using SABR --- materialious/src/lib/components/Player.svelte | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/materialious/src/lib/components/Player.svelte b/materialious/src/lib/components/Player.svelte index 96e6a1f6..415102e9 100644 --- a/materialious/src/lib/components/Player.svelte +++ b/materialious/src/lib/components/Player.svelte @@ -185,10 +185,16 @@ enabled: true, restrictions: { maxWidth: 1920, - maxHeight: 1080 + maxHeight: 1080, + maxBandwidth: data.video.ytjs + ? Number( + data.video.ytjs?.video.page[0].player_config?.stream_selection_config.max_bitrate + ) + : -1 } }, streaming: { + autoLowLatencyMode: true, bufferingGoal: 120, rebufferingGoal: 0.01, bufferBehind: 300, From ff6a667f65aa48b569994864c103e73f43ce9391 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Thu, 29 May 2025 16:39:09 +1200 Subject: [PATCH 7/9] Bump version to 1.8.5 --- materialious/android/app/build.gradle | 4 ++-- materialious/electron/materialious.metainfo.xml | 6 +++++- materialious/electron/package.json | 4 ++-- materialious/package.json | 4 ++-- update_versions.py | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index a0e89835..ced51595 100644 --- a/materialious/android/app/build.gradle +++ b/materialious/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "us.materialio.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 108 - versionName "1.8.4" + versionCode 109 + versionName "1.8.5" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/materialious/electron/materialious.metainfo.xml b/materialious/electron/materialious.metainfo.xml index 806dc9c9..d98e74a6 100644 --- a/materialious/electron/materialious.metainfo.xml +++ b/materialious/electron/materialious.metainfo.xml @@ -53,7 +53,11 @@ intense - + + + https://github.com/Materialious/Materialious/releases/tag/1.8.5 + + https://github.com/Materialious/Materialious/releases/tag/1.8.4 diff --git a/materialious/electron/package.json b/materialious/electron/package.json index eb41388f..ab585488 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.8.4", + "version": "1.8.5", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", @@ -44,4 +44,4 @@ "capacitor", "electron" ] -} +} \ No newline at end of file diff --git a/materialious/package.json b/materialious/package.json index 32640e0d..b72d5e08 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.8.4", + "version": "1.8.5", "private": true, "scripts": { "dev": "vite dev", @@ -71,4 +71,4 @@ "terser": "^5.34.1", "youtubei.js": "^13.4.0" } -} +} \ No newline at end of file diff --git a/update_versions.py b/update_versions.py index 8f58437a..b30b9e54 100644 --- a/update_versions.py +++ b/update_versions.py @@ -3,7 +3,7 @@ import os import re from datetime import datetime -LATEST_VERSION = "1.8.4" +LATEST_VERSION = "1.8.5" RELEASE_DATE = datetime.now().strftime("%Y-%-m-%d") # Format: YYYY-M-D WORKING_DIR = os.path.join( From c545a409399cf6fbd0e5b4b0ce9d68b9a098ebfc Mon Sep 17 00:00:00 2001 From: WardPearce Date: Thu, 29 May 2025 16:41:23 +1200 Subject: [PATCH 8/9] Bump lock --- materialious/electron/package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/materialious/electron/package-lock.json b/materialious/electron/package-lock.json index a15d4a25..aa3b9685 100644 --- a/materialious/electron/package-lock.json +++ b/materialious/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "Materialious", - "version": "1.8.4", + "version": "1.8.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "Materialious", - "version": "1.8.4", + "version": "1.8.5", "license": "MIT", "dependencies": { "@capacitor-community/electron": "^5.0.0", From 12824a7255d2cab26542db3ae48906a9cf2571d7 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Thu, 29 May 2025 16:47:39 +1200 Subject: [PATCH 9/9] Minor fix to transcript --- materialious/src/lib/components/Transcript.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/materialious/src/lib/components/Transcript.svelte b/materialious/src/lib/components/Transcript.svelte index eb69d6c2..feba597b 100644 --- a/materialious/src/lib/components/Transcript.svelte +++ b/materialious/src/lib/components/Transcript.svelte @@ -116,7 +116,7 @@ onclick={() => (playerElement.currentTime = cue.startTime)} class:secondary-container={currentTime >= cue.startTime && currentTime <= cue.endTime} > -

{videoLength(cue.startTime)}

+

{videoLength(cue.startTime)}

{decodeHtmlCharCodes(cue.text.replace(/<[^>]+>/g, ''))}

{/each}