From 914f35405f760a3dd0455f73c247565044d2183a Mon Sep 17 00:00:00 2001 From: WardPearce Date: Wed, 18 Sep 2024 18:54:19 +1200 Subject: [PATCH] Rename syncious to API extended --- docs/DOCKER.md | 3 +-- docs/INSTANCES.md | 4 ++-- docs/SETTINGS.md | 12 ------------ materialious/Dockerfile | 1 + materialious/android/app/build.gradle | 4 ++-- materialious/electron/package.json | 2 +- materialious/package.json | 2 +- materialious/replace_env_vars.sh | 1 + materialious/src/lib/Settings.svelte | 2 +- materialious/src/lib/Thumbnail.svelte | 1 + materialious/src/lib/store.ts | 2 +- update_versions.py | 2 +- 12 files changed, 13 insertions(+), 23 deletions(-) diff --git a/docs/DOCKER.md b/docs/DOCKER.md index 3ab4cf21..756cd606 100644 --- a/docs/DOCKER.md +++ b/docs/DOCKER.md @@ -235,7 +235,6 @@ http: Modify/add `VITE_DEFAULT_RETURNYTDISLIKES_INSTANCE` for Materialious to be the reverse proxied URL of RYD-Proxy. ## Step 5 (Optional, but recommended): Self-host Invidious API extended -Please note, Materialious configuration using the env var `VITE_DEFAULT_SYNCIOUS_INSTANCE` for Invidious API extended, this will change in the future (no-breaking.) ### Step 1: Docker compose Add the following to your docker compose @@ -259,7 +258,7 @@ services: Add these additional environment variables to Materialious. ```yaml -VITE_DEFAULT_SYNCIOUS_INSTANCE: "https://syncious.example.com" +VITE_DEFAULT_API_EXTENDED_INSTANCE: "https://syncious.example.com" ``` ## Step 6 (Optional): Self-host PeerJS diff --git a/docs/INSTANCES.md b/docs/INSTANCES.md index 1382daa8..5b320c55 100644 --- a/docs/INSTANCES.md +++ b/docs/INSTANCES.md @@ -6,7 +6,7 @@ - **Man in the Middle:** No - **Accounts:** Yes - **RYD-Proxy:** Yes - - **Syncious integration:** Yes + - **API Extended integration:** Yes - **Self-hosted PeerJS:** No - [materialious.einfachzocken.eu](https://materialious.einfachzocken.eu/) @@ -16,5 +16,5 @@ - **Man in the Middle:** No - **Accounts:** Yes - **RYD-Proxy:** No - - **Syncious integration:** No + - **API Extended integration:** No - **Self-hosted PeerJS:** No diff --git a/docs/SETTINGS.md b/docs/SETTINGS.md index 78668d60..a3174fa9 100644 --- a/docs/SETTINGS.md +++ b/docs/SETTINGS.md @@ -25,9 +25,6 @@ Materialious allows you to customize various settings by overwriting the default + [Theatre mode by default](#theatre-mode-by-default) + [Autoplay next by default](#autoplay-next-by-default) + [Dash](#dash) - * [Return YT Dislikes](#return-yt-dislikes) - * [Syncious](#syncious) - + [Syncious Instance](#syncious-instance) * [Sponsorblock](#sponsorblock) + [Sponsor](#sponsor) + [Unpaid/Self Promotion](#unpaidself-promotion) @@ -196,15 +193,6 @@ Configures an open-source proxy for the Return YouTube Dislike API, with optiona "returnYtDislikes": true ``` -## Syncious - -Syncious keeps your watch progress synced across Invidious clients. - -```json -"syncious": true -``` - - ## Sponsorblock Configures Sponsorblock categories for skipping unwanted video segments. diff --git a/materialious/Dockerfile b/materialious/Dockerfile index 8d3eb0b0..440a8175 100644 --- a/materialious/Dockerfile +++ b/materialious/Dockerfile @@ -19,6 +19,7 @@ RUN echo "VITE_DEFAULT_INVIDIOUS_INSTANCE=VITE_DEFAULT_INVIDIOUS_INSTANCE_PLACEH echo "VITE_DEFAULT_PEERJS_PORT=VITE_DEFAULT_PEERJS_PORT_PLACEHOLDER" >> .env && \ echo "VITE_DEFAULT_DOWNLOAD_ENABLED=VITE_DEFAULT_DOWNLOAD_ENABLED_PLACEHOLDER" >> .env && \ echo "VITE_DEFAULT_SYNCIOUS_INSTANCE=VITE_DEFAULT_SYNCIOUS_INSTANCE_PLACEHOLDER" >> .env && \ + echo "VITE_DEFAULT_API_EXTENDED_INSTANCE=VITE_DEFAULT_API_EXTENDED_INSTANCE_PLACEHOLDER" >> .env && \ echo "VITE_DEFAULT_SETTINGS='\"VITE_DEFAULT_SETTINGS_PLACEHOLDER\"'" >> .env && \ echo "VITE_DEFAULT_RETURNYTDISLIKES_INSTANCE=VITE_DEFAULT_RETURNYTDISLIKES_INSTANCE_PLACEHOLDER" >> .env diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index b9e25f83..1f7e5110 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 38 - versionName "1.4.1" + versionCode 39 + versionName "1.4.2" 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 e91988d6..2ae0b9a4 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.4.1", + "version": "1.4.2", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package.json b/materialious/package.json index 4d9216d2..7779f80c 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.4.1", + "version": "1.4.2", "private": true, "scripts": { "dev": "vite dev", diff --git a/materialious/replace_env_vars.sh b/materialious/replace_env_vars.sh index 8462fb3c..721c7226 100644 --- a/materialious/replace_env_vars.sh +++ b/materialious/replace_env_vars.sh @@ -12,4 +12,5 @@ find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VI find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VITE_DEFAULT_PEERJS_PORT_PLACEHOLDER|'"$VITE_DEFAULT_PEERJS_PORT"'|g' {} + find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VITE_DEFAULT_DOWNLOAD_ENABLED_PLACEHOLDER|'"$VITE_DEFAULT_DOWNLOAD_ENABLED"'|g' {} + find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VITE_DEFAULT_SYNCIOUS_INSTANCE_PLACEHOLDER|'"$VITE_DEFAULT_SYNCIOUS_INSTANCE"'|g' {} + +find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VITE_DEFAULT_API_EXTENDED_INSTANCE_PLACEHOLDER|'"$VITE_DEFAULT_API_EXTENDED_INSTANCE"'|g' {} + find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VITE_DEFAULT_SETTINGS_PLACEHOLDER|'"$VITE_DEFAULT_SETTINGS"'|g' {} + diff --git a/materialious/src/lib/Settings.svelte b/materialious/src/lib/Settings.svelte index d91889a0..abed3181 100644 --- a/materialious/src/lib/Settings.svelte +++ b/materialious/src/lib/Settings.svelte @@ -494,7 +494,7 @@
-
Syncious
+
API Extended
diff --git a/materialious/src/lib/Thumbnail.svelte b/materialious/src/lib/Thumbnail.svelte index 6d3c38ee..85b792d4 100644 --- a/materialious/src/lib/Thumbnail.svelte +++ b/materialious/src/lib/Thumbnail.svelte @@ -232,6 +232,7 @@ videoPreview = await getVideo(video.videoId); if (videoPreview.formatStreams.length === 0) { showVideoPreview = false; + videoPreview = null; } if (videoPreview.hlsUrl) { diff --git a/materialious/src/lib/store.ts b/materialious/src/lib/store.ts index 37055dc5..c86e5a3a 100644 --- a/materialious/src/lib/store.ts +++ b/materialious/src/lib/store.ts @@ -50,7 +50,7 @@ export const returnYTDislikesInstanceStore: Writable export const synciousStore = persisted('syncious', true); export const synciousInstanceStore: Writable = persisted( 'synciousInstance', - platformDependentDefault(import.meta.env.VITE_DEFAULT_SYNCIOUS_INSTANCE, 'https://syncious.materialio.us') + platformDependentDefault(import.meta.env.VITE_DEFAULT_SYNCIOUS_INSTANCE || import.meta.env.VITE_DEFAULT_API_EXTENDED_INSTANCE, 'https://extended-api.materialio.us') ); export const interfaceRegionStore: Writable = persisted('interfaceRegion', 'US'); diff --git a/update_versions.py b/update_versions.py index 0d31a2a0..d29b0231 100644 --- a/update_versions.py +++ b/update_versions.py @@ -5,7 +5,7 @@ import json import os import re -LATEST_VERSION = "1.4.1" +LATEST_VERSION = "1.4.2" WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious") ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json")