Merge pull request #269 from decaf-dev/dev

1.35.0

Author: decaf-dev

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "vault-explorer",
 	"name": "Vault Explorer",
-	"version": "1.34.3",
+	"version": "1.35.0",
 	"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.34.3",
+	"version": "1.35.0",
 	"description": "Explore your vault in visual format",
 	"main": "main.js",
 	"scripts": {

src/obsidian/styles.css

@@ -1,3 +1,8 @@
 .vault-explorer-premium-setting {
 	color: var(--text-accent);
 }
+
+.vault-explorer-setting-description {
+	padding-top: var(--size-4-1);
+	font-size: var(--font-smaller);
+}

src/obsidian/vault-explorer-settings-tab.ts

@@ -14,17 +14,13 @@ import {
 } from "src/logger/constants";
 import Logger from "js-logger";
 import { stringToLogLevel } from "src/logger";
-import {
-	CollapseStyle,
-	CoverImageSource,
-	FileInteractionStyle,
-	TExplorerView,
-} from "src/types";
+import { CollapseStyle, CoverImageSource, TExplorerView } from "src/types";
 import EventManager from "src/event/event-manager";
 import LicenseKeyApp from "../svelte/license-key-app/index.svelte";
 import { PluginEvent } from "src/event/types";
 
 import "./styles.css";
+import { clearSocialImageCache } from "src/svelte/app/services/social-media-image";
 
 export default class VaultExplorerSettingsTab extends PluginSettingTab {
 	plugin: VaultExplorerPlugin;
@@ -653,29 +649,6 @@ export default class VaultExplorerSettingsTab extends PluginSettingTab {
 			target: containerEl,
 		});
 
-		new Setting(containerEl).setName("Storage").setHeading();
-
-		const configFolderDesc = new DocumentFragment();
-		configFolderDesc.createDiv({
-			text: "Set the plugin configuration folder.",
-		});
-		configFolderDesc.createDiv({
-			text: "Restart Obsidian after changing this setting.",
-			cls: "mod-warning",
-		});
-
-		new Setting(containerEl)
-			.setName("Config folder")
-			.setDesc(configFolderDesc)
-			.addText((component) =>
-				component
-					.setValue(this.plugin.settings.configDir)
-					.onChange(async (value) => {
-						this.plugin.settings.configDir = value;
-						await this.plugin.saveSettings();
-					})
-			);
-
 		new Setting(containerEl).setName("Debugging").setHeading();
 		new Setting(containerEl)
 			.setName("Log level")
@@ -699,6 +672,40 @@ export default class VaultExplorerSettingsTab extends PluginSettingTab {
 					}
 				);
 			});
+
+		new Setting(containerEl).setName("Data").setHeading();
+
+		const configFolderDesc = new DocumentFragment();
+		configFolderDesc.createDiv({
+			text: "Set the plugin configuration folder.",
+		});
+		configFolderDesc.createDiv({
+			text: "Restart Obsidian after changing this setting.",
+			cls: "mod-warning vault-explorer-setting-description",
+		});
+
+		new Setting(containerEl)
+			.setName("Config folder")
+			.setDesc(configFolderDesc)
+			.addText((component) =>
+				component
+					.setValue(this.plugin.settings.configDir)
+					.onChange(async (value) => {
+						this.plugin.settings.configDir = value;
+						await this.plugin.saveSettings();
+					})
+			);
+
+		new Setting(containerEl)
+			.setName("Social media image cache")
+			.addButton((button) =>
+				button
+					.setClass("mod-destructive")
+					.setButtonText("Clear cache")
+					.onClick(async () => {
+						await clearSocialImageCache();
+					})
+			);
 	}
 
 	onClose() {

src/obsidian/vault-explorer-view.ts

@@ -1,4 +1,4 @@
-import { ItemView, Vault, WorkspaceLeaf } from "obsidian";
+import { ItemView, WorkspaceLeaf } from "obsidian";
 
 import { VAULT_EXPLORER_VIEW } from "src/constants";
 import VaultExplorerApp from "../svelte/app/index.svelte";

src/svelte/app/components/filter-group-list.svelte

@@ -107,6 +107,7 @@
 		padding-bottom: 8px;
 		resize: horizontal;
 		overflow-x: auto;
+		max-width: 100%;
 	}
 
 	.vault-explorer-empty-label {

src/svelte/app/services/social-media-image.ts

@@ -1,6 +1,6 @@
 import { DBSchema, IDBPDatabase, openDB } from "idb";
 import Logger from "js-logger";
-import { requestUrl } from "obsidian";
+import { Notice, requestUrl } from "obsidian";
 
 const DATABASE_NAME = "vaultexplorer";
 const STORE_NAME = "socialMediaImage";
@@ -24,8 +24,22 @@ export const clearSocialImageCache = async () => {
 		functionName: "clearSocialMediaImageCache",
 		message: "called",
 	});
-	const db = await openDatabase();
-	await db.clear(STORE_NAME);
+	try {
+		const db = await openDatabase();
+		await db.clear(STORE_NAME);
+		new Notice("Vault Explorer: social media image cache cleared");
+	} catch (err) {
+		new Notice("Failed to clear social media image cache");
+		const error = err as Error;
+		Logger.error(
+			{
+				fileName: "social-media-image.ts",
+				functionName: "clearSocialMediaImageCache",
+				message: "failed to clear cache",
+			},
+			error.message
+		);
+	}
 };
 
 export const fetchSocialImage = async (url: string) => {
@@ -73,9 +87,21 @@ export const fetchSocialImage = async (url: string) => {
 		const ogImage = getMetaTagContent(document, "og:image");
 		const twitterImage = getMetaTagContent(document, "twitter:image");
 
-		const imageUrl = ogImage || twitterImage;
+		let imageUrl = ogImage || twitterImage;
 
 		if (imageUrl) {
+			//Handle edge case where social media image URL has slashes at the beginning
+			//See issue #265
+			if (imageUrl.startsWith("//")) {
+				imageUrl = imageUrl.replace(/^\/+/, "");
+			}
+
+			//Handle edge case where the url doesn't start with https://
+			//See issue #265
+			if (!imageUrl.startsWith("https://")) {
+				imageUrl = `https://${imageUrl}`;
+			}
+
 			Logger.debug(
 				{
 					fileName: "social-media-image.ts",

test-vault/.obsidian/plugins/vault-explorer/data.json

@@ -25,8 +25,28 @@
     },
     "custom": {
       "isEnabled": true,
-      "selectedGroupId": "",
-      "groups": []
+      "selectedGroupId": "A3PgwC3AaYu1XqDn",
+      "groups": [
+        {
+          "id": "A3PgwC3AaYu1XqDn",
+          "name": "Group 1",
+          "rules": [
+            {
+              "id": "EiihU98U3T6b6UNr",
+              "type": "property",
+              "propertyType": "text",
+              "propertyName": "",
+              "operator": "and",
+              "isEnabled": true,
+              "condition": "is",
+              "value": "",
+              "matchWhenPropertyDNE": false
+            }
+          ],
+          "isEnabled": false,
+          "isSticky": false
+        }
+      ]
     },
     "favorites": {
       "isEnabled": true,
@@ -75,7 +95,7 @@
   "enableClockUpdates": true,
   "enableFileIcons": true,
   "enableScrollButtons": true,
-  "filterGroupsWidth": "201px",
+  "filterGroupsWidth": "759px",
   "shouldWrapFilterGroups": false,
   "pageSize": 25,
   "viewOrder": [
@@ -84,6 +104,6 @@
     "feed"
   ],
   "configDir": ".vaultexplorer",
-  "pluginVersion": "1.34.2",
+  "pluginVersion": "1.34.3",
   "logLevel": "trace"
 }

versions.json

@@ -120,5 +120,6 @@
 	"1.34.0": "1.4.13",
 	"1.34.1": "1.4.13",
 	"1.34.2": "1.4.13",
-	"1.34.3": "1.4.13"
+	"1.34.3": "1.4.13",
+	"1.35.0": "1.4.13"
 }