From d04cc9082bfb7785f352057d9c2eca1dab0add92 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Mon, 9 Sep 2024 18:30:25 +1200 Subject: [PATCH 1/2] Bump version --- materialious/android/app/build.gradle | 4 ++-- materialious/electron/package.json | 2 +- materialious/package.json | 2 +- update_versions.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index 2592ba29..d2f11f3e 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 27 - versionName "1.2.2" + versionCode 28 + versionName "1.2.3" 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/package.json b/materialious/electron/package.json index 5fa01b69..be7cee56 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.2.2", + "version": "1.2.3", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package.json b/materialious/package.json index 6f87696d..35770ba8 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.2.2", + "version": "1.2.3", "private": true, "scripts": { "dev": "vite dev", diff --git a/update_versions.py b/update_versions.py index e584b4a8..299cf085 100644 --- a/update_versions.py +++ b/update_versions.py @@ -5,7 +5,7 @@ import json import os import re -LATEST_VERSION = "1.2.2" +LATEST_VERSION = "1.2.3" WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious") ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json") From 0982f4cdb0d07d81f514b44ce988fb3ac8bb4e4f Mon Sep 17 00:00:00 2001 From: WardPearce Date: Mon, 9 Sep 2024 18:43:42 +1200 Subject: [PATCH 2/2] Remove playlist videos with no length --- .../routes/(app)/playlist/[slug]/+page.svelte | 6 ++++++ .../src/routes/(app)/watch/[slug]/+page.svelte | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/materialious/src/routes/(app)/playlist/[slug]/+page.svelte b/materialious/src/routes/(app)/playlist/[slug]/+page.svelte index 979fb915..e41257ac 100644 --- a/materialious/src/routes/(app)/playlist/[slug]/+page.svelte +++ b/materialious/src/routes/(app)/playlist/[slug]/+page.svelte @@ -17,6 +17,9 @@ videos = data.playlist.videos.sort((a: PlaylistPageVideo, b: PlaylistPageVideo) => { return a.index < b.index ? -1 : 1; }); + videos = videos.filter((playlistVideo) => { + return playlistVideo.lengthSeconds > 0; + }); onMount(async () => { for (let page = 1; page++; ) { @@ -29,6 +32,9 @@ return a.index < b.index ? -1 : 1; } ); + videos = videos.filter((playlistVideo) => { + return playlistVideo.lengthSeconds > 0; + }); } }); } diff --git a/materialious/src/routes/(app)/watch/[slug]/+page.svelte b/materialious/src/routes/(app)/watch/[slug]/+page.svelte index 0642529b..eff6e125 100644 --- a/materialious/src/routes/(app)/watch/[slug]/+page.svelte +++ b/materialious/src/routes/(app)/watch/[slug]/+page.svelte @@ -320,6 +320,10 @@ return a.index < b.index ? -1 : 1; } ); + + playlistVideos = playlistVideos.filter((playlistVideo) => { + return playlistVideo.lengthSeconds > 0; + }); } } @@ -641,7 +645,11 @@ {/each} {/if} {:else} -
+
{playlist.title}

@@ -697,7 +705,11 @@ class:border={playlistVideo.videoId === data.video.videoId} > {#key playlistVideo.videoId} - + {/key}

{/each}