diff --git a/materialious/src/lib/externalSettings.ts b/materialious/src/lib/externalSettings.ts
index 07706050..6df07094 100644
--- a/materialious/src/lib/externalSettings.ts
+++ b/materialious/src/lib/externalSettings.ts
@@ -12,7 +12,6 @@ import {
interfaceDisplayThumbnailAvatars,
interfaceForceCase,
interfaceLowBandwidthMode,
- interfacePreviewVideoOnHoverStore,
interfaceRegionStore,
interfaceSearchSuggestionsStore,
playerAlwaysLoopStore,
@@ -20,7 +19,6 @@ import {
playerAutoplayNextByDefaultStore,
playerDefaultLanguage,
playerListenByDefaultStore,
- playerMiniPlayerStore,
playerProxyVideosStore,
playerSavePlaybackPositionStore,
playerTheatreModeByDefaultStore,
@@ -99,11 +97,6 @@ const persistedStores: { name: string, store: Writable
, type: 'string' | 'b
store: interfaceSearchSuggestionsStore,
type: 'boolean'
},
- {
- name: 'previewVideoOnHover',
- store: interfacePreviewVideoOnHoverStore,
- type: 'boolean'
- },
{
name: 'sponsorBlock',
store: sponsorBlockStore,
@@ -134,11 +127,6 @@ const persistedStores: { name: string, store: Writable, type: 'string' | 'b
store: deArrowThumbnailInstanceStore,
type: 'string'
},
- {
- name: 'playerMiniPlayer',
- store: playerMiniPlayerStore,
- type: 'boolean'
- },
{
name: 'syncious',
store: synciousStore,
diff --git a/materialious/src/lib/store.ts b/materialious/src/lib/store.ts
index 37b9ead4..baa0f87f 100644
--- a/materialious/src/lib/store.ts
+++ b/materialious/src/lib/store.ts
@@ -37,7 +37,6 @@ export const playerListenByDefaultStore = persisted('listenByDefault', false);
export const playerSavePlaybackPositionStore = persisted('savePlaybackPosition', true);
export const playerTheatreModeByDefaultStore = persisted('theatreModeByDefault', false);
export const playerAutoplayNextByDefaultStore = persisted('autoplayNextByDefault', false);
-export const playerMiniPlayerStore = persisted('miniPlayer', true);
export const playerYouTubeJsFallback = persisted('youTubeJsFallback', true);
export const playerYouTubeJsAlways = persisted('youTubeJsAlways', false);
export const playerAndroidBgPlayer = persisted('androidBgPlayer', true);
@@ -58,7 +57,6 @@ export const synciousInstanceStore: Writable = persis
export const interfaceRegionStore: Writable = persisted('interfaceRegion', 'US');
export const interfaceSearchSuggestionsStore = persisted('searchSuggestions', true);
-export const interfacePreviewVideoOnHoverStore = persisted('previewVideoOnHover', true);
export const interfaceForceCase: Writable = persisted('forceCase', null);
export const interfaceAutoExpandComments: Writable = persisted('autoExpandComments', true);
export const interfaceAutoExpandDesc: Writable = persisted('autoExpandDesc', false);
diff --git a/update_versions.py b/update_versions.py
index a561cc9e..769ec3f4 100644
--- a/update_versions.py
+++ b/update_versions.py
@@ -1,54 +1,72 @@
-"""Small script for keeping versioning consistent for Materialious
-"""
-
import json
import os
import re
+from datetime import datetime
+
+LATEST_VERSION = "1.7.11"
+RELEASE_DATE = datetime.now().strftime("%Y-%-m-%d") # Format: YYYY-M-D
-LATEST_VERSION = "1.7.9"
WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious")
ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json")
ELECTRON_PACKAGE = os.path.join(WORKING_DIR, "electron", "package.json")
ANDROID_PACKAGE = os.path.join(WORKING_DIR, "android", "app", "build.gradle")
+METAINFO_FILE = os.path.join(WORKING_DIR, "electron", "materialious.metainfo.xml")
def package_json_update_ver(location: str) -> None:
with open(location, "r") as f_:
- package = json.loads(f_.read())
+ package = json.load(f_)
if package["version"] == LATEST_VERSION:
return
-
package["version"] = LATEST_VERSION
with open(location, "w") as f_:
- f_.write(json.dumps(package, indent="\t"))
+ json.dump(package, f_, indent="\t")
+
+
+def update_android_version() -> None:
+ with open(ANDROID_PACKAGE, "r") as f_:
+ contents = f_.read()
+
+ version_code_match = re.search(r"versionCode\s+(\d+)", contents)
+ version_name_match = re.search(r'versionName\s+"([^"]+)"', contents)
+
+ if version_code_match and version_name_match:
+ version_code = int(version_code_match.group(1)) + 1
+ contents = re.sub(r"versionCode\s+\d+", f"versionCode {version_code}", contents)
+ contents = re.sub(
+ r'versionName\s+"[^"]+"', f'versionName "{LATEST_VERSION}"', contents
+ )
+
+ with open(ANDROID_PACKAGE, "w") as f_:
+ f_.write(contents)
+
+
+def update_metainfo_release() -> None:
+ with open(METAINFO_FILE, "r") as f_:
+ contents = f_.read()
+
+ # Check if the version already exists in the releases
+ if re.search(rf'
+ https://github.com/Materialious/Materialious/releases/tag/{LATEST_VERSION}
+ """
+
+ # Insert the new release after the opening tag
+ updated_contents = re.sub(r"(\s*)", rf"\1{new_release}\n", contents)
+
+ with open(METAINFO_FILE, "w") as f_:
+ f_.write(updated_contents)
if __name__ == "__main__":
for location in (ROOT_PACKAGE, ELECTRON_PACKAGE):
package_json_update_ver(location)
- with open(ANDROID_PACKAGE, "r") as f_:
- contents = f_.read()
-
- version_code_match = re.search(r"versionCode\s+(\d+)", contents)
- version_name_match = re.search(r'versionName\s+"([^"]+)"', contents)
-
- if version_code_match and version_name_match:
- version_code = version_code_match.group(1)
- version_name = version_name_match.group(1)
-
- f_.close()
-
- with open(ANDROID_PACKAGE, "w") as f_:
- new_version_code = int(version_code) + 1
-
- f_.write(
- contents.replace(
- f"versionCode {version_code}", f"versionCode {new_version_code}"
- ).replace(
- f'versionName "{version_name}"',
- f'versionName "{LATEST_VERSION}"',
- )
- )
+ update_android_version()
+ update_metainfo_release()