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/index.html b/index.html index 8c1065f..60dd87d 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-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/src/lib.rs b/src-tauri/src/lib.rs index 89a8960..83f317e 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -535,20 +535,33 @@ async fn document_mtime(path: String) -> Result { // is ~1ms). A sync command would run on the main thread and freeze the UI; an // async command runs off it, so the window stays responsive during the read. // -// Confined to the user's home dir or the bundled resource dir (examples): -// canonicalize resolves `..`/symlinks, then we require the result to sit under -// an allowed root. Errors stay generic to avoid leaking paths. +// Confined to the folder the user opened, plus the bundled resource dir for the +// built-in examples. `root` is the folder the window is currently browsing, so +// a document can only ever pull in files the user already granted access to by +// opening that folder — a crafted relative link cannot escape it. +// +// Confining to the *home* dir instead (as this did until 0.11.1) got the threat +// model backwards: it allowed ~/.ssh and ~/.aws while refusing every folder +// outside home, so opening anything under /tmp, /Volumes or a repo cloned +// elsewhere failed even though the sidebar listed it fine. +// +// canonicalize resolves `..`/symlinks on both sides before comparing. Errors +// stay generic to avoid leaking paths. #[tauri::command] -async fn read_document(app: tauri::AppHandle, path: String) -> Result { +async fn read_document( + app: tauri::AppHandle, + path: String, + root: String, +) -> Result { let requested = std::fs::canonicalize(&path).map_err(|_| "cannot resolve path".to_string())?; - let roots = [app.path().home_dir(), app.path().resource_dir()] + let roots = [std::fs::canonicalize(&root).ok(), app.path().resource_dir().ok()] .into_iter() .flatten() .filter_map(|p| std::fs::canonicalize(p).ok()); - if !roots.into_iter().any(|root| requested.starts_with(&root)) { - return Err("path outside allowed roots".to_string()); + if !roots.into_iter().any(|allowed| requested.starts_with(&allowed)) { + return Err("path outside the opened folder".to_string()); } let t = std::time::Instant::now(); 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", diff --git a/src/locales/en.json b/src/locales/en.json index 27e0b4a..522cc9f 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -3,7 +3,6 @@ "titlebar.print": "Print", "titlebar.theme": "Toggle dark mode", "titlebar.preferences": "Preferences", - "search.placeholder": "Search…", "search.prev": "Previous (Shift+Cmd+G)", "search.next": "Next (Cmd+G)", @@ -11,7 +10,6 @@ "search.opt.case": "Case sensitive (Aa)", "search.opt.diacritics": "Ignore accents", "search.opt.wholeword": "Whole word", - "app.name": "Markdown Viewer", "empty.subtitle": "Open a folder to browse your documentation.", "empty.open": "Open folder", @@ -19,14 +17,12 @@ "outline.title": "On this page", "breadcrumb.change": "Change folder", "sidebar.parent": "Parent directory", - "prefs.title": "Preferences", "prefs.close": "Close (Esc)", "prefs.done": "Done", "prefs.tab.general": "General", "prefs.tab.fonts": "Fonts", "prefs.tab.appearance": "Appearance", - "prefs.general.language.title": "Language", "prefs.general.language.hint": "Interface language", "prefs.general.outline.title": "Outline panel", @@ -34,7 +30,6 @@ "prefs.outline.auto": "Auto", "prefs.outline.always": "Always", "prefs.outline.hidden": "Hidden", - "prefs.fonts.size.title": "Size", "prefs.fonts.size.hint": "Quick preset for document text", "prefs.fonts.size.small": "Small", @@ -59,7 +54,6 @@ "prefs.fonts.size.exact.hint": "Overrides the preset (10–32 px)", "prefs.fonts.system.default": "System default", "prefs.fonts.placeholder.auto": "auto", - "prefs.appearance.follow": "Follow system", "prefs.appearance.follow.hint": "Automatically switch between the light and dark variant of the theme based on the macOS appearance.", "prefs.appearance.new": "New theme…", @@ -74,7 +68,6 @@ "prefs.appearance.duplicate": "Duplicate", "prefs.appearance.edit": "Edit", "prefs.appearance.custom.badge": "Custom", - "editor.title": "Theme editor", "editor.back": "← Back", "editor.default.name": "My theme", @@ -103,11 +96,15 @@ "editor.var.table-stripe": "Table stripe", "editor.var.search-hit": "Search highlight", "editor.var.search-hit-active": "Active search hit", - "mermaid.error": "Mermaid syntax error — showing source", "mermaid.close": "Close (Esc)", "code.copy": "Copy", "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" + "slowRead.dismiss": "Dismiss", + "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 1cd4033..641325e 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -3,7 +3,6 @@ "titlebar.print": "Imprimer", "titlebar.theme": "Basculer mode sombre", "titlebar.preferences": "Préférences", - "search.placeholder": "Rechercher…", "search.prev": "Précédent (Shift+Cmd+G)", "search.next": "Suivant (Cmd+G)", @@ -11,7 +10,6 @@ "search.opt.case": "Sensible à la casse (Aa)", "search.opt.diacritics": "Ignorer les accents", "search.opt.wholeword": "Mot entier", - "app.name": "Markdown Viewer", "empty.subtitle": "Ouvrez un dossier pour parcourir votre documentation.", "empty.open": "Ouvrir un dossier", @@ -19,14 +17,12 @@ "outline.title": "Sur cette page", "breadcrumb.change": "Changer de dossier", "sidebar.parent": "Dossier parent", - "prefs.title": "Préférences", "prefs.close": "Fermer (Échap)", "prefs.done": "Terminé", "prefs.tab.general": "Général", "prefs.tab.fonts": "Polices", "prefs.tab.appearance": "Apparence", - "prefs.general.language.title": "Langue", "prefs.general.language.hint": "Langue de l'interface", "prefs.general.outline.title": "Panneau de plan", @@ -34,7 +30,6 @@ "prefs.outline.auto": "Auto", "prefs.outline.always": "Toujours", "prefs.outline.hidden": "Caché", - "prefs.fonts.size.title": "Taille", "prefs.fonts.size.hint": "Préréglage rapide pour le texte du document", "prefs.fonts.size.small": "Petit", @@ -59,7 +54,6 @@ "prefs.fonts.size.exact.hint": "Surcharge le préréglage (10–32 px)", "prefs.fonts.system.default": "Par défaut système", "prefs.fonts.placeholder.auto": "auto", - "prefs.appearance.follow": "Suivre le système", "prefs.appearance.follow.hint": "Bascule automatiquement entre la variante claire et sombre du thème selon l'apparence macOS.", "prefs.appearance.new": "Nouveau thème…", @@ -74,7 +68,6 @@ "prefs.appearance.duplicate": "Dupliquer", "prefs.appearance.edit": "Éditer", "prefs.appearance.custom.badge": "Personnalisé", - "editor.title": "Éditeur de thème", "editor.back": "← Retour", "editor.default.name": "Mon thème", @@ -103,11 +96,15 @@ "editor.var.table-stripe": "Rayure de tableau", "editor.var.search-hit": "Résultat de recherche", "editor.var.search-hit-active": "Résultat actif", - "mermaid.error": "Erreur de syntaxe Mermaid — affichage de la source", "mermaid.close": "Fermer (Échap)", "code.copy": "Copier", "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" + "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.", + "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 e259d2e..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); @@ -415,6 +422,10 @@ const slowReadNotice = document.getElementById( const slowReadDismiss = document.getElementById( "slow-read-dismiss" ) as HTMLButtonElement; +const loadError = document.getElementById("load-error") as HTMLDivElement; +const loadErrorText = document.getElementById( + "load-error-text" +) as HTMLSpanElement; const openBtn = document.getElementById("open-btn") as HTMLButtonElement; const examplesBtn = document.getElementById( "examples-btn" @@ -666,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"); @@ -778,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 ?? ""; @@ -1417,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); @@ -1499,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", () => { @@ -1774,7 +1811,12 @@ async function readDocumentText( return { text: cached.text, slow: false }; } const start = performance.now(); - const text = await invoke("read_document", { path: fullPath }); + // `root` is the access the user granted by opening this folder; the backend + // refuses anything outside it. + const text = await invoke("read_document", { + path: fullPath, + root: rootPath, + }); const slow = performance.now() - start >= SLOW_READ_MS; if (mtime !== null) { docCache.set(fullPath, { mtime, text }); @@ -1793,6 +1835,7 @@ async function loadFile(filePath: string): Promise { } const tPing1 = performance.now(); + loadError.hidden = true; showLoadingSoon(); const tRead0 = performance.now(); let text: string; @@ -1857,6 +1900,15 @@ async function loadFile(filePath: string): Promise { }); } catch (e) { console.error("Failed to load file:", filePath, e); + // Surface the failure. A console-only error made a whole class of unopenable + // files look like an unresponsive click: the sidebar listed them, selecting + // one simply did nothing. + hideLoading(); + loadErrorText.textContent = t("loadError.message").replace( + "{file}", + filePath.split("/").pop() ?? filePath + ); + loadError.hidden = false; } } 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"; }