Merge pull request #282 from Materialious/fix/1.0.8

Fix/1.0.8

materialious/Dockerfile

@@ -18,7 +18,7 @@ RUN echo "VITE_DEFAULT_INVIDIOUS_INSTANCE=VITE_DEFAULT_INVIDIOUS_INSTANCE_PLACEH
     echo "VITE_DEFAULT_PEERJS_PATH=VITE_DEFAULT_PEERJS_PATH_PLACEHOLDER" >> .env && \
     echo "VITE_DEFAULT_PEERJS_PORT=VITE_DEFAULT_PEERJS_PORT_PLACEHOLDER" >> .env && \
     echo "VITE_DEFAULT_SYNCIOUS_INSTANCE=VITE_DEFAULT_SYNCIOUS_INSTANCE_PLACEHOLDER" >> .env && \
-    echo "VITE_DEFAULT_SETTINGS=VITE_DEFAULT_SETTINGS_PLACEHOLDER" >> .env && \
+    echo "VITE_DEFAULT_SETTINGS='\"VITE_DEFAULT_SETTINGS_PLACEHOLDER\"'" >> .env && \
     echo "VITE_DEFAULT_RETURNYTDISLIKES_INSTANCE=VITE_DEFAULT_RETURNYTDISLIKES_INSTANCE_PLACEHOLDER" >> .env
 
 # Install dependencies and build the project

materialious/android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "us.materialio.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 7
-        versionName "1.0.7"
+        versionCode 8
+        versionName "1.0.8"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

materialious/electron/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "Materialious",
-	"version": "1.0.7",
+	"version": "1.0.8",
 	"description": "Modern material design for Invidious.",
 	"author": {
 		"name": "Ward Pearce",

materialious/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "materialious",
-	"version": "1.0.7",
+	"version": "1.0.8",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",

materialious/src/lib/externalSettings.ts

@@ -168,12 +168,25 @@ function setStores(toSet: Record<string, any>) {
 }
 
 export function loadSettingsFromEnv() {
+	if (typeof import.meta.env.VITE_DEFAULT_SETTINGS !== 'string') return;
+
+	// If $VITE_DEFAULT_SETTINGS is passed via docker, it will be wrapped with quotations.
+	let defaultSettingsJson = import.meta.env.VITE_DEFAULT_SETTINGS;
+
+	if (defaultSettingsJson.startsWith('"')) {
+		defaultSettingsJson = defaultSettingsJson.slice(1);
+	}
+
+	if (defaultSettingsJson.endsWith('"')) {
+		defaultSettingsJson = defaultSettingsJson.slice(0, -1);
+	}
+
 	try {
-		if (typeof import.meta.env.VITE_DEFAULT_SETTINGS !== 'undefined') {
-			const defaultSettings = JSON.parse(import.meta.env.VITE_DEFAULT_SETTINGS);
-			setStores(defaultSettings);
-		}
-	} catch { }
+		const defaultSettings = JSON.parse(defaultSettingsJson);
+		setStores(defaultSettings);
+	} catch (error) {
+		console.log(error);
+	}
 }
 
 export function bookmarkletSaveToUrl(): string {

materialious/src/routes/search/[slug]/+page.svelte

@@ -37,7 +37,7 @@
 	}
 </script>
 
-<div class="space" style="margin-bottom: 1em;">
+<div style="margin-top: 1em;">
 	<div class="tabs left-align min scroll">
 		<a
 			class:active={data.searchType === 'all'}

update_versions.py

@@ -5,7 +5,7 @@ import json
 import os
 import re
 
-LATEST_VERSION = "1.0.7"
+LATEST_VERSION = "1.0.8"
 WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious")
 
 ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json")