blade/materialious
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve caching, improve unique item Id func

Browse Source
This commit is contained in:
ward
2025-06-09 15:15:51 +12:00
parent 9b147d0a9a
commit ef6cc6afb7
16 changed files with 52 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
materialious/android/app/build.gradle
+2 -2
View File
@@ -7,8 +7,8 @@ android {
applicationId "us.materialio.app"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 121
versionName "1.9.4"
versionCode 122
versionName "1.9.5"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
materialious/electron/materialious.metainfo.xml
+5 -1
View File
@@ -56,7 +56,11 @@
</content_rating>
<releases>
<release version="1.9.4" date="2025-6-08">
<release version="1.9.5" date="2025-6-09">
<url>https://github.com/Materialious/Materialious/releases/tag/1.9.5</url>
</release>
<release version="1.9.4" date="2025-6-08">
<url>https://github.com/Materialious/Materialious/releases/tag/1.9.4</url>
</release>
<release version="1.9.3" date="2025-6-05">
materialious/electron/package-lock.json
Generated
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "Materialious",
"version": "1.9.3",
"version": "1.9.4",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "Materialious",
"version": "1.9.3",
"version": "1.9.4",
"license": "MIT",
"dependencies": {
"@capacitor-community/electron": "^5.0.0",
materialious/electron/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "Materialious",
"version": "1.9.4",
"version": "1.9.5",
"description": "Modern material design for Invidious.",
"author": {
"name": "Ward Pearce",
materialious/package-lock.json
Generated
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "materialious",
"version": "1.9.1",
"version": "1.9.4",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "materialious",
"version": "1.9.1",
"version": "1.9.4",
"hasInstallScript": true,
"dependencies": {
"@capacitor-community/electron": "^5.0.1",
materialious/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "materialious",
"version": "1.9.4",
"version": "1.9.5",
"private": true,
"scripts": {
"dev": "vite dev",
materialious/src/lib/components/Settings/Interface.svelte
+7 -2
View File
@@ -10,7 +10,7 @@
import { _ } from '$lib/i18n';
import { get } from 'svelte/store';
import { ensureNoTrailingSlash } from '../../misc';
import { getPages } from '../../navPages';
import { getPages, type Pages } from '../../navPages';
import {
authStore,
darkModeStore,
@@ -109,6 +109,11 @@
await window.electronAPI.setAllowInsecureSSL(isAllowed);
}
});
let pages: Pages = $state([]);
authStore.subscribe(() => {
pages = getPages();
});
</script>
{#if Capacitor.isNativePlatform()}
@@ -314,7 +319,7 @@
bind:value={defaultPage}
onchange={() => interfaceDefaultPage.set(defaultPage)}
>
{#each getPages() as page}
{#each pages as page}
{#if !page.requiresAuth || get(authStore)}
<option selected={$interfaceDefaultPage === page.href} value={page.href}>{page.name}</option
>
materialious/src/lib/components/VideoList.svelte
+4 -1
View File
@@ -21,10 +21,13 @@
}
onMount(() => {
if ($feedLastItemId)
if ($feedLastItemId) {
document
.getElementById($feedLastItemId)
?.scrollIntoView({ behavior: 'instant', block: 'center', inline: 'nearest' });
feedLastItemId.set(undefined);
}
});
</script>
materialious/src/lib/misc.ts
+2
View File
@@ -80,6 +80,8 @@ export type feedItems = feedItem[];
export function extractUniqueId(item: feedItem): string {
if ('videoId' in item) {
return item.videoId;
} else if ('playlistId' in item) {
return item.playlistId;
} else if ('authorId' in item) {
return item.authorId;
} else {
materialious/src/lib/navPages.ts
+3 -1
View File
@@ -1,8 +1,10 @@
import { _ } from '$lib/i18n';
import { get } from 'svelte/store';
export type Pages = { icon: string; href: string; name: string; requiresAuth: boolean }[];
// Must be a func do to how i18n is loaded
export function getPages(): { icon: string; href: string; name: string; requiresAuth: boolean }[] {
export function getPages(): Pages {
return [
{
icon: 'home',
materialious/src/routes/(app)/+page.ts
+4 -2
View File
@@ -18,9 +18,11 @@ export async function load() {
}
}
feedCacheStore.set({ popular });
feedCacheStore.set({ ...get(feedCacheStore), popular });
} else {
getPopular().then((newPopular) => feedCacheStore.set({ popular: newPopular }));
getPopular().then((newPopular) =>
feedCacheStore.set({ ...get(feedCacheStore), popular: newPopular })
);
}
return {
materialious/src/routes/(app)/search/[slug]/+page.svelte
+3 -1
View File
@@ -22,6 +22,8 @@
document
.getElementById($feedLastItemId)
?.scrollIntoView({ behavior: 'instant', block: 'center', inline: 'nearest' });
feedLastItemId.set(undefined);
}
});
@@ -94,7 +96,7 @@
class="no-padding"
style="height: 100%;"
role="presentation"
onclick={() => feedLastItemId.set(extractUniqueId(item))}
onclick={async () => feedLastItemId.set(await extractUniqueId(item))}
id={extractUniqueId(item)}
>
{#if item.type === 'video'}
materialious/src/routes/(app)/search/[slug]/+page.ts
+5 -1
View File
@@ -20,13 +20,17 @@ export async function load({ params, url }) {
if (!search) {
try {
searchCacheStore.set({ [searchStoreId]: await getSearch(params.slug, { type: type }) });
searchCacheStore.set({
...get(searchCacheStore),
[searchStoreId]: await getSearch(params.slug, { type: type })
});
} catch (errorMessage: any) {
error(500, errorMessage);
}
} else {
getSearch(params.slug, { type: type }).then((newSearch) => {
searchCacheStore.set({
...get(searchCacheStore),
[searchStoreId]: excludeDuplicateFeeds(search, newSearch) as (
| Channel
| Video
materialious/src/routes/(app)/subscriptions/+page.ts
+2 -1
View File
@@ -18,11 +18,12 @@ export async function load() {
videos = [...feeds.notifications, ...feeds.videos];
feedCacheStore.set({ subscription: videos });
feedCacheStore.set({ ...get(feedCacheStore), subscription: videos });
} else {
await getFeed(100, 1).then((feeds) => {
const newVideos = [...feeds.notifications, ...feeds.videos, ...videos];
feedCacheStore.set({
...get(feedCacheStore),
subscription: excludeDuplicateFeeds(videos, newVideos) as (
| VideoBase
| Video
materialious/src/routes/(app)/trending/+page.ts
+4 -2
View File
@@ -13,8 +13,10 @@ export async function load() {
error(500, errorMessage);
}
feedCacheStore.set({ trending });
feedCacheStore.set({ ...get(feedCacheStore), trending });
} else {
getTrending().then((newTrending) => feedCacheStore.set({ trending: newTrending }));
getTrending().then((newTrending) =>
feedCacheStore.set({ ...get(feedCacheStore), trending: newTrending })
);
}
}
update_versions.py
+5 -13
View File
@@ -3,19 +3,15 @@ import os
import re
from datetime import datetime
LATEST_VERSION = "1.9.4"
LATEST_VERSION = "1.9.5"
RELEASE_DATE = datetime.now().strftime("%Y-%-m-%d") # Format: YYYY-M-D
WORKING_DIR = os.path.join(
os.path.dirname(os.path.realpath(__file__)), "materialious"
)
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"
)
METAINFO_FILE = os.path.join(WORKING_DIR, "electron", "materialious.metainfo.xml")
def package_json_update_ver(location: str) -> None:
@@ -38,9 +34,7 @@ def update_android_version() -> None:
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"versionCode\s+\d+", f"versionCode {version_code}", contents)
contents = re.sub(
r'versionName\s+"[^"]+"',
f'versionName "{LATEST_VERSION}"',
@@ -66,9 +60,7 @@ def update_metainfo_release() -> None:
</release>"""
# Insert the new release after the opening <releases> tag
updated_contents = re.sub(
r"(<releases>\s*)", rf"\1{new_release}\n", contents
)
updated_contents = re.sub(r"(<releases>\s*)", rf"\1{new_release}\n", contents)
with open(METAINFO_FILE, "w") as f_:
f_.write(updated_contents)