From 1932244bd24487305b9717d5a13089a3d7e55c32 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Sat, 18 May 2024 19:00:04 +1200 Subject: [PATCH] Added support for unproxied dash on desktop --- materialious/android/app/build.gradle | 4 ++-- materialious/electron/package.json | 2 +- materialious/package.json | 2 +- materialious/src/lib/Player.svelte | 7 ++++++- update_versions.py | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index 31285055..acd9401b 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 10 - versionName "1.0.10" + versionCode 11 + versionName "1.0.11" 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 e6e00701..ef098278 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.0.10", + "version": "1.0.11", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package.json b/materialious/package.json index 8e0db101..6e4bc62e 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.0.10", + "version": "1.0.11", "private": true, "scripts": { "dev": "vite dev", diff --git a/materialious/src/lib/Player.svelte b/materialious/src/lib/Player.svelte index 4ce8499d..b658d3fc 100644 --- a/materialious/src/lib/Player.svelte +++ b/materialious/src/lib/Player.svelte @@ -2,6 +2,7 @@ import 'vidstack/bundle'; import { page } from '$app/stores'; + import { Capacitor } from '@capacitor/core'; import type { Page } from '@sveltejs/kit'; import { SponsorBlock, type Category } from 'sponsorblock-api'; import { onDestroy, onMount } from 'svelte'; @@ -138,7 +139,11 @@ } if (get(playerDashStore)) { - src = [{ src: data.video.dashUrl + '?local=true', type: 'application/dash+xml' }]; + src = [{ src: data.video.dashUrl, type: 'application/dash+xml' }]; + + if (Capacitor.getPlatform() !== 'electron' || proxyVideos) { + (src[0] as { src: string }).src += '?local=true'; + } player.addEventListener('dash-can-play', async () => { await loadPlayerPos(); diff --git a/update_versions.py b/update_versions.py index c9b7bc10..9c0aece1 100644 --- a/update_versions.py +++ b/update_versions.py @@ -5,7 +5,7 @@ import json import os import re -LATEST_VERSION = "1.0.10" +LATEST_VERSION = "1.0.11" WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious") ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json")