From 72f5aac524c147b5375a3f1405cb73a8473b9504 Mon Sep 17 00:00:00 2001 From: Prud'homme Date: Thu, 13 Aug 2026 16:33:03 +0200 Subject: [PATCH 1/3] fix(fs): open documents from any folder the user opened MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since 0.11.0 documents are read through `read_document`, which only allowed paths under the home dir or the bundled resource dir. Opening a folder anywhere else — /tmp, /Volumes, a repo cloned outside home — listed its files in the sidebar but refused to open any of them: the listing goes through the fs plugin (scoped to `/**`), the read did not. The failure was invisible. `loadFile` only logged to the console, so selecting a file just did nothing, which reads as an unresponsive click rather than a refusal. Confining to the home dir also had the threat model backwards: it allowed ~/.ssh and ~/.aws while blocking /tmp. Confine to the folder the user opened instead — the access they actually granted — so a crafted relative link still cannot escape it, and every folder they can browse, they can read. The resource dir stays allowed for the bundled examples. Surface load failures in the content area (FR + EN) so a file that cannot be opened says so instead of silently doing nothing. Claude-Session: https://claude.ai/code/session_01NcJuB2iR4WEfuQVLpYqWi4 --- index.html | 19 +++++++++++++++++++ src-tauri/src/lib.rs | 27 ++++++++++++++++++++------- src/locales/en.json | 11 ++--------- src/locales/fr.json | 11 ++--------- src/main.ts | 21 ++++++++++++++++++++- 5 files changed, 63 insertions(+), 26 deletions(-) diff --git a/index.html b/index.html index 8c1065f..9f9b7f3 100644 --- a/index.html +++ b/index.html @@ -1902,6 +1902,22 @@ line-height: 1.45; } #slow-read-notice[hidden] { display: none; } + + /* Same shape as the slow-read notice, in an error tone. */ + #load-error { + display: flex; + align-items: flex-start; + gap: 10px; + margin: 0 0 24px; + padding: 10px 14px; + border: 1px solid var(--border); + border-left: 3px solid #dc2626; + border-radius: 6px; + color: var(--text); + font-size: 13px; + line-height: 1.45; + } + #load-error[hidden] { display: none; } #slow-read-notice .srn-text { flex: 1; } #slow-read-notice .srn-close { flex: none; @@ -2049,6 +2065,9 @@

Markdown Viewer

+ +
+
+ + Ouverture depuis le Finder + + + Quand un document est déjà ouvert + +
+
+ + +
+
diff --git a/src/locales/en.json b/src/locales/en.json index 0a2d3b2..522cc9f 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -102,5 +102,9 @@ "code.copied": "Copied!", "slowRead.message": "This file took a long time to open. This folder looks cloud-synced (OneDrive, iCloud…): \"online-only\" files are downloaded on first read. Move your documents to a local folder to speed things up.", "slowRead.dismiss": "Dismiss", - "loadError.message": "Could not open {file}. The file may have been moved, or it sits outside the folder you opened." + "loadError.message": "Could not open {file}. The file may have been moved, or it sits outside the folder you opened.", + "prefs.general.finderOpen.title": "Opening from Finder", + "prefs.general.finderOpen.hint": "When a document is already open", + "prefs.finderOpen.newWindow": "New window", + "prefs.finderOpen.reuse": "Current window" } diff --git a/src/locales/fr.json b/src/locales/fr.json index f3f913a..641325e 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -102,5 +102,9 @@ "code.copied": "Copié !", "slowRead.message": "Ce fichier a mis longtemps à s'ouvrir. Ce dossier semble synchronisé dans le cloud (OneDrive, iCloud…) : les fichiers « en ligne uniquement » se téléchargent à la première lecture. Déplacez vos documents dans un dossier local pour accélérer.", "slowRead.dismiss": "Masquer", - "loadError.message": "Impossible d'ouvrir {file}. Le fichier a peut-être été déplacé, ou il se trouve hors du dossier que vous avez ouvert." + "loadError.message": "Impossible d'ouvrir {file}. Le fichier a peut-être été déplacé, ou il se trouve hors du dossier que vous avez ouvert.", + "prefs.general.finderOpen.title": "Ouverture depuis le Finder", + "prefs.general.finderOpen.hint": "Quand un document est déjà ouvert", + "prefs.finderOpen.newWindow": "Nouvelle fenêtre", + "prefs.finderOpen.reuse": "Fenêtre actuelle" } diff --git a/src/main.ts b/src/main.ts index 3dcf16c..424bbcd 100644 --- a/src/main.ts +++ b/src/main.ts @@ -31,6 +31,7 @@ import { FONT_WEIGHT_KEY, MAX_CUSTOM_FONT_SIZE, MIN_CUSTOM_FONT_SIZE, + FINDER_OPEN_KEY, OUTLINE_PREF_KEY, applyBodyFontToDOM, applyCodeFontToDOM, @@ -41,9 +42,11 @@ import { resolveInitialCustomFontSize, resolveInitialFontFamily, resolveInitialFontSize, + resolveInitialFinderOpenPref, resolveInitialFontWeight, resolveInitialOutlinePref, setSegmentActive, + type FinderOpenPref, type FontSize, type FontWeight, type OutlinePref, @@ -101,6 +104,7 @@ let currentBodyFont: string | null = null; let currentCodeFont: string | null = null; let currentFontWeight: FontWeight | null = null; let currentCustomFontSize: number | null = null; +let finderOpenPref: FinderOpenPref = "new-window"; const systemDarkMQ = window.matchMedia("(prefers-color-scheme: dark)"); function isDark(): boolean { @@ -181,6 +185,9 @@ async function initTheme(): Promise { currentCustomFontSize = resolveInitialCustomFontSize( await store.get(CUSTOM_FONT_SIZE_KEY) ); + finderOpenPref = resolveInitialFinderOpenPref( + await store.get(FINDER_OPEN_KEY) + ); applyActiveTheme(); applyFontSize(savedFontSize); @@ -670,6 +677,9 @@ const prefsFontSize = document.getElementById( "prefs-fontsize" ) as HTMLSelectElement; const prefsOutline = document.getElementById("prefs-outline") as HTMLDivElement; +const prefsFinderOpen = document.getElementById( + "prefs-finder-open" +) as HTMLDivElement; const prefsTabs = document.querySelectorAll(".prefs-tab"); const prefsTabPanels = document.querySelectorAll(".prefs-tab-panel"); @@ -782,6 +792,7 @@ function syncPrefsUI(): void { prefsOutline, (document.documentElement.dataset.outline as OutlinePref) ?? "auto" ); + setSegmentActive(prefsFinderOpen, finderOpenPref); prefsBodyFont.value = currentBodyFont ?? ""; prefsCodeFont.value = currentCodeFont ?? ""; prefsFontWeight.value = currentFontWeight ?? ""; @@ -1421,6 +1432,17 @@ function initPreferences(): void { }); } + for (const btn of prefsFinderOpen.querySelectorAll( + "button" + )) { + btn.addEventListener("click", async () => { + const value = btn.dataset.value as FinderOpenPref; + finderOpenPref = value; + setSegmentActive(prefsFinderOpen, value); + await savePref(FINDER_OPEN_KEY, value); + }); + } + prefsAdvancedToggle.addEventListener("click", () => { const open = !prefsAdvanced.classList.contains("visible"); setAdvancedOpen(open); @@ -1503,6 +1525,17 @@ async function init(): Promise { setRootPath(event.payload); }); appWindow.listen("open-file", (event) => { + // The backend routes this to the frontmost window only. Reusing it would + // discard whatever that window was showing, so by default hand the document + // to a new window — unless this one is still on the welcome screen, where + // spawning would just leave an empty window behind. + if (finderOpenPref === "new-window" && activeFile !== null) { + void invoke("open_new_window", { path: event.payload }).catch((e) => { + console.warn("Failed to open a new window, reusing this one:", e); + openFileFromPath(event.payload); + }); + return; + } openFileFromPath(event.payload); }); appWindow.listen("menu-open-folder", () => { diff --git a/src/preferences.test.ts b/src/preferences.test.ts index f307974..73d37da 100644 --- a/src/preferences.test.ts +++ b/src/preferences.test.ts @@ -3,6 +3,8 @@ import { resolveDark, resolveInitialAppearance, resolveInitialFontSize, + isFinderOpenPref, + resolveInitialFinderOpenPref, resolveInitialOutlinePref, resolveInitialFontWeight, resolveInitialFontFamily, @@ -334,3 +336,26 @@ describe("advanced DOM appliers — CSS variables", () => { expect(root.style.getPropertyValue("--md-body-size")).toBe(""); }); }); + +describe("resolveInitialFinderOpenPref", () => { + it("keeps a valid stored value", () => { + expect(resolveInitialFinderOpenPref("reuse")).toBe("reuse"); + expect(resolveInitialFinderOpenPref("new-window")).toBe("new-window"); + }); + + // Opening a Finder document must not discard what the current window shows, + // which is what macOS document viewers do. + it("defaults to opening a new window", () => { + expect(resolveInitialFinderOpenPref(undefined)).toBe("new-window"); + expect(resolveInitialFinderOpenPref(null)).toBe("new-window"); + expect(resolveInitialFinderOpenPref("nope")).toBe("new-window"); + expect(resolveInitialFinderOpenPref(42)).toBe("new-window"); + }); + + it("recognises exactly the two supported values", () => { + expect(isFinderOpenPref("new-window")).toBe(true); + expect(isFinderOpenPref("reuse")).toBe(true); + expect(isFinderOpenPref("newwindow")).toBe(false); + expect(isFinderOpenPref("")).toBe(false); + }); +}); diff --git a/src/preferences.ts b/src/preferences.ts index 2d7a022..7f3cf47 100644 --- a/src/preferences.ts +++ b/src/preferences.ts @@ -1,6 +1,8 @@ export type Appearance = "system" | "light" | "dark"; export type FontSize = "small" | "medium" | "large"; export type OutlinePref = "auto" | "always" | "hidden"; +/** What happens when a document is opened from Finder while a window is open. */ +export type FinderOpenPref = "new-window" | "reuse"; export const APPEARANCE_VALUES: readonly Appearance[] = [ "system", @@ -17,10 +19,15 @@ export const OUTLINE_VALUES: readonly OutlinePref[] = [ "always", "hidden", ]; +export const FINDER_OPEN_VALUES: readonly FinderOpenPref[] = [ + "new-window", + "reuse", +]; export const APPEARANCE_KEY = "appearance"; export const FONTSIZE_KEY = "fontSize"; export const OUTLINE_PREF_KEY = "outlinePref"; +export const FINDER_OPEN_KEY = "finderOpenPref"; export const LEGACY_THEME_KEY = "theme"; export const BODY_FONT_KEY = "bodyFontFamily"; @@ -146,6 +153,21 @@ export function resolveInitialFontSize(value: unknown): FontSize { return isFontSize(value) ? value : "medium"; } +export function isFinderOpenPref(value: unknown): value is FinderOpenPref { + return ( + typeof value === "string" && + (FINDER_OPEN_VALUES as readonly string[]).includes(value) + ); +} + +/** + * Defaults to opening a new window, matching how macOS document viewers behave: + * opening a file from Finder should not discard what the current window shows. + */ +export function resolveInitialFinderOpenPref(value: unknown): FinderOpenPref { + return isFinderOpenPref(value) ? value : "new-window"; +} + export function resolveInitialOutlinePref(value: unknown): OutlinePref { return isOutlinePref(value) ? value : "auto"; } From 20a1814dbb861b5cdc6b77eb4152b913054bb81c Mon Sep 17 00:00:00 2001 From: Prud'homme Date: Thu, 13 Aug 2026 16:49:23 +0200 Subject: [PATCH 3/3] chore(release): v0.11.1 Claude-Session: https://claude.ai/code/session_01NcJuB2iR4WEfuQVLpYqWi4 --- CHANGELOG.md | 11 +++++++++++ src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd83745..c4d7c96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/), and this project adheres to [Semantic Versioning](https://semver.org/). +## [0.11.1](https://github.com/ekino/MarkdownViewer/releases/tag/v0.11.1) - 2026-08-13 + +### Added + +- General preference for what opening a document from Finder does when a document is already open: hand it to a new window (default, matching macOS document viewers) or replace the current window's content. A window still on the welcome screen is reused either way, so choosing "new window" never leaves an empty window behind (FR + EN) + +### Fixed + +- Open documents from folders outside the home directory. Since 0.11.0 the sidebar listed files under `/tmp`, `/Volumes` or a repo cloned outside home, but selecting one did nothing: the listing and the read did not share the same access rule. Reads are now confined to the folder you opened — the access you actually granted — which also stops a crafted relative link from escaping it +- Show a message when a document cannot be opened. The failure was logged to the console only, so an unopenable file looked like an unresponsive click (FR + EN) + ## [0.11.0](https://github.com/ekino/MarkdownViewer/releases/tag/v0.11.0) - 2026-08-13 ### Added diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 1c42efc..1eda5c5 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2209,7 +2209,7 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "mdv" -version = "0.11.0" +version = "0.11.1" dependencies = [ "block2", "font-kit", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 9b5098a..696e813 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mdv" -version = "0.11.0" +version = "0.11.1" description = "A Tauri App" authors = ["you"] license = "" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index af25ca8..608183c 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "../node_modules/@tauri-apps/cli/config.schema.json", "productName": "Markdown Viewer", - "version": "0.11.0", + "version": "0.11.1", "identifier": "com.mdv.viewer", "build": { "frontendDist": "../dist",