Merge pull request #340 from decaf-dev/dev

1.44.1

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "vault-explorer",
 	"name": "Vault Explorer",
-	"version": "1.44.0",
+	"version": "1.44.1",
 	"minAppVersion": "1.4.13",
 	"description": "Explore your vault in visual format",
 	"author": "DecafDev",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-vault-explorer",
-	"version": "1.44.0",
+	"version": "1.44.1",
 	"description": "Explore your vault in visual format",
 	"main": "main.js",
 	"scripts": {

src/main.ts

@@ -210,6 +210,12 @@ export default class VaultExplorerPlugin extends Plugin {
 					localStorage.removeItem(LOCAL_STORAGE_LICENSE_KEY);
 				}
 				if (isVersionLessThan(loadedVersion, "1.37.1")) {
+					console.log("Clearing image cache");
+					await clearSMICache();
+				}
+				if (isVersionLessThan(loadedVersion, "1.44.1")) {
+					//socialMediaImageUrl -> smiUrl
+					console.log("Clearing image cache");
 					await clearSMICache();
 				}
 			}

src/svelte/app/components/grid-card.svelte

@@ -27,7 +27,8 @@
 
 	type SocialMediaImageResult = {
 		status: "SUCCESS" | "NOT_FOUND" | "EXPIRED" | "NO_IMAGE";
-		url?: string; // Only present when status is 'SUCCESS'
+		websiteUrl: string;
+		smiUrl: string | null;
 	};
 
 	export let displayName: string;
@@ -184,24 +185,29 @@
 	async function getCachedSocialMediaImageUrl(
 		websiteUrl: string,
 	): Promise<SocialMediaImageResult> {
+		Logger.trace({
+			fileName: "grid-card.svelte",
+			functionName: "getCachedSocialMediaUrl",
+			message: "result",
+		});
 		const entry = await getSMICacheEntry(websiteUrl);
 
 		if (entry) {
-			const { socialMediaImageUrl } = entry;
+			const { smiUrl } = entry;
 
-			if (socialMediaImageUrl) {
+			if (smiUrl) {
 				const isExpired = await isSMICacheEntryExpired(entry);
 				if (!isExpired) {
-					return { status: "SUCCESS", url: socialMediaImageUrl };
+					return { status: "SUCCESS", websiteUrl, smiUrl };
 				} else {
-					return { status: "EXPIRED" }; // Image found but expired
+					return { status: "EXPIRED", websiteUrl, smiUrl }; // Image found but expired
 				}
 			} else {
-				return { status: "NO_IMAGE" }; // Social image was fetched but doesn't exist
+				return { status: "NO_IMAGE", websiteUrl, smiUrl }; // Image was previously cached but doesn't exist
 			}
 		}
 
-		return { status: "NOT_FOUND" }; // Image not cached
+		return { status: "NOT_FOUND", websiteUrl, smiUrl: null }; // Website URL doesn't have a cached image
 	}
 
 	$: if (imageUrl) {
@@ -218,9 +224,9 @@
 				},
 			);
 
-			const { status, url } = result;
+			const { status, smiUrl } = result;
 			if (status === "SUCCESS") {
-				imgSrc = url!;
+				imgSrc = smiUrl;
 			} else if (status === "EXPIRED" || status === "NOT_FOUND") {
 				imgSrc = imageUrl;
 			} else if (status === "NO_IMAGE") {

src/svelte/app/services/smi-cache.ts

@@ -1,4 +1,4 @@
-import { DBSchema, IDBPDatabase, openDB } from "idb";
+import { DBSchema, openDB } from "idb";
 import Logger from "js-logger";
 import { Notice } from "obsidian";
 
@@ -9,7 +9,7 @@ const ENTRY_EXPIRATION_TIME = ONE_WEEK_MILLIS;
 
 interface SocialMediaImageEntry {
 	url: string;
-	socialMediaImageUrl: string | null; // null if no social media image found
+	smiUrl: string | null; // null if no social media image found
 	timestamp: number;
 }
 
@@ -28,6 +28,22 @@ export const isSMICacheEntryExpired = async (entry: SocialMediaImageEntry) => {
 };
 
 export const getSMICacheEntry = async (websiteUrl: string) => {
+	Logger.trace({
+		fileName: "smi-cache.ts",
+		functionName: "getSMICacheEntry",
+		message: "called",
+	});
+
+	Logger.debug(
+		{
+			fileName: "grid-card.svelte",
+			functionName: "getCachedSocialMediaUrl",
+			message: "getting cached entry",
+		},
+		{
+			websiteUrl,
+		}
+	);
 	const db = await openDatabase();
 	const cachedEntry = await db.get(STORE_NAME, websiteUrl);
 	return cachedEntry ?? null;
@@ -60,7 +76,7 @@ export const putSMICacheEntry = async (url: string, smiUrl: string | null) => {
 	const db = await openDatabase();
 	await db.put(STORE_NAME, {
 		url,
-		socialMediaImageUrl: smiUrl,
+		smiUrl,
 		timestamp: Date.now(),
 	});
 };

versions.json

@@ -141,5 +141,6 @@
 	"1.42.1": "1.4.13",
 	"1.43.0": "1.4.13",
 	"1.43.1": "1.4.13",
-	"1.44.0": "1.4.13"
+	"1.44.0": "1.4.13",
+	"1.44.1": "1.4.13"
 }