Compare commits

...
Author SHA1 Message Date
Yuri Karamian f39b301efc fix: judge network paths by their text on Windows
On Windows, a network path from note content that lies outside the vault
and outside any folder the user opened is refused before the filesystem is
asked about it, in the backend path checks and in the frontend resolvers.
Other platforms are unchanged.
2026-10-10 17:29:10 +02:00
Yuri Karamian 1ad948d4f0 fix: open only document and media files with the default application
Other file types are shown in the file manager instead of being handed to
the system opener.
2026-10-10 17:19:19 +02:00
Yuri Karamian 6341fa8c9b fix: bound frontmatter parsing
Frontmatter is parsed through a YAML engine with limits on size, aliases
and nesting. Frontmatter outside those limits is read as a note without
metadata instead of being handed to the unbounded loader.
2026-10-10 16:21:23 +02:00
Yuri Karamian 21ab7ac49e fix: keep editor state consistent when a note fails to load
A note that cannot be converted for the rich editor no longer leaves the
previous note's content in place. The editor is emptied and locked, saving
is blocked, and source mode shows the real content. Programmatic document
changes no longer leave the next user edit untracked.
2026-10-10 15:28:17 +02:00
Yuri Karamian 3b25992a15 fix: validate remote paths during sync
Paths from a WebDAV listing and from the stored sync state are now checked
before they are used as local file paths, and other spellings of the app's
internal folder are never synced.
2026-10-10 14:30:10 +02:00
Yuri Karamian 33514f28c9 fix: name the operation and file in sync errors
A local file failure during WebDAV sync surfaced as a bare OS error such as
"Operation not permitted (os error 1)", with no file and no hint that it
was local. Local failures now name themselves, the operation and the file,
and requests that get no answer name the operation and remote path.

Refs #249
2026-10-10 13:34:39 +02:00
Yuri Karamian 6e2165661c fix: keep the note title readable in a narrow editor pane
The title was the only part of the header that could shrink, down to a few
characters or nothing. It now keeps a minimum width and the toolbar buttons
move to a second row when there is no room. Unchanged when there is room,
and on mobile.

Refs #246
2026-10-10 13:34:39 +02:00
Yuri Karamian e168f4e004 fix: no indented blank line after a nested list
A nested list left an indented blank line behind when saved, which showed
as an extra empty line after the list in source view.

Refs #277
2026-10-10 13:34:39 +02:00
Yuri Karamian 2014365e4a fix: reset the zoom to the font size chosen in Appearance
Ctrl+0 reset the editor font to a fixed 14 px, because zooming overwrote
the size chosen in Appearance. That choice is now kept separately and
Ctrl+0 returns to it. For existing installs the size in use at first
launch becomes the preference.

Refs #272
2026-10-10 13:34:39 +02:00
Yuri Karamian 8df5efacb8 fix: write spaces at the edges of bold and italic outside the markers
Text formatted with a trailing or leading space was saved as **bold **rest,
which Markdown does not read as bold, so it showed as literal asterisks
after reopening. Edge spaces now go outside the markers and a mark over
only spaces is not written. Formatting around an inline code span is
dropped when a letter or digit touches it, where it would not render.

Refs #240, #276
2026-10-10 13:34:38 +02:00
Yuri Karamian f87b8af238 fix: let Backspace leave and remove a collapsible section
Backspace at the start of a collapsible section's body did nothing, so the
caret could never leave it and a section on the first line of a note could
not be removed from the keyboard. It now steps back into the summary, where
further Backspaces delete the text and unwrap the section. A section with
nothing in it is removed.

Refs #278
2026-10-10 13:34:38 +02:00
Yuri Karamian f0bf0ac5e3 fix: keep bare code fences, link titles, table alignment and formatted inline code
A round-trip audit of 1590 notes showed four things lost the first time a
note was edited. A code block without a language was saved as "text".
Link titles were dropped. Table column alignment was reset. Bold or
italic around inline code was removed.

All four now survive loading, editing and saving. Formatting that covers
only part of a code run is still dropped, since it cannot be written
inside a code span.
2026-10-10 10:19:04 +02:00
Yuri Karamian 0ecacbe1dd fix: parse lines with many unclosed links in linear time, and close a stale image toolbar
A line with thousands of unclosed [label]( starts took about 1.1 s at
56 KB, because each start read to the end of the line for its closing
parenthesis. The legacy link rule now skips starts beyond the last
closing parenthesis and bounds the failed searches per block.

The image toolbar stayed open after an undo and its buttons then changed
a different image. It now closes when its image is no longer at the
remembered position.
2026-10-09 23:28:46 +02:00
Yuri Karamian 455b059fb5 fix: group images a blank line apart into a grid, and keep blank lines on ungroup
Images separated by a blank line load with an empty paragraph between
them, so the Grid button never found two neighboring image blocks and
did nothing in an existing note. Grouping now spans a single empty
paragraph between image blocks and takes the one above the first image,
which would otherwise be saved as a marker line above the grid.

Ungroup gave each image its own paragraph but no blank line, so the
images were saved directly under the preceding paragraph and became part
of it on reload. Top-level grids now ungroup into images a blank line
apart, the reverse of grouping them.

Refs #254
2026-10-09 23:06:53 +02:00
Yuri Karamian f4c6649c0a Merge branch 'feature/side-by-side-grid-masonry-layout-for-images' into 'main' 2026-10-09 22:50:50 +02:00
Yuri Karamian 6c4d1c2e93 Merge branch 'feature/image-hover-titles' into 'main' 2026-10-09 22:45:39 +02:00
Shawn Olson 32b1e091fd fix: keep formatting when pasting from the context menu on WebKitGTK
For content copied from another app, WebKitGTK's navigator.clipboard.read() often
returns nothing, or only text/plain, while Ctrl+V still receives the HTML. The
context menu then pasted plain text and lost bold, links and other formatting.

Whatever the web clipboard leaves out is now filled in from the native clipboard.
The new read_clipboard_contents command (replacing read_clipboard_text) returns
both text and HTML through arboard. The result is replayed through the same paste
handlers as Ctrl+V. That includes the WebKitGTK image fallback for an <img>-only
clipboard. The direct native image read only runs when there is no text or HTML.
2026-10-09 12:34:54 -07:00
Shawn Olson 9aa9ca7d3e test: keep the grid title assertion independent of the image title policy 2026-10-09 09:12:25 -07:00
Shawn Olson 0b94d9ff32 feat: keep image hover titles ("title") and let users edit them
Images now keep their CommonMark title as hover text through load, edit and
save: `![alt](image.png "Hover text")`. Link titles are still dropped, as
before.

Parsing:
- helix_images no longer strips `title` from images (links unchanged).
- An image whose destination and title are valid CommonMark now uses
  markdown-it's own image rule instead of the legacy-link rule. Previously
  any space before a title sent the image down the legacy path, which can't
  handle escaped quotes (`"Say \"hi\""`) or `(title)` titles and mangled
  them into the URL.
- Genuinely legacy forms (spaces in the path, `%20"title"`) still go through
  the legacy rule, which now also keeps the image's title.

Saving: `serializeImageTitle()` writes ` "title"` with CommonMark backslash
escapes (`\"`, `\\`, and `\&` only before entity-like text). The parser
undoes these exactly, so titles survive any number of saves unchanged.

UI: a "T" button on the image toolbar opens a small dialog to set or clear
the hover text.

Tests: tests/image-titles.test.mjs covers exact round trips for tricky titles
(parentheses, &, entities, quotes, backslashes, markup), no growth over
repeated saves, the written form, titles from other apps, legacy
destinations, and links still dropping titles. The upstream assertion that
images render without `title=` is updated to the new contract.
2026-10-09 09:12:11 -07:00
Shawn Olson bd86fb8a4d feat: side-by-side image grids via a portable :::img-grid block
Implements #254. Several images can now sit side by side in a grid or masonry
layout with 2 to 4 columns. The syntax is plain Markdown images inside a
`:::` container, so other renderers show the images stacked:

    :::img-grid cols=3 masonry
    ![](a.jpg)
    ![Beach|size=small](b.jpg)
    :::

Parsing is a markdown-it block rule (`helix_img_grid` in markdownParser.ts),
not a text pre-pass:
- Grid syntax inside code blocks is never converted, because code blocks
  claim those lines first.
- A block converts only if every line is exactly one image (CommonMark image
  syntax, so titles, parentheses and <angle> destinations parse as for any
  image). Unknown options, out-of-range columns, captions, linked images,
  blank lines or a missing closer leave the whole block as ordinary Markdown.
- Each grid image is an ordinary inline image token, so it gets the same
  source resolution, `|size=` handling and title policy as other images.

Saving writes the grid as a normal block through joinMarkdownBlocks, with a
blank line before it. The images serialize with the same code as images in
paragraphs, one per line. The header is written in canonical form.

Editor (src/lib/editor/extensions/imageGrid.ts):
- `imageGrid` node (`image+`) whose renderHTML includes data-img-grid, so
  copied grids paste back as grids
- header controls: cycle columns, grid/masonry toggle, ungroup
- image toolbar: "Grid" groups the image with neighboring image-only blocks;
  arrow buttons move an image left or right inside its grid
- drag-and-drop reorder within and between grids; an emptied grid is removed
- `/image-grid` slash command: multi-file picker that inserts a grid, using
  the origin-guarded asset saving
- mobile: 3-4 column grids collapse to 2. Print: compact 2-column rows,
  controls hidden

Tests (tests/image-grid.test.mjs) cover byte-identical round trips, sizes,
code-fenced examples, no partial conversion, titles and angle-bracket
destinations, repeated saves, trailing closers, nesting, reloading next to
other blocks, renderHTML/parseHTML agreement, grouping and reorder targets.
2026-10-09 09:09:02 -07:00
Shawn Olson ec479ced8e fix: make editor context-menu paste match keyboard paste on Linux
On Linux, the context-menu Paste used its own navigator.clipboard.readText()
flow. On WebKitGTK it lost text copied from other applications. When a web
image copy also carried text, it pasted the URL instead of the bitmap. It
also skipped ProseMirror's paste handling, so things like callout paste and
the pasted-HTML style cleanup never ran.

The context menu now reads the clipboard with navigator.clipboard.read(),
classifies each format, and replays the result as a paste event on the
editor DOM. That runs the same path as Ctrl/Cmd+V: ProseMirror's paste
handler, every handlePaste prop (file, callout, link), transformPastedHTML,
the clipboard parsers and TipTap's paste rules.

Only real attachments (image/*, application/pdf) become files. Other text
formats such as text/uri-list stay text, and browser/OS metadata formats are
ignored, so a copied link no longer becomes a pasted-0.uri-list attachment.
A link offered only as a URI list pastes as its first URI.

When the web clipboard is unavailable (WebKitGTK bug #218519), Paste falls
back to native arboard reads: the image first, then text through the new
read_clipboard_text command. The text is replayed through the same paste
path. Every await re-checks the editor origin, as upstream's paste code does.

The classification lives in src/lib/utils/clipboard-paste.ts and has
regression tests.

Closes #259
2026-10-09 08:53:42 -07:00
Yuri Karamian add45ad9dd fix: clear the old caret when switching notes
Switching quickly between notes in the rich editor could leave a frozen
caret from the previous note next to the real one. The outgoing native
selection is now cleared before the note content is replaced, including
for very large notes. Reproduced on Linux and gone with the change.

Refs #281
2026-10-09 09:28:27 +02:00
Yuri Karamian 076234974a fix: parse long link destinations in linear time, and polish small mobile and history details
Strip a legacy link title with a single scan instead of a regular
expression that is quadratic on a long run of spaces. Widen the done
checkbox's tap area on phones without changing its look, and say "1
unchanged line" in Version History when only one line is folded.
2026-10-08 01:04:18 +02:00
Yuri Karamian 6d9b29343f perf: build very large notes in slices so opening them does not freeze
For notes over 100,000 characters, show the first screen at once and build
the rest of the document in growing slices. Until it is complete the
document cannot be edited: a user action, saving, or switching modes
finishes the build first, and switching notes cancels it. Smaller notes load
as before.
2026-10-08 00:34:07 +02:00
Yuri Karamian 504461bfe7 fix: Overdue tasks exclude completed ones
The Overdue filter now lists only tasks that are late and still open, even
with Hide done off, and a completed task's due date no longer uses the
overdue colour. Today and the calendar are unchanged.
2026-10-08 00:34:07 +02:00
Yuri Karamian 4aa72e4c76 fix: keep list blocks, folded callouts and opened notes intact; speed up saving
Keep a second paragraph, code block or quote inside its list item when a
note is saved, indented under the item. Import attachment links that follow
a stray backtick and images indented by four spaces. Keep a folded callout
that was revealed from the Outline open while it is edited.

Stop treating the editor's first normalization of a freshly loaded note as
an edit, so opening a note no longer saves or reformats it. Join serialized
blocks in linear time, so autosaving a large note no longer freezes the page.
2026-10-07 23:42:03 +02:00
Yuri Karamian ea4a5eae26 fix: keep dollar signs, aligned images, attachment names and code spaces intact
Write a literal $ as typed unless plain dollars could create, remove or
re-pair an inline formula. Save portable image paths when a centered,
aligned or styled block is written. Percent-encode a newly stored
attachment's path before it is inserted, and keep a Windows drive letter
literal in paths outside the vault. Keep whitespace-only code spans in
simple list items, task items and table cells.

Compare Version History in bounded time with a synchronous line diff and
an edit limit. Beyond the limit, shared lines at the start and end stay
unchanged and the rest is shown as removed and added.
2026-10-07 22:25:16 +02:00
Yuri Karamian 8d3338ef89 fix: keep callouts, numbered lists, images and blank lines intact on save
Render the first soft break of a callout's opening paragraph as a newline
so the title and body split correctly again. Only turn [ ] and [x] markers
into task items in bullet lists, not numbered ones. Join serialized blocks
in markdown.ts so an empty paragraph before an image is written as a blank
line, and lists no longer gain an extra blank line, without collapsing blank
lines inside code blocks.

In Version History, compare the current note and snapshots after ignoring
leading and trailing blank lines, so unchanged last lines and a blank line
after the frontmatter no longer show as changes.
2026-10-07 22:12:20 +02:00
Yuri Karamian b2c306d69f fix: scan vaults whose own folder name starts with a dot
A vault kept in a dot-named folder such as ~/.notes was treated as hidden
by seven vault walkers, so All Notes, note titles for links, Graph View,
Tasks and rename link updates found no notes. Exempt the vault root from
the hidden-folder check, as the tag scan and search already do. Hidden
subfolders, .helixnotes and the existing hidden-name rules are unchanged.
2026-10-07 21:03:49 +02:00
Yuri KaramianandClaude Sonnet 5.5 ac2c0aef94 fix: read full frontmatter for note metadata and speed up title and graph scans
Note lists, mobile listings and tag counts read a fixed 1-2 KB prefix, so notes
with longer frontmatter lost their title and tags. Read the complete frontmatter
instead, stopping after the closing delimiter (256 KB cap if unterminated).

Scan note titles in parallel from the frontmatter only, and build graph nodes and
links in one parallel read per note without keeping note bodies in memory. The
Ctrl+K link dialog reuses the loaded wiki-link title cache.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-10-07 20:39:21 +02:00
Yuri Karamian f07241dd3a fix: harden note saves, attachment imports, and Markdown handling
- Fix new-note save conflicts and scoped external Markdown access
- Preserve attachment URIs and links across saves, imports, and moves
- Ignore unused and overridden attachment reference definitions
- Improve Markdown parsing, outline handling, and editor performance
- Optimize graph, task filtering, tags, WebDAV, and Obsidian imports
- Fix note-list metadata wrapping and add regression coverage
- Document saving and close-to-tray behavior
2026-10-06 06:09:14 +02:00
Yuri Karamian 14b2a3e8a2 feat: improve history review and note workflows
- Add draft-aware diffs, rendered snapshots and restore confirmation
- Show saved YAML frontmatter in Note Info
- Add Today/Overdue task filters and Ubuntu font families
- Honor timestamp preferences
- Improve vault labels and full-path tooltips

Refs: #234, #244, #257, #262, #265, #268
2026-10-04 00:46:43 +02:00
Yuri Karamian 505ed2b890 docs: update README downloads to v1.3.6 2026-09-30 22:13:48 +02:00
Yuri Karamian b03d7fd12c fix: simplify update download label 2026-09-30 22:09:20 +02:00
Yuri Karamian e1f1ef0b02 Harden v1.3.6 data safety and editor lifecycle
Protect file mutations, backup restoration, and WebDAV synchronization from data loss. Preserve editor drafts across concurrent saves, external changes, and window or vault transitions. Integrate toolbar customization inline and extend regression coverage.
2026-09-29 14:05:46 +02:00
Yuri Karamian 806c63aa65 Add desktop toolbar customization and fix pane toggle icons 2026-09-28 23:28:56 +02:00
Yuri Karamian 4157beddf7 Remove GitLab CI 2026-09-28 21:15:55 +02:00
Yuri Karamian 923cb9571c Improve search and show save errors
- Show search results in the right notebook or All Notes list
- Scroll to the selected note and highlight matching text
- Keep unsaved edits safe and ignore old or cancelled searches
- Show save errors with a Retry button
- Run graph and vault statistics scans in the background
- Fix folder checks when counting vault files
- Keep desktop window-close code out of mobile builds
2026-09-28 21:06:28 +02:00
Yuri Karamian 640b5e3d10 Improve editor performance and harden note saving
Replace the source editor with CodeMirror and reduce typing-time work.
Virtualize note lists, apply targeted refreshes, and batch search indexing.
Improve vault and in-note search, and bound graph layout work.
Make saves revision-safe and flush pending changes before navigation or close.
Preserve originating-vault ownership across async operations and detached windows.
Harden sync, attachment writes, and notebook/tag appearance updates.
Keep Trash previews read-only and skip restoring trashed notes.
Update AI model presets and isolate streamed responses by request.
Fix local image rendering and preserve portable image paths.
Include regression tests for the changed behavior.
2026-09-28 07:50:46 +02:00
Yuri Karamian 3607cf1b3f Merge branch 'main' into 'main'
feat: add custom tag icons and colors

See merge request ArkHost/HelixNotes!9
2026-09-21 09:08:33 +00:00
Blake Boone 245cdacb68 feat: add custom tag icons and colors 2026-09-21 09:08:33 +00:00
Yuri Karamian 2983e3db29 Merge branch 'main' into 'main'
Merge branch 'fix/sort-theme-list-alphabetically' into 'main'

Closes #250

See merge request ArkHost/HelixNotes!7
2026-09-17 12:30:52 +00:00
Shawn cc7c9e2b49 Merge branch HelixNotes:main into main 2026-09-15 16:09:56 +00:00
Shawn 2240231f61 Merge branch 'fix/sort-theme-list-alphabetically' into 'main'
fix: sort theme list alphabetically

See merge request locodarwin/HelixNotes!1
2026-09-15 15:36:44 +00:00
Yuri Karamian b2d0c7175e test: cover built-in theme preset ordering 2026-09-15 15:04:51 +02:00
Shawn Olson 1bc0026731 fix: sort theme list alphabetically 2026-09-14 14:42:06 -07:00
Yuri Karamian 41c0e4c993 fix: preserve Linux window title and configuration 2026-09-10 16:50:54 +02:00
Yuri Karamian 34a0f9efa3 fix: keep mobile navigation visible with collapsed desktop sidebar 2026-09-06 22:46:11 +02:00
Yuri Karamian 9d92489586 Merge branch 'fix/macos-escape-overlay-fullscreen' into 'main'
Prevent Escape from exiting fullscreen when closing overlays

See merge request ArkHost/HelixNotes!4
2026-09-04 13:00:47 +00:00
Vijay c45efb60ab Prevent Escape from exiting fullscreen when closing overlays 2026-09-04 13:00:46 +00:00
Yuri Karamian 0d11fd01dd fix: preserve hidden note title across editor modes 2026-09-04 14:46:30 +02:00
Yuri Karamian 0aaa05ce5c Merge branch 'fix/context-menu-paste-image' into 'main'
fix: paste images from the editor context menu

See merge request ArkHost/HelixNotes!6
2026-09-04 08:54:04 +00:00
Sridhar 77e92ef25c fix: paste images from the editor context menu 2026-09-04 08:54:04 +00:00
Yuri Karamian d7e4be7f3a Merge branch 'fix/webkitgtk-clipboard-image-paste' into 'main'
fix: paste images copied from a browser on WebKitGTK

Closes #245

See merge request ArkHost/HelixNotes!5
2026-09-03 19:07:34 +00:00
Sridhar 2aa572dcaa fix: paste images copied from a browser on WebKitGTK 2026-09-03 19:07:34 +00:00
Yuri Karamian 32f270ce9e Update v1.3.5 download documentation 2026-08-27 00:37:30 +02:00
Yuri Karamian a15b267614 Add scroll font size preference and bump v1.3.5 2026-08-26 17:16:16 +02:00
Yuri Karamian ce48d77cd8 fix: stop wiki links extending after autocomplete 2026-08-23 15:38:57 +02:00
Yuri Karamian 221625aabd fix: override vulnerable cookie dependency 2026-08-17 21:17:53 +02:00
Yuri Karamian 1bd4cd8138 chore: set Rust MSRV to 1.88 2026-08-17 21:15:11 +02:00
Yuri Karamian dd748776b2 test: add local verification command 2026-08-17 21:08:31 +02:00
Yuri Karamian 0391a60c1b fix: block private image proxy requests 2026-08-17 21:06:50 +02:00
Yuri Karamian 33d77cf2fd fix: restrict external file access 2026-08-17 21:02:05 +02:00
Yuri Karamian 81e4e26290 fix: restrict asset protocol to vaults 2026-08-17 20:14:34 +02:00
Yuri Karamian 111d819f92 fix: improve editor accessibility 2026-08-17 19:55:00 +02:00
Yuri Karamian c37818de1a fix: improve settings accessibility 2026-08-17 19:49:05 +02:00
Yuri Karamian 95dab8cf74 fix: improve note list accessibility 2026-08-17 19:46:50 +02:00
Yuri Karamian 62365f52b1 fix: mark resize handles presentational 2026-08-17 19:45:19 +02:00
Yuri Karamian 6eb1ec6eb2 fix: improve sidebar interactions 2026-08-17 19:44:35 +02:00
Yuri Karamian 527c6a7a91 fix: label storage location choices 2026-08-17 19:43:31 +02:00
Yuri Karamian 45e3c389e4 fix: handle info overlay clicks 2026-08-17 19:42:47 +02:00
Yuri Karamian 9ccbf3aff5 fix: make layout references reactive 2026-08-17 19:31:21 +02:00
Yuri Karamian 695664913a fix: make graph state reactive 2026-08-17 19:28:48 +02:00
Yuri Karamian d0fb87cf3a style: format Rust code 2026-08-17 19:27:05 +02:00
Yuri Karamian ac7c79af04 fix: resolve Rust lints 2026-08-17 19:24:32 +02:00
Yuri Karamian 1ebf2a9843 fix: resolve type errors 2026-08-17 19:04:21 +02:00
Yuri Karamian 44dcfbe24a fix: tighten app permissions 2026-08-17 18:57:56 +02:00
Yuri Karamian 00196ecedb fix: protect config files 2026-08-17 18:53:53 +02:00
Yuri Karamian c4d2d1b2d1 fix: validate version paths 2026-08-17 18:52:40 +02:00
Yuri Karamian 3a9a5129c4 fix: restrict backup paths 2026-08-17 18:50:57 +02:00
Yuri Karamian a964ee1930 fix: restrict vault paths 2026-08-17 18:49:32 +02:00
Yuri Karamian 2d57577338 fix: update Rust dependencies 2026-08-17 18:43:11 +02:00
Yuri Karamian 206faed113 fix: update frontend dependencies 2026-08-17 18:37:57 +02:00
Yuri Karamian b3c292d6e2 test(paths): cover cross-platform asset resolution 2026-08-17 18:35:26 +02:00
Yuri Karamian 43f15962f7 Revert "chore(release): prepare v1.3.5"
This reverts commit ade146f9f3.
2026-08-17 17:03:01 +02:00
Yuri Karamian ade146f9f3 chore(release): prepare v1.3.5 2026-08-17 16:50:14 +02:00
Yuri Karamian b253ec4121 fix(paths): preserve cross-platform asset paths 2026-08-17 15:58:20 +02:00
Yuri Karamian c4a91b8f1c fix(sorting): sort numeric names naturally 2026-08-15 16:18:22 +02:00
Yuri Karamian 87c879bcac fix(notebooks): normalize icon paths across platforms 2026-08-15 01:40:14 +02:00
Yuri Karamian 27609fb4f3 Fix Windows internal note links 2026-08-11 02:41:39 +02:00
Yuri Karamian b0555fe648 Add Clear Formatting action to editor context menu 2026-08-08 23:53:27 +02:00
Yuri Karamian 32ef51161d Scroll code block into view after fence input rule 2026-08-07 21:50:34 +02:00
Yuri Karamian 23abd0a19a Add Maintenance tab for vault statistics and cleanup 2026-08-07 17:12:15 +02:00
Yuri Karamian 5f726eb01f Move orphaned attachment cleanup from About to Settings 2026-08-07 17:01:41 +02:00
Yuri Karamian 73f7604187 Speed up note switcher and sync window scaling 2026-08-07 16:51:06 +02:00
Yuri Karamian 7ca226d918 Merge remote-tracking branch 'origin/main' 2026-08-07 01:06:32 +02:00
Yuri Karamian 1cbdf704bd Add opt-in title bar note switcher 2026-08-07 00:56:54 +02:00
Yuri Karamian b5bd5ea151 Document Linux installation options 2026-08-07 00:48:40 +02:00
Yuri Karamian bdf94e2494 Keep Note Info open across note changes 2026-08-06 15:13:43 +02:00
Yuri Karamian 1950c4cc3c Fix system theme pair integration 2026-08-06 15:12:43 +02:00
Yuri Karamian aeddcc6e58 Merge branch 'system-theme-pair' into 'main' 2026-08-06 14:07:34 +02:00
Yuri Karamian bb9d01f57c Merge branch 'custom-theme-derived-vars' into 'main' 2026-08-06 14:03:37 +02:00
Yuri Karamian ac25dfd773 Move note trash action into Note Info 2026-08-06 14:01:47 +02:00
Hadrian Chio e61c66dc26 Add light and dark theme pair for the system appearance setting 2026-08-05 09:24:06 +02:00
Hadrian Chio 3e8aa7f10d Fix custom themes falling back to light divider and tertiary text colors 2026-08-05 08:57:55 +02:00
Yuri Karamian 2dd0985ea9 Add Android image pinch zoom (Closes #115) 2026-08-03 16:56:38 +02:00
Yuri Karamian 18bb6bb702 Fix Linux startup theme flash (#195) 2026-08-03 15:54:17 +02:00
Yuri Karamian fcf48a5b7a Fix Markdown mark round-trips (#219) 2026-08-03 14:04:49 +02:00
Yuri Karamian c7906f4069 Keep source mode last in editor toolbar 2026-08-03 13:31:54 +02:00
Yuri Karamian e6e1ed1ed6 Add note duplication (#24) 2026-08-03 13:23:18 +02:00
Yuri Karamian 1a880a4f96 Add open-note trash action (#177) 2026-08-03 10:45:59 +02:00
Yuri Karamian f4e05ed9c4 Add Markdown source highlighting (#173) 2026-08-03 09:00:43 +02:00
Yuri Karamian 4a1045b41e Preserve collapsible code blocks (#138) 2026-08-03 03:26:06 +02:00
Yuri Karamian c305b5f8dd Add Android camera image capture (#131) 2026-08-03 03:13:04 +02:00
Yuri Karamian b5962af466 Add collapsible section shortcut (#129) 2026-08-03 02:56:42 +02:00
Yuri Karamian 13e83b6689 Restore note scroll positions (#127) 2026-08-03 02:43:40 +02:00
Yuri Karamian 432e4f472a Keep local tests out of repository 2026-08-03 02:31:55 +02:00
Yuri Karamian 8731ca4ec1 Support mixed nested lists (#39) 2026-08-03 02:26:39 +02:00
Yuri Karamian 6b165059cc Refine note info path and history 2026-08-03 02:03:58 +02:00
Yuri Karamian 213797a38e Fix mobile outline navigation (#109) 2026-08-03 01:53:29 +02:00
Yuri Karamian fc3e388b80 Refine custom icon size guidance 2026-08-03 01:53:25 +02:00
Yuri Karamian 1c0359e540 Add custom icon size guidance 2026-08-03 01:33:38 +02:00
Yuri Karamian da859e581b Copy active note path from Info panel 2026-08-03 01:16:30 +02:00
Yuri Karamian 763e673738 Show vault location in Info panel 2026-08-03 01:12:50 +02:00
Yuri Karamian 550d3ab3e9 Add per-notebook icons and sync 2026-08-03 01:05:07 +02:00
Yuri Karamian e62404d4c0 Fix dragging selected notes to notebooks 2026-08-03 00:27:18 +02:00
Yuri Karamian 54e051ba02 Add configurable startup view 2026-08-03 00:12:55 +02:00
Yuri Karamian 344728dbe8 Fix macOS traffic lights after window state changes
Reapply the native traffic-light alignment after resize, focus, scale, and theme events so AppKit window-state transitions cannot leave the controls at their default position.
2026-08-02 23:53:26 +02:00
Yuri Karamian 818e9ad82a Merge branch 'nix-build-fix' into 'main'
fix(nix): Update flake.lock and increment fetcher version

Closes #230

See merge request ArkHost/HelixNotes!1
2026-08-02 21:41:20 +00:00
jervw 4931ee3fab fix(nix): Update flake.lock and increment fetcher version 2026-08-02 21:41:20 +00:00
Yuri Karamian 65e09e8fdd fix(mobile): expose notebook actions 2026-07-25 17:51:33 +02:00
Yuri Karamian 64e521d549 fix(ios): poll vault changes to avoid file descriptor exhaustion 2026-07-25 17:14:42 +02:00
Yuri Karamian b8308d89e8 Update README downloads for v1.3.4 2026-07-24 22:38:47 +02:00
Yuri Karamian 0e5b380f8c Sync detached window typography 2026-07-24 20:55:57 +02:00
Yuri Karamian e76919ab5c Fix mobile navigation and Tasks layout 2026-07-24 20:55:57 +02:00
Yuri Karamian 84ab90fd3f Bump version to 1.3.4 2026-07-24 19:44:21 +02:00
Yuri Karamian 87b191eb63 Fix Android adaptive icon padding 2026-07-24 19:44:21 +02:00
Yuri Karamian 0def9d6d6d Fix iOS vault plugin registration 2026-07-24 16:57:20 +02:00
Yuri Karamian e708d8ee63 Fix macOS traffic light vertical alignment 2026-07-24 16:42:20 +02:00
Yuri Karamian 461001442a Fix macOS traffic light vertical alignment 2026-07-24 16:38:06 +02:00
Yuri Karamian 6b5e923e8e Fix macOS traffic light alignment 2026-07-24 16:31:38 +02:00
Yuri Karamian 289606a746 Fix macOS AppKit build 2026-07-24 16:14:48 +02:00
Yuri Karamian 9c53b3b594 Fix iOS Files vault transitions 2026-07-24 15:54:12 +02:00
Yuri Karamian d497ff8aaf Add iOS Files vault selection 2026-07-24 02:19:00 +02:00
Yuri Karamian 51acd51cb2 Expose iOS vault in Files 2026-07-24 00:44:15 +02:00
Yuri Karamian b4bb3b89d6 Update project links for GitLab migration 2026-07-23 17:58:44 +02:00
Yuri Karamian 9b51aef073 Reveal selected tasks in editor 2026-07-20 13:09:35 +02:00
Yuri Karamian 4aa0b200b9 Fix Windows relative image resolution (#215) 2026-07-20 02:47:11 +02:00
Yuri Karamian 8769b56fd1 Fix strikethrough keyboard shortcut (#205) 2026-07-20 02:42:32 +02:00
Yuri Karamian 06d2cd744f Refine scrollbars and editor spacing (#209) 2026-07-20 02:30:29 +02:00
Yuri Karamian 7428cc7dfb shorten comments 2026-07-20 02:20:14 +02:00
Yuri Karamian 6c89d668fe Fix table sizing and headerless table persistence (#213) 2026-07-20 02:17:38 +02:00
Yuri Karamian 2c76a4747e Fix mobile notebook navigation and sidebar clipping (#220) 2026-07-20 02:08:36 +02:00
Yuri Karamian fd55c00015 Fix note unfiling and relative image paths (#222) 2026-07-20 02:03:15 +02:00
Yuri Karamian 28ef37f354 Fix mobile safe-area layout 2026-07-15 12:00:54 +02:00
Chris Paganon bf5a9f134d fix(editor): refocus open in-note search on Ctrl+F (#216)
Pressing ctrl-F doesn’t refocus the search field if there is already a search term, it only focuses search on 1st open of the search field. This PR fixes it so that every time the user presses CTRL+F, the search field is focused again.

Tested on linux.

Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/216
2026-07-14 18:36:34 +02:00
Yuri Karamian 2991940ba8 fix: remove transparency from iOS app icons 2026-07-13 20:43:23 +02:00
Yuri Karamian 54352a03d8 Mermaid diagram "Copy failed: The operation is insecure" on Linux 2026-07-10 14:09:56 +02:00
Yuri Karamian c4d1f12b2e fix: use vault-relative paths in wikilinks for cross-device sync 2026-07-10 11:30:06 +02:00
Yuri Karamian aa699007f7 Revert "Exclude gen/ from Cargo package to fix iOS build fingerprint error"
This reverts commit 047a8b3c3d.
2026-07-09 17:08:14 +02:00
Yuri Karamian 047a8b3c3d Exclude gen/ from Cargo package to fix iOS build fingerprint error 2026-07-09 16:56:58 +02:00
Yuri Karamian 6098dd01b4 Add macOS notarization entitlements + iOS mobile guards
- Add entitlements.plist for Developer ID hardened runtime (JIT,
  unsigned memory, library validation, network client)
- Reference entitlements in tauri.conf.json bundle.macOS
- Guard get_install_type() with early mobile return (avoids
  std::process::Command in iOS binary)
- Add cfg(mobile) no-op branch to xdg_open()
2026-07-09 16:46:59 +02:00
Yuri Karamian b16beb9af5 regenerate icons set 2026-07-09 16:24:21 +02:00
mf 95565d7506 fix(editor): scale code block font size with editor zoom (#208)
Code blocks used a hardcoded 13px font-size instead of scaling with --editor-font-size, so they didn't resize with the rest of the editor content when zooming.

Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/208
2026-07-07 12:04:49 +02:00
lokthare a13d17ed81 Change nix formatter (#206)
the files were formatted with alejandra. the nix community has set a standard for the format and release a new tool.

Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/206
2026-07-06 15:53:20 +02:00
Yuri Karamian 95515cac9d Properly center macOS traffic lights via objc2 (#169) 2026-07-05 23:59:08 +02:00
Yuri Karamian 21dd2d1681 Improve sidebar notebook/unfiled icons and list indentation 2026-07-05 02:45:55 +02:00
Yuri Karamian 6d5f12c47c Improve sidebar notebook/unfiled icons and list indentation 2026-07-04 20:23:15 +02:00
Andreas Lenhardt d01bd4ea01 update max_token value in ai tests (#204)
#203

Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/204
2026-07-04 14:31:07 +02:00
lokthare bd7d66b1e8 Fix nix build (#202)
fix nix build by updating flake.lock and dependencies hashes

Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/202
2026-07-04 11:53:56 +02:00
Yuri Karamian 0b9fe69819 Revert PR #200 (custom theme consolidation) - broke search 2026-07-03 16:42:09 +02:00
Dmitry Rubtsov 936c38a21d Fix custom theme not applied on startup (light-theme dividers) (#200)
Launching with a custom dark theme left every divider in light-theme colors until you re-toggled the theme in Settings.

`applyTheme` was copy-pasted across the components and the copies drifted. Three of them (+page.svelte's onMount block, AppLayout.svelte, NoteWindow.svelte) had no custom-* branch, so for a custom theme they stripped the dark class and data-theme attribute, matched nothing, and fell back to the bare light :root values.

`+layout.svelte` applied the custom theme correctly, but `AppLayout` — the always-mounted shell — re-runs its own broken copy from an `$effect` on `$theme`, immediately wiping it out. Dividers gave it away because custom themes override `--border-color` but not `--border-light`, which dividers use.

Fix: consolidate into a single `applyTheme`(which already owns darkThemes/isDarkTheme) with a real `custom-*` branch, and have every call site use it and pass the loaded custom themes so `custom-*` ids resolve.

Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/200
2026-07-03 13:34:11 +02:00
Yuri Karamian e60e637437 Fix macOS traffic light vertical centering (#169) 2026-06-30 22:16:19 +02:00
Yuri Karamian 479c957698 Robust Obsidian importer: frontmatter normalization, syntax conversion, deprecated property renaming, same-note heading links 2026-06-30 22:10:22 +02:00
Yuri Karamian 13fd70f944 Fix Android note creation delay: throttle file watcher IPC (#191) 2026-06-30 19:48:19 +02:00
Yuri Karamian 015726f896 Add inline restore/delete icons on trashed notes (#188) 2026-06-30 16:41:06 +02:00
Yuri Karamian 5e2c31598c Block note creation in Quick Access/Trash, add icons to trash actions (#188) 2026-06-30 16:13:22 +02:00
Yuri Karamian 24d1ba9f8f Block note creation in Quick Access and Trash views (#188) 2026-06-30 15:59:35 +02:00
Yuri Karamian 5345442de2 Auto-cleanup orphaned attachments on vault open (#190) 2026-06-30 15:54:37 +02:00
Yuri Karamian 6ea2ca0ae2 Keep textarea selection visible when opening AI menu in source mode 2026-06-30 14:40:28 +02:00
Yuri Karamian 6f4f526d07 Fix OpenAI test using max_tokens for GPT-5 models 2026-06-30 14:36:20 +02:00
Yuri Karamian 13bad87500 Fix AI apply-to-note in source mode (#189) 2026-06-30 14:29:44 +02:00
Yuri Karamian acecc9c68d Fix callout body paragraphs merging on reload (#192) 2026-06-30 14:09:25 +02:00
Yuri Karamian 35a8501f2d Fix mobile popup positioning using visualViewport (#193) 2026-06-30 12:51:41 +02:00
Yuri Karamian 09f9df968d Render callouts live on Enter and paste in WYSIWYG (#186) 2026-06-30 12:37:14 +02:00
Yuri Karamian 2c58bf3d9a Fix empty lines round-trip and trim trailing markers (#185) 2026-06-30 11:01:25 +02:00
Yuri Karamian e063f1c73a Clamp formatting-bar dropdown menus into the viewport (#178) 2026-06-28 19:36:16 +02:00
Yuri Karamian cafc0ce1ec Reveal search result in its notebook in the notes list 2026-06-28 19:21:14 +02:00
Yuri Karamian a192723fbd Refresh outline panel when switching notes (#184) 2026-06-28 19:12:29 +02:00
Yuri Karamian b643eeb884 Gate set_mobile_config_dir behind cfg(mobile) to fix desktop dead-code warning (#183) 2026-06-28 19:08:01 +02:00
Yuri Karamian eb042e5760 Tolerate HTTP 403 in MKCOL for non-compliant WebDAV servers (#91) 2026-06-28 19:04:52 +02:00
Yuri Karamian 6251d96193 docs: bump README download links to 1.3.3 2026-06-28 14:49:54 +02:00
Yuri Karamian db92dabba5 chore: bump version to 1.3.3 2026-06-28 13:31:49 +02:00
Yuri Karamian 2469a971ca WebDAV sync: make config per-vault so switching vaults no longer cross-contaminates remotes; migrate existing global config to the active vault 2026-06-27 11:33:07 +02:00
Yuri Karamian a43bf05bf0 WebDAV sync: make config per-vault so switching vaults no longer cross-contaminates remotes; migrate existing global config
to the active vault
2026-06-27 01:08:02 +02:00
blake ffd9ebad7e The outline side panel now persists when a user clicks in the editor. (#176)
WIP

Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/176
2026-06-27 00:00:16 +02:00
mf d2100c8500 Create notes from empty list double-click (#175)
Double-clicking empty space in the notes list now creates a new note. The notebook sidebar double-click shortcut is scoped to the notebook section so adjacent panes do not trigger notebook creation.

Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/175
2026-06-26 23:59:54 +02:00
Yuri Karamian 7e63d721bc Fix 'Open in New Window' cursor jumping to the top when pausing (ignore the file-watcher echo of the window's own save) 2026-06-25 16:08:25 +02:00
Yuri Karamian 2c774c51c6 Notebook reorder: make path math separator-agnostic so manual sort works on Windows (backslash paths) 2026-06-25 15:10:20 +02:00
Yuri Karamian 8eba4527af Notebook reorder: commit drop on any release event and skip pointer capture on mouse, so it works in WebView2 (Windows) 2026-06-25 14:55:59 +02:00
Yuri Karamian 181b3eb6c2 Notebook reorder: track drag on window pointer events so it works in WebView2 (Windows) 2026-06-25 14:47:06 +02:00
Yuri Karamian 879d2f42c6 Notebook reorder via pointer-event drag handle (fixes Windows/Android); click body selects, chevron expands 2026-06-25 13:31:49 +02:00
Yuri Karamian 85ea26b57a Notebook reorder: use pointer events via a drag handle so manual sort works on Windows and Android 2026-06-25 13:29:24 +02:00
Yuri Karamian 800c81e598 Add ! menu on task lines for setting priority and due date 2026-06-25 12:57:51 +02:00
Yuri Karamian 30c3523722 Parallelize vault-stats and tasks scanning for faster Info/Tasks loads on Android 2026-06-25 12:37:32 +02:00
Yuri Karamian 761bf5b42e Android: add an Info button to the top bar that opens the About panel 2026-06-25 12:37:12 +02:00
Yuri Karamian b10a7b1bfc Fix typing stutter in large notes by debouncing per-keystroke document scans 2026-06-25 12:09:06 +02:00
blake 313d86df23 Show all existing tags when tag input is empty (#165)
WIP: Previously suggestions only appeared after typing; now all unused tags can be shown immediately when the tag menu opens.
Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/165
2026-06-25 11:45:53 +02:00
Yuri Karamian 95627cbb5c Fix ordered list markers and empty-callout placeholder on WebKitGTK 2026-06-25 11:43:08 +02:00
Yuri Karamian b9ea14f330 README: document the macOS damaged-app fix (xattr) 2026-06-25 11:42:53 +02:00
Yuri Karamian 812d025a9d Fix ordered list markers showing only the last digit on WebKitGTK 2026-06-25 00:33:58 +02:00
Yuri Karamian 11cc2daa4b Parallelize notebook and note scanning for faster loads on Android 2026-06-24 23:28:28 +02:00
Blake Boone 5c36f2aa71 Added collapsable info panel that tracks word/character count, snapshots, last modified, etc. (#164)
WIP

Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/164
2026-06-24 22:54:52 +02:00
Yuri Karamian 987b1b9ed7 Add opt-in date grouping for the All Notes list 2026-06-24 22:38:23 +02:00
Yuri Karamian 3ef0e14581 Add callouts (> [!type]) with fold, titles, type picker, and custom types 2026-06-24 21:57:13 +02:00
mf f98b3415bc feat(editor): resizable outline panel (#161)
Add a drag handle to resize the outline panel and persist its width in
vault state (outline_width). Outline text now scales with the editor
font size.

Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/161
2026-06-24 21:01:43 +02:00
mf 16805c96aa Delete active note on shortcut (#156)
Press `ctrl+shift+del` to move the active note to the trash.

Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/156
2026-06-24 21:00:33 +02:00
Yuri Karamian 9f2e0ba8b6 README: add macOS Apple Silicon (aarch64) download link 2026-06-24 20:05:56 +02:00
blake 7b3609afbb Added custom themes, import/export option with json (#159)
Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/159
2026-06-23 20:19:23 +02:00
Yuri Karamian 84ff75f223 Fix #157: don't flag notebook folder icons as orphaned attachments 2026-06-23 14:03:29 +02:00
Yuri Karamian 56dc0eefd7 Fix #63 desktop/mobile layout; hide Updates tab on Android; dim inline task tokens in the editor 2026-06-23 13:52:26 +02:00
Yuri Karamian eeea16531a Fix #63: decide layout from compile-time platform, not the webview user-agent 2026-06-23 13:12:36 +02:00
Yuri Karamian ac5ab2a27a Release v1.3.2 2026-06-22 23:06:19 +02:00
Yuri Karamian fef4ece2c0 Make editor + menus match the toolbar per platform (dedupe desktop, complete mobile) 2026-06-22 14:25:44 +02:00
Yuri Karamian 613451f4d8 Show search + info/settings icons in the collapsed sidebar rail 2026-06-22 13:45:01 +02:00
Yuri Karamian 04dee78b27 Add command-palette entries to reach hidden sidebar views (#153) 2026-06-22 13:28:24 +02:00
Yuri Karamian 69330bf23c Add command-palette entries to reach hidden sidebar views (#153) 2026-06-22 13:20:15 +02:00
Yuri Karamian 4843bcacd5 Reveal hidden notes list when selecting a sidebar view (#145) 2026-06-22 12:59:04 +02:00
Yuri Karamian 3d28665e1e Add settings to hide unused sidebar items (#153) 2026-06-22 12:52:07 +02:00
Yuri Karamian 209585a0b4 Preserve create date for notes without frontmatter dates (#139) 2026-06-22 12:50:50 +02:00
mf 84eab75ec8 Do not render Notes in Notebook sidebar (#152)
Keeps the notebook tree focused on notebooks and leaves note browsing to the note list.

![image](/attachments/a1e50fba-26b7-4dcd-9d44-9938783c6bc5)

Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/152
2026-06-22 11:57:08 +02:00
Yuri Karamian ce17b38509 Add custom note sorting (#149) 2026-06-21 21:44:56 +02:00
Yuri Karamian 85c1e1e7d3 Add customizable keyboard shortcuts (#148) 2026-06-21 13:56:55 +02:00
mf ebf38e2281 Add notes list toggle shortcut (#145)
Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/145
2026-06-21 12:50:31 +02:00
mf 32ec62419d Focus sub-notebook input from context menu (#150)
Focus the sub-notebook name field after choosing New Sub-notebook from a notebook context menu.

Validation: pnpm build
Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/150
2026-06-21 12:49:41 +02:00
mf e46fda91a4 Add custom note sorting 2026-06-21 10:46:22 +03:30
mf 62d5388176 Add customizable keyboard shortcuts
Drive app shortcuts from a central keybindings store (defaults +
localStorage overrides). In the Info panel's Shortcuts tab: click a
shortcut to rebind, right-click to reset, Esc to cancel; combos
already in use are rejected.
2026-06-21 10:37:58 +03:30
Yuri Karamian db2bef892a Add Indent/Outdent buttons to mobile editor toolbar 2026-06-20 23:29:24 +02:00
Yuri Karamian 1c46935cc5 Add Note Width setting to cap editor content width (#137) 2026-06-20 15:01:01 +02:00
Yuri Karamian f0f19125d5 Pin Notebooks header while scrolling, add divider above it (#126) 2026-06-20 14:45:11 +02:00
Yuri Karamian 828f83d2e3 Preserve cursor position when toggling markdown source editor (#125) 2026-06-20 14:35:22 +02:00
Yuri Karamian 002fdb763e WebDAV: source manifest etag from PROPFIND, not PUT response (#147) 2026-06-20 14:14:43 +02:00
Yuri Karamian d3ff1fb931 Parse markdown links with angle brackets and titles (#146) 2026-06-20 13:01:18 +02:00
Yuri Karamian 7951472ae3 Fix reserved $ prefix in variable name 2026-06-19 14:36:10 +02:00
Yuri Karamian 5cffe8846b Fix table menu overflow and conditional reset button 2026-06-19 14:34:28 +02:00
Yuri Karamian 806e975e31 Fix table context menu going below screen 2026-06-19 14:30:32 +02:00
Yuri Karamian e4232269f6 Fix table styling not detected for HTML serialization 2026-06-19 14:29:00 +02:00
Yuri Karamian ab759a006d Fix table content loss in markdown serialization 2026-06-19 14:26:00 +02:00
Yuri Karamian ca7f25003c Tables serialize as markdown by default, HTML only when styled 2026-06-19 14:24:25 +02:00
Yuri Karamian 08ab0b90f2 Fix Enter key in language search truncating code block 2026-06-19 14:15:07 +02:00
Yuri Karamian e275f5c0bb Add PowerShell syntax highlighting 2026-06-19 14:05:04 +02:00
Yuri Karamian 683a01627e add highlight.js 2026-06-19 14:01:04 +02:00
Yuri Karamian 3c11a7f63e Add search filter to code block language selector 2026-06-19 14:00:39 +02:00
Yuri Karamian 90a96552d3 Always show code block controls at low opacity 2026-06-19 14:00:38 +02:00
Yuri Karamian a710603b0a Unify code block copy button and language selector styling 2026-06-19 14:00:38 +02:00
mf 80a6fdca69 Move single list items with Alt Shift arrows (#143)
Adds Alt+Shift+Up/Down for moving only the current list or task item while preserving the existing Alt+Up/Down block movement.

Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/143
2026-06-19 12:14:34 +02:00
mf 1dc78ca916 Add F2 rename shortcut (#142)
Adds F2 as a keyboard shortcut for focused note and notebook rows, reusing the existing inline rename flow.

Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/142
2026-06-19 12:14:20 +02:00
Yuri Karamian 3118af1e41 Merge branch 'fix/blob-images-source-mode' 2026-06-19 12:12:36 +02:00
Yuri Karamian a669d96aed Fix images not rendering after comment in source mode (#87) 2026-06-19 12:09:30 +02:00
Yuri Karamian a0b1fa0481 Fix images not rendering after comment in source mode (#87) 2026-06-19 12:03:49 +02:00
Yuri Karamian 2e8c048a3e Fix images not rendering after <- Client-side Create New Pull Zone button for allowed --> comment in source mode (#87) 2026-06-19 12:01:13 +02:00
Yuri Karamian d2ddc7f0de Fix editor not rendering on every other source mode switch 2026-06-19 11:54:13 +02:00
Yuri Karamian 3b88b20c61 Fix editor not rendering on every other source mode switch 2026-06-19 11:49:18 +02:00
Yuri Karamian f8371aaa57 Fix editor not rendering on every other source mode switch 2026-06-19 11:47:11 +02:00
Yuri Karamian c5a45131a5 Fix editor not rendering on every other source mode switch 2026-06-19 11:40:57 +02:00
Yuri Karamian 1681fade3b Fix editor not rendering on every other source mode switch 2026-06-19 11:38:40 +02:00
Yuri Karamian 4f324ad682 Fix pasted images disappearing when switching to source mode (#87) 2026-06-19 11:31:49 +02:00
Yuri Karamian c1a9871703 Fix pasted images disappearing when switching to source mode (#87) 2026-06-19 11:30:07 +02:00
Yuri Karamian 83390f5ed2 Fix images not rendering when switching back from source mode 2026-06-19 11:27:38 +02:00
Yuri Karamian 5bf6d8063e Fix images not rendering when switching back from source mode 2026-06-19 11:25:45 +02:00
Yuri Karamian a1913558b9 Fix pasted images disappearing when switching to source mode (#87) 2026-06-19 11:18:06 +02:00
Yuri Karamian 93e96829f4 Add setting to toggle link arrows (#128) 2026-06-19 11:06:49 +02:00
Yuri Karamian 11673bd8c4 Fix Android crash when swiping back with modal open (#90) 2026-06-19 10:47:39 +02:00
lokthare 4f4e2854a6 Update flake.nix / fix cargoHash (#136)
I wanted to try HelixNotes, I pulled the main branch but it failed to build with `nix build`.

Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/136
2026-06-19 09:54:58 +02:00
Yuri Karamian 856ac94a76 Centralize darkThemes list, fix dark themes reverting to light on restart 2026-06-18 13:50:33 +02:00
MF 28263de53d Improve notebook path creation (#135)
Backspace on an empty sub-notebook field returns to top-level creation, and top-level names like Parent/Child now create nested notebooks in one action. Validated with pnpm build.

Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/135
2026-06-18 13:40:41 +02:00
blake b6e855ce3e Accent colors now change automatically when a user selects a theme. Also added a One Dark theme. (#130)
WIP

Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/130
2026-06-18 13:27:03 +02:00
MF 51148efe2e Focus notebook name after sidebar double-click (#134)
Double-clicking empty sidebar space now opens the new-notebook field and focuses it, matching the + button flow.

Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/134
2026-06-18 13:24:15 +02:00
Yuri Karamian 32e056dc24 Fix heading submenu clipped in context menu, flip on narrow screens (#113) 2026-06-18 13:20:35 +02:00
Yuri Karamian c14ad6387d Fix heading submenu clipped in context menu (#113) 2026-06-18 13:16:43 +02:00
Yuri Karamian 93122ade7b Show current vault indication in vault picker (#124) 2026-06-18 13:08:34 +02:00
blake 80bdabaf1b Material Dark, Material Light, Monokai, Rose Pine, Everforest, Horizon, Cyberpunk, Black themes all added. (#122)
WIP: New themes
Reviewed-on: https://codeberg.org/ArkHost/HelixNotes/pulls/122
2026-06-16 23:40:58 +02:00
Yuri Karamian cea98cffde update README 2026-06-16 23:20:22 +02:00
210 changed files with 39193 additions and 7517 deletions

No files matched your search

+74 -25
View File
@@ -1,7 +1,7 @@
# HelixNotes
[![License: AGPL-3.0](https://img.shields.io/badge/License-AGPL--3.0-blue.svg)](https://codeberg.org/ArkHost/HelixNotes/src/branch/main/LICENSE)
[![Latest Release](https://img.shields.io/badge/release-v1.3.0-green)](https://codeberg.org/ArkHost/HelixNotes/releases)
[![License: AGPL-3.0](https://img.shields.io/badge/License-AGPL--3.0-blue.svg)](https://gitlab.com/ArkHost/HelixNotes/-/blob/main/LICENSE)
[![Latest Release](https://img.shields.io/badge/release-v1.3.6-green)](https://gitlab.com/ArkHost/HelixNotes/-/releases/v1.3.6)
[![Website](https://img.shields.io/badge/web-helixnotes.com-purple)](https://helixnotes.com)
[![Platform](https://img.shields.io/badge/platform-Linux%20%7C%20Windows%20%7C%20macOS%20%7C%20Android-lightgrey)]()
@@ -10,29 +10,45 @@ A local markdown note-taking app built with Tauri, SvelteKit, and Rust.
Your notes are stored as standard Markdown files on your local filesystem.
No cloud, no lock-in.
## Download (v1.3.0)
## Download (v1.3.6)
### Linux
#### Arch / Manjaro (AUR)
#### AppImage
The AppImage works only on Fedora 43+, Arch Linux, and openSUSE Tumbleweed (x86_64).
[Download AppImage](https://download.helixnotes.com/releases/v1.3.6/HelixNotes_1.3.6_amd64.AppImage)
#### Distro-specific packages
##### Fedora 43+ (DNF)
```bash
yay -S helixnotes-appimage-bin
sudo dnf config-manager addrepo \
--from-repofile=https://repo.arkhost.com/helixnotes.repo
sudo dnf install helix-notes
```
#### Debian / Ubuntu / Mint (APT)
##### Debian / Ubuntu / Mint (APT)
```bash
curl -fsSL https://repo.arkhost.com/gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/arkhost.gpg && echo "deb [signed-by=/usr/share/keyrings/arkhost.gpg arch=amd64] https://repo.arkhost.com stable main" | sudo tee /etc/apt/sources.list.d/helixnotes.list && sudo apt update && sudo apt install helix-notes
```
#### Solus (EOPKG)
##### Arch / Manjaro (AUR)
```bash
yay -S helixnotes-appimage-bin
```
##### Solus (EOPKG)
```bash
sudo eopkg it helixnotes
```
#### NixOS
##### NixOS
<details>
<summary>flake.nix</summary>
@@ -42,7 +58,7 @@ sudo eopkg it helixnotes
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
helix-notes = {
url = "git+https://codeberg.org/ArkHost/HelixNotes";
url = "git+https://gitlab.com/ArkHost/HelixNotes";
# inputs.nixpkgs.follows = "nixpkgs";
}
};
@@ -90,51 +106,76 @@ sudo eopkg it helixnotes
```
</details>
#### AppImage (Arch, Fedora 43+, openSUSE Tumbleweed)
#### Manual package downloads
[Download AppImage](https://download.helixnotes.com/releases/v1.3.0/HelixNotes_1.3.0_amd64.AppImage)
#### .deb (manual)
[Download .deb](https://codeberg.org/ArkHost/HelixNotes/releases/download/v1.3.0/HelixNotes_1.3.0_amd64.deb) (Ubuntu 22.04+)
- [.deb](https://download.helixnotes.com/releases/v1.3.6/HelixNotes_1.3.6_amd64.deb) (Ubuntu 22.04+)
- [.rpm](https://download.helixnotes.com/releases/v1.3.6/HelixNotes-1.3.6-1.x86_64.rpm)
### Windows
[Download Installer](https://codeberg.org/ArkHost/HelixNotes/releases/download/v1.3.0/HelixNotes_1.3.0_x64-setup.exe) (Windows 10/11)
[Download Installer](https://download.helixnotes.com/releases/v1.3.6/HelixNotes_1.3.6_x64-setup.exe) (Windows 10/11)
### macOS
[Download .dmg](https://codeberg.org/ArkHost/HelixNotes/releases/download/v1.3.0/HelixNotes_1.3.0_x64.dmg) (Intel, runs on Apple Silicon via Rosetta)
[Download .dmg (Apple Silicon)](https://download.helixnotes.com/releases/v1.3.6/HelixNotes_1.3.6_aarch64.dmg) (M-series Macs)
[Download .dmg (Intel)](https://download.helixnotes.com/releases/v1.3.6/HelixNotes_1.3.6_x64.dmg)
The Apple Silicon build is signed and notarized by Apple. The Intel build may still trigger a Gatekeeper warning. If macOS reports that the Intel build is damaged, run this once after installing or updating it:
```bash
xattr -cr /Applications/HelixNotes.app
```
### Android
[Download APK](https://codeberg.org/ArkHost/HelixNotes/releases/download/v1.3.0/HelixNotes_1.3.0_android.apk)
[Download APK](https://download.helixnotes.com/releases/v1.3.6/HelixNotes_1.3.6_android.apk)
---
All releases: [codeberg.org/ArkHost/HelixNotes/releases](https://codeberg.org/ArkHost/HelixNotes/releases)
All releases: [gitlab.com/ArkHost/HelixNotes/-/releases](https://gitlab.com/ArkHost/HelixNotes/-/releases)
## Features
- Markdown editor with toolbar, slash commands, source mode, code highlighting
- **Tasks view**: aggregate `- [ ]` checklists from across all notes, set priority and due dates, work in a list or a calendar (drag a task to reschedule)
- **Tasks view**: aggregate `- [ ]` checklists from across all notes, set priority and due dates, filter Today or Overdue tasks, work in a list or a calendar (drag a task to reschedule)
- `[[Wiki-links]]` and graph view
- Full-text search (Tantivy), CJK-aware for Chinese, Japanese, and Korean
- Outline panel, daily notes with calendar view, tags with autocomplete, drag-and-drop
- Live KaTeX math editor (`/math`, `/imath`) with modal preview, double-click to edit
- Mermaid diagrams (opt-in render, copy as PNG, save as PNG/SVG)
- Encrypted secret blocks (`/secret`) stored as portable `helix-secret` markdown fences
- Insert date/time (`/date`, `/time`, `/now`), color swatches (`/color`), configurable week start
- Insert date/time (`/date`, `/time`, `/now`) with 12-hour or 24-hour timestamps, color swatches (`/color`), configurable week start
- Manual notebook sorting (drag to reorder above, into, or below)
- External `.md` viewer mode with import-to-vault flow
- PDF preview, Obsidian import, "Show in File Manager"
- AI writing tools (Ollama / OpenAI-compatible / Anthropic / OpenAI)
- **Optional WebDAV sync** to your own server (Nextcloud, ownCloud, a NAS): manual or automatic, with keep-both conflict copies
- Version history with diffs, automatic backups
- Version history with main-area diffs and rendered read-only snapshots, automatic backups
- Multi-window, file associations, focus mode, view mode
- Themes (light, dark, and 14 palettes), accent colors, fonts, 80-200% interface scale
- Themes (light, dark, and 14 palettes), accent colors, fonts including bundled Ubuntu and Ubuntu Mono, 80-200% interface scale
- Local plain-text files, no company cloud
### Version history
Changes compares the selected snapshot with the current editor contents, including unsaved edits. Added and removed lines show what restoring that version would change; long unchanged sections can be expanded.
Snapshot displays the stored note read-only, with View source available for its Markdown body. Metadata is separate and is not restored. Snapshot links are inactive, secrets stay locked, and diagrams render only when requested.
Restore replaces the current note's body and asks for confirmation if it would replace an unsaved draft. Inspecting versions does not replace the live editor contents or reset their undo history.
### Note Info
Open **Note info** from the editor toolbar. Expand **Frontmatter** to inspect the original YAML header, including custom keys, without editing it. This shows the last loaded or saved metadata; unsaved changes are not included, and the display updates after saving.
### Saving notes
Notes autosave after three seconds without edits. During continuous typing, a save is queued at least every ten seconds. Ctrl+S (Cmd+S on macOS), switching notes, and closing an editor flush pending changes immediately. A failed save leaves the note marked **Unsaved** and blocks leaving that editor.
Note writes run off the UI thread and replace the file atomically. Unchanged notes are not rewritten. Ordinary saves update only the affected note in the list, wiki-link cache, and Tasks view; search-index updates are batched in the background. External file changes are still picked up by the watcher.
With **Close to tray** enabled and a tray icon available, closing the main window hides it after saving. With the setting off, closing the main window closes the application. The close-to-tray setting takes effect immediately; enabling the tray icon itself requires a restart. Explicit **Quit** exits rather than hiding to the tray.
Full documentation: [helixnotes.com/docs](https://helixnotes.com/docs.html)
## Tech Stack
@@ -147,7 +188,7 @@ Full documentation: [helixnotes.com/docs](https://helixnotes.com/docs.html)
### Prerequisites
- [Rust](https://rustup.rs/) (1.77+)
- [Rust](https://rustup.rs/) (1.88+)
- [Node.js](https://nodejs.org/) (18+)
- [pnpm](https://pnpm.io/)
- System dependencies for Tauri: see [Tauri prerequisites](https://v2.tauri.app/start/prerequisites/)
@@ -159,6 +200,14 @@ pnpm install
pnpm tauri dev
```
### Verification
Run the frontend checks and tests, Rust tests and lints, and production frontend build with one command:
```bash
pnpm verify
```
### Production Build
```bash
@@ -175,4 +224,4 @@ pnpm tauri build
## License
[AGPL-3.0](https://codeberg.org/ArkHost/HelixNotes/src/branch/main/LICENSE)
[AGPL-3.0](https://gitlab.com/ArkHost/HelixNotes/-/blob/main/LICENSE)
Generated
+3 -3
View File
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1777268161,
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
"lastModified": 1785571196,
"narHash": "sha256-KoTsyMQqnXQZq8deCEnu4QkyldkwH/bpMMhUcfMdGIw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
"rev": "148bab9c1c3c53136ecb44a6ea356a0ed5b39b06",
"type": "github"
},
"original": {
+60 -54
View File
@@ -6,71 +6,77 @@
flake-utils.url = "github:numtide/flake-utils";
};
outputs = {
self,
nixpkgs,
flake-utils,
}:
flake-utils.lib.eachDefaultSystem (system: let
pkgs = import nixpkgs {inherit system;};
outputs =
{
self,
nixpkgs,
flake-utils,
}:
flake-utils.lib.eachDefaultSystem (
system:
let
pkgs = import nixpkgs { inherit system; };
cargoToml = builtins.fromTOML (builtins.readFile ./src-tauri/Cargo.toml);
pname = cargoToml.package.name;
version = cargoToml.package.version;
in {
packages.default = pkgs.rustPlatform.buildRustPackage {
inherit pname version;
src = ./.;
cargoHash = "sha256-QF4HMYBjrxCBiq6PcsNy+kEOq/j+3zDzlcT5dy7MtQk=";
pnpmDeps = pkgs.fetchPnpmDeps {
cargoToml = builtins.fromTOML (builtins.readFile ./src-tauri/Cargo.toml);
pname = cargoToml.package.name;
version = cargoToml.package.version;
in
{
packages.default = pkgs.rustPlatform.buildRustPackage {
inherit pname version;
src = ./.;
fetcherVersion = 3;
hash = "sha256-Odmd1gwioCvnnExvCOQwDPCgLyrBfTpeUKHy3BrNtiM=";
};
nativeBuildInputs = with pkgs; [
cargo-tauri.hook
cargoHash = "sha256-P0iXImWYKYPxVj7q2JSuDmd8JvjcKW4DzFUzXeUQZPk=C";
pnpmConfigHook
pnpm
nodejs
pnpmDeps = pkgs.fetchPnpmDeps {
inherit pname version;
src = ./.;
fetcherVersion = 4;
hash = "sha256-odUNKO2D50DG+VpuoTEo5FLMYy5pQSHQBtfHJrhJt78=";
};
pkg-config
jq
moreutils
wrapGAppsHook3
];
nativeBuildInputs = with pkgs; [
cargo-tauri.hook
buildInputs = with pkgs;
lib.optionals stdenv.hostPlatform.isLinux [
webkitgtk_4_1
libayatana-appindicator
pnpmConfigHook
pnpm
nodejs
pkg-config
jq
moreutils
wrapGAppsHook3
];
cargoRoot = "src-tauri";
buildAndTestSubdir = self.packages.${system}.default.cargoRoot;
buildInputs =
with pkgs;
lib.optionals stdenv.hostPlatform.isLinux [
webkitgtk_4_1
libayatana-appindicator
];
# Deactivate the upstream update mechanism
postPatch = ''
jq '
.bundle.createUpdaterArtifacts = false |
.plugins.updater = {"active": false, "pubkey": "", "endpoints": []}
' \
src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
'';
cargoRoot = "src-tauri";
buildAndTestSubdir = self.packages.${system}.default.cargoRoot;
meta = with pkgs.lib; {
description = "HelixNotes desktop application";
homepage = "https://helixnotes.com/";
license = licenses.agpl3Plus;
platforms = platforms.linux ++ platforms.darwin;
mainProgram = "helixnotes";
# Deactivate the upstream update mechanism
postPatch = ''
jq '
.bundle.createUpdaterArtifacts = false |
.plugins.updater = {"active": false, "pubkey": "", "endpoints": []}
' \
src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
'';
meta = with pkgs.lib; {
description = "HelixNotes desktop application";
homepage = "https://helixnotes.com/";
license = licenses.agpl3Plus;
platforms = platforms.linux ++ platforms.darwin;
mainProgram = "helixnotes";
};
};
};
formatter = pkgs.alejandra;
});
formatter = pkgs.nixfmt;
}
);
}
+25 -12
View File
@@ -2,8 +2,9 @@
"name": "helixnotes",
"private": true,
"license": "AGPL-3.0-or-later",
"version": "1.3.1",
"version": "1.3.6",
"type": "module",
"packageManager": "pnpm@11.18.0",
"scripts": {
"dev": "vite dev",
"build": "vite build",
@@ -11,6 +12,10 @@
"prepare": "svelte-kit sync || echo ''",
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
"test": "node --test tests/*.test.mjs src/lib/utils/*.test.mjs",
"test:rust": "cargo test --manifest-path src-tauri/Cargo.toml",
"lint:rust": "cargo fmt --manifest-path src-tauri/Cargo.toml --check && cargo clippy --manifest-path src-tauri/Cargo.toml --all-targets -- -D warnings",
"verify": "pnpm check && pnpm test && pnpm test:rust && pnpm lint:rust && pnpm build",
"tauri": "tauri",
"tauri:dev": "tauri dev",
"tauri:build": "tauri build"
@@ -18,31 +23,36 @@
"devDependencies": {
"@sveltejs/adapter-auto": "^7.0.0",
"@sveltejs/adapter-static": "^3.0.10",
"@sveltejs/kit": "^2.50.2",
"@sveltejs/kit": "^2.70.2",
"@sveltejs/vite-plugin-svelte": "^6.2.4",
"@tailwindcss/postcss": "^4.1.18",
"@tailwindcss/vite": "^4.1.18",
"@tailwindcss/postcss": "^4.3.3",
"@tailwindcss/vite": "^4.3.3",
"@tauri-apps/cli": "^2.10.0",
"svelte": "^5.49.2",
"@types/node": "26.2.0",
"svelte": "^5.56.9",
"svelte-check": "^4.3.6",
"tailwindcss": "^4.1.18",
"tailwindcss": "^4.3.3",
"typescript": "^5.9.3",
"vite": "^7.3.1"
"vite": "^7.3.6"
},
"dependencies": {
"@codemirror/commands": "^6.11.1",
"@codemirror/lang-markdown": "^6.5.2",
"@codemirror/language": "^6.12.4",
"@codemirror/state": "^6.7.6",
"@codemirror/view": "^6.43.13",
"@lezer/highlight": "^1.2.4",
"@tauri-apps/api": "^2.10.1",
"@tauri-apps/plugin-dialog": "^2.6.0",
"@tauri-apps/plugin-fs": "^2.4.5",
"@tauri-apps/plugin-opener": "^2.5.3",
"@tauri-apps/plugin-updater": "^2.10.0",
"@tiptap/core": "^3.19.0",
"@tiptap/extension-code-block-lowlight": "^3.19.0",
"@tiptap/extension-code-block": "^3.19.0",
"@tiptap/extension-color": "^3.19.0",
"@tiptap/extension-details": "^3.19.0",
"@tiptap/extension-highlight": "^3.19.0",
"@tiptap/extension-image": "^3.19.0",
"@tiptap/extension-link": "^3.19.0",
"@tiptap/extension-placeholder": "^3.19.0",
"@tiptap/extension-subscript": "^3.19.0",
"@tiptap/extension-superscript": "^3.19.0",
"@tiptap/extension-table": "^3.19.0",
@@ -59,13 +69,16 @@
"@tiptap/starter-kit": "^3.19.0",
"@types/katex": "^0.16.8",
"@types/markdown-it": "^14.1.2",
"diff": "^9.0.0",
"dompurify": "^3.4.13",
"highlight.js": "^11.11.1",
"katex": "^0.16.28",
"lowlight": "^3.3.0",
"markdown-it": "^14.1.0",
"markdown-it": "^14.3.0",
"markdown-it-mark": "^4.0.0",
"markdown-it-sub": "^2.0.0",
"markdown-it-sup": "^2.0.0",
"markdown-it-task-lists": "^2.1.1",
"mermaid": "^11.14.0"
"mermaid": "^11.16.1"
}
}
+797 -713
View File
File diff suppressed because it is too large. Load diff
+4
View File
@@ -0,0 +1,4 @@
allowBuilds:
esbuild: true
overrides:
cookie: 0.7.2
+84 -276
View File
@@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
version = 4
[[package]]
name = "adler2"
@@ -8,17 +8,6 @@ version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
[[package]]
name = "ahash"
version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
dependencies = [
"getrandom 0.2.17",
"once_cell",
"version_check",
]
[[package]]
name = "ahash"
version = "0.8.12"
@@ -138,12 +127,6 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236"
[[package]]
name = "arrayvec"
version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
[[package]]
name = "async-broadcast"
version = "0.7.2"
@@ -346,18 +329,6 @@ dependencies = [
"crunchy",
]
[[package]]
name = "bitvec"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
dependencies = [
"funty",
"radium",
"tap",
"wyz",
]
[[package]]
name = "block-buffer"
version = "0.10.4"
@@ -389,29 +360,6 @@ dependencies = [
"piper",
]
[[package]]
name = "borsh"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d1da5ab77c1437701eeff7c88d968729e7766172279eab0676857b3d63af7a6f"
dependencies = [
"borsh-derive",
"cfg_aliases",
]
[[package]]
name = "borsh-derive"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0686c856aa6aac0c4498f936d7d6a02df690f614c03e4d906d1018062b5c5e2c"
dependencies = [
"once_cell",
"proc-macro-crate 3.4.0",
"proc-macro2",
"quote",
"syn 2.0.117",
]
[[package]]
name = "brotli"
version = "8.0.2"
@@ -439,40 +387,6 @@ version = "3.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
[[package]]
name = "byte-unit"
version = "5.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c6d47a4e2961fb8721bcfc54feae6455f2f64e7054f9bc67e875f0e77f4c58d"
dependencies = [
"rust_decimal",
"schemars 1.2.1",
"serde",
"utf8-width",
]
[[package]]
name = "bytecheck"
version = "0.6.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2"
dependencies = [
"bytecheck_derive",
"ptr_meta",
"simdutf8",
]
[[package]]
name = "bytecheck_derive"
version = "0.6.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
]
[[package]]
name = "bytemuck"
version = "1.25.0"
@@ -624,6 +538,17 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
[[package]]
name = "chacha20"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81"
dependencies = [
"cfg-if",
"cpufeatures 0.3.0",
"rand_core 0.10.1",
]
[[package]]
name = "chrono"
version = "0.4.44"
@@ -738,6 +663,15 @@ dependencies = [
"libc",
]
[[package]]
name = "cpufeatures"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
dependencies = [
"libc",
]
[[package]]
name = "crc32fast"
version = "1.5.0"
@@ -768,9 +702,9 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
version = "0.9.18"
version = "0.9.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f"
dependencies = [
"crossbeam-utils",
]
@@ -1314,12 +1248,6 @@ dependencies = [
"libc",
]
[[package]]
name = "funty"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
[[package]]
name = "futf"
version = "0.1.5"
@@ -1590,11 +1518,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
dependencies = [
"cfg-if",
"js-sys",
"libc",
"r-efi",
"wasip2",
"wasm-bindgen",
]
[[package]]
@@ -1604,10 +1530,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec"
dependencies = [
"cfg-if",
"js-sys",
"libc",
"r-efi",
"rand_core 0.10.1",
"wasip2",
"wasip3",
"wasm-bindgen",
]
[[package]]
@@ -1796,9 +1725,6 @@ name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
dependencies = [
"ahash 0.7.8",
]
[[package]]
name = "hashbrown"
@@ -1806,7 +1732,7 @@ version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
dependencies = [
"ahash 0.8.12",
"ahash",
"allocator-api2",
]
@@ -1850,18 +1776,23 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "helixnotes"
version = "1.3.1"
version = "1.3.6"
dependencies = [
"aho-corasick",
"arboard",
"chrono",
"dirs",
"fs4",
"futures",
"gray_matter",
"image",
"libc",
"log",
"notify",
"objc2-app-kit",
"parking_lot",
"png 0.17.16",
"quick-xml 0.36.2",
"quick-xml",
"rayon",
"regex",
"reqwest 0.12.28",
@@ -1876,11 +1807,13 @@ dependencies = [
"tauri-build",
"tauri-plugin-dialog",
"tauri-plugin-fs",
"tauri-plugin-ios-vault-access",
"tauri-plugin-log",
"tauri-plugin-opener",
"tauri-plugin-single-instance",
"tauri-plugin-updater",
"tauri-plugin-window-state",
"tempfile",
"tokio",
"urlencoding",
"uuid",
@@ -2552,9 +2485,6 @@ name = "log"
version = "0.4.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
dependencies = [
"value-bag",
]
[[package]]
name = "lru"
@@ -2573,9 +2503,9 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
[[package]]
name = "lz4_flex"
version = "0.11.5"
version = "0.11.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08ab2867e3eeeca90e844d1940eab391c9dc5228783db2ed999acbc0a9ed375a"
checksum = "373f5eceeeab7925e0c1098212f2fbc4d416adec9d35051a6ab251e824c1854a"
[[package]]
name = "mac"
@@ -3415,13 +3345,13 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
[[package]]
name = "plist"
version = "1.8.0"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07"
checksum = "7da1d65da6dd5d1e44199ac0f58712d241c0f439f80adea8924d832384087f85"
dependencies = [
"base64 0.22.1",
"indexmap 2.13.0",
"quick-xml 0.38.4",
"quick-xml",
"serde",
"time",
]
@@ -3574,26 +3504,6 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "ptr_meta"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1"
dependencies = [
"ptr_meta_derive",
]
[[package]]
name = "ptr_meta_derive"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
]
[[package]]
name = "pure-rust-locales"
version = "0.8.2"
@@ -3617,18 +3527,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
[[package]]
name = "quick-xml"
version = "0.36.2"
version = "0.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
dependencies = [
"memchr",
]
[[package]]
name = "quick-xml"
version = "0.38.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
checksum = "e660451e55124f798a69a5af3f49ccfbefbd41910eefd25caf2393e1f3473ec1"
dependencies = [
"memchr",
]
@@ -3655,14 +3556,15 @@ dependencies = [
[[package]]
name = "quinn-proto"
version = "0.11.13"
version = "0.11.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
checksum = "2f4bfc015262b9df63c8845072ce59068853ff5872180c2ce2f13038b970e560"
dependencies = [
"bytes",
"getrandom 0.3.4",
"getrandom 0.4.1",
"lru-slab",
"rand 0.9.2",
"rand 0.10.2",
"rand_pcg 0.10.2",
"ring",
"rustc-hash 2.1.1",
"rustls",
@@ -3703,12 +3605,6 @@ version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
[[package]]
name = "radium"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
[[package]]
name = "rand"
version = "0.7.3"
@@ -3720,7 +3616,7 @@ dependencies = [
"rand_chacha 0.2.2",
"rand_core 0.5.1",
"rand_hc",
"rand_pcg",
"rand_pcg 0.2.1",
]
[[package]]
@@ -3736,12 +3632,13 @@ dependencies = [
[[package]]
name = "rand"
version = "0.9.2"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80"
dependencies = [
"rand_chacha 0.9.0",
"rand_core 0.9.5",
"chacha20",
"getrandom 0.4.1",
"rand_core 0.10.1",
]
[[package]]
@@ -3764,16 +3661,6 @@ dependencies = [
"rand_core 0.6.4",
]
[[package]]
name = "rand_chacha"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
dependencies = [
"ppv-lite86",
"rand_core 0.9.5",
]
[[package]]
name = "rand_core"
version = "0.5.1"
@@ -3794,12 +3681,9 @@ dependencies = [
[[package]]
name = "rand_core"
version = "0.9.5"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
dependencies = [
"getrandom 0.3.4",
]
checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
[[package]]
name = "rand_distr"
@@ -3829,6 +3713,15 @@ dependencies = [
"rand_core 0.5.1",
]
[[package]]
name = "rand_pcg"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a"
dependencies = [
"rand_core 0.10.1",
]
[[package]]
name = "raw-window-handle"
version = "0.6.2"
@@ -3933,15 +3826,6 @@ version = "0.8.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
[[package]]
name = "rend"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c"
dependencies = [
"bytecheck",
]
[[package]]
name = "reqwest"
version = "0.12.28"
@@ -4061,35 +3945,6 @@ dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "rkyv"
version = "0.7.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2297bf9c81a3f0dc96bc9521370b88f054168c29826a75e89c55ff196e7ed6a1"
dependencies = [
"bitvec",
"bytecheck",
"bytes",
"hashbrown 0.12.3",
"ptr_meta",
"rend",
"rkyv_derive",
"seahash",
"tinyvec",
"uuid",
]
[[package]]
name = "rkyv_derive"
version = "0.7.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84d7b42d4b8d06048d3ac8db0eb31bcb942cbeb709f0b5f2b2ebde398d3038f5"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
]
[[package]]
name = "rust-stemmers"
version = "1.2.0"
@@ -4100,22 +3955,6 @@ dependencies = [
"serde_derive",
]
[[package]]
name = "rust_decimal"
version = "1.40.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61f703d19852dbf87cbc513643fa81428361eb6940f1ac14fd58155d295a3eb0"
dependencies = [
"arrayvec",
"borsh",
"bytes",
"num-traits",
"rand 0.8.5",
"rkyv",
"serde",
"serde_json",
]
[[package]]
name = "rustc-hash"
version = "1.1.0"
@@ -4229,9 +4068,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
[[package]]
name = "rustls-webpki"
version = "0.103.9"
version = "0.103.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53"
checksum = "0527518605e68109d875e248ea259b6758801cf165e4b2c2733ae3b51f12535a"
dependencies = [
"ring",
"rustls-pki-types",
@@ -4325,12 +4164,6 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "seahash"
version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
[[package]]
name = "security-framework"
version = "3.7.0"
@@ -4572,7 +4405,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
dependencies = [
"cfg-if",
"cpufeatures",
"cpufeatures 0.2.17",
"digest",
]
@@ -4598,12 +4431,6 @@ version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
[[package]]
name = "simdutf8"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
[[package]]
name = "siphasher"
version = "0.3.11"
@@ -5005,17 +4832,11 @@ dependencies = [
"syn 2.0.117",
]
[[package]]
name = "tap"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
[[package]]
name = "tar"
version = "0.4.44"
version = "0.4.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a"
checksum = "3f6221d9a6003c78398e3b239969f352578258df48c8eb051caadae0015bc840"
dependencies = [
"filetime",
"libc",
@@ -5201,14 +5022,22 @@ dependencies = [
"url",
]
[[package]]
name = "tauri-plugin-ios-vault-access"
version = "0.1.0"
dependencies = [
"serde",
"tauri",
"tauri-plugin",
]
[[package]]
name = "tauri-plugin-log"
version = "2.8.0"
version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7545bd67f070a4500432c826e2e0682146a1d6712aee22a2786490156b574d93"
checksum = "6792296e6f389268016c77db21ebae1fc0568f2fccf88b1ec7e2ea71330afb4c"
dependencies = [
"android_logger",
"byte-unit",
"fern",
"log",
"objc2",
@@ -5953,12 +5782,6 @@ version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba"
[[package]]
name = "utf8-width"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1292c0d970b54115d14f2492fe0170adf21d68a1de108eebc51c1df4f346a091"
[[package]]
name = "utf8_iter"
version = "1.0.4"
@@ -5977,12 +5800,6 @@ dependencies = [
"wasm-bindgen",
]
[[package]]
name = "value-bag"
version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ba6f5989077681266825251a52748b8c1d8a4ad098cc37e440103d0ea717fc0"
[[package]]
name = "version-compare"
version = "0.2.1"
@@ -6235,12 +6052,12 @@ dependencies = [
[[package]]
name = "wayland-scanner"
version = "0.31.8"
version = "0.31.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5423e94b6a63e68e439803a3e153a9252d5ead12fd853334e2ad33997e3889e3"
checksum = "338e30461b3a2b67d70eb30a6d89f8e0c93a833e07d2ae89085cd070c4a00ac0"
dependencies = [
"proc-macro2",
"quick-xml 0.38.4",
"quick-xml",
"quote",
]
@@ -6996,15 +6813,6 @@ dependencies = [
"x11-dl",
]
[[package]]
name = "wyz"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
dependencies = [
"tap",
]
[[package]]
name = "x11"
version = "2.21.0"
+23 -3
View File
@@ -1,11 +1,15 @@
[package]
name = "helixnotes"
version = "1.3.1"
version = "1.3.6"
description = "Local markdown note-taking app"
authors = ["HelixNotes"]
license = "AGPL-3.0-or-later"
edition = "2021"
rust-version = "1.77.2"
rust-version = "1.88"
[lints.clippy]
# This style lint is version-dependent and produces over 100 legacy-only diagnostics on Rust 1.88.
uninlined_format_args = "allow"
[lib]
name = "app_lib"
@@ -14,6 +18,9 @@ crate-type = ["staticlib", "cdylib", "rlib"]
[build-dependencies]
tauri-build = { version = "2", features = [] }
[dev-dependencies]
tauri = { version = "2", features = ["test"] }
[dependencies]
tauri = { version = "2", features = ["protocol-asset", "tray-icon", "image-png"] }
tauri-plugin-log = "2"
@@ -25,7 +32,9 @@ serde_json = "1"
serde_yaml = "0.9"
log = "0.4"
notify = "8"
parking_lot = "0.12"
walkdir = "2"
tempfile = "3"
chrono = { version = "0.4", features = ["serde", "unstable-locales"] }
sys-locale = "0.3"
uuid = { version = "1", features = ["v4"] }
@@ -34,14 +43,25 @@ gray_matter = "0.2"
tokio = { version = "1", features = ["full"] }
dirs = "6"
regex = "1"
aho-corasick = "1"
zip = { version = "2", default-features = false, features = ["deflate"] }
reqwest = { version = "0.12", default-features = false, features = ["json", "stream", "rustls-tls", "blocking"] }
futures = "0.3"
rayon = "1"
quick-xml = "0.36"
quick-xml = "0.41"
urlencoding = "2"
sha2 = "0.10"
fs4 = { version = "0.8", default-features = false }
rustls = { version = "0.23", default-features = false, features = ["ring", "logging", "std", "tls12"] }
[target.'cfg(target_os = "macos")'.dependencies]
objc2-app-kit = "0.3.2"
[target.'cfg(target_os = "android")'.dependencies]
libc = "0.2"
[target.'cfg(target_os = "ios")'.dependencies]
tauri-plugin-ios-vault-access = { path = "plugins/ios-vault-access" }
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
tauri-plugin-updater = "2"
tauri-plugin-single-instance = "2"
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>UIFileSharingEnabled</key>
<true/>
<key>LSSupportsOpeningDocumentsInPlace</key>
<true/>
</dict>
</plist>
+1 -1
View File
@@ -1,3 +1,3 @@
fn main() {
tauri_build::build()
tauri_build::build()
}
+2 -27
View File
@@ -11,6 +11,7 @@
"core:window:allow-minimize",
"core:window:allow-toggle-maximize",
"core:window:allow-close",
"core:window:allow-show",
"core:window:allow-is-maximized",
"core:window:allow-set-decorations",
"core:window:allow-is-fullscreen",
@@ -23,32 +24,6 @@
"dialog:allow-message",
"dialog:allow-ask",
"dialog:allow-confirm",
"fs:default",
"fs:allow-read",
"fs:allow-write",
"fs:allow-exists",
"fs:allow-mkdir",
"fs:allow-remove",
"fs:allow-rename",
"fs:allow-copy-file",
"fs:allow-stat",
"fs:allow-read-dir",
"fs:allow-read-file",
"fs:allow-write-file",
"fs:allow-watch",
"opener:default",
{
"identifier": "opener:allow-open-path",
"allow": [{ "path": "/**" }]
},
{
"identifier": "opener:allow-open-url",
"allow": [
{ "url": "https://**" },
{ "url": "http://**" },
{ "url": "mailto:*" }
]
},
"opener:allow-reveal-item-in-dir"
"fs:allow-read-file"
]
}
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<!-- Hardened runtime entitlements for Developer ID distribution (outside Mac App Store).
Required for notarization. These do NOT enable App Sandbox.
Without these, the WebKit webview and bundled Rust libraries get killed by the
hardened runtime's library validation. -->
<key>com.apple.security.cs.allow-jit</key>
<true/>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
<true/>
<key>com.apple.security.cs.disable-library-validation</key>
<true/>
<!-- Network access for auto-updater, AI features, WebDAV sync, image proxy -->
<key>com.apple.security.network.client</key>
<true/>
</dict>
</plist>
@@ -35,6 +35,16 @@ class MainActivity : TauriActivity() {
webView.settings.layoutAlgorithm = android.webkit.WebSettings.LayoutAlgorithm.NORMAL
}
override fun onPause() {
// Give the editor a chance to persist its current document before Android
// suspends the WebView. The save remains best-effort when the process is killed.
webView?.evaluateJavascript(
"window.dispatchEvent(new Event('app-lifecycle-flush'))",
null
)
super.onPause()
}
override fun onResume() {
super.onResume()
if (hasStoragePermission()) {
Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#fff</color>
<color name="ic_launcher_background">#626ED4</color>
</resources>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 709 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 556 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 961 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 984 B

+11
View File
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="512" height="512" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg">
<g transform="translate(85.333 85.333) scale(0.666667)">
<line x1="178.45584" y1="178.45584" x2="333.54416" y2="333.54416" stroke="#ffffff" stroke-width="25" stroke-opacity="0.5" stroke-linecap="round"/>
<line x1="337.53708" y1="174.46292" x2="174.46294" y2="337.53708" stroke="#ffffff" stroke-width="25" stroke-opacity="0.5" stroke-linecap="round"/>
<circle cx="153" cy="153" r="36" fill="#ffffff"/>
<circle cx="359" cy="153" r="36" fill="#ffffff"/>
<circle cx="153" cy="359" r="36" fill="#ffffff"/>
<circle cx="359" cy="359" r="36" fill="#ffffff"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 706 B

Binary file not shown.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

+52
View File
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="512"
height="512"
viewBox="0 0 512 512"
version="1.1"
id="svg5"
xmlns="http://www.w3.org/2000/svg"><rect
width="512"
height="512"
rx="112"
ry="112"
fill="#626ED4"
id="rect1" /><line
x1="178.45584"
y1="178.45584"
x2="333.54416"
y2="333.54416"
stroke="#ffffff"
stroke-width="25"
stroke-opacity="0.5"
stroke-linecap="round"
id="line1" /><line
x1="337.53708"
y1="174.46292"
x2="174.46294"
y2="337.53708"
stroke="#ffffff"
stroke-width="25"
stroke-opacity="0.5"
stroke-linecap="round"
id="line2" /><circle
cx="153"
cy="153"
r="36"
fill="#ffffff"
id="circle2" /><circle
cx="359"
cy="153"
r="36"
fill="#ffffff"
id="circle3" /><circle
cx="153"
cy="359"
r="36"
fill="#ffffff"
id="circle4" /><circle
cx="359"
cy="359"
r="36"
fill="#ffffff"
id="circle5" /></svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 667 B

After

Width:  |  Height:  |  Size: 475 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 788 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 788 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 721 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 788 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 84 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

+21
View File
@@ -0,0 +1,21 @@
{
"themes": [
{
"colors": {
"bg_active": "#373a52",
"bg_editor": "#1a1b26",
"bg_hover": "#2f3145",
"bg_primary": "#1a1b26",
"bg_secondary": "#1f2029",
"bg_tertiary": "#2a2b3d",
"border_color": "#2f3145",
"text_primary": "#c8cde4",
"text_secondary": "#6b7094"
},
"id": "custom-1782146306429",
"is_dark": true,
"name": "My theme"
}
],
"version": 1
}
@@ -0,0 +1,15 @@
[package]
name = "tauri-plugin-ios-vault-access"
version = "0.1.0"
authors = ["HelixNotes"]
description = "iOS Files folder access for HelixNotes"
edition = "2021"
rust-version = "1.77.2"
links = "tauri-plugin-ios-vault-access"
[dependencies]
tauri = "2"
serde = { version = "1", features = ["derive"] }
[build-dependencies]
tauri-plugin = { version = "2", features = ["build"] }
@@ -0,0 +1,3 @@
fn main() {
tauri_plugin::Builder::new(&[]).ios_path("ios").build();
}
@@ -0,0 +1,24 @@
// swift-tools-version:5.3
import PackageDescription
let package = Package(
name: "tauri-plugin-ios-vault-access",
platforms: [.iOS(.v14)],
products: [
.library(
name: "tauri-plugin-ios-vault-access",
type: .static,
targets: ["tauri-plugin-ios-vault-access"]
)
],
dependencies: [
.package(name: "Tauri", path: "../.tauri/tauri-api")
],
targets: [
.target(
name: "tauri-plugin-ios-vault-access",
dependencies: [.byName(name: "Tauri")],
path: "Sources"
)
]
)
@@ -0,0 +1,312 @@
import Foundation
import SwiftRs
import Tauri
import UIKit
import UniformTypeIdentifiers
private struct BookmarkRequest: Decodable {
let bookmarkId: String
}
final class IosVaultAccessPlugin: Plugin, UIDocumentPickerDelegate {
private let fileManager = FileManager.default
private let lock = NSLock()
private var pickerInvoke: Invoke?
private var activeBookmarkId: String?
private var activeURL: URL?
private var stagedBookmarkId: String?
private var stagedURL: URL?
deinit {
rollbackStagedScope()
releaseCurrentScope()
}
@objc func chooseFolder(_ invoke: Invoke) {
DispatchQueue.main.async {
guard self.pickerInvoke == nil else {
invoke.reject("A folder picker is already open.")
return
}
guard let viewController = self.manager.viewController else {
self.pickerInvoke = nil
invoke.reject("Files is unavailable right now. Try again.")
return
}
self.pickerInvoke = invoke
let picker = UIDocumentPickerViewController(
forOpeningContentTypes: [.folder],
asCopy: false
)
picker.delegate = self
picker.allowsMultipleSelection = false
viewController.present(picker, animated: true)
}
}
@objc func resolveFolder(_ invoke: Invoke) throws {
let request = try invoke.parseArgs(BookmarkRequest.self)
do {
invoke.resolve(try resolveBookmark(request.bookmarkId))
} catch {
invoke.reject(message(for: error))
}
}
@objc func releaseActive(_ invoke: Invoke) {
rollbackStagedScope()
releaseCurrentScope()
invoke.resolve()
}
@objc func commitStaged(_ invoke: Invoke) {
commitStagedScope()
invoke.resolve()
}
@objc func rollbackStaged(_ invoke: Invoke) {
rollbackStagedScope()
invoke.resolve()
}
@objc func forgetBookmark(_ invoke: Invoke) throws {
let request = try invoke.parseArgs(BookmarkRequest.self)
do {
let file = try bookmarkFile(for: request.bookmarkId, createDirectory: false)
lock.lock()
let isActive = activeBookmarkId == request.bookmarkId
let isStaged = stagedBookmarkId == request.bookmarkId
lock.unlock()
if fileManager.fileExists(atPath: file.path) {
try fileManager.removeItem(at: file)
}
if isActive {
releaseCurrentScope()
}
if isStaged {
rollbackStagedScope()
}
invoke.resolve()
} catch {
invoke.reject(message(for: error))
}
}
func documentPicker(
_ controller: UIDocumentPickerViewController,
didPickDocumentsAt urls: [URL]
) {
guard let invoke = takePickerInvoke() else { return }
guard let url = urls.first else {
invoke.resolve(cancelledResult())
return
}
do {
guard url.startAccessingSecurityScopedResource() else {
throw AccessError.denied
}
var adopted = false
defer {
if !adopted { url.stopAccessingSecurityScopedResource() }
}
let name = try validateFolder(url)
let bookmarkId = existingBookmarkId(for: url) ?? UUID().uuidString.lowercased()
let bookmark = try url.bookmarkData(
options: .minimalBookmark,
includingResourceValuesForKeys: nil,
relativeTo: nil
)
try bookmark.write(to: bookmarkFile(for: bookmarkId, createDirectory: true), options: .atomic)
stageScope(url: url, bookmarkId: bookmarkId)
adopted = true
invoke.resolve(result(bookmarkId: bookmarkId, url: url, name: name))
} catch {
invoke.reject(message(for: error))
}
}
func documentPickerWasCancelled(_ controller: UIDocumentPickerViewController) {
takePickerInvoke()?.resolve(cancelledResult())
}
private func resolveBookmark(_ bookmarkId: String) throws -> [String: Any] {
guard UUID(uuidString: bookmarkId) != nil else { throw AccessError.missing }
lock.lock()
let currentURL = activeBookmarkId == bookmarkId ? activeURL : nil
lock.unlock()
if let currentURL {
return result(bookmarkId: bookmarkId, url: currentURL, name: try validateFolder(currentURL))
}
let data = try Data(contentsOf: bookmarkFile(for: bookmarkId, createDirectory: false))
var stale = false
let url = try URL(
resolvingBookmarkData: data,
options: [],
relativeTo: nil,
bookmarkDataIsStale: &stale
)
guard url.startAccessingSecurityScopedResource() else { throw AccessError.denied }
var adopted = false
defer {
if !adopted { url.stopAccessingSecurityScopedResource() }
}
let name = try validateFolder(url)
if stale {
let refreshed = try url.bookmarkData(
options: .minimalBookmark,
includingResourceValuesForKeys: nil,
relativeTo: nil
)
try refreshed.write(to: bookmarkFile(for: bookmarkId, createDirectory: true), options: .atomic)
}
stageScope(url: url, bookmarkId: bookmarkId)
adopted = true
return result(bookmarkId: bookmarkId, url: url, name: name)
}
private func validateFolder(_ url: URL) throws -> String {
let values = try url.resourceValues(forKeys: [.isDirectoryKey, .nameKey])
guard values.isDirectory == true else { throw AccessError.notFolder }
guard try url.checkResourceIsReachable() else { throw AccessError.unavailable }
return values.name ?? url.lastPathComponent
}
private func stageScope(url: URL, bookmarkId: String) {
lock.lock()
let previous = stagedURL
stagedURL = url
stagedBookmarkId = bookmarkId
lock.unlock()
previous?.stopAccessingSecurityScopedResource()
}
private func commitStagedScope() {
lock.lock()
guard let next = stagedURL else {
lock.unlock()
return
}
let previous = activeURL
activeURL = next
activeBookmarkId = stagedBookmarkId
stagedURL = nil
stagedBookmarkId = nil
lock.unlock()
previous?.stopAccessingSecurityScopedResource()
}
private func rollbackStagedScope() {
lock.lock()
let staged = stagedURL
stagedURL = nil
stagedBookmarkId = nil
lock.unlock()
staged?.stopAccessingSecurityScopedResource()
}
private func releaseCurrentScope() {
lock.lock()
let previous = activeURL
activeURL = nil
activeBookmarkId = nil
lock.unlock()
previous?.stopAccessingSecurityScopedResource()
}
private func takePickerInvoke() -> Invoke? {
let invoke = pickerInvoke
pickerInvoke = nil
return invoke
}
private func bookmarkDirectory(create: Bool) throws -> URL {
let base = try fileManager.url(
for: .applicationSupportDirectory,
in: .userDomainMask,
appropriateFor: nil,
create: true
)
let directory = base.appendingPathComponent("VaultBookmarks", isDirectory: true)
if create {
try fileManager.createDirectory(at: directory, withIntermediateDirectories: true)
}
return directory
}
private func bookmarkFile(for id: String, createDirectory: Bool) throws -> URL {
guard UUID(uuidString: id) != nil else { throw AccessError.missing }
let directory = try bookmarkDirectory(create: createDirectory)
return directory.appendingPathComponent("\(id).bookmark")
}
private func existingBookmarkId(for selectedURL: URL) -> String? {
guard
let directory = try? bookmarkDirectory(create: true),
let files = try? fileManager.contentsOfDirectory(
at: directory,
includingPropertiesForKeys: nil
)
else { return nil }
let selectedPath = selectedURL.standardizedFileURL.path
for file in files where file.pathExtension == "bookmark" {
guard let data = try? Data(contentsOf: file) else { continue }
var stale = false
guard
let resolved = try? URL(
resolvingBookmarkData: data,
options: [],
relativeTo: nil,
bookmarkDataIsStale: &stale
),
resolved.standardizedFileURL.path == selectedPath
else { continue }
let id = file.deletingPathExtension().lastPathComponent
if UUID(uuidString: id) != nil { return id }
}
return nil
}
private func result(bookmarkId: String, url: URL, name: String) -> [String: Any] {
["bookmarkId": bookmarkId, "path": url.path, "name": name, "cancelled": false]
}
private func cancelledResult() -> [String: Any] {
["bookmarkId": "", "path": "", "name": "", "cancelled": true]
}
private func message(for error: Error) -> String {
if let accessError = error as? AccessError { return accessError.localizedDescription }
return "The selected folder is unavailable. Open Files and try again."
}
}
private enum AccessError: LocalizedError {
case denied
case missing
case notFolder
case unavailable
var errorDescription: String? {
switch self {
case .denied:
return "HelixNotes no longer has access to this folder. Choose it again in Files."
case .missing:
return "Saved access to this folder is missing. Choose it again in Files."
case .notFolder:
return "The selected item is not a folder."
case .unavailable:
return "The selected folder is unavailable. Open Files and try again."
}
}
}
@_cdecl("init_plugin_ios_vault_access")
func initPlugin() -> Plugin {
IosVaultAccessPlugin()
}
@@ -0,0 +1,84 @@
use serde::{Deserialize, Serialize};
use tauri::{
plugin::{Builder, PluginHandle, TauriPlugin},
Manager, Runtime,
};
#[derive(Debug, Clone, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct FolderSelection {
pub bookmark_id: String,
pub path: String,
pub name: String,
#[serde(default)]
pub cancelled: bool,
}
#[derive(Serialize)]
#[serde(rename_all = "camelCase")]
struct BookmarkRequest<'a> {
bookmark_id: &'a str,
}
#[cfg(target_os = "ios")]
tauri::ios_plugin_binding!(init_plugin_ios_vault_access);
pub struct IosVaultAccess<R: Runtime>(PluginHandle<R>);
impl<R: Runtime> IosVaultAccess<R> {
pub fn choose_folder(&self) -> Result<FolderSelection, String> {
self.0
.run_mobile_plugin("chooseFolder", ())
.map_err(|error| error.to_string())
}
pub fn resolve_folder(&self, bookmark_id: &str) -> Result<FolderSelection, String> {
self.0
.run_mobile_plugin("resolveFolder", BookmarkRequest { bookmark_id })
.map_err(|error| error.to_string())
}
pub fn release_active(&self) -> Result<(), String> {
self.0
.run_mobile_plugin("releaseActive", ())
.map_err(|error| error.to_string())
}
pub fn commit_staged(&self) -> Result<(), String> {
self.0
.run_mobile_plugin("commitStaged", ())
.map_err(|error| error.to_string())
}
pub fn rollback_staged(&self) -> Result<(), String> {
self.0
.run_mobile_plugin("rollbackStaged", ())
.map_err(|error| error.to_string())
}
pub fn forget_bookmark(&self, bookmark_id: &str) -> Result<(), String> {
self.0
.run_mobile_plugin("forgetBookmark", BookmarkRequest { bookmark_id })
.map_err(|error| error.to_string())
}
}
pub trait IosVaultAccessExt<R: Runtime> {
fn ios_vault_access(&self) -> &IosVaultAccess<R>;
}
impl<R: Runtime, T: Manager<R>> IosVaultAccessExt<R> for T {
fn ios_vault_access(&self) -> &IosVaultAccess<R> {
self.state::<IosVaultAccess<R>>().inner()
}
}
pub fn init<R: Runtime>() -> TauriPlugin<R> {
Builder::new("ios-vault-access")
.setup(|app, api| {
let handle = api.register_ios_plugin(init_plugin_ios_vault_access)?;
app.manage(IosVaultAccess(handle));
Ok(())
})
.build()
}
+96 -50
View File
@@ -8,6 +8,7 @@ const ANTHROPIC_API_URL: &str = "https://api.anthropic.com/v1/messages";
const OPENAI_API_URL: &str = "https://api.openai.com/v1/chat/completions";
const OLLAMA_DEFAULT_URL: &str = "http://localhost:11434";
#[allow(clippy::too_many_arguments)]
pub fn ai_request(
app: AppHandle,
provider: String,
@@ -22,7 +23,11 @@ pub fn ai_request(
let rt = tokio::runtime::Runtime::new().unwrap();
rt.block_on(async {
// Handle all API keys as optional; ollama and v1 completions doesnt always require it.
let key_opt = if api_key.is_empty() { None } else { Some(api_key.as_str()) };
let key_opt = if api_key.is_empty() {
None
} else {
Some(api_key.as_str())
};
let result = match provider.as_str() {
"openai" => {
stream_openai(
@@ -84,6 +89,7 @@ pub fn ai_request(
let _ = app.emit(
"ai-stream",
AiStreamEvent {
request_id: request_id.clone(),
event_type: "error".to_string(),
text: None,
error: Some(e),
@@ -98,7 +104,37 @@ pub fn ai_request(
/// so both `https://host` and `https://host/v1` work (we append `/v1/chat/completions`).
fn normalize_openai_base(base: &str) -> String {
let b = base.trim().trim_end_matches('/');
b.strip_suffix("/v1").unwrap_or(b).trim_end_matches('/').to_string()
b.strip_suffix("/v1")
.unwrap_or(b)
.trim_end_matches('/')
.to_string()
}
fn openai_request_body(
model: &str,
system_prompt: Option<&str>,
user_message: &str,
stream: bool,
max_tokens: u32,
) -> serde_json::Value {
// GPT-5/6 reject legacy output limits and sampling with their default reasoning.
let reasoning = model.starts_with("gpt-5") || model.starts_with("gpt-6");
let token_key = if reasoning {
"max_completion_tokens"
} else {
"max_tokens"
};
let mut messages = Vec::with_capacity(if system_prompt.is_some() { 2 } else { 1 });
if let Some(system) = system_prompt {
messages.push(json!({ "role": "system", "content": system }));
}
messages.push(json!({ "role": "user", "content": user_message }));
let mut body =
json!({ "model": model, "stream": stream, token_key: max_tokens, "messages": messages });
if stream && !reasoning {
body["temperature"] = json!(0.7);
}
body
}
async fn stream_anthropic(
@@ -107,7 +143,7 @@ async fn stream_anthropic(
model: &str,
system_prompt: &str,
user_message: &str,
_request_id: &str,
request_id: &str,
) -> Result<(), String> {
let client = Client::new();
@@ -160,6 +196,7 @@ async fn stream_anthropic(
let _ = app.emit(
"ai-stream",
AiStreamEvent {
request_id: request_id.to_owned(),
event_type: "done".to_string(),
text: None,
error: None,
@@ -177,6 +214,7 @@ async fn stream_anthropic(
let _ = app.emit(
"ai-stream",
AiStreamEvent {
request_id: request_id.to_owned(),
event_type: "text".to_string(),
text: Some(text.to_string()),
error: None,
@@ -188,6 +226,7 @@ async fn stream_anthropic(
let _ = app.emit(
"ai-stream",
AiStreamEvent {
request_id: request_id.to_owned(),
event_type: "done".to_string(),
text: None,
error: None,
@@ -202,6 +241,7 @@ async fn stream_anthropic(
let _ = app.emit(
"ai-stream",
AiStreamEvent {
request_id: request_id.to_owned(),
event_type: "error".to_string(),
text: None,
error: Some(msg.to_string()),
@@ -220,6 +260,7 @@ async fn stream_anthropic(
let _ = app.emit(
"ai-stream",
AiStreamEvent {
request_id: request_id.to_owned(),
event_type: "done".to_string(),
text: None,
error: None,
@@ -236,41 +277,13 @@ async fn stream_openai(
model: &str,
system_prompt: &str,
user_message: &str,
_request_id: &str,
request_id: &str,
) -> Result<(), String> {
let client = Client::new();
let is_gpt5 = model.starts_with("gpt-5");
let token_key = if is_gpt5 {
"max_completion_tokens"
} else {
"max_tokens"
};
let body = openai_request_body(model, Some(system_prompt), user_message, true, 4096);
let mut body = json!({
"model": model,
"stream": true,
token_key: 4096,
"messages": [
{
"role": "system",
"content": system_prompt
},
{
"role": "user",
"content": user_message
}
]
});
// GPT-5 models don't support temperature
if !is_gpt5 {
body["temperature"] = json!(0.7);
}
let mut req = client
.post(url)
.header("content-type", "application/json");
let mut req = client.post(url).header("content-type", "application/json");
if let Some(key) = api_key {
req = req.header("Authorization", format!("Bearer {}", key));
@@ -306,6 +319,7 @@ async fn stream_openai(
let _ = app.emit(
"ai-stream",
AiStreamEvent {
request_id: request_id.to_owned(),
event_type: "done".to_string(),
text: None,
error: None,
@@ -321,6 +335,7 @@ async fn stream_openai(
let _ = app.emit(
"ai-stream",
AiStreamEvent {
request_id: request_id.to_owned(),
event_type: "text".to_string(),
text: Some(content.to_string()),
error: None,
@@ -335,6 +350,7 @@ async fn stream_openai(
let _ = app.emit(
"ai-stream",
AiStreamEvent {
request_id: request_id.to_owned(),
event_type: "done".to_string(),
text: None,
error: None,
@@ -349,6 +365,7 @@ async fn stream_openai(
let _ = app.emit(
"ai-stream",
AiStreamEvent {
request_id: request_id.to_owned(),
event_type: "error".to_string(),
text: None,
error: Some(err.to_string()),
@@ -365,6 +382,7 @@ async fn stream_openai(
let _ = app.emit(
"ai-stream",
AiStreamEvent {
request_id: request_id.to_owned(),
event_type: "done".to_string(),
text: None,
error: None,
@@ -380,7 +398,11 @@ pub async fn test_connection(
model: &str,
base_url: Option<&str>,
) -> Result<String, String> {
let key_opt = if api_key.is_empty() { None } else { Some(api_key) };
let key_opt = if api_key.is_empty() {
None
} else {
Some(api_key)
};
match provider {
"openai" => test_openai(OPENAI_API_URL, Some(api_key), model).await,
"ollama" => {
@@ -405,7 +427,7 @@ async fn test_anthropic(api_key: &str, model: &str) -> Result<String, String> {
let body = json!({
"model": model,
"max_tokens": 10,
"max_tokens": 20,
"messages": [
{
"role": "user",
@@ -435,21 +457,9 @@ async fn test_anthropic(api_key: &str, model: &str) -> Result<String, String> {
async fn test_openai(url: &str, api_key: Option<&str>, model: &str) -> Result<String, String> {
let client = Client::new();
let body = openai_request_body(model, None, "Hi", false, 20);
let body = json!({
"model": model,
"max_tokens": 10,
"messages": [
{
"role": "user",
"content": "Hi"
}
]
});
let mut req = client
.post(url)
.header("content-type", "application/json");
let mut req = client.post(url).header("content-type", "application/json");
if let Some(key) = api_key {
req = req.header("Authorization", format!("Bearer {}", key));
@@ -469,3 +479,39 @@ async fn test_openai(url: &str, api_key: Option<&str>, model: &str) -> Result<St
Err(format!("API error {}: {}", status, body_text))
}
}
#[cfg(test)]
mod request_tests {
use super::*;
#[test]
fn gpt6_streaming_requests_use_supported_parameters() {
let body = openai_request_body(
"gpt-6-astra",
Some("Return Markdown"),
"Revise this",
true,
4096,
);
assert_eq!(body["max_completion_tokens"], 4096);
assert!(body.get("max_tokens").is_none());
assert!(body.get("temperature").is_none());
}
#[test]
fn prior_openai_and_local_models_keep_their_parameter_contract() {
let prior = openai_request_body("gpt-5.5", None, "Hi", false, 20);
assert!(prior.get("max_completion_tokens").is_some());
assert!(prior.get("max_tokens").is_none());
let local = openai_request_body(
"gemma3:4b",
Some("Return Markdown"),
"Revise this",
true,
4096,
);
assert_eq!(local["max_tokens"], 4096);
assert_eq!(local["temperature"], 0.7);
assert!(local.get("max_completion_tokens").is_none());
}
}
+255
View File
@@ -0,0 +1,255 @@
use std::path::Path;
use tauri::{AppHandle, Manager, Runtime};
use tauri_plugin_fs::FsExt;
/// Only configured user-selected vaults may provide an external note's vault-relative root.
pub fn external_note_root<R: Runtime>(
app: &AppHandle<R>,
note_path: &Path,
) -> Result<std::path::PathBuf, String> {
let note = std::fs::canonicalize(note_path).map_err(|error| error.to_string())?;
if let Some(state) = app.try_state::<crate::state::AppState>() {
let (active, mut roots) = {
let config = state.config.lock().map_err(|error| error.to_string())?;
(
config.active_vault.clone(),
config
.vaults
.iter()
.map(|vault| vault.path.clone())
.collect::<Vec<_>>(),
)
};
roots.sort_by_key(|root| std::cmp::Reverse(root.len()));
for root in active.into_iter().chain(roots) {
if let Ok(root) = std::fs::canonicalize(root) {
if note.starts_with(&root) {
return Ok(root);
}
}
}
}
note.parent()
.map(Path::to_path_buf)
.ok_or_else(|| "External note has no parent directory".into())
}
/// Grants asset-protocol access only to a vault selected by the user.
/// `.helixnotes` is added explicitly because Unix glob matching excludes hidden paths.
pub fn allow_vault_assets<R: Runtime>(app: &AppHandle<R>, vault_path: &Path) -> Result<(), String> {
// Keep the canonical native path: Tauri's scope normalizes Unix paths plus
// Windows drive, verbatim, and UNC prefixes when matching asset requests.
let vault = std::fs::canonicalize(vault_path).map_err(|error| {
format!(
"Failed to resolve vault asset path '{}': {error}",
vault_path.display()
)
})?;
let scope = app.asset_protocol_scope();
scope
.allow_directory(&vault, true)
.map_err(|error| error.to_string())?;
scope
.allow_directory(vault.join(".helixnotes"), true)
.map_err(|error| error.to_string())
}
/// Grants access to relative assets next to a Markdown file explicitly opened by the user.
pub fn allow_external_note_assets<R: Runtime>(
app: &AppHandle<R>,
note_path: &Path,
) -> Result<(), String> {
let note = std::fs::canonicalize(note_path).map_err(|error| {
format!(
"Failed to resolve external note path '{}': {error}",
note_path.display()
)
})?;
let parent = note
.parent()
.ok_or_else(|| "External note has no parent directory".to_string())?;
app.asset_protocol_scope()
.allow_directory(parent, true)
.map_err(|error| error.to_string())?;
let root = external_note_root(app, &note)?;
let attachments = root.join(".helixnotes/attachments");
// Never follow a hidden attachment-directory symlink when extending either scope.
if std::fs::canonicalize(&attachments)
.is_ok_and(|canonical| canonical == attachments && canonical.is_dir())
{
app.asset_protocol_scope()
.allow_directory(&attachments, true)
.map_err(|error| error.to_string())?;
if let Some(scope) = app.try_fs_scope() {
scope
.allow_directory(&attachments, true)
.map_err(|error| error.to_string())?;
}
}
Ok(())
}
#[cfg(test)]
mod tests {
use super::*;
use std::fs;
fn test_directory(name: &str) -> std::path::PathBuf {
std::env::temp_dir().join(format!("helixnotes-{name}-{}", uuid::Uuid::new_v4()))
}
#[test]
fn static_asset_scope_does_not_expose_the_filesystem() {
let config: serde_json::Value =
serde_json::from_str(include_str!("../tauri.conf.json")).unwrap();
let scope = &config["app"]["security"]["assetProtocol"]["scope"];
assert_eq!(scope["allow"], serde_json::json!([]));
assert_eq!(scope["deny"], serde_json::json!([]));
assert_eq!(scope["requireLiteralLeadingDot"], true);
}
#[test]
fn runtime_scope_allows_only_the_selected_vault() {
let root = test_directory("asset-scope");
let vault = root.join("Vault [Cross Platform]");
let attachments = vault.join(".helixnotes").join("attachments");
fs::create_dir_all(&attachments).unwrap();
let note_image = vault.join("images").join("note image.png");
fs::create_dir_all(note_image.parent().unwrap()).unwrap();
fs::write(&note_image, b"image").unwrap();
let attachment = attachments.join("attachment.png");
fs::write(&attachment, b"attachment").unwrap();
let outside = root.join("outside.png");
fs::write(&outside, b"outside").unwrap();
let app = tauri::test::mock_app();
allow_vault_assets(app.handle(), &vault).unwrap();
let scope = app.asset_protocol_scope();
assert!(scope.is_allowed(&note_image));
assert!(scope.is_allowed(&attachment));
assert!(!scope.is_allowed(&outside));
fs::remove_dir_all(root).unwrap();
}
#[test]
fn external_note_scopes_include_its_attachments_but_not_hidden_private_metadata() {
use tauri_plugin_fs::FsExt;
let root = tempfile::tempdir().unwrap();
let parent = root.path().join("external");
let attachments = parent.join(".helixnotes/attachments");
fs::create_dir_all(&attachments).unwrap();
fs::create_dir_all(parent.join(".helixnotes/history")).unwrap();
fs::create_dir_all(parent.join(".ssh")).unwrap();
let note = parent.join("Note.md");
let image = attachments.join("image.png");
let history = parent.join(".helixnotes/history/snapshot.md");
let private = parent.join(".ssh/private.bin");
for file in [&note, &image, &history, &private] {
fs::write(file, b"fixture").unwrap();
}
let app = tauri::test::mock_builder()
.plugin(tauri_plugin_fs::init())
.build(tauri::test::mock_context(tauri::test::noop_assets()))
.unwrap();
app.fs_scope().allow_file(&note).unwrap();
app.fs_scope().allow_directory(&parent, true).unwrap();
let before_private = [
app.fs_scope().is_allowed(&history),
app.fs_scope().is_allowed(&private),
];
allow_external_note_assets(app.handle(), &note).unwrap();
assert!(
app.fs_scope().is_allowed(&image),
"import must be able to read its managed attachments"
);
assert!(
app.asset_protocol_scope().is_allowed(&image),
"the viewer must display managed attachments"
);
for (file, previous) in [&history, &private].into_iter().zip(before_private) {
assert_eq!(
app.fs_scope().is_allowed(file),
previous,
"attachment grants must not widen private metadata access"
);
assert!(!app.asset_protocol_scope().is_allowed(file));
}
}
#[test]
fn external_notebook_uses_its_registered_vault_root_for_attachment_scopes() {
use tauri_plugin_fs::FsExt;
let root = tempfile::tempdir().unwrap();
let vault = root.path().join("source");
fs::create_dir_all(vault.join("Notebook")).unwrap();
fs::create_dir_all(vault.join(".helixnotes/attachments")).unwrap();
let note = vault.join("Notebook/Note.md");
let image = vault.join(".helixnotes/attachments/image.png");
fs::write(&note, b"Note").unwrap();
fs::write(&image, b"Image").unwrap();
let app = tauri::test::mock_builder()
.plugin(tauri_plugin_fs::init())
.manage(crate::state::AppState::new(crate::types::AppConfig {
vaults: vec![crate::types::VaultConfig {
path: vault.to_string_lossy().into_owned(),
..Default::default()
}],
..Default::default()
}))
.build(tauri::test::mock_context(tauri::test::noop_assets()))
.unwrap();
allow_external_note_assets(app.handle(), &note).unwrap();
assert!(app.asset_protocol_scope().is_allowed(&image));
assert!(app.fs_scope().is_allowed(&image));
}
#[cfg(unix)]
#[test]
fn external_attachment_scope_does_not_follow_hidden_directory_symlinks() {
use tauri_plugin_fs::FsExt;
let root = tempfile::tempdir().unwrap();
let parent = root.path().join("external");
let private = root.path().join("private");
fs::create_dir_all(parent.join(".helixnotes")).unwrap();
fs::create_dir(&private).unwrap();
let note = parent.join("Note.md");
let file = private.join("private.bin");
fs::write(&note, b"Note").unwrap();
fs::write(&file, b"private fixture").unwrap();
std::os::unix::fs::symlink(&private, parent.join(".helixnotes/attachments")).unwrap();
let app = tauri::test::mock_builder()
.plugin(tauri_plugin_fs::init())
.build(tauri::test::mock_context(tauri::test::noop_assets()))
.unwrap();
allow_external_note_assets(app.handle(), &note).unwrap();
assert!(!app.fs_scope().is_allowed(&file));
assert!(!app.asset_protocol_scope().is_allowed(&file));
}
#[test]
fn external_note_scope_allows_relative_assets_only_below_its_directory() {
let root = test_directory("external-note-assets");
let note_dir = root.join("shared note");
let assets = note_dir.join("images");
fs::create_dir_all(&assets).unwrap();
let note = note_dir.join("note.md");
let image = assets.join("image.png");
let outside = root.join("outside.png");
fs::write(&note, b"note").unwrap();
fs::write(&image, b"image").unwrap();
fs::write(&outside, b"outside").unwrap();
let app = tauri::test::mock_app();
allow_external_note_assets(app.handle(), &note).unwrap();
let scope = app.asset_protocol_scope();
assert!(scope.is_allowed(&note));
assert!(scope.is_allowed(&image));
assert!(!scope.is_allowed(&outside));
fs::remove_dir_all(root).unwrap();
}
}
+997 -169
View File
File diff suppressed because it is too large. Load diff
+4031 -1228
View File
File diff suppressed because it is too large. Load diff
+194 -73
View File
@@ -1,48 +1,122 @@
use std::fs;
use std::path::{Path, PathBuf};
use std::path::{Component, Path, PathBuf};
use chrono::{DateTime, Utc};
use crate::types::VersionEntry;
fn safe_path_component<'a>(value: &'a str, label: &str) -> Result<&'a str, String> {
let mut components = Path::new(value).components();
if value.is_empty()
|| !matches!(components.next(), Some(Component::Normal(_)))
|| components.next().is_some()
{
return Err(format!("Invalid {label}"));
}
Ok(value)
}
/// Directory: .helixnotes/history/<note-id>/
fn history_dir(vault_path: &str, note_id: &str) -> PathBuf {
Path::new(vault_path)
fn history_dir(vault_path: &str, note_id: &str) -> Result<PathBuf, String> {
Ok(Path::new(vault_path)
.join(".helixnotes")
.join("history")
.join(note_id)
.join(safe_path_component(note_id, "note ID")?))
}
fn snapshot_path(dir: &Path, raw_content: &str) -> Result<(), String> {
use std::io::Write;
let mut temporary = tempfile::Builder::new()
.prefix(".helixnotes-history-")
.tempfile_in(dir)
.map_err(|error| error.to_string())?;
temporary
.write_all(raw_content.as_bytes())
.map_err(|error| error.to_string())?;
temporary
.as_file()
.sync_all()
.map_err(|error| error.to_string())?;
let mut instant = Utc::now();
loop {
// Fractional seconds keep timestamps valid RFC3339 for the UI while
// allowing multiple versions within one second.
let timestamp = instant.format("%Y-%m-%dT%H-%M-%S%.3f");
let path = dir.join(format!("{timestamp}.md"));
match temporary.persist_noclobber(&path) {
Ok(_) => return Ok(()),
Err(error) if error.error.kind() == std::io::ErrorKind::AlreadyExists => {
temporary = error.file;
instant += chrono::Duration::milliseconds(1);
}
Err(error) => return Err(error.error.to_string()),
}
}
}
fn version_timestamp(filename: &str) -> String {
match (filename.get(..13), filename.get(14..16), filename.get(17..)) {
(Some(hour), Some(minute), Some(rest))
if filename.as_bytes().get(10) == Some(&b'T')
&& filename.as_bytes().get(13) == Some(&b'-')
&& filename.as_bytes().get(16) == Some(&b'-') =>
{
format!("{hour}:{minute}:{rest}Z")
}
_ => filename.to_string(),
}
}
fn snapshot_filename(timestamp: &str) -> String {
let time = timestamp.strip_suffix('Z').unwrap_or(timestamp);
match (time.get(..13), time.get(14..16), time.get(17..)) {
(Some(hour), Some(minute), Some(rest))
if time.as_bytes().get(10) == Some(&b'T')
&& time.as_bytes().get(13) == Some(&b':')
&& time.as_bytes().get(16) == Some(&b':') =>
{
format!("{hour}-{minute}-{rest}.md")
}
_ => format!("{timestamp}.md"),
}
}
/// Save a version snapshot if enough time has passed since the last one.
/// Minimum interval: 5 minutes between snapshots.
pub fn maybe_snapshot(vault_path: &str, note_id: &str, raw_content: &str, max_versions: u32) {
let dir = history_dir(vault_path, note_id);
let Ok(dir) = history_dir(vault_path, note_id) else {
log::warn!("Skipping history snapshot with an invalid note ID");
return;
};
// Check if we should create a snapshot (5 min cooldown)
// Old second-resolution and new fractional-second names share the first
// 19 ASCII bytes. Ignore arbitrary files (including malformed Unicode).
if let Ok(entries) = fs::read_dir(&dir) {
let mut files: Vec<String> = entries
.filter_map(|e| e.ok())
.filter_map(|e| e.file_name().to_str().map(|s| s.to_string()))
.filter(|n| n.ends_with(".md"))
.collect();
files.sort();
if let Some(last) = files.last() {
if let Some(ts) = last.strip_suffix(".md") {
// Parse timestamp: 2026-02-08T18-30-00.md
if let Some(t_pos) = ts.find('T') {
let date_part = &ts[..t_pos];
let time_part = &ts[t_pos + 1..];
let time_colons = time_part.replace('-', ":");
let iso = format!("{}T{}Z", date_part, time_colons);
if let Ok(last_time) = iso.parse::<DateTime<Utc>>() {
let elapsed = Utc::now() - last_time;
if elapsed.num_minutes() < 5 {
return; // Too soon, skip
}
}
let latest = entries
.filter_map(|entry| {
let name = entry.ok()?.file_name();
let name = name.to_str()?;
if !name.ends_with(".md") {
return None;
}
}
let (Some(hour), Some(minute), Some(second)) =
(name.get(..13), name.get(14..16), name.get(17..19))
else {
return None;
};
if name.as_bytes().get(10) != Some(&b'T')
|| name.as_bytes().get(13) != Some(&b'-')
|| name.as_bytes().get(16) != Some(&b'-')
{
return None;
}
format!("{hour}:{minute}:{second}Z")
.parse::<DateTime<Utc>>()
.ok()
})
.max();
if latest.is_some_and(|last| (Utc::now() - last).num_minutes() < 5) {
return;
}
}
@@ -52,12 +126,8 @@ pub fn maybe_snapshot(vault_path: &str, note_id: &str, raw_content: &str, max_ve
return;
}
let timestamp = Utc::now().format("%Y-%m-%dT%H-%M-%S").to_string();
let filename = format!("{}.md", timestamp);
let path = dir.join(&filename);
if let Err(e) = fs::write(&path, raw_content) {
eprintln!("Failed to write version snapshot: {}", e);
if let Err(error) = snapshot_path(&dir, raw_content) {
eprintln!("Failed to write version snapshot: {error}");
return;
}
@@ -68,31 +138,26 @@ pub fn maybe_snapshot(vault_path: &str, note_id: &str, raw_content: &str, max_ve
}
/// Force-create a version snapshot, bypassing the cooldown.
pub fn force_snapshot(vault_path: &str, note_id: &str, raw_content: &str, max_versions: u32) {
let dir = history_dir(vault_path, note_id);
pub fn force_snapshot(
vault_path: &str,
note_id: &str,
raw_content: &str,
max_versions: u32,
) -> Result<(), String> {
let dir = history_dir(vault_path, note_id)?;
fs::create_dir_all(&dir).map_err(|error| error.to_string())?;
if let Err(e) = fs::create_dir_all(&dir) {
eprintln!("Failed to create history dir: {}", e);
return;
}
let timestamp = Utc::now().format("%Y-%m-%dT%H-%M-%S").to_string();
let filename = format!("{}.md", timestamp);
let path = dir.join(&filename);
if let Err(e) = fs::write(&path, raw_content) {
eprintln!("Failed to write version snapshot: {}", e);
return;
}
snapshot_path(&dir, raw_content)?;
if max_versions > 0 {
let _ = prune_versions(&dir, max_versions);
prune_versions(&dir, max_versions)?;
}
Ok(())
}
/// List all version snapshots for a note, newest first.
pub fn list_versions(vault_path: &str, note_id: &str) -> Result<Vec<VersionEntry>, String> {
let dir = history_dir(vault_path, note_id);
let dir = history_dir(vault_path, note_id)?;
if !dir.exists() {
return Ok(Vec::new());
}
@@ -102,7 +167,7 @@ pub fn list_versions(vault_path: &str, note_id: &str) -> Result<Vec<VersionEntry
for entry in fs::read_dir(&dir).map_err(|e| e.to_string())? {
let entry = entry.map_err(|e| e.to_string())?;
let path = entry.path();
if path.extension().map_or(false, |ext| ext == "md") {
if path.extension().is_some_and(|ext| ext == "md") {
let filename = path
.file_stem()
.unwrap_or_default()
@@ -110,16 +175,7 @@ pub fn list_versions(vault_path: &str, note_id: &str) -> Result<Vec<VersionEntry
.to_string();
let meta = fs::metadata(&path).map_err(|e| e.to_string())?;
// Parse timestamp from filename
let timestamp = if let Some(t_pos) = filename.find('T') {
let date_part = &filename[..t_pos];
let time_part = &filename[t_pos + 1..];
let time_colons = time_part.replace('-', ":");
format!("{}T{}Z", date_part, time_colons)
} else {
filename.clone()
};
let timestamp = version_timestamp(&filename);
entries.push(VersionEntry {
timestamp,
size: meta.len(),
@@ -134,17 +190,11 @@ pub fn list_versions(vault_path: &str, note_id: &str) -> Result<Vec<VersionEntry
/// Get the raw content of a specific version.
pub fn get_version(vault_path: &str, note_id: &str, timestamp: &str) -> Result<String, String> {
// Convert ISO timestamp back to filename: 2026-02-08T18:30:00Z → 2026-02-08T18-30-00.md
let filename = if let Some(t_pos) = timestamp.find('T') {
let date_part = &timestamp[..t_pos];
let time_part = timestamp[t_pos + 1..].trim_end_matches('Z');
let time_dashes = time_part.replace(':', "-");
format!("{}.md", format!("{}T{}", date_part, time_dashes))
} else {
format!("{}.md", timestamp)
};
safe_path_component(timestamp, "version timestamp")?;
// Accept both legacy second-resolution names and unique suffixes.
let filename = snapshot_filename(timestamp);
let path = history_dir(vault_path, note_id).join(&filename);
let path = history_dir(vault_path, note_id)?.join(&filename);
fs::read_to_string(&path).map_err(|e| format!("Version not found: {}", e))
}
@@ -154,7 +204,7 @@ fn prune_versions(dir: &Path, max: u32) -> Result<(), String> {
.map_err(|e| e.to_string())?
.filter_map(|e| e.ok())
.map(|e| e.path())
.filter(|p| p.extension().map_or(false, |ext| ext == "md"))
.filter(|p| p.extension().is_some_and(|ext| ext == "md"))
.collect();
// Sort by name (timestamps sort lexicographically) - newest last
@@ -169,3 +219,74 @@ fn prune_versions(dir: &Path, max: u32) -> Result<(), String> {
Ok(())
}
#[cfg(test)]
mod tests {
use super::{get_version, list_versions};
use std::fs;
use uuid::Uuid;
#[test]
fn rejects_history_path_traversal() {
let vault =
std::env::temp_dir().join(format!("helixnotes-history-test-{}", Uuid::new_v4()));
let metadata = vault.join(".helixnotes");
let escaped_history = metadata.join("escaped");
fs::create_dir_all(&escaped_history).unwrap();
fs::write(escaped_history.join("2026-01-01T00-00-00.md"), "escaped").unwrap();
fs::create_dir_all(metadata.join("history").join("safe")).unwrap();
fs::write(metadata.join("secret.md"), "secret").unwrap();
assert!(list_versions(&vault.to_string_lossy(), "../escaped").is_err());
assert!(get_version(&vault.to_string_lossy(), "safe", "../../secret").is_err());
fs::remove_dir_all(vault).unwrap();
}
#[test]
fn rapid_forced_versions_are_individually_retrievable_and_prunable() {
let vault = tempfile::tempdir().unwrap();
let root = vault.path().to_str().unwrap();
for index in 0..200 {
super::force_snapshot(root, "note", &format!("snapshot {index}"), 0).unwrap();
}
let versions = list_versions(root, "note").unwrap();
assert_eq!(versions.len(), 200);
let contents: std::collections::HashSet<_> = versions
.iter()
.map(|version| get_version(root, "note", &version.timestamp).unwrap())
.collect();
assert_eq!(contents.len(), 200);
assert!(contents.contains("snapshot 0"));
assert!(contents.contains("snapshot 199"));
super::force_snapshot(root, "note", "latest", 10).unwrap();
let retained = list_versions(root, "note").unwrap();
assert_eq!(retained.len(), 10);
assert_eq!(
get_version(root, "note", &retained[0].timestamp).unwrap(),
"latest"
);
}
#[test]
fn legacy_versions_remain_readable_and_recent_unique_versions_observe_cooldown() {
let vault = tempfile::tempdir().unwrap();
let root = vault.path().to_str().unwrap();
let history = vault.path().join(".helixnotes/history/note");
fs::create_dir_all(&history).unwrap();
fs::write(history.join("2026-01-01T00-00-00.md"), "legacy").unwrap();
fs::write(history.join("2026-01-01T1é-00-00.md"), "unusual filename").unwrap();
super::force_snapshot(root, "note", "new", 0).unwrap();
super::maybe_snapshot(root, "note", "too soon", 0);
let versions = list_versions(root, "note").unwrap();
assert_eq!(versions.len(), 3);
assert_eq!(
get_version(root, "note", "2026-01-01T00:00:00Z").unwrap(),
"legacy"
);
assert_eq!(
get_version(root, "note", &versions[0].timestamp).unwrap(),
"new"
);
}
}
+245
View File
@@ -0,0 +1,245 @@
use reqwest::{blocking::Client, redirect::Policy, Url};
use std::io::Read;
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, ToSocketAddrs};
use std::time::Duration;
const MAX_IMAGE_BYTES: u64 = 20 * 1024 * 1024;
pub struct ImageResponse {
pub content_type: String,
pub body: Vec<u8>,
}
pub enum ProxyError {
Invalid(String),
Blocked(String),
Fetch(String),
}
impl ProxyError {
pub fn status(&self) -> u16 {
match self {
Self::Invalid(_) => 400,
Self::Blocked(_) => 403,
Self::Fetch(_) => 502,
}
}
pub fn message(&self) -> &str {
match self {
Self::Invalid(message) | Self::Blocked(message) | Self::Fetch(message) => message,
}
}
}
fn is_public_ipv4(ip: Ipv4Addr) -> bool {
let [a, b, c, _] = ip.octets();
!(a == 0
|| a == 10
|| a == 127
|| a >= 224
|| (a == 100 && (64..=127).contains(&b))
|| (a == 169 && b == 254)
|| (a == 172 && (16..=31).contains(&b))
|| (a == 192 && b == 168)
|| (a == 192 && b == 0 && c == 0)
|| (a == 192 && b == 0 && c == 2)
|| (a == 198 && (b == 18 || b == 19))
|| (a == 198 && b == 51 && c == 100)
|| (a == 203 && b == 0 && c == 113))
}
fn is_public_ipv6(ip: Ipv6Addr) -> bool {
if ip.is_unspecified() || ip.is_loopback() || ip.to_ipv4().is_some() {
return false;
}
let first = ip.segments()[0];
(0x2000..=0x3fff).contains(&first) && ip.segments()[..2] != [0x2001, 0x0db8]
}
fn is_public_ip(ip: IpAddr) -> bool {
match ip {
IpAddr::V4(ip) => is_public_ipv4(ip),
IpAddr::V6(ip) => is_public_ipv6(ip),
}
}
fn normalized_host(host: &str) -> String {
host.trim_start_matches('[')
.trim_end_matches(']')
.trim_end_matches('.')
.to_ascii_lowercase()
}
fn validate_url(raw_url: &str) -> Result<Url, ProxyError> {
let url = Url::parse(raw_url).map_err(|_| ProxyError::Invalid("Invalid image URL".into()))?;
if !matches!(url.scheme(), "http" | "https") {
return Err(ProxyError::Invalid(
"Only HTTP and HTTPS images are supported".into(),
));
}
if !url.username().is_empty() || url.password().is_some() {
return Err(ProxyError::Invalid(
"Image URLs must not contain credentials".into(),
));
}
let expected_port = if url.scheme() == "https" { 443 } else { 80 };
if url.port_or_known_default() != Some(expected_port) {
return Err(ProxyError::Blocked("Non-standard image URL port".into()));
}
let host = url
.host_str()
.ok_or_else(|| ProxyError::Invalid("Image URL has no host".into()))?;
if host.ends_with('.') {
return Err(ProxyError::Invalid(
"Image URL host must not have a trailing dot".into(),
));
}
let normalized = normalized_host(host);
if normalized == "localhost" || normalized.ends_with(".localhost") {
return Err(ProxyError::Blocked(
"Local image hosts are not allowed".into(),
));
}
if let Ok(ip) = normalized.parse::<IpAddr>() {
if !is_public_ip(ip) {
return Err(ProxyError::Blocked(
"Private image addresses are not allowed".into(),
));
}
}
Ok(url)
}
fn resolve_public_host(url: &Url) -> Result<(String, Vec<SocketAddr>), ProxyError> {
let host = url
.host_str()
.ok_or_else(|| ProxyError::Invalid("Image URL has no host".into()))?;
let host = normalized_host(host);
let port = url
.port_or_known_default()
.ok_or_else(|| ProxyError::Invalid("Image URL has no port".into()))?;
let addresses: Vec<_> = (host.as_str(), port)
.to_socket_addrs()
.map_err(|error| ProxyError::Fetch(format!("Could not resolve image host: {error}")))?
.collect();
if addresses.is_empty() {
return Err(ProxyError::Fetch(
"Image host resolved to no addresses".into(),
));
}
if addresses.iter().any(|address| !is_public_ip(address.ip())) {
return Err(ProxyError::Blocked(
"Image host resolves to a private address".into(),
));
}
Ok((host, addresses))
}
fn image_client(host: &str, addresses: &[SocketAddr]) -> Result<Client, ProxyError> {
let redirect_host = host.to_string();
Client::builder()
.timeout(Duration::from_secs(30))
.redirect(Policy::custom(move |attempt| {
let redirected_elsewhere = match attempt.url().host_str() {
Some(host) => normalized_host(host) != redirect_host,
None => true,
};
if attempt.previous().len() >= 5
|| redirected_elsewhere
|| validate_url(attempt.url().as_str()).is_err()
{
attempt.stop()
} else {
attempt.follow()
}
}))
.resolve_to_addrs(host, addresses)
.build()
.map_err(|error| ProxyError::Fetch(format!("Could not create image client: {error}")))
}
pub fn fetch(raw_url: &str) -> Result<ImageResponse, ProxyError> {
let url = validate_url(raw_url)?;
let (host, addresses) = resolve_public_host(&url)?;
let client = image_client(&host, &addresses)?;
let mut response = client
.get(url)
.send()
.map_err(|error| ProxyError::Fetch(format!("Image request failed: {error}")))?;
if !response.status().is_success() {
return Err(ProxyError::Fetch(format!(
"Image server returned {}",
response.status()
)));
}
if response
.content_length()
.is_some_and(|length| length > MAX_IMAGE_BYTES)
{
return Err(ProxyError::Blocked("Image exceeds the 20 MiB limit".into()));
}
let content_type = response
.headers()
.get(reqwest::header::CONTENT_TYPE)
.and_then(|value| value.to_str().ok())
.unwrap_or("")
.to_string();
if !content_type.to_ascii_lowercase().starts_with("image/") {
return Err(ProxyError::Blocked(
"Remote resource is not an image".into(),
));
}
let mut body = Vec::new();
response
.by_ref()
.take(MAX_IMAGE_BYTES + 1)
.read_to_end(&mut body)
.map_err(|error| ProxyError::Fetch(format!("Could not read image: {error}")))?;
if body.len() as u64 > MAX_IMAGE_BYTES {
return Err(ProxyError::Blocked("Image exceeds the 20 MiB limit".into()));
}
Ok(ImageResponse { content_type, body })
}
#[cfg(test)]
mod tests {
use super::{is_public_ip, validate_url};
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
#[test]
fn blocks_local_and_private_networks() {
for ip in [
IpAddr::V4(Ipv4Addr::LOCALHOST),
IpAddr::V4(Ipv4Addr::new(10, 0, 0, 1)),
IpAddr::V4(Ipv4Addr::new(169, 254, 169, 254)),
IpAddr::V4(Ipv4Addr::new(192, 168, 1, 1)),
IpAddr::V6(Ipv6Addr::LOCALHOST),
"fc00::1".parse().unwrap(),
"fe80::1".parse().unwrap(),
] {
assert!(!is_public_ip(ip), "{ip}");
}
assert!(is_public_ip("93.184.216.34".parse().unwrap()));
assert!(is_public_ip(
"2606:2800:220:1:248:1893:25c8:1946".parse().unwrap()
));
}
#[test]
fn validates_only_public_web_image_urls() {
for url in [
"file:///etc/passwd",
"http://localhost/image.png",
"http://127.0.0.1/image.png",
"http://[::1]/image.png",
"http://example.com:8080/image.png",
"https://example.com./image.png",
"https://user:pass@example.com/image.png",
] {
assert!(validate_url(url).is_err(), "{url}");
}
assert!(validate_url("https://example.com/image.png").is_ok());
assert!(validate_url("http://93.184.216.34/image.png").is_ok());
}
}
+230 -91
View File
@@ -1,7 +1,9 @@
mod ai;
mod asset_scope;
mod backup;
mod commands;
mod history;
mod image_proxy;
mod search;
mod state;
mod sync;
@@ -11,6 +13,7 @@ mod vault;
use state::AppState;
#[allow(unused_imports)]
use tauri::{Emitter, Manager};
use tauri_plugin_fs::FsExt;
#[cfg(desktop)]
use tauri::{
@@ -34,15 +37,50 @@ pub fn run() {
let config = commands::load_app_config();
#[cfg(desktop)]
let show_tray = config.show_tray_icon;
#[cfg(desktop)]
let close_to_tray = config.close_to_tray && show_tray;
let app_state = AppState::new(config);
// Inject the compile-time platform so the frontend never sniffs the (sometimes
// mobile-looking) WebKitGTK user-agent. (#63)
let platform_init = format!(
"window.__HELIX_PLATFORM__={{mobile:{},android:{},ios:{}}};",
cfg!(mobile),
cfg!(target_os = "android"),
cfg!(target_os = "ios"),
);
let mut builder = tauri::Builder::default()
.plugin(
tauri::plugin::Builder::<tauri::Wry>::new("helix-platform")
.js_init_script(platform_init)
.build(),
)
.plugin(tauri_plugin_dialog::init())
.plugin(tauri_plugin_fs::init())
.plugin(tauri_plugin_opener::init())
.on_webview_event(|webview, event| {
if let tauri::WebviewEvent::DragDrop(tauri::DragDropEvent::Drop { paths, .. }) = event {
let scope = webview.fs_scope();
for path in paths {
if path.is_file() {
let _ = scope.allow_file(path);
}
}
}
})
.on_page_load(|webview, payload| {
#[cfg(target_os = "macos")]
if webview.label() == "main"
&& matches!(payload.event(), tauri::webview::PageLoadEvent::Finished)
{
queue_macos_traffic_light_fix(&webview.window());
}
#[cfg(not(target_os = "macos"))]
let _ = (webview, payload);
})
.setup(move |app| {
#[cfg(target_os = "ios")]
app.handle().plugin(tauri_plugin_ios_vault_access::init())?;
if cfg!(debug_assertions) {
app.handle().plugin(
tauri_plugin_log::Builder::default()
@@ -66,6 +104,20 @@ pub fn run() {
});
}
let active_vault = app
.state::<AppState>()
.config
.lock()
.ok()
.and_then(|config| config.active_vault.clone());
if let Some(vault_path) = active_vault {
if let Err(error) =
asset_scope::allow_vault_assets(app.handle(), std::path::Path::new(&vault_path))
{
log::warn!("Failed to restore the vault asset scope: {error}");
}
}
#[cfg(desktop)]
if show_tray {
setup_tray(app)?;
@@ -85,10 +137,18 @@ pub fn run() {
std::env::current_dir().unwrap_or_default().join(&path)
};
if let Some(resolved_str) = resolved.to_str() {
if resolved.is_file() {
let _ = app.fs_scope().allow_file(&resolved);
if let Some(parent) = resolved.parent() {
let _ = app.fs_scope().allow_directory(parent, true);
}
let _ =
asset_scope::allow_external_note_assets(app.handle(), &resolved);
}
let app_state = app.state::<AppState>();
let _ = app_state.pending_open_file.lock().map(|mut p| {
*p = Some(resolved_str.to_string());
});
if let Err(error) = app_state.enqueue_open_file(resolved_str.to_string()) {
log::error!("Could not queue startup file: {error}");
}
}
}
}
@@ -98,14 +158,26 @@ pub fn run() {
.manage(app_state)
.invoke_handler(tauri::generate_handler![
commands::open_vault,
commands::choose_external_vault,
commands::restore_external_vault,
commands::remove_vault,
commands::get_app_config,
#[cfg(desktop)]
commands::complete_window_close,
commands::set_theme,
commands::set_system_themes,
commands::set_accent_color,
commands::save_custom_theme,
commands::delete_custom_theme,
commands::export_custom_theme,
commands::import_custom_themes,
commands::set_font_size,
commands::set_scroll_to_change_font_size,
commands::set_toolbar_layout,
commands::set_font_family,
commands::set_line_height,
commands::set_ui_scale,
commands::set_content_width,
commands::get_notebooks,
commands::count_root_notes,
commands::create_notebook,
@@ -115,13 +187,16 @@ pub fn run() {
commands::get_notes,
commands::read_note,
commands::save_note,
commands::import_note,
commands::create_note,
commands::duplicate_note,
commands::create_daily_note,
commands::rename_note,
commands::delete_note,
commands::move_note,
commands::get_all_tags,
commands::get_all_note_titles,
commands::get_note_switcher_titles,
commands::get_graph_data,
commands::get_tasks,
commands::set_task_done,
@@ -136,12 +211,18 @@ pub fn run() {
commands::empty_trash,
commands::load_vault_state,
commands::save_vault_state,
commands::copy_text_to_clipboard,
commands::read_clipboard_contents,
commands::read_clipboard_image,
commands::copy_image_to_clipboard,
commands::save_image,
commands::save_attachment,
commands::get_notebook_icons,
commands::set_notebook_icon,
commands::import_notebook_icon,
commands::get_tag_styles,
commands::set_tag_style,
commands::import_tag_icon,
commands::set_general_settings,
commands::get_quick_access,
commands::add_quick_access,
@@ -152,6 +233,7 @@ pub fn run() {
commands::trash_orphaned_attachments,
commands::import_obsidian,
commands::open_file,
commands::reveal_file,
commands::open_url,
commands::copy_file_to,
commands::write_bytes_to,
@@ -173,78 +255,30 @@ pub fn run() {
commands::get_install_type,
commands::is_mobile_platform,
commands::get_pending_open_file,
commands::ack_pending_open_file,
#[cfg(desktop)]
commands::cancel_window_close,
])
.register_asynchronous_uri_scheme_protocol("imgproxy", |_ctx, request, responder| {
let path = request.uri().path().to_string();
std::thread::spawn(move || {
let encoded = path.strip_prefix('/').unwrap_or(&path);
let external_url = percent_decode(encoded);
if !external_url.starts_with("http://") && !external_url.starts_with("https://") {
let _ = responder.respond(
let response = match image_proxy::fetch(&external_url) {
Ok(image) => tauri::http::Response::builder()
.status(200)
.header("Content-Type", image.content_type)
.header("Access-Control-Allow-Origin", "*")
.header("X-Content-Type-Options", "nosniff")
.body(image.body),
Err(error) => {
log::warn!("Blocked external image request: {}", error.message());
tauri::http::Response::builder()
.status(400)
.status(error.status())
.body(Vec::new())
.unwrap(),
);
return;
}
let client = match reqwest::blocking::Client::builder()
.timeout(std::time::Duration::from_secs(30))
.build()
{
Ok(c) => c,
Err(_) => {
let _ = responder.respond(
tauri::http::Response::builder()
.status(502)
.body(Vec::new())
.unwrap(),
);
return;
}
};
match client.get(&external_url).send() {
Ok(resp) => {
let content_type = resp
.headers()
.get("content-type")
.and_then(|h| h.to_str().ok())
.unwrap_or("application/octet-stream")
.to_string();
let status = resp.status().as_u16();
match resp.bytes() {
Ok(bytes) => {
let _ = responder.respond(
tauri::http::Response::builder()
.status(status)
.header("Content-Type", &content_type)
.header("Access-Control-Allow-Origin", "*")
.body(bytes.to_vec())
.unwrap(),
);
}
Err(_) => {
let _ = responder.respond(
tauri::http::Response::builder()
.status(502)
.body(Vec::new())
.unwrap(),
);
}
}
}
Err(_) => {
let _ = responder.respond(
tauri::http::Response::builder()
.status(502)
.body(Vec::new())
.unwrap(),
);
}
}
responder.respond(response.expect("valid image proxy response"));
});
});
@@ -271,42 +305,91 @@ pub fn run() {
std::path::Path::new(&cwd).join(path)
};
if let Some(resolved_str) = resolved.to_str() {
let _ = app.emit("open-file", resolved_str.to_string());
if resolved.is_file() {
let _ = app.fs_scope().allow_file(&resolved);
if let Some(parent) = resolved.parent() {
let _ = app.fs_scope().allow_directory(parent, true);
}
let _ = asset_scope::allow_external_note_assets(app, &resolved);
}
if let Err(error) = app
.state::<AppState>()
.enqueue_open_file(resolved_str.to_string())
{
log::error!("Could not queue open file: {error}");
} else {
let _ = app.emit("open-file-pending", ());
}
}
}
}));
builder = builder.plugin(tauri_plugin_updater::Builder::new().build());
builder = builder.plugin(tauri_plugin_window_state::Builder::default().build());
let window_state_builder = tauri_plugin_window_state::Builder::default();
#[cfg(target_os = "linux")]
let window_state_builder = window_state_builder.with_state_flags(
tauri_plugin_window_state::StateFlags::SIZE
| tauri_plugin_window_state::StateFlags::POSITION
| tauri_plugin_window_state::StateFlags::MAXIMIZED
| tauri_plugin_window_state::StateFlags::DECORATIONS
| tauri_plugin_window_state::StateFlags::FULLSCREEN,
);
builder = builder.plugin(window_state_builder.build());
builder = builder.on_window_event(move |window, event| {
match event {
tauri::WindowEvent::CloseRequested { api, .. } => {
// Only hide to tray for the main window
if close_to_tray && window.label() == "main" {
api.prevent_close();
let _ = window.hide();
#[cfg(target_os = "macos")]
if window.label() == "main"
&& matches!(
event,
tauri::WindowEvent::Resized(_)
| tauri::WindowEvent::Focused(true)
| tauri::WindowEvent::ScaleFactorChanged { .. }
| tauri::WindowEvent::ThemeChanged(_)
)
{
// AppKit can restore the default button Y position after window-state
// changes. Queue this pass so it runs after AppKit finishes its layout.
queue_macos_traffic_light_fix(window);
}
// Closing the main window also requests a save-aware close of note windows.
if matches!(event, tauri::WindowEvent::Destroyed) && window.label() == "main" {
for (label, win) in window.app_handle().webview_windows() {
if label.starts_with("note-") {
let _ = win.close();
}
}
tauri::WindowEvent::Destroyed => {
// When main window is destroyed, close all note windows
if window.label() == "main" {
let app = window.app_handle();
for (label, win) in app.webview_windows() {
if label.starts_with("note-") {
let _ = win.close();
}
}
}
}
_ => {}
}
});
}
builder
.run(tauri::generate_context!())
.expect("error while running tauri application");
let app = builder
.build(tauri::generate_context!())
.expect("error while building tauri application");
app.run(|app, event| {
#[cfg(desktop)]
if let tauri::RunEvent::ExitRequested {
code: Some(_), api, ..
} = event
{
let windows = app.webview_windows();
if !windows.is_empty() {
// Menu/tray Quit must give each editor the same save opportunity
// as a window close. The app exits once the last window closes.
api.prevent_exit();
app.state::<AppState>()
.quitting
.store(true, std::sync::atomic::Ordering::Relaxed);
for window in windows.values() {
if let Err(error) = window.close() {
log::error!("Failed to close window during quit: {error}");
}
}
}
}
#[cfg(mobile)]
let _ = (app, event);
});
}
#[cfg(desktop)]
@@ -315,7 +398,7 @@ fn setup_tray(app: &mut tauri::App) -> Result<(), Box<dyn std::error::Error>> {
let quit = MenuItemBuilder::with_id("quit", "Quit").build(app)?;
let menu = MenuBuilder::new(app).items(&[&show, &quit]).build()?;
let _tray = TrayIconBuilder::new()
let _tray = TrayIconBuilder::with_id("helixnotes")
.icon(
Image::from_path("icons/32x32.png")
.unwrap_or_else(|_| app.default_window_icon().cloned().unwrap()),
@@ -368,3 +451,59 @@ fn percent_decode(input: &str) -> String {
}
String::from_utf8_lossy(&output).to_string()
}
#[cfg(target_os = "macos")]
fn queue_macos_traffic_light_fix(window: &tauri::Window) {
let window_on_main = window.clone();
let _ = window.run_on_main_thread(move || {
fix_macos_traffic_lights(&window_on_main);
});
}
#[cfg(target_os = "macos")]
fn fix_macos_traffic_lights(window: &tauri::Window) {
use objc2_app_kit::{NSView, NSWindow, NSWindowButton};
const TITLEBAR_HEIGHT: f64 = 34.0;
const LEFT_INSET: f64 = 12.0;
let ns_window_ptr = match window.ns_window() {
Ok(ptr) => ptr,
Err(_) => return,
};
let ns_window: &NSWindow = unsafe { &*(ns_window_ptr as *const NSWindow) };
let close = match ns_window.standardWindowButton(NSWindowButton::CloseButton) {
Some(button) => button,
None => return,
};
let miniaturize = match ns_window.standardWindowButton(NSWindowButton::MiniaturizeButton) {
Some(button) => button,
None => return,
};
let zoom = match ns_window.standardWindowButton(NSWindowButton::ZoomButton) {
Some(button) => button,
None => return,
};
let window_height = ns_window.frame().size.height;
if window_height <= 0.0 {
return;
}
let close_frame = NSView::frame(&close);
let button_spacing = NSView::frame(&miniaturize).origin.x - close_frame.origin.x;
for (index, button) in [&close, &miniaturize, &zoom].into_iter().enumerate() {
let button_superview = match unsafe { button.superview() } {
Some(view) => view,
None => return,
};
let mut frame = NSView::frame(button);
let top_inset = ((TITLEBAR_HEIGHT - frame.size.height) / 2.0).max(0.0);
let mut target = frame.origin;
target.y = window_height - top_inset - frame.size.height;
frame.origin.y = button_superview.convertPoint_fromView(target, None).y;
frame.origin.x = LEFT_INSET + index as f64 * button_spacing;
button.setFrameOrigin(frame.origin);
}
}
+1 -1
View File
@@ -2,5 +2,5 @@
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
fn main() {
app_lib::run();
app_lib::run();
}
+1518 -218
View File
File diff suppressed because it is too large. Load diff
+292 -8
View File
@@ -1,28 +1,312 @@
use crate::search::SearchIndex;
use crate::search::{SearchIndex, SearchIndexShutdown};
use crate::types::AppConfig;
use notify::RecommendedWatcher;
use crate::vault::watcher::VaultWatcher;
use std::collections::{HashMap, HashSet, VecDeque};
use std::sync::atomic::AtomicBool;
use std::sync::Mutex;
use std::sync::Arc;
use std::sync::{Arc, Mutex, Weak};
use tauri::AppHandle;
#[cfg(desktop)]
use tauri::{Manager, Runtime, Url};
#[cfg(desktop)]
fn is_detached_window_for_vault(label: &str, url: &Url, target_path: &str) -> bool {
label.starts_with("note-")
&& url
.query_pairs()
.any(|(key, value)| key == "vault" && value == target_path)
}
struct CachedSearchIndex {
index: Weak<SearchIndex>,
shutdown: Arc<SearchIndexShutdown>,
}
#[derive(Clone, serde::Serialize)]
#[serde(rename_all = "camelCase")]
pub struct PendingOpenFile {
pub id: u64,
pub path: String,
}
#[derive(Default)]
struct PendingOpenFiles {
next_id: u64,
requests: VecDeque<PendingOpenFile>,
}
pub struct AppState {
pub config: Mutex<AppConfig>,
pub search_index: Mutex<Option<Arc<SearchIndex>>>,
pub watcher: Mutex<Option<RecommendedWatcher>>,
search_indexes: Mutex<HashMap<String, CachedSearchIndex>>,
pub watchers: Mutex<HashMap<String, VaultWatcher>>,
pub vault_transition: tokio::sync::Mutex<()>,
pub vault_maintenance: Arc<tokio::sync::Mutex<()>>,
pub note_save: Arc<tokio::sync::Mutex<()>>,
pub importing: AtomicBool,
pub syncing: AtomicBool,
pub pending_open_file: Mutex<Option<String>>,
#[cfg(desktop)]
pub quitting: AtomicBool,
pending_open_files: Mutex<PendingOpenFiles>,
}
impl AppState {
pub fn enqueue_open_file(&self, path: String) -> Result<(), String> {
let mut pending = self
.pending_open_files
.lock()
.map_err(|error| error.to_string())?;
pending.next_id += 1;
let id = pending.next_id;
pending.requests.push_back(PendingOpenFile { id, path });
Ok(())
}
pub fn peek_pending_open_file(&self) -> Result<Option<PendingOpenFile>, String> {
let pending = self
.pending_open_files
.lock()
.map_err(|error| error.to_string())?;
Ok(pending.requests.front().cloned())
}
pub fn ack_pending_open_file(&self, id: u64) -> Result<bool, String> {
let mut pending = self
.pending_open_files
.lock()
.map_err(|error| error.to_string())?;
if pending
.requests
.front()
.is_some_and(|request| request.id == id)
{
pending.requests.pop_front();
Ok(true)
} else {
Ok(false)
}
}
pub fn ensure_vault_watcher(&self, app: &AppHandle, vault_path: &str) -> Result<(), String> {
let mut watchers = self.watchers.lock().map_err(|error| error.to_string())?;
if !watchers.contains_key(vault_path) {
let watcher = crate::vault::watcher::start_watcher(app.clone(), vault_path.to_owned())?;
watchers.insert(vault_path.to_owned(), watcher);
}
Ok(())
}
pub fn retain_vault_watchers(&self) -> Result<(), String> {
let configured: HashSet<String> = {
let config = self.config.lock().map_err(|error| error.to_string())?;
config
.vaults
.iter()
.map(|vault| vault.path.clone())
.chain(config.active_vault.clone())
.collect()
};
let removed = {
let mut watchers = self.watchers.lock().map_err(|error| error.to_string())?;
let removed: Vec<String> = watchers
.keys()
.filter(|path| !configured.contains(*path))
.cloned()
.collect();
removed
.into_iter()
.filter_map(|path| watchers.remove(&path))
.collect::<Vec<_>>()
};
drop(removed);
Ok(())
}
#[cfg(desktop)]
pub fn ensure_no_detached_windows<R: Runtime>(
app: &AppHandle<R>,
target_path: &str,
) -> Result<(), String> {
for (label, window) in app.webview_windows() {
if is_detached_window_for_vault(
&label,
&window.url().map_err(|error| error.to_string())?,
target_path,
) {
return Err(
"Close this vault's detached note windows before forgetting it.".into(),
);
}
}
Ok(())
}
// A refresh worker may outlive a vault switch. Reuse its writer when opening
// that vault again instead of competing for Tantivy's exclusive writer lock.
pub fn search_index_for_vault(&self, vault_path: &str) -> Result<Arc<SearchIndex>, String> {
let mut indexes = self
.search_indexes
.lock()
.map_err(|error| error.to_string())?;
indexes
.retain(|_, cached| cached.index.strong_count() > 0 || !cached.shutdown.is_finished());
if let Some(cached) = indexes.get(vault_path) {
if let Some(index) = cached.index.upgrade() {
return Ok(index);
}
// The last Arc is gone, but its writer may still be shutting down.
cached.shutdown.wait();
}
let index = Arc::new(SearchIndex::new(vault_path)?);
indexes.insert(
vault_path.to_owned(),
CachedSearchIndex {
index: Arc::downgrade(&index),
shutdown: index.shutdown_signal(),
},
);
Ok(index)
}
pub fn validate_vault(&self, vault_path: &str) -> Result<(), String> {
let config = self.config.lock().map_err(|error| error.to_string())?;
if config.active_vault.as_deref() == Some(vault_path)
|| config.vaults.iter().any(|vault| vault.path == vault_path)
{
Ok(())
} else {
Err("Unknown vault".to_string())
}
}
pub fn vault_snapshot(&self, vault_path: &str) -> Result<Option<Arc<SearchIndex>>, String> {
let search = self
.search_index
.lock()
.map_err(|error| error.to_string())?;
let config = self.config.lock().map_err(|error| error.to_string())?;
if config.active_vault.as_deref() == Some(vault_path) {
return Ok(search.clone());
}
if !config.vaults.iter().any(|vault| vault.path == vault_path) {
return Err("Unknown vault".to_string());
}
drop(config);
drop(search);
// Detached windows retain access to configured vaults. Never pair their
// writes with the main window's index, nor hold config during disk I/O.
self.search_index_for_vault(vault_path).map(Some)
}
pub fn active_vault_snapshot(&self) -> Result<(String, Option<Arc<SearchIndex>>), String> {
// Match vault transition and watcher lock order. The vault and its
// optional index must remain paired even if a switch follows the read.
let search = self
.search_index
.lock()
.map_err(|error| error.to_string())?;
let config = self.config.lock().map_err(|error| error.to_string())?;
Ok((
config.active_vault.clone().ok_or("No active vault")?,
search.clone(),
))
}
pub fn active_search(&self) -> Result<(Arc<SearchIndex>, String), String> {
let (vault_path, search) = self.active_vault_snapshot()?;
Ok((search.ok_or("Search index not initialized")?, vault_path))
}
#[cfg(desktop)]
pub fn should_hide_to_tray(&self, label: &str, tray_available: bool) -> Result<bool, String> {
if label != "main"
|| !tray_available
|| self.quitting.load(std::sync::atomic::Ordering::Relaxed)
{
return Ok(false);
}
let config = self.config.lock().map_err(|error| error.to_string())?;
Ok(config.show_tray_icon && config.close_to_tray)
}
pub fn new(config: AppConfig) -> Self {
Self {
config: Mutex::new(config),
search_index: Mutex::new(None),
watcher: Mutex::new(None),
search_indexes: Mutex::new(HashMap::new()),
watchers: Mutex::new(HashMap::new()),
vault_transition: tokio::sync::Mutex::new(()),
vault_maintenance: Arc::new(tokio::sync::Mutex::new(())),
note_save: Arc::new(tokio::sync::Mutex::new(())),
importing: AtomicBool::new(false),
syncing: AtomicBool::new(false),
pending_open_file: Mutex::new(None),
#[cfg(desktop)]
quitting: AtomicBool::new(false),
pending_open_files: Mutex::new(PendingOpenFiles::default()),
}
}
}
#[cfg(all(test, desktop))]
mod tests {
use super::*;
#[test]
fn pending_open_requests_survive_reads_and_only_acknowledge_head() {
let state = AppState::new(AppConfig::default());
state.enqueue_open_file("one.md".into()).unwrap();
state.enqueue_open_file("two.md".into()).unwrap();
let first = state.peek_pending_open_file().unwrap().unwrap();
assert_eq!(first.path, "one.md");
assert_eq!(
state.peek_pending_open_file().unwrap().unwrap().id,
first.id
);
assert!(!state.ack_pending_open_file(first.id + 1).unwrap());
assert_eq!(
state.peek_pending_open_file().unwrap().unwrap().id,
first.id
);
assert!(state.ack_pending_open_file(first.id).unwrap());
let second = state.peek_pending_open_file().unwrap().unwrap();
assert_eq!(second.path, "two.md");
assert!(!state.ack_pending_open_file(first.id).unwrap());
assert!(state.ack_pending_open_file(second.id).unwrap());
assert!(state.peek_pending_open_file().unwrap().is_none());
}
#[test]
fn detached_window_owner_matches_encoded_vault_path_only() {
let url = Url::parse("tauri://localhost/?note=a.md&vault=%2Fvaults%2FA%26B").unwrap();
assert!(is_detached_window_for_vault(
"note-123",
&url,
"/vaults/A&B"
));
assert!(!is_detached_window_for_vault("note-123", &url, "/vaults/A"));
assert!(!is_detached_window_for_vault("main", &url, "/vaults/A&B"));
}
#[test]
fn close_policy_respects_live_settings_window_type_and_explicit_quit() {
let mut state = AppState::new(AppConfig {
show_tray_icon: true,
close_to_tray: true,
..AppConfig::default()
});
assert!(state.should_hide_to_tray("main", true).unwrap());
assert!(!state.should_hide_to_tray("note-123", true).unwrap());
assert!(!state.should_hide_to_tray("main", false).unwrap());
state
.quitting
.store(true, std::sync::atomic::Ordering::Relaxed);
assert!(!state.should_hide_to_tray("main", true).unwrap());
state
.quitting
.store(false, std::sync::atomic::Ordering::Relaxed);
state.config.get_mut().unwrap().close_to_tray = false;
assert!(!state.should_hide_to_tray("main", true).unwrap());
state.config.get_mut().unwrap().close_to_tray = true;
state.config.get_mut().unwrap().show_tray_icon = false;
assert!(!state.should_hide_to_tray("main", true).unwrap());
}
}
+1515 -225
View File
File diff suppressed because it is too large. Load diff
+278 -7
View File
@@ -42,6 +42,37 @@ pub struct NotebookEntry {
pub note_count: usize,
}
#[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq, Eq)]
#[serde(deny_unknown_fields)]
pub struct TagStyle {
#[serde(default, skip_serializing_if = "Option::is_none")]
pub icon: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub color: Option<String>,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(tag = "kind", content = "value", rename_all = "lowercase")]
pub enum TagStyleChange {
Icon(Option<String>),
Color(Option<String>),
Reset,
}
impl TagStyle {
pub fn is_empty(&self) -> bool {
self.icon
.as_ref()
.map(|value| value.trim().is_empty())
.unwrap_or(true)
&& self
.color
.as_ref()
.map(|value| value.trim().is_empty())
.unwrap_or(true)
}
}
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct NoteContent {
pub path: String,
@@ -50,21 +81,96 @@ pub struct NoteContent {
pub raw: String,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
#[derive(Debug, Clone, Default, Serialize, Deserialize)]
pub struct VaultConfig {
pub path: String,
pub name: String,
#[serde(default)]
pub bookmark_id: Option<String>,
// Per-vault WebDAV sync (was previously global on AppConfig; those fields are kept deprecated for migration).
#[serde(default)]
pub sync_provider: Option<String>,
#[serde(default)]
pub webdav_url: Option<String>,
#[serde(default)]
pub webdav_username: Option<String>,
#[serde(default)]
pub webdav_password: Option<String>,
#[serde(default)]
pub sync_on_open: bool,
#[serde(default)]
pub sync_on_change: bool,
#[serde(default)]
pub sync_interval_minutes: u32,
#[serde(default)]
pub last_sync_time: Option<String>,
#[serde(default)]
pub last_backup_time: Option<String>,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct CustomThemeColors {
pub bg_primary: String,
pub bg_secondary: String,
pub bg_tertiary: String,
pub bg_hover: String,
pub bg_active: String,
pub bg_editor: String,
pub text_primary: String,
pub text_secondary: String,
pub border_color: String,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct CustomTheme {
pub id: String,
pub name: String,
pub is_dark: bool,
pub colors: CustomThemeColors,
}
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "lowercase")]
pub enum StartupView {
Daily,
QuickAccess,
Tasks,
#[default]
#[serde(other)]
All,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct ToolbarLayout {
pub main: Vec<String>,
pub more: Vec<String>,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct AppConfig {
pub vaults: Vec<VaultConfig>,
pub active_vault: Option<String>,
#[serde(default)]
pub active_bookmark_id: Option<String>,
pub theme: String,
/// Themes used when `theme` is "system": the frontend picks one by the OS color scheme.
/// Default to the plain "light"/"dark" schemes so existing configs keep their behavior.
#[serde(default = "default_system_light_theme")]
pub system_light_theme: String,
#[serde(default = "default_system_dark_theme")]
pub system_dark_theme: String,
#[serde(default)]
pub accent_color: Option<String>,
#[serde(default)]
pub font_size: Option<u32>,
/// The size chosen in Appearance. Zooming changes `font_size` only, and resetting the zoom
/// returns to this.
#[serde(default)]
pub preferred_font_size: Option<u32>,
#[serde(default = "default_true")]
pub scroll_to_change_font_size: bool,
#[serde(default)]
pub toolbar_layout: Option<ToolbarLayout>,
#[serde(default)]
pub font_family: Option<String>,
#[serde(default)]
@@ -72,10 +178,14 @@ pub struct AppConfig {
#[serde(default)]
pub ui_scale: Option<f64>,
#[serde(default)]
pub content_width: Option<u32>,
#[serde(default)]
pub compact_notes: bool,
#[serde(default = "default_true")]
pub show_note_dates: bool,
#[serde(default)]
pub show_note_switcher: bool,
#[serde(default)]
pub time_format: String,
#[serde(default = "default_week_start")]
pub week_start: String,
@@ -95,6 +205,18 @@ pub struct AppConfig {
pub hide_title_in_body: bool,
#[serde(default)]
pub show_line_numbers: bool,
#[serde(default = "default_true")]
pub show_link_arrows: bool,
#[serde(default = "default_true")]
pub show_all_notes: bool,
#[serde(default = "default_true")]
pub show_quick_access: bool,
#[serde(default = "default_true")]
pub show_tasks: bool,
#[serde(default = "default_true")]
pub show_daily_notes: bool,
#[serde(default = "default_true")]
pub show_trash: bool,
#[serde(default)]
pub backup_enabled: bool,
#[serde(default = "default_backup_frequency")]
@@ -104,8 +226,6 @@ pub struct AppConfig {
#[serde(default)]
pub backup_location: Option<String>,
#[serde(default)]
pub last_backup_time: Option<String>,
#[serde(default)]
pub backup_include_attachments: bool,
#[serde(default = "default_max_versions")]
pub max_versions_per_note: u32,
@@ -130,14 +250,18 @@ pub struct AppConfig {
#[serde(default)]
pub default_view_mode: bool,
#[serde(default)]
pub new_notes_in_source_mode: bool,
#[serde(default)]
pub show_tray_icon: bool,
#[serde(default)]
pub close_to_tray: bool,
#[serde(default = "default_true")]
pub enable_wiki_links: bool,
#[serde(default)]
pub startup_view: StartupView,
#[serde(default)]
pub restore_last_session: bool,
// WebDAV sync (opt-in; all off by default). Endpoint is fully user-configured.
// DEPRECATED: WebDAV sync moved to per-vault VaultConfig. Kept for one release to migrate old configs.
#[serde(default)]
pub sync_provider: Option<String>,
#[serde(default)]
@@ -154,12 +278,18 @@ pub struct AppConfig {
pub sync_interval_minutes: u32,
#[serde(default)]
pub last_sync_time: Option<String>,
#[serde(default)]
pub custom_themes: Vec<CustomTheme>,
}
fn default_true() -> bool {
true
}
fn default_outline_width() -> f64 {
220.0
}
fn default_pdf_height() -> u32 {
600
}
@@ -189,7 +319,15 @@ fn default_max_versions() -> u32 {
}
fn default_ai_model() -> String {
"claude-sonnet-4-6".to_string()
"claude-sonnet-5".to_string()
}
fn default_system_light_theme() -> String {
"light".to_string()
}
fn default_system_dark_theme() -> String {
"dark".to_string()
}
impl Default for AppConfig {
@@ -197,14 +335,22 @@ impl Default for AppConfig {
Self {
vaults: Vec::new(),
active_vault: None,
active_bookmark_id: None,
theme: "system".to_string(),
system_light_theme: default_system_light_theme(),
system_dark_theme: default_system_dark_theme(),
accent_color: None,
font_size: None,
preferred_font_size: None,
scroll_to_change_font_size: true,
toolbar_layout: None,
font_family: None,
line_height: None,
ui_scale: None,
content_width: None,
compact_notes: false,
show_note_dates: true,
show_note_switcher: false,
time_format: "relative".to_string(),
week_start: "monday".to_string(),
daily_title_format: "localized".to_string(),
@@ -215,11 +361,16 @@ impl Default for AppConfig {
title_mode: "input".to_string(),
hide_title_in_body: false,
show_line_numbers: false,
show_link_arrows: true,
show_all_notes: true,
show_quick_access: true,
show_tasks: true,
show_daily_notes: true,
show_trash: true,
backup_enabled: false,
backup_frequency: "24h".to_string(),
backup_max_count: 10,
backup_location: None,
last_backup_time: None,
backup_include_attachments: false,
max_versions_per_note: 20,
ai_provider: None,
@@ -229,12 +380,14 @@ impl Default for AppConfig {
ollama_api_key: None,
openai_compatible_base_url: None,
openai_compatible_api_key: None,
ai_model: "claude-sonnet-4-6".to_string(),
ai_model: default_ai_model(),
ai_writing_style: None,
default_view_mode: false,
new_notes_in_source_mode: false,
show_tray_icon: false,
close_to_tray: false,
enable_wiki_links: true,
startup_view: StartupView::All,
restore_last_session: false,
sync_provider: None,
webdav_url: None,
@@ -244,6 +397,7 @@ impl Default for AppConfig {
sync_on_change: false,
sync_interval_minutes: 0,
last_sync_time: None,
custom_themes: Vec::new(),
}
}
}
@@ -253,14 +407,20 @@ pub struct VaultState {
pub last_open_note: Option<String>,
pub sidebar_width: f64,
pub notelist_width: f64,
#[serde(default = "default_outline_width")]
pub outline_width: f64,
pub sidebar_collapsed: bool,
#[serde(default)]
pub notelist_collapsed: bool,
#[serde(default)]
pub collapsed_notebooks: Vec<String>,
#[serde(default)]
pub notebook_sort_mode: String,
#[serde(default)]
pub notebook_order: std::collections::HashMap<String, i32>,
#[serde(default)]
pub note_order: std::collections::HashMap<String, i32>,
#[serde(default)]
pub sort_mode: String,
#[serde(default)]
pub last_view_mode: String,
@@ -284,10 +444,13 @@ impl Default for VaultState {
last_open_note: None,
sidebar_width: 220.0,
notelist_width: 280.0,
outline_width: default_outline_width(),
sidebar_collapsed: false,
notelist_collapsed: false,
collapsed_notebooks: Vec::new(),
notebook_sort_mode: String::new(),
notebook_order: std::collections::HashMap::new(),
note_order: std::collections::HashMap::new(),
sort_mode: String::new(),
last_view_mode: String::new(),
last_notebook: None,
@@ -300,24 +463,66 @@ impl Default for VaultState {
}
}
/// Half-open UTF-16 offsets into the corresponding plain-text result field.
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
pub struct SearchMatch {
pub start: usize,
pub end: usize,
}
#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
#[serde(rename_all = "lowercase")]
pub enum SearchTargetField {
Body,
Title,
Tags,
}
/// Half-open UTF-16 offsets into the indexed field, with exact source context.
/// Body excludes frontmatter; tags use the indexed space-joined values.
/// Text is capped at 240 Unicode scalars and each context at 32 scalars.
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
pub struct SearchTarget {
pub field: SearchTargetField,
pub start: usize,
pub end: usize,
pub text: String,
pub before: String,
pub after: String,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct SearchResult {
pub path: String,
pub title: String,
pub snippet: String,
pub score: f32,
pub title_matches: Vec<SearchMatch>,
pub snippet_matches: Vec<SearchMatch>,
pub match_target: Option<SearchTarget>,
}
#[derive(Debug, Clone, Serialize, Deserialize, Default)]
pub struct SearchPage {
pub results: Vec<SearchResult>,
pub total: usize,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct FileEvent {
pub vault_path: String,
pub event_type: String,
pub path: String,
pub note: Option<NoteEntry>,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct ImportResult {
pub files_converted: u64,
pub links_converted: u64,
pub frontmatter_normalized: u64,
pub syntax_converted: u64,
pub attachments_moved: u64,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
@@ -345,6 +550,7 @@ pub struct VersionEntry {
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct AiStreamEvent {
pub request_id: String,
pub event_type: String, // "text", "done", "error"
pub text: Option<String>,
pub error: Option<String>,
@@ -386,3 +592,68 @@ pub struct TaskItem {
pub due: Option<String>,
pub priority: Option<String>,
}
#[cfg(test)]
mod startup_view_tests {
use super::{AppConfig, StartupView};
#[test]
fn serializes_supported_startup_views() {
for (view, expected) in [
(StartupView::All, "\"all\""),
(StartupView::QuickAccess, "\"quickaccess\""),
(StartupView::Tasks, "\"tasks\""),
(StartupView::Daily, "\"daily\""),
] {
assert_eq!(serde_json::to_string(&view).unwrap(), expected);
}
}
#[test]
fn unknown_startup_view_falls_back_to_all_notes() {
assert_eq!(
serde_json::from_str::<StartupView>("\"future-view\"").unwrap(),
StartupView::All
);
}
#[test]
fn existing_configs_default_system_theme_pair() {
let mut value = serde_json::to_value(AppConfig::default()).unwrap();
let object = value.as_object_mut().unwrap();
object.remove("system_light_theme");
object.remove("system_dark_theme");
let config: AppConfig = serde_json::from_value(value).unwrap();
assert_eq!(config.system_light_theme, "light");
assert_eq!(config.system_dark_theme, "dark");
}
#[test]
fn note_switcher_is_opt_in_for_new_and_existing_configs() {
let config = AppConfig::default();
assert!(!config.show_note_switcher);
let mut value = serde_json::to_value(config).unwrap();
value.as_object_mut().unwrap().remove("show_note_switcher");
let config: AppConfig = serde_json::from_value(value).unwrap();
assert!(!config.show_note_switcher);
}
#[test]
fn scroll_font_sizing_stays_enabled_for_new_and_existing_configs() {
let config = AppConfig::default();
assert!(config.scroll_to_change_font_size);
let mut value = serde_json::to_value(config).unwrap();
value
.as_object_mut()
.unwrap()
.remove("scroll_to_change_font_size");
let config: AppConfig = serde_json::from_value(value).unwrap();
assert!(config.scroll_to_change_font_size);
}
}
+165 -12
View File
@@ -1,9 +1,70 @@
use crate::types::NoteMeta;
use chrono::{NaiveDate, NaiveDateTime, Utc};
use gray_matter::engine::YAML;
use gray_matter::Matter;
use gray_matter::engine::{Engine, YAML as UnboundedYaml};
use gray_matter::{Matter, Pod};
use serde::{Deserialize, Serialize};
const MAX_FRONTMATTER_BYTES: usize = 64 * 1024;
const MAX_FRONTMATTER_ALIASES: usize = 16;
const MAX_FRONTMATTER_INDENT: usize = 200;
const MAX_FRONTMATTER_INDICATORS: usize = 32;
/// YAML frontmatter engine for notes, which are untrusted input (sync, import, shared vaults).
/// The underlying loader expands every alias by copying and recurses once per nesting level, so a
/// note of a few hundred bytes could take gigabytes or overflow the stack and take the app down
/// at every start. Frontmatter outside these bounds is treated as carrying no metadata.
pub struct BoundedYaml;
impl Engine for BoundedYaml {
fn parse(content: &str) -> Pod {
if frontmatter_within_bounds(content) {
UnboundedYaml::parse(content)
} else {
Pod::Null
}
}
}
fn frontmatter_within_bounds(content: &str) -> bool {
if content.len() > MAX_FRONTMATTER_BYTES {
return false;
}
// Aliases multiply: with few of them the expansion stays small whatever they point at.
let bytes = content.as_bytes();
let aliases = bytes
.iter()
.enumerate()
.filter(|&(index, &byte)| {
byte == b'*'
&& (index == 0
|| matches!(
bytes[index - 1],
b' ' | b'\t' | b'\n' | b'[' | b',' | b':' | b'-' | b'{'
))
&& bytes
.get(index + 1)
.is_some_and(|next| next.is_ascii_alphanumeric() || matches!(next, b'_' | b'-'))
})
.count();
if aliases > MAX_FRONTMATTER_ALIASES {
return false;
}
// Block nesting deepens by indentation, or by indicators chained on one line (`- - - x`).
content.lines().all(|line| {
let indent = line.len() - line.trim_start_matches(' ').len();
let mut rest = &line.as_bytes()[indent..];
let mut indicators = 0;
while let [b'-' | b'?' | b':', b' ' | b'\t', tail @ ..] = rest {
indicators += 1;
rest = tail;
while let [b' ' | b'\t', tail @ ..] = rest {
rest = tail;
}
}
indent <= MAX_FRONTMATTER_INDENT && indicators <= MAX_FRONTMATTER_INDICATORS
})
}
#[derive(Debug, Serialize, Deserialize, Default)]
struct RawFrontmatter {
id: Option<String>,
@@ -15,7 +76,7 @@ struct RawFrontmatter {
}
/// Try to parse a date string in multiple common formats.
fn parse_date_flexible(s: &str) -> Option<chrono::DateTime<Utc>> {
pub fn parse_date_flexible(s: &str) -> Option<chrono::DateTime<Utc>> {
let s = s.trim();
// RFC 3339 / ISO 8601 with timezone (e.g. 2024-01-15T10:30:00+00:00)
if let Ok(dt) = s.parse::<chrono::DateTime<Utc>>() {
@@ -41,7 +102,7 @@ fn parse_date_flexible(s: &str) -> Option<chrono::DateTime<Utc>> {
}
pub fn parse_note(raw: &str, filename: &str) -> (NoteMeta, String) {
let matter = Matter::<YAML>::new();
let matter = Matter::<BoundedYaml>::new();
let result = matter.parse(raw);
let fm: RawFrontmatter = result
@@ -108,7 +169,7 @@ pub fn serialize_frontmatter(meta: &NoteMeta) -> String {
"[{}]",
meta.tags
.iter()
.map(|t| format!("{}", t))
.map(|t| t.to_string())
.collect::<Vec<_>>()
.join(", ")
)
@@ -134,7 +195,7 @@ pub fn update_note_raw(meta: &NoteMeta, body: &str) -> String {
/// Merge NoteMeta fields into existing frontmatter, preserving unknown YAML keys.
/// Falls back to serialize_frontmatter() if the original has no frontmatter.
pub fn merge_frontmatter(original_raw: &str, meta: &NoteMeta, body: &str) -> String {
let matter = Matter::<YAML>::new();
let matter = Matter::<BoundedYaml>::new();
let parsed = matter.parse(original_raw);
// If original had no frontmatter, use the simple serializer
@@ -191,7 +252,7 @@ pub fn merge_frontmatter(original_raw: &str, meta: &NoteMeta, body: &str) -> Str
format!("---\n{}---\n{}", yaml_str, body_with_heading)
}
fn filename_to_title(filename: &str) -> String {
pub fn filename_to_title(filename: &str) -> String {
let stem = filename.trim_end_matches(".md");
// Only replace dashes/underscores acting as word separators (between non-space chars).
// Keep dashes that are surrounded by spaces (e.g. "Title - Subtitle").
@@ -214,7 +275,7 @@ fn filename_to_title(filename: &str) -> String {
/// Quick title extraction from raw note content (frontmatter only, no full parse)
pub fn extract_title(raw: &str) -> Option<String> {
let matter = Matter::<YAML>::new();
let matter = Matter::<BoundedYaml>::new();
let result = matter.parse(raw);
let fm: RawFrontmatter = result
.data
@@ -279,7 +340,7 @@ fn strip_html_and_markdown(input: &str) -> String {
chars.next(); // skip '['
let mut depth = 1;
// Skip alt text
while let Some(c) = chars.next() {
for c in chars.by_ref() {
if c == '[' {
depth += 1;
}
@@ -294,7 +355,7 @@ fn strip_html_and_markdown(input: &str) -> String {
if chars.peek() == Some(&'(') {
chars.next();
let mut depth = 1;
while let Some(c) = chars.next() {
for c in chars.by_ref() {
if c == '(' {
depth += 1;
}
@@ -313,7 +374,7 @@ fn strip_html_and_markdown(input: &str) -> String {
if ch == '[' {
let mut link_text = String::new();
let mut depth = 1;
while let Some(c) = chars.next() {
for c in chars.by_ref() {
if c == '[' {
depth += 1;
}
@@ -329,7 +390,7 @@ fn strip_html_and_markdown(input: &str) -> String {
if chars.peek() == Some(&'(') {
chars.next();
let mut depth = 1;
while let Some(c) = chars.next() {
for c in chars.by_ref() {
if c == '(' {
depth += 1;
}
@@ -422,4 +483,96 @@ mod tests {
eprintln!("Stripped: {:?}", stripped);
assert!(stripped.contains("Telefoonnummer"));
}
fn alias_bomb(levels: usize, width: usize) -> String {
let mut note = format!(
"---\ntitle: Bomb\na0: &a0 [{}]\n",
vec!["1"; width].join(",")
);
for level in 1..levels {
let alias = format!("*a{}", level - 1);
note.push_str(&format!(
"a{level}: &a{level} [{}]\n",
vec![alias.as_str(); width].join(",")
));
}
note.push_str("---\nbody\n");
note
}
/// Runs on a stack the size of the app's worker threads, where the unbounded loader overflowed.
fn on_worker_stack<T: Send + 'static>(work: impl FnOnce() -> T + Send + 'static) -> T {
std::thread::Builder::new()
.stack_size(2 * 1024 * 1024)
.spawn(work)
.unwrap()
.join()
.unwrap()
}
#[test]
fn hostile_frontmatter_is_read_as_a_note_without_metadata() {
let nested_on_one_line = format!("---\nt: {}x\n---\nbody\n", "- ".repeat(2400));
let mut nested_by_indent = String::from("---\nt:\n");
for depth in 0..400 {
note_line(&mut nested_by_indent, depth);
}
nested_by_indent.push_str("---\nbody\n");
let oversized = format!(
"---\ntitle: Big\nfiller: \"{}\"\n---\nbody\n",
"x".repeat(MAX_FRONTMATTER_BYTES)
);
for note in [
alias_bomb(10, 8),
alias_bomb(40, 2),
nested_on_one_line,
nested_by_indent,
oversized,
] {
let started = std::time::Instant::now();
let (title, content, extracted, merged) = on_worker_stack(move || {
let (meta, content) = parse_note(&note, "Fallback Name.md");
let merged = merge_frontmatter(&note, &meta, &content);
(meta.title, content, extract_title(&note), merged)
});
assert!(started.elapsed() < std::time::Duration::from_secs(2));
// No metadata is taken from it, and the body is still split off as usual.
assert_eq!(title, "Fallback Name");
assert_eq!(content, "body");
assert_eq!(extracted, None);
assert!(
merged.ends_with("body"),
"{}",
&merged[merged.len().saturating_sub(40)..]
);
}
}
fn note_line(note: &mut String, depth: usize) {
note.push_str(&" ".repeat(depth));
note.push_str("-\n");
}
#[test]
fn ordinary_frontmatter_is_unaffected_by_the_bounds() {
let (meta, content) = parse_note(
"---\nid: abc\ntitle: \"*Starred* title: 5*3\"\ntags:\n - one\n - two\npinned: true\n---\n# Body\n",
"x.md",
);
assert_eq!(meta.id, "abc");
assert_eq!(meta.title, "*Starred* title: 5*3");
assert_eq!(meta.tags, vec!["one", "two"]);
assert!(meta.pinned);
assert_eq!(content, "# Body");
// A few aliases and modest nesting are ordinary YAML.
let (meta, _) = parse_note(
"---\ntitle: Shared\nbase: &base [a, b]\ntags: *base\nextra:\n - - nested\n - list\n---\nbody\n",
"x.md",
);
assert_eq!(meta.title, "Shared");
assert_eq!(meta.tags, vec!["a", "b"]);
assert!(frontmatter_within_bounds(&format!(
"title: {}",
"x".repeat(MAX_FRONTMATTER_BYTES - 16)
)));
}
}
File diff suppressed because it is too large. Load diff
+4
View File
@@ -1,3 +1,7 @@
pub mod frontmatter;
pub mod import;
pub mod operations;
pub mod watcher;
#[cfg(test)]
mod note_import_tests;
+493
View File
@@ -0,0 +1,493 @@
use super::operations::{
ensure_vault_structure, import_note as import_from_root, ExternalNoteReference,
};
fn import_note(
vault: &str,
source: &str,
notebook: Option<&str>,
raw: &str,
references: Vec<ExternalNoteReference>,
authorize: impl Fn(&Path) -> Result<(), String>,
) -> Result<crate::types::NoteContent, String> {
import_from_root(
vault,
source,
Path::new(source).parent().unwrap(),
notebook,
raw,
references,
authorize,
)
}
use std::fs;
use std::path::{Path, PathBuf};
fn reference(raw: &str, original: &str, href: &str, html: bool) -> ExternalNoteReference {
let from = raw.find(original).unwrap();
ExternalNoteReference {
from,
to: from + original.len(),
href: href.into(),
html,
pdf: false,
}
}
fn fixture(raw: &str) -> (tempfile::TempDir, String, PathBuf) {
let root = tempfile::tempdir().unwrap();
let vault = root.path().join("vault").to_string_lossy().into_owned();
ensure_vault_structure(&vault).unwrap();
let external = root.path().join("external");
fs::create_dir_all(external.join("images")).unwrap();
let source = external.join("External.md");
fs::write(&source, raw).unwrap();
(root, vault, source)
}
fn attachments(vault: &str) -> Vec<PathBuf> {
fs::read_dir(Path::new(vault).join(".helixnotes/attachments"))
.unwrap()
.map(|entry| entry.unwrap().path())
.collect()
}
#[test]
fn imports_relative_files_once_preserving_originals_frontmatter_and_literal_content() {
let raw = "---\r\ntitle: Portable\r\ncustom: 雪 📝\r\n---\r\n![One](images/café%20雪.png)\r\n![Two](images/./café%20雪.png)\r\n<a href=\"images/report.pdf#page=2&amp;mode=fit\">PDF</a>\r\n\r\n~~~md\r\n![Example](missing.png)\r\n~~~\r\n";
for notebook in [None, Some("Projects/Nested")] {
let (_root, vault, source) = fixture(raw);
let parent = source.parent().unwrap();
fs::write(parent.join("images/café 雪.png"), b"image bytes").unwrap();
fs::write(parent.join("images/report.pdf"), b"pdf bytes").unwrap();
fs::create_dir_all(Path::new(&vault).join("Projects/Nested")).unwrap();
let references = vec![
reference(raw, "images/café%20雪.png", "images/café%20雪.png", false),
reference(
raw,
"images/./café%20雪.png",
"images/./café%20雪.png",
false,
),
reference(
raw,
"images/report.pdf#page=2&amp;mode=fit",
"images/report.pdf#page=2&mode=fit",
true,
),
];
let note = import_note(
&vault,
source.to_str().unwrap(),
notebook,
raw,
references,
|path| {
if path.starts_with(parent) {
Ok(())
} else {
Err("Not selected".into())
}
},
)
.unwrap();
assert!(note
.raw
.starts_with("---\r\ntitle: Portable\r\ncustom: 雪 📝\r\n---\r\n"));
assert!(note.raw.contains("![Example](missing.png)"));
assert!(note.raw.contains("#page=2&amp;mode=fit"));
assert_eq!(fs::read_to_string(&source).unwrap(), raw);
assert_eq!(fs::read_to_string(&note.path).unwrap(), note.raw);
let files = attachments(&vault);
assert_eq!(
files.len(),
2,
"aliases of one file share one portable copy"
);
for file in files {
let filename = urlencoding::encode(file.file_name().unwrap().to_str().unwrap());
let relative = format!(".helixnotes/attachments/{filename}");
assert!(note.raw.contains(&relative));
assert!(Path::new(&vault)
.join(urlencoding::decode(&relative).unwrap().as_ref())
.is_file());
}
assert_eq!(
fs::read(parent.join("images/café 雪.png")).unwrap(),
b"image bytes"
);
assert_eq!(
fs::read(parent.join("images/report.pdf")).unwrap(),
b"pdf bytes"
);
}
}
#[test]
fn imported_pdf_embeds_keep_the_vault_root_path_convention_in_nested_notebooks() {
let raw = "<div data-pdf-src=\"images/report.pdf\" data-pdf-name=\"Report\"></div>";
let (_root, vault, source) = fixture(raw);
fs::write(source.parent().unwrap().join("images/report.pdf"), b"pdf").unwrap();
fs::create_dir_all(Path::new(&vault).join("Projects/Nested")).unwrap();
let mut pdf = reference(raw, "images/report.pdf", "images/report.pdf", true);
pdf.pdf = true;
let note = import_note(
&vault,
source.to_str().unwrap(),
Some("Projects/Nested"),
raw,
vec![pdf],
|_| Ok(()),
)
.unwrap();
assert!(note.raw.contains("data-pdf-src=\".helixnotes/attachments/"));
assert!(note.raw.contains("data-pdf-name=\"Report\""));
assert_eq!(attachments(&vault).len(), 1);
}
#[test]
fn imported_document_links_remain_managed_and_stable_after_note_and_notebook_moves() {
let raw = "[Report](images/report.pdf#page=2)";
let (_root, vault, source) = fixture(raw);
fs::write(source.parent().unwrap().join("images/report.pdf"), b"pdf").unwrap();
fs::create_dir_all(Path::new(&vault).join("Projects/Nested")).unwrap();
fs::create_dir_all(Path::new(&vault).join("Archive")).unwrap();
let note = import_note(
&vault,
source.to_str().unwrap(),
Some("Projects/Nested"),
raw,
vec![reference(
raw,
"images/report.pdf#page=2",
"images/report.pdf#page=2",
false,
)],
|_| Ok(()),
)
.unwrap();
assert!(
note.raw.starts_with("[Report](.helixnotes/attachments/"),
"managed links must not depend on notebook depth"
);
let href = note
.raw
.strip_prefix("[Report](")
.unwrap()
.strip_suffix(')')
.unwrap();
let attachment = Path::new(&vault).join(
urlencoding::decode(href.split('#').next().unwrap())
.unwrap()
.as_ref(),
);
assert_eq!(fs::read(attachment).unwrap(), b"pdf");
let moved = super::operations::move_note(&vault, &note.path, &vault).unwrap();
assert_eq!(fs::read_to_string(moved).unwrap(), note.raw);
// Imported managed paths remain stable when their containing notebook is moved too.
let second = import_note(
&vault,
source.to_str().unwrap(),
Some("Projects/Nested"),
raw,
vec![reference(
raw,
"images/report.pdf#page=2",
"images/report.pdf#page=2",
false,
)],
|_| Ok(()),
)
.unwrap();
super::operations::move_notebook(
&vault,
Path::new(&vault).join("Projects").to_str().unwrap(),
Path::new(&vault).join("Archive").to_str().unwrap(),
)
.unwrap();
assert_eq!(
fs::read_to_string(Path::new(&vault).join("Archive/Projects/Nested/External.md")).unwrap(),
second.raw
);
}
#[test]
fn import_does_not_replace_existing_note_or_same_named_attachment() {
let raw = "![Image](images/photo.png)";
let (_root, vault, source) = fixture(raw);
fs::write(
source.parent().unwrap().join("images/photo.png"),
b"new image",
)
.unwrap();
fs::write(Path::new(&vault).join("External.md"), b"keep note").unwrap();
fs::write(
Path::new(&vault).join(".helixnotes/attachments/photo.png"),
b"keep image",
)
.unwrap();
let note = import_note(
&vault,
source.to_str().unwrap(),
None,
raw,
vec![reference(
raw,
"images/photo.png",
"images/photo.png",
false,
)],
|_| Ok(()),
)
.unwrap();
assert!(note.path.ends_with("External (2).md"));
assert_eq!(
fs::read(Path::new(&vault).join("External.md")).unwrap(),
b"keep note"
);
assert_eq!(
fs::read(Path::new(&vault).join(".helixnotes/attachments/photo.png")).unwrap(),
b"keep image"
);
assert_eq!(attachments(&vault).len(), 2);
}
#[test]
fn stale_sources_missing_files_and_denied_attachments_publish_nothing() {
let raw = "![Image](images/photo.png)";
let (_root, vault, source) = fixture(raw);
let plan = || {
vec![reference(
raw,
"images/photo.png",
"images/photo.png",
false,
)]
};
assert!(import_note(
&vault,
source.to_str().unwrap(),
None,
"stale",
plan(),
|_| Ok(())
)
.is_err());
assert!(
import_note(&vault, source.to_str().unwrap(), None, raw, plan(), |_| Ok(
()
))
.is_err()
);
fs::write(source.parent().unwrap().join("images/photo.png"), b"image").unwrap();
let denied = import_note(
&vault,
source.to_str().unwrap(),
None,
raw,
plan(),
|path| {
if path == source {
Ok(())
} else {
Err("Attachment not selected".into())
}
},
);
assert!(denied.unwrap_err().contains("not selected"));
assert!(attachments(&vault).is_empty());
assert!(!Path::new(&vault).join("External.md").exists());
assert_eq!(fs::read_to_string(&source).unwrap(), raw);
}
#[test]
fn invalid_destinations_ranges_and_absolute_references_are_rejected() {
let raw = "雪 ![Image](images/photo.png)";
let (_root, vault, source) = fixture(raw);
fs::write(source.parent().unwrap().join("images/photo.png"), b"image").unwrap();
assert!(import_note(
&vault,
source.to_str().unwrap(),
Some("../escape"),
raw,
vec![],
|_| Ok(())
)
.is_err());
for href in [
"/private.png",
"%2Fprivate.png",
"C:/private.png",
"https://example.com/file.png",
"Related.md",
] {
assert!(import_note(
&vault,
source.to_str().unwrap(),
None,
raw,
vec![reference(raw, "images/photo.png", href, false)],
|_| Ok(())
)
.is_err());
}
assert!(import_note(
&vault,
source.to_str().unwrap(),
None,
raw,
vec![ExternalNoteReference {
from: 1,
to: 3,
href: "images/photo.png".into(),
html: false,
pdf: false,
}],
|_| Ok(())
)
.is_err());
let plan = vec![
reference(raw, "images/photo.png", "images/photo.png", false),
reference(raw, "images/photo.png", "images/photo.png", false),
];
assert!(import_note(
&vault,
source.to_str().unwrap(),
None,
raw,
plan,
|_| Ok(())
)
.is_err());
assert!(attachments(&vault).is_empty());
}
#[test]
fn failed_note_publication_removes_only_its_new_attachments() {
let raw = "![Image](images/photo.png)";
let (_root, vault, source) = fixture(raw);
fs::write(source.parent().unwrap().join("images/photo.png"), b"image").unwrap();
fs::write(Path::new(&vault).join("External.md"), b"keep").unwrap();
for number in 2..=100 {
fs::write(
Path::new(&vault).join(format!("External ({number}).md")),
b"keep",
)
.unwrap();
}
let original_asset = Path::new(&vault).join(".helixnotes/attachments/original.png");
fs::write(&original_asset, b"keep attachment").unwrap();
assert!(import_note(
&vault,
source.to_str().unwrap(),
None,
raw,
vec![reference(
raw,
"images/photo.png",
"images/photo.png",
false
)],
|_| Ok(())
)
.is_err());
assert_eq!(attachments(&vault), vec![original_asset]);
assert_eq!(
fs::read(Path::new(&vault).join("External.md")).unwrap(),
b"keep"
);
assert_eq!(fs::read_to_string(&source).unwrap(), raw);
assert!(!fs::read_dir(&vault).unwrap().any(|entry| entry
.unwrap()
.file_name()
.to_string_lossy()
.starts_with(".helixnotes-import-")));
}
#[test]
fn note_content_cannot_import_parent_files_or_hidden_secrets_from_a_broad_scope() {
let raw = "[File](asset.bin)";
let (root, vault, source) = fixture(raw);
let parent = source.parent().unwrap();
for name in [
".ssh/key.bin",
".helixnotes/history/private.bin",
".helixnotes/attachments/photo.bin",
] {
let file = parent.join(name);
fs::create_dir_all(file.parent().unwrap()).unwrap();
fs::write(file, b"private fixture").unwrap();
}
fs::write(root.path().join("private.bin"), b"private outside fixture").unwrap();
for href in [
"../private.bin",
".ssh/key.bin",
".helixnotes/history/private.bin",
] {
assert!(import_note(
&vault,
source.to_str().unwrap(),
None,
raw,
vec![reference(raw, "asset.bin", href, false)],
|_| Ok(())
)
.is_err());
assert!(attachments(&vault).is_empty());
assert!(!Path::new(&vault).join("External.md").exists());
}
let note = import_note(
&vault,
source.to_str().unwrap(),
None,
raw,
vec![reference(
raw,
"asset.bin",
".helixnotes/attachments/photo.bin",
false,
)],
|_| Ok(()),
)
.unwrap();
assert!(note.raw.contains(".helixnotes/attachments/"));
assert_eq!(attachments(&vault).len(), 1);
}
#[cfg(unix)]
#[test]
fn import_rejects_attachment_and_notebook_destinations_that_follow_symlinks() {
let raw = "![Image](images/photo.png)";
let (root, vault, source) = fixture(raw);
fs::write(source.parent().unwrap().join("images/photo.png"), b"image").unwrap();
let outside = root.path().join("outside");
fs::create_dir(&outside).unwrap();
std::os::unix::fs::symlink(&outside, Path::new(&vault).join("Notebook")).unwrap();
assert!(import_note(
&vault,
source.to_str().unwrap(),
Some("Notebook"),
raw,
vec![],
|_| Ok(())
)
.is_err());
let directory = Path::new(&vault).join(".helixnotes/attachments");
fs::remove_dir(&directory).unwrap();
std::os::unix::fs::symlink(&outside, &directory).unwrap();
assert!(import_note(
&vault,
source.to_str().unwrap(),
None,
raw,
vec![reference(
raw,
"images/photo.png",
"images/photo.png",
false
)],
|_| Ok(())
)
.is_err());
assert!(fs::read_dir(outside).unwrap().next().is_none());
}
File diff suppressed because it is too large. Load diff
+354 -48
View File
@@ -1,69 +1,213 @@
use notify::{Config, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
use std::path::Path;
use notify::event::{CreateKind, ModifyKind, RemoveKind, RenameMode};
use notify::{Config, Event, EventKind, PollWatcher, RecommendedWatcher, RecursiveMode, Watcher};
use std::collections::HashMap;
use std::path::{Component, Path, PathBuf};
use std::sync::mpsc;
use std::time::Duration;
use std::time::{Duration, Instant};
use tauri::{AppHandle, Emitter, Manager};
use crate::state::AppState;
use crate::types::FileEvent;
use crate::vault::operations::helixnotes_dir;
use crate::vault::operations::{is_hidden, read_note_entry_fast};
pub fn start_watcher(app: AppHandle, vault_path: String) -> Result<RecommendedWatcher, String> {
const IOS_POLL_INTERVAL: Duration = Duration::from_secs(10);
const NATIVE_POLL_INTERVAL: Duration = Duration::from_secs(1);
const EVENT_BATCH_INTERVAL: Duration = Duration::from_millis(50);
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
enum WatcherBackend {
Recommended,
Poll,
}
const fn watcher_backend_for_target(is_ios: bool) -> WatcherBackend {
if is_ios {
WatcherBackend::Poll
} else {
WatcherBackend::Recommended
}
}
const fn poll_interval_for_backend(backend: WatcherBackend) -> Duration {
match backend {
WatcherBackend::Recommended => NATIVE_POLL_INTERVAL,
WatcherBackend::Poll => IOS_POLL_INTERVAL,
}
}
pub enum VaultWatcher {
Recommended(RecommendedWatcher),
Poll(PollWatcher),
}
impl VaultWatcher {
fn watch(&mut self, path: &Path, recursive_mode: RecursiveMode) -> notify::Result<()> {
match self {
Self::Recommended(watcher) => watcher.watch(path, recursive_mode),
Self::Poll(watcher) => watcher.watch(path, recursive_mode),
}
}
}
fn collect_changes(event: Event, vault_root: &Path, changes: &mut HashMap<PathBuf, &'static str>) {
let (default_type, may_be_directory) = match event.kind {
EventKind::Create(kind) => ("create", kind != CreateKind::File),
EventKind::Remove(kind) => ("remove", kind != RemoveKind::File),
EventKind::Modify(ModifyKind::Name(_)) => ("modify", true),
EventKind::Modify(_) => ("modify", false),
_ => return,
};
for (index, path) in event.paths.into_iter().enumerate() {
let Ok(relative) = path.strip_prefix(vault_root) else {
continue;
};
if !relative.components().all(|component| match component {
Component::Normal(name) => !is_hidden(Path::new(name)),
Component::CurDir => true,
_ => false,
}) {
continue;
}
// Removed/renamed directories no longer pass is_dir(). Retain unknown
// missing paths so external notebook changes still reach the UI.
if path.extension().and_then(|extension| extension.to_str()) != Some("md")
&& !path.is_dir()
&& !(may_be_directory && !path.exists())
{
continue;
}
let event_type = match event.kind {
EventKind::Modify(ModifyKind::Name(RenameMode::From)) => "remove",
EventKind::Modify(ModifyKind::Name(RenameMode::Both)) if index == 0 => "remove",
_ => default_type,
};
changes.insert(path, event_type);
}
}
pub(crate) fn changed_entry(path: PathBuf, event_type: &str, vault_root: &Path) -> FileEvent {
let is_note =
path.extension().and_then(|extension| extension.to_str()) == Some("md") && path.is_file();
let note = if is_note {
read_note_entry_fast(&path, vault_root).ok()
} else {
None
};
// Atomic replacement may also report removal of the old destination. The
// final filesystem state, not the platform's rename spelling, is authoritative.
let event_type = if path.exists() {
if event_type == "remove" {
"modify"
} else {
event_type
}
} else {
"remove"
};
FileEvent {
vault_path: vault_root.to_string_lossy().to_string(),
event_type: event_type.to_string(),
path: path.to_string_lossy().to_string(),
note,
}
}
pub fn start_watcher(app: AppHandle, vault_path: String) -> Result<VaultWatcher, String> {
let (tx, rx) = mpsc::channel();
let mut watcher = RecommendedWatcher::new(
tx,
Config::default().with_poll_interval(Duration::from_secs(1)),
)
.map_err(|e| e.to_string())?;
let backend = watcher_backend_for_target(cfg!(target_os = "ios"));
let config = Config::default().with_poll_interval(poll_interval_for_backend(backend));
let mut watcher = match backend {
WatcherBackend::Recommended => VaultWatcher::Recommended(
RecommendedWatcher::new(tx, config).map_err(|e| e.to_string())?,
),
WatcherBackend::Poll => {
VaultWatcher::Poll(PollWatcher::new(tx, config).map_err(|e| e.to_string())?)
}
};
watcher
.watch(Path::new(&vault_path), RecursiveMode::Recursive)
.map_err(|e| e.to_string())?;
let hn_dir = helixnotes_dir(&vault_path);
std::thread::spawn(move || {
while let Ok(result) = rx.recv() {
match result {
Ok(event) => {
// Skip all file events while importing
let state = app.state::<AppState>();
if state.importing.load(std::sync::atomic::Ordering::Relaxed) {
continue;
let vault_root = Path::new(&vault_path);
let mut changes = HashMap::new();
let mut search = None;
loop {
let first = if changes.is_empty() {
match rx.recv() {
Ok(event) => Some(event),
Err(_) => return,
}
} else {
match rx.recv_timeout(EVENT_BATCH_INTERVAL) {
Ok(event) => Some(event),
Err(mpsc::RecvTimeoutError::Timeout) => None,
Err(mpsc::RecvTimeoutError::Disconnected) => return,
}
};
let deadline = Instant::now() + EVENT_BATCH_INTERVAL;
let mut next = first;
while let Some(result) = next {
match result {
Ok(event) => {
collect_changes(event, vault_root, &mut changes);
}
// Skip .helixnotes directory events
let dominated_by_hn = event.paths.iter().all(|p| p.starts_with(&hn_dir));
if dominated_by_hn {
Err(error) => log::error!("File watcher error: {error}"),
}
let remaining = deadline.saturating_duration_since(Instant::now());
if remaining.is_zero() {
break;
}
next = rx.recv_timeout(remaining).ok();
}
let state = app.state::<AppState>();
// Native note mutations hold note_save through their path event.
// Read and emit only after they finish, so the watcher cannot
// publish an intermediate rename or stale note contents.
let _save_guard = state.note_save.blocking_lock();
// Keep the batch while muted, rather than losing concurrent external
// edits. Nothing is indexed or emitted until local imports finish.
if state.importing.load(std::sync::atomic::Ordering::Relaxed) {
continue;
}
// Each watcher belongs to its own vault. A detached note window may
// still need changes from a vault that is no longer active; never
// index those changes into the main window's active search index.
if state.validate_vault(&vault_path).is_err() {
continue;
}
if search.is_none() {
match state.vault_snapshot(&vault_path) {
Ok(index) => search = index,
Err(error) => {
log::error!("Could not open search index for watched vault: {error}");
continue;
}
// Only care about .md file events
let has_md = event.paths.iter().any(|p| {
p.extension().and_then(|x| x.to_str()) == Some("md") || p.is_dir()
});
if !has_md {
continue;
}
let event_type = match event.kind {
EventKind::Create(_) => "create",
EventKind::Modify(_) => "modify",
EventKind::Remove(_) => "remove",
_ => continue,
};
for path in &event.paths {
let fe = FileEvent {
event_type: event_type.to_string(),
path: path.to_string_lossy().to_string(),
};
let _ = app.emit("file-changed", &fe);
}
}
Err(e) => {
log::error!("File watcher error: {}", e);
}
let mut refresh_vault = false;
for (path, event_type) in changes.drain() {
if path.extension().and_then(|extension| extension.to_str()) == Some("md")
&& !path.is_dir()
{
if let Some(search) = &search {
if let Err(error) = search.queue_index_note(&path.to_string_lossy()) {
log::error!("Could not queue external note for search: {error}");
}
}
} else {
refresh_vault = true;
}
let event = changed_entry(path, event_type, vault_root);
let _ = app.emit("file-changed", &event);
}
if refresh_vault {
if let Some(search) = &search {
if let Err(error) = search.queue_vault_refresh(&vault_path) {
log::error!("Could not queue notebook search refresh: {error}");
}
}
}
}
@@ -71,3 +215,165 @@ pub fn start_watcher(app: AppHandle, vault_path: String) -> Result<RecommendedWa
Ok(watcher)
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn ios_uses_polling_backend() {
assert_eq!(watcher_backend_for_target(true), WatcherBackend::Poll);
}
#[test]
fn other_platforms_keep_recommended_backend() {
assert_eq!(
watcher_backend_for_target(false),
WatcherBackend::Recommended
);
}
#[test]
fn watcher_backends_use_the_expected_intervals() {
assert_eq!(
poll_interval_for_backend(WatcherBackend::Poll),
Duration::from_secs(10)
);
assert_eq!(
poll_interval_for_backend(WatcherBackend::Recommended),
Duration::from_secs(1)
);
}
fn mapped_events(events: Vec<Event>, vault_root: &Path) -> Vec<FileEvent> {
let mut changes = HashMap::new();
for event in events {
collect_changes(event, vault_root, &mut changes);
}
changes
.into_iter()
.map(|(path, event_type)| changed_entry(path, event_type, vault_root))
.collect()
}
#[test]
fn atomic_replace_emits_only_enriched_destination() {
let vault = tempfile::tempdir().unwrap();
let target = vault.path().join("Note.md");
let temporary = vault.path().join(".helixnotes-save-123");
std::fs::write(&target, "---\ntitle: New title\n---\nUpdated preview.").unwrap();
let events = mapped_events(
vec![
Event::new(EventKind::Modify(ModifyKind::Name(RenameMode::Both)))
.add_path(temporary)
.add_path(target.clone()),
Event::new(EventKind::Remove(RemoveKind::File)).add_path(target.clone()),
Event::new(EventKind::Create(CreateKind::File))
.add_path(vault.path().join(".helixnotes/history/snapshot.md")),
Event::new(EventKind::Create(CreateKind::File))
.add_path(vault.path().join(".hidden/secret.md")),
],
vault.path(),
);
assert_eq!(events.len(), 1);
assert_eq!(events[0].path, target.to_string_lossy());
assert_eq!(events[0].event_type, "modify");
let note = events[0].note.as_ref().unwrap();
assert_eq!(note.meta.title, "New title");
assert_eq!(note.relative_path, "Note.md");
assert_eq!(note.preview, "Updated preview.");
}
#[test]
fn external_note_and_directory_renames_keep_both_sides() {
let vault = tempfile::tempdir().unwrap();
let old_note = vault.path().join("Before.md");
let new_note = vault.path().join("After.md");
let old_directory = vault.path().join("Old.notebook");
let new_directory = vault.path().join("New.notebook");
std::fs::write(&new_note, "renamed note").unwrap();
std::fs::create_dir(&new_directory).unwrap();
let events = mapped_events(
vec![
Event::new(EventKind::Modify(ModifyKind::Name(RenameMode::Both)))
.add_path(old_note.clone())
.add_path(new_note.clone()),
Event::new(EventKind::Modify(ModifyKind::Name(RenameMode::Both)))
.add_path(old_directory.clone())
.add_path(new_directory.clone()),
],
vault.path(),
);
for removed in [old_note, old_directory] {
let event = events
.iter()
.find(|event| event.path == removed.to_string_lossy())
.unwrap();
assert_eq!(event.event_type, "remove");
assert!(event.note.is_none());
}
let note = events
.iter()
.find(|event| event.path == new_note.to_string_lossy())
.unwrap();
assert_eq!(note.event_type, "modify");
assert!(note.note.is_some());
let directory = events
.iter()
.find(|event| event.path == new_directory.to_string_lossy())
.unwrap();
assert_eq!(directory.event_type, "modify");
assert!(directory.note.is_none());
}
#[test]
fn batching_keeps_distinct_external_changes_and_deleted_directories() {
let vault = tempfile::tempdir().unwrap();
let first = vault.path().join("First.md");
let second = vault.path().join("Second.md");
let removed = vault.path().join("Removed.notebook");
std::fs::write(&first, "first external change").unwrap();
std::fs::write(&second, "second external change").unwrap();
let events = mapped_events(
vec![
Event::new(EventKind::Create(CreateKind::File)).add_path(first.clone()),
Event::new(EventKind::Modify(ModifyKind::Any)).add_path(first.clone()),
Event::new(EventKind::Create(CreateKind::File)).add_path(second.clone()),
Event::new(EventKind::Remove(RemoveKind::Folder)).add_path(removed.clone()),
],
vault.path(),
);
let first_event = events
.iter()
.find(|event| event.path == first.to_string_lossy())
.unwrap();
assert_eq!(
first_event.note.as_ref().unwrap().preview,
"first external change"
);
let second_event = events
.iter()
.find(|event| event.path == second.to_string_lossy())
.unwrap();
assert_eq!(
second_event.note.as_ref().unwrap().preview,
"second external change"
);
let removed_event = events
.iter()
.find(|event| event.path == removed.to_string_lossy())
.unwrap();
assert_eq!(removed_event.event_type, "remove");
assert!(removed_event.note.is_none());
assert_eq!(
events
.iter()
.filter(|event| event.path == first.to_string_lossy())
.count(),
1
);
}
}
+10 -3
View File
@@ -1,7 +1,7 @@
{
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "HelixNotes",
"version": "1.3.1",
"version": "1.3.6",
"identifier": "com.helixnotes.app",
"build": {
"frontendDist": "../build",
@@ -24,10 +24,14 @@
}
],
"security": {
"csp": "default-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src 'self' asset: http://asset.localhost imgproxy: http://imgproxy.localhost https: blob: data:; font-src 'self' data:; style-src 'self' 'unsafe-inline'; frame-src 'self' asset: http://asset.localhost",
"csp": "default-src 'self'; img-src 'self' asset: http://asset.localhost imgproxy: http://imgproxy.localhost https: blob: data:; font-src 'self' data:; style-src 'self' 'unsafe-inline'; frame-src 'self' asset: http://asset.localhost",
"assetProtocol": {
"enable": true,
"scope": ["**/*", "/**", "**/.helixnotes/**"]
"scope": {
"allow": [],
"deny": [],
"requireLiteralLeadingDot": true
}
}
}
},
@@ -55,6 +59,9 @@
"appimage": {
"bundleMediaFramework": false
}
},
"macOS": {
"entitlements": "entitlements.plist"
}
}
}
+18
View File
@@ -0,0 +1,18 @@
{
"app": {
"windows": [
{
"title": "HelixNotes",
"label": "main",
"width": 1200,
"height": 800,
"minWidth": 800,
"minHeight": 500,
"resizable": true,
"fullscreen": false,
"decorations": false,
"visible": false
}
]
}
}
+332 -4
View File
@@ -152,6 +152,65 @@
src: url("/fonts/open-sans/OpenSans-BoldItalic.woff2") format("woff2");
}
/* Ubuntu families - unmodified upstream fonts, Ubuntu Font Licence 1.0.
Copyright and licence notices are bundled beside each family's local assets. */
@font-face {
font-family: "Ubuntu";
font-style: normal;
font-weight: 400;
font-display: swap;
src: url("/fonts/ubuntu/Ubuntu-R.ttf") format("truetype");
}
@font-face {
font-family: "Ubuntu";
font-style: normal;
font-weight: 700;
font-display: swap;
src: url("/fonts/ubuntu/Ubuntu-B.ttf") format("truetype");
}
@font-face {
font-family: "Ubuntu";
font-style: italic;
font-weight: 400;
font-display: swap;
src: url("/fonts/ubuntu/Ubuntu-RI.ttf") format("truetype");
}
@font-face {
font-family: "Ubuntu";
font-style: italic;
font-weight: 700;
font-display: swap;
src: url("/fonts/ubuntu/Ubuntu-BI.ttf") format("truetype");
}
@font-face {
font-family: "Ubuntu Mono";
font-style: normal;
font-weight: 400;
font-display: swap;
src: url("/fonts/ubuntu-mono/UbuntuMono-R.ttf") format("truetype");
}
@font-face {
font-family: "Ubuntu Mono";
font-style: normal;
font-weight: 700;
font-display: swap;
src: url("/fonts/ubuntu-mono/UbuntuMono-B.ttf") format("truetype");
}
@font-face {
font-family: "Ubuntu Mono";
font-style: italic;
font-weight: 400;
font-display: swap;
src: url("/fonts/ubuntu-mono/UbuntuMono-RI.ttf") format("truetype");
}
@font-face {
font-family: "Ubuntu Mono";
font-style: italic;
font-weight: 700;
font-display: swap;
src: url("/fonts/ubuntu-mono/UbuntuMono-BI.ttf") format("truetype");
}
:root {
/* Light theme */
--bg-primary: #ffffff;
@@ -173,6 +232,21 @@
--danger-hover: #d43d3d;
--success: #40c057;
--warning: #fab005;
/* Obsidian-style callout accent hues (RGB triplets; mixed with the background via opacity, so one set works on every theme) */
--callout-note: 68, 138, 255;
--callout-abstract: 0, 191, 188;
--callout-info: 0, 184, 212;
--callout-todo: 0, 184, 212;
--callout-tip: 0, 191, 188;
--callout-success: 8, 185, 78;
--callout-question: 236, 191, 0;
--callout-warning: 236, 117, 0;
--callout-failure: 233, 49, 71;
--callout-danger: 233, 49, 71;
--callout-bug: 233, 49, 71;
--callout-example: 120, 82, 238;
--callout-quote: 158, 158, 158;
--callout-custom: 124, 134, 156;
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.05);
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.08);
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.12);
@@ -204,6 +278,20 @@
--danger-hover: #eba0ac;
--success: #a6e3a1;
--warning: #f9e2af;
--callout-note: 100, 160, 255;
--callout-abstract: 60, 209, 205;
--callout-info: 60, 200, 224;
--callout-todo: 60, 200, 224;
--callout-tip: 60, 209, 205;
--callout-success: 80, 205, 120;
--callout-question: 240, 205, 80;
--callout-warning: 245, 150, 60;
--callout-failure: 240, 95, 115;
--callout-danger: 240, 95, 115;
--callout-bug: 240, 95, 115;
--callout-example: 165, 135, 245;
--callout-quote: 150, 150, 162;
--callout-custom: 150, 160, 182;
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.2);
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.3);
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.4);
@@ -761,6 +849,231 @@
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.12);
}
:root[data-theme="material-dark"] {
--bg-primary: #212121;
--bg-secondary: #1b1b1b;
--bg-tertiary: #282828;
--bg-hover: #2d2d2d;
--bg-active: #393939;
--bg-editor: #212121;
--text-primary: #eeffff;
--text-secondary: #b0bec5;
--text-tertiary: #546e7a;
--text-accent: #80cbc4;
--border-color: #2d2d2d;
--border-light: #252525;
--accent: #80cbc4;
--accent-hover: #4db6ac;
--accent-light: color-mix(in srgb, #80cbc4 12%, transparent);
--danger: #ff5370;
--danger-hover: #e53050;
--success: #c3e88d;
--warning: #ffcb6b;
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.4);
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.5);
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.6);
}
:root[data-theme="material-light"] {
--bg-primary: #fafafa;
--bg-secondary: #f5f5f5;
--bg-tertiary: #eeeeee;
--bg-hover: #e0e0e0;
--bg-active: #d6d6d6;
--bg-editor: #fafafa;
--text-primary: #212121;
--text-secondary: #546e7a;
--text-tertiary: #90a4ae;
--text-accent: #00897b;
--border-color: #e0e0e0;
--border-light: #eeeeee;
--accent: #00897b;
--accent-hover: #00796b;
--accent-light: color-mix(in srgb, #00897b 8%, transparent);
--danger: #e53935;
--danger-hover: #c62828;
--success: #388e3c;
--warning: #f57c00;
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.05);
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.08);
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.12);
}
:root[data-theme="monokai"] {
--bg-primary: #272822;
--bg-secondary: #1e1f1c;
--bg-tertiary: #2d2e27;
--bg-hover: #3a3b32;
--bg-active: #49483e;
--bg-editor: #272822;
--text-primary: #f8f8f2;
--text-secondary: #a59f85;
--text-tertiary: #75715e;
--text-accent: #a6e22e;
--border-color: #3a3b32;
--border-light: #2d2e27;
--accent: #a6e22e;
--accent-hover: #8ec226;
--accent-light: color-mix(in srgb, #a6e22e 12%, transparent);
--danger: #f92672;
--danger-hover: #e01060;
--success: #a6e22e;
--warning: #e6db74;
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.3);
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.4);
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.5);
}
:root[data-theme="rose-pine"] {
--bg-primary: #191724;
--bg-secondary: #1f1d2e;
--bg-tertiary: #26233a;
--bg-hover: #312f44;
--bg-active: #403d52;
--bg-editor: #191724;
--text-primary: #e0def4;
--text-secondary: #908caa;
--text-tertiary: #6e6a86;
--text-accent: #c4a7e7;
--border-color: #312f44;
--border-light: #26233a;
--accent: #c4a7e7;
--accent-hover: #b094d8;
--accent-light: color-mix(in srgb, #c4a7e7 12%, transparent);
--danger: #eb6f92;
--danger-hover: #d05572;
--success: #9ccfd8;
--warning: #f6c177;
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.3);
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.4);
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.5);
}
:root[data-theme="everforest"] {
--bg-primary: #2d353b;
--bg-secondary: #272e33;
--bg-tertiary: #2e383c;
--bg-hover: #374145;
--bg-active: #414b50;
--bg-editor: #2d353b;
--text-primary: #d3c6aa;
--text-secondary: #9da9a0;
--text-tertiary: #7a8478;
--text-accent: #83c092;
--border-color: #374145;
--border-light: #2e383c;
--accent: #83c092;
--accent-hover: #6aac7a;
--accent-light: color-mix(in srgb, #83c092 12%, transparent);
--danger: #e67e80;
--danger-hover: #cc6264;
--success: #a7c080;
--warning: #dbbc7f;
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.3);
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.4);
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.5);
}
:root[data-theme="horizon"] {
--bg-primary: #1c1e26;
--bg-secondary: #16181f;
--bg-tertiary: #21232c;
--bg-hover: #2e303e;
--bg-active: #3a3c4e;
--bg-editor: #1c1e26;
--text-primary: #d5d8da;
--text-secondary: #9a9da5;
--text-tertiary: #626672;
--text-accent: #e9547f;
--border-color: #2e303e;
--border-light: #21232c;
--accent: #e9547f;
--accent-hover: #d83d6e;
--accent-light: color-mix(in srgb, #e9547f 12%, transparent);
--danger: #f43e5c;
--danger-hover: #e02848;
--success: #29d398;
--warning: #fab38e;
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.3);
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.4);
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.5);
}
:root[data-theme="cyberpunk"] {
--bg-primary: #0a0e17;
--bg-secondary: #060911;
--bg-tertiary: #0f1420;
--bg-hover: #141a28;
--bg-active: #1c2438;
--bg-editor: #0a0e17;
--text-primary: #e0e8ff;
--text-secondary: #8899cc;
--text-tertiary: #445588;
--text-accent: #00d9ff;
--border-color: #1c2438;
--border-light: #0f1420;
--accent: #ff0080;
--accent-hover: #e0006a;
--accent-light: color-mix(in srgb, #ff0080 12%, transparent);
--danger: #ff0044;
--danger-hover: #cc0033;
--success: #00ff88;
--warning: #ffcc00;
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.5);
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.6);
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.7);
}
:root[data-theme="black"] {
--bg-primary: #000000;
--bg-secondary: #0a0a0a;
--bg-tertiary: #111111;
--bg-hover: #1a1a1a;
--bg-active: #222222;
--bg-editor: #000000;
--text-primary: #f0f0f0;
--text-secondary: #999999;
--text-tertiary: #555555;
--text-accent: #ffffff;
--border-color: #1a1a1a;
--border-light: #111111;
--accent: #ffffff;
--accent-hover: #e0e0e0;
--accent-light: color-mix(in srgb, #ffffff 12%, transparent);
--danger: #ff3333;
--danger-hover: #cc2222;
--success: #33ff77;
--warning: #ffcc00;
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.6);
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.7);
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.8);
}
:root[data-theme="one-dark"] {
--bg-primary: #282c34;
--bg-secondary: #21252b;
--bg-tertiary: #2c313a;
--bg-hover: #3e4451;
--bg-active: #4b5263;
--bg-editor: #282c34;
--text-primary: #abb2bf;
--text-secondary: #828997;
--text-tertiary: #5c6370;
--text-accent: #61afef;
--border-color: #3e4451;
--border-light: #2c313a;
--accent: #61afef;
--accent-hover: #4d9fdf;
--accent-light: color-mix(in srgb, #61afef 12%, transparent);
--danger: #e06c75;
--danger-hover: #cc5560;
--success: #98c379;
--warning: #e5c07b;
--shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.3);
--shadow-md: 0 4px 12px rgba(0, 0, 0, 0.4);
--shadow-lg: 0 8px 24px rgba(0, 0, 0, 0.5);
}
*,
*::before,
*::after {
@@ -888,10 +1201,6 @@ body.resizing {
/* ── Mobile (Android/iOS) ── */
@media (max-width: 768px) {
body {
padding-top: env(safe-area-inset-top);
padding-bottom: env(safe-area-inset-bottom);
padding-left: env(safe-area-inset-left);
padding-right: env(safe-area-inset-right);
-webkit-tap-highlight-color: transparent;
touch-action: manipulation;
}
@@ -982,6 +1291,25 @@ body.resizing {
page-break-inside: avoid;
}
/* Image grids print as compact 2-column rows without their editing controls. */
.ProseMirror .img-grid-header {
display: none !important;
}
.ProseMirror .img-grid,
.ProseMirror .img-grid[data-layout='masonry'] {
display: grid !important;
grid-template-columns: repeat(2, 1fr) !important;
columns: auto !important;
gap: 8px !important;
break-inside: avoid;
}
.ProseMirror .img-grid img {
margin: 0 !important;
width: 100% !important;
max-width: 100% !important;
break-inside: avoid;
}
/* Avoid breaking inside these elements */
h1,
h2,
+235 -72
View File
@@ -1,43 +1,96 @@
import { invoke } from "@tauri-apps/api/core";
import type { ExternalNoteReference } from "./editor/externalNote";
import type {
AppConfig,
CustomTheme,
NoteContent,
NoteEntry,
NoteMeta,
NotebookEntry,
NoteTitleEntry,
SearchResult,
SearchPage,
TrashContents,
VaultState,
VaultStats,
TagStyle,
TagStyleChange,
ImportResult,
BackupEntry,
VersionEntry,
TaskItem,
ExternalVaultResult,
StartupView,
ToolbarLayout,
PendingOpenFile,
} from "./types";
export async function openVault(path: string): Promise<void> {
return invoke("open_vault", { path });
}
export async function removeVault(path: string): Promise<void> {
return invoke("remove_vault", { path });
export async function chooseExternalVault(): Promise<ExternalVaultResult | null> {
return invoke("choose_external_vault");
}
export async function restoreExternalVault(bookmarkId: string): Promise<ExternalVaultResult> {
return invoke("restore_external_vault", { bookmarkId });
}
export async function removeVault(path: string, bookmarkId?: string | null): Promise<void> {
return invoke("remove_vault", { path, bookmarkId: bookmarkId ?? null });
}
export async function getAppConfig(): Promise<AppConfig> {
return invoke("get_app_config");
}
export async function completeWindowClose(): Promise<void> {
return invoke("complete_window_close");
}
export async function cancelWindowClose(): Promise<void> {
return invoke("cancel_window_close");
}
export async function setTheme(theme: string): Promise<void> {
return invoke("set_theme", { theme });
}
export async function setSystemThemes(light: string, dark: string): Promise<void> {
return invoke("set_system_themes", { light, dark });
}
export async function setAccentColor(color: string): Promise<void> {
return invoke("set_accent_color", { color });
}
export async function setFontSize(size: number): Promise<void> {
return invoke("set_font_size", { size });
export async function saveCustomTheme(theme: CustomTheme): Promise<void> {
return invoke("save_custom_theme", { theme });
}
export async function deleteCustomTheme(id: string): Promise<void> {
return invoke("delete_custom_theme", { id });
}
export async function exportCustomTheme(id: string, path: string): Promise<void> {
return invoke("export_custom_theme", { id, path });
}
export async function importCustomThemes(path: string): Promise<CustomTheme[]> {
return invoke("import_custom_themes", { path });
}
/** `preferred` marks a choice made in Appearance, which is what resetting the zoom returns to. */
export async function setFontSize(size: number, preferred = false): Promise<void> {
return invoke("set_font_size", { size, preferred });
}
export async function setScrollToChangeFontSize(enabled: boolean): Promise<void> {
return invoke("set_scroll_to_change_font_size", { enabled });
}
export async function setToolbarLayout(layout: ToolbarLayout | null): Promise<void> {
return invoke("set_toolbar_layout", { layout });
}
export async function setFontFamily(family: string): Promise<void> {
@@ -52,6 +105,10 @@ export async function setUiScale(scale: number): Promise<void> {
return invoke("set_ui_scale", { scale });
}
export async function setContentWidth(width: number | null): Promise<void> {
return invoke("set_content_width", { width });
}
export async function getNotebooks(): Promise<NotebookEntry[]> {
return invoke("get_notebooks");
}
@@ -61,28 +118,31 @@ export async function countRootNotes(): Promise<number> {
}
export async function createNotebook(
vaultPath: string,
parentRelative: string | null,
name: string,
): Promise<NotebookEntry> {
return invoke("create_notebook", { parentRelative, name });
return invoke("create_notebook", { vaultPath, parentRelative, name });
}
export async function renameNotebook(
vaultPath: string,
path: string,
newName: string,
): Promise<string> {
return invoke("rename_notebook", { path, newName });
return invoke("rename_notebook", { vaultPath, path, newName });
}
export async function deleteNotebook(path: string): Promise<void> {
return invoke("delete_notebook", { path });
export async function deleteNotebook(vaultPath: string, path: string): Promise<void> {
return invoke("delete_notebook", { vaultPath, path });
}
export async function moveNotebook(
vaultPath: string,
notebookPath: string,
destParent: string,
): Promise<string> {
return invoke("move_notebook", { notebookPath, destParent });
return invoke("move_notebook", { vaultPath, notebookPath, destParent });
}
export async function getNotes(
@@ -91,64 +151,90 @@ export async function getNotes(
return invoke("get_notes", { notebookPath });
}
export async function readNote(path: string): Promise<NoteContent> {
return invoke("read_note", { path });
export async function readNote(vaultPath: string, path: string): Promise<NoteContent> {
return invoke("read_note", { vaultPath, path });
}
export async function saveNote(
vaultPath: string,
path: string,
meta: NoteMeta,
body: string,
): Promise<void> {
return invoke("save_note", { path, meta, body });
expectedRaw: string,
): Promise<NoteContent> {
return invoke("save_note", { vaultPath, path, meta, body, expectedRaw });
}
export async function importNote(
vaultPath: string,
sourcePath: string,
notebookRelative: string | null,
expectedRaw: string,
references: ExternalNoteReference[],
): Promise<NoteContent> {
return invoke("import_note", { vaultPath, sourcePath, notebookRelative, expectedRaw, references });
}
export async function createNote(
vaultPath: string,
notebookRelative: string | null,
title: string,
): Promise<NoteEntry> {
return invoke("create_note", { notebookRelative, title });
return invoke("create_note", { vaultPath, notebookRelative, title });
}
export async function createDailyNote(date?: string): Promise<NoteEntry> {
return invoke("create_daily_note", { date: date ?? null });
export async function duplicateNote(vaultPath: string, path: string): Promise<NoteEntry> {
return invoke("duplicate_note", { vaultPath, path });
}
export async function createDailyNote(vaultPath: string, date?: string): Promise<NoteEntry> {
return invoke("create_daily_note", { vaultPath, date: date ?? null });
}
export async function renameNote(
vaultPath: string,
path: string,
newTitle: string,
): Promise<string> {
return invoke("rename_note", { path, newTitle });
return invoke("rename_note", { vaultPath, path, newTitle });
}
export async function deleteNote(path: string): Promise<void> {
return invoke("delete_note", { path });
export async function deleteNote(vaultPath: string, path: string): Promise<void> {
return invoke("delete_note", { vaultPath, path });
}
export async function moveNote(
vaultPath: string,
notePath: string,
destNotebook: string,
): Promise<string> {
return invoke("move_note", { notePath, destNotebook });
return invoke("move_note", { vaultPath, notePath, destNotebook });
}
export async function getAllTags(): Promise<[string, number][]> {
return invoke("get_all_tags");
}
export async function getAllNoteTitles(): Promise<NoteTitleEntry[]> {
return invoke("get_all_note_titles");
export async function getAllNoteTitles(vaultPath: string): Promise<NoteTitleEntry[]> {
return invoke("get_all_note_titles", { vaultPath });
}
export async function getGraphData(): Promise<{ nodes: { title: string; path: string }[]; edges: { source: number; target: number }[] }> {
return invoke("get_graph_data");
export async function getNoteSwitcherTitles(
recentPaths: string[],
): Promise<NoteTitleEntry[]> {
return invoke("get_note_switcher_titles", { recentPaths });
}
export async function getGraphData(vaultPath: string): Promise<{ nodes: { title: string; path: string }[]; edges: { source: number; target: number; bidirectional: boolean }[] }> {
return invoke("get_graph_data", { vaultPath });
}
export async function searchNotes(
query: string,
limit?: number,
): Promise<SearchResult[]> {
return invoke("search_notes", { query, limit });
offset?: number,
): Promise<SearchPage> {
return invoke("search_notes", { query, limit, offset });
}
export async function reindex(): Promise<void> {
@@ -160,60 +246,106 @@ export async function getTrash(): Promise<TrashContents> {
}
export async function restoreNote(
vaultPath: string,
trashPath: string,
destNotebook: string | null,
): Promise<string> {
return invoke("restore_note", { trashPath, destNotebook });
return invoke("restore_note", { vaultPath, trashPath, destNotebook });
}
export async function restoreNotebook(trashPath: string): Promise<string> {
return invoke("restore_notebook", { trashPath });
export async function restoreNotebook(vaultPath: string, trashPath: string): Promise<string> {
return invoke("restore_notebook", { vaultPath, trashPath });
}
export async function permanentDelete(path: string): Promise<void> {
return invoke("permanent_delete", { path });
export async function permanentDelete(vaultPath: string, path: string): Promise<void> {
return invoke("permanent_delete", { vaultPath, path });
}
export async function emptyTrash(): Promise<void> {
return invoke("empty_trash");
export async function emptyTrash(vaultPath: string): Promise<void> {
return invoke("empty_trash", { vaultPath });
}
export async function loadVaultState(): Promise<VaultState> {
return invoke("load_vault_state");
export async function loadVaultState(vaultPath: string): Promise<VaultState> {
return invoke("load_vault_state", { vaultPath });
}
export async function saveVaultState(vaultState: VaultState): Promise<void> {
return invoke("save_vault_state", { vaultState });
export async function saveVaultState(vaultPath: string, vaultState: VaultState): Promise<void> {
return invoke("save_vault_state", { vaultPath, vaultState });
}
export async function copyTextToClipboard(text: string): Promise<void> {
return invoke("copy_text_to_clipboard", { text });
}
export async function readClipboardImage(): Promise<number[]> {
return invoke("read_clipboard_image");
}
export interface ClipboardContents {
text: string | null;
html: string | null;
}
export async function readClipboardContents(): Promise<ClipboardContents> {
return invoke("read_clipboard_contents");
}
export async function copyImageToClipboard(path: string): Promise<void> {
return invoke("copy_image_to_clipboard", { path });
}
export async function saveImage(name: string, data: number[]): Promise<string> {
return invoke("save_image", { name, data });
export async function saveImage(vaultPath: string, name: string, data: number[]): Promise<string> {
return invoke("save_image", { vaultPath, name, data });
}
export async function saveAttachment(
vaultPath: string,
name: string,
data: number[],
): Promise<string> {
return invoke("save_attachment", { name, data });
return invoke("save_attachment", { vaultPath, name, data });
}
export async function getNotebookIcons(): Promise<Record<string, string>> {
return invoke("get_notebook_icons");
export async function getNotebookIcons(vaultPath: string): Promise<Record<string, string>> {
return invoke("get_notebook_icons", { vaultPath });
}
export async function setNotebookIcon(
vaultPath: string,
notebookRelative: string,
iconRelative: string | null,
): Promise<void> {
return invoke("set_notebook_icon", { notebookRelative, iconRelative });
return invoke("set_notebook_icon", { vaultPath, notebookRelative, iconRelative });
}
export async function getTagStyles(vaultPath: string): Promise<Record<string, TagStyle>> {
return invoke("get_tag_styles", { vaultPath });
}
export async function setTagStyle(
vaultPath: string,
tag: string,
change: TagStyleChange,
): Promise<TagStyle | null> {
return invoke("set_tag_style", { vaultPath, tag, change });
}
export async function importNotebookIcon(
vaultPath: string,
notebookRelative: string,
name: string,
data: number[],
): Promise<string> {
return invoke("import_notebook_icon", { vaultPath, notebookRelative, name, data });
}
export async function importTagIcon(
vaultPath: string,
tag: string,
name: string,
data: number[],
): Promise<TagStyle> {
return invoke("import_tag_icon", { vaultPath, tag, name, data });
}
export async function setGeneralSettings(
@@ -228,12 +360,21 @@ export async function setGeneralSettings(
titleMode: string,
hideTitleInBody: boolean,
showLineNumbers: boolean,
showLinkArrows: boolean,
defaultViewMode: boolean,
newNotesInSourceMode: boolean,
showTrayIcon: boolean,
closeToTray: boolean,
enableWikiLinks: boolean,
showNoteDates: boolean,
showNoteSwitcher: boolean,
startupView: StartupView,
restoreLastSession: boolean,
showAllNotes: boolean,
showQuickAccess: boolean,
showTasks: boolean,
showDailyNotes: boolean,
showTrash: boolean,
): Promise<void> {
return invoke("set_general_settings", {
compactNotes,
@@ -247,25 +388,34 @@ export async function setGeneralSettings(
titleMode,
hideTitleInBody,
showLineNumbers,
showLinkArrows,
defaultViewMode,
newNotesInSourceMode,
showTrayIcon,
closeToTray,
enableWikiLinks,
showNoteDates,
showNoteSwitcher,
startupView,
restoreLastSession,
showAllNotes,
showQuickAccess,
showTasks,
showDailyNotes,
showTrash,
});
}
export async function getQuickAccess(): Promise<NoteEntry[]> {
return invoke("get_quick_access");
export async function getQuickAccess(vaultPath: string): Promise<NoteEntry[]> {
return invoke("get_quick_access", { vaultPath });
}
export async function addQuickAccess(noteRelative: string): Promise<void> {
return invoke("add_quick_access", { noteRelative });
export async function addQuickAccess(vaultPath: string, noteRelative: string): Promise<void> {
return invoke("add_quick_access", { vaultPath, noteRelative });
}
export async function removeQuickAccess(noteRelative: string): Promise<void> {
return invoke("remove_quick_access", { noteRelative });
export async function removeQuickAccess(vaultPath: string, noteRelative: string): Promise<void> {
return invoke("remove_quick_access", { vaultPath, noteRelative });
}
export async function reorderQuickAccess(paths: string[]): Promise<void> {
@@ -281,12 +431,12 @@ export interface OrphanAttachment {
size: number;
}
export async function findOrphanedAttachments(): Promise<OrphanAttachment[]> {
return invoke("find_orphaned_attachments");
export async function findOrphanedAttachments(vaultPath: string): Promise<OrphanAttachment[]> {
return invoke("find_orphaned_attachments", { vaultPath });
}
export async function trashOrphanedAttachments(names: string[]): Promise<number> {
return invoke("trash_orphaned_attachments", { names });
export async function trashOrphanedAttachments(vaultPath: string, names: string[]): Promise<number> {
return invoke("trash_orphaned_attachments", { vaultPath, names });
}
export async function importObsidian(): Promise<void> {
@@ -297,6 +447,10 @@ export async function openFile(path: string): Promise<void> {
return invoke("open_file", { path });
}
export async function revealFile(path: string): Promise<void> {
return invoke("reveal_file", { path });
}
export async function openUrl(url: string): Promise<void> {
return invoke("open_url", { url });
}
@@ -321,20 +475,20 @@ export async function copyPngToClipboard(data: Uint8Array): Promise<void> {
// ── Backup ──
export async function createBackup(): Promise<void> {
return invoke("create_backup");
export async function createBackup(vaultPath: string): Promise<void> {
return invoke("create_backup", { vaultPath });
}
export async function listBackups(): Promise<BackupEntry[]> {
return invoke("list_backups");
export async function listBackups(vaultPath: string): Promise<BackupEntry[]> {
return invoke("list_backups", { vaultPath });
}
export async function restoreBackup(backupPath: string): Promise<void> {
return invoke("restore_backup", { backupPath });
export async function restoreBackup(vaultPath: string, backupPath: string): Promise<void> {
return invoke("restore_backup", { vaultPath, backupPath });
}
export async function deleteBackup(backupPath: string): Promise<void> {
return invoke("delete_backup", { backupPath });
export async function deleteBackup(vaultPath: string, backupPath: string): Promise<void> {
return invoke("delete_backup", { vaultPath, backupPath });
}
export async function setBackupSettings(
@@ -355,35 +509,38 @@ export async function setBackupSettings(
// ── Tasks ──
export async function getTasks(): Promise<TaskItem[]> {
return invoke("get_tasks");
export async function getTasks(notePath?: string): Promise<TaskItem[]> {
return invoke("get_tasks", { notePath: notePath ?? null });
}
export async function setTaskDone(
vaultPath: string,
notePath: string,
line: number,
rawLine: string,
done: boolean,
): Promise<void> {
return invoke("set_task_done", { notePath, line, rawLine, done });
return invoke("set_task_done", { vaultPath, notePath, line, rawLine, done });
}
export async function setTaskPriority(
vaultPath: string,
notePath: string,
line: number,
rawLine: string,
priority: string | null,
): Promise<void> {
return invoke("set_task_priority", { notePath, line, rawLine, priority });
return invoke("set_task_priority", { vaultPath, notePath, line, rawLine, priority });
}
export async function setTaskDue(
vaultPath: string,
notePath: string,
line: number,
rawLine: string,
due: string | null,
): Promise<void> {
return invoke("set_task_due", { notePath, line, rawLine, due });
return invoke("set_task_due", { vaultPath, notePath, line, rawLine, due });
}
// ── Sync (WebDAV) ──
@@ -410,22 +567,24 @@ export async function syncNow(): Promise<void> {
// ── Version History ──
export async function getNoteVersions(noteId: string): Promise<VersionEntry[]> {
return invoke("get_note_versions", { noteId });
export async function getNoteVersions(vaultPath: string, noteId: string): Promise<VersionEntry[]> {
return invoke("get_note_versions", { vaultPath, noteId });
}
export async function getNoteVersionContent(
vaultPath: string,
noteId: string,
timestamp: string,
): Promise<string> {
return invoke("get_note_version_content", { noteId, timestamp });
return invoke("get_note_version_content", { vaultPath, noteId, timestamp });
}
export async function createVersion(
vaultPath: string,
path: string,
noteId: string,
): Promise<void> {
return invoke("create_version", { path, noteId });
return invoke("create_version", { vaultPath, path, noteId });
}
// ── AI ──
@@ -467,6 +626,10 @@ export async function isMobilePlatform(): Promise<boolean> {
return invoke("is_mobile_platform");
}
export async function getPendingOpenFile(): Promise<string | null> {
export async function getPendingOpenFile(): Promise<PendingOpenFile | null> {
return invoke("get_pending_open_file");
}
export async function ackPendingOpenFile(id: number): Promise<void> {
return invoke("ack_pending_open_file", { id });
}
File diff suppressed because it is too large. Load diff
+50 -9
View File
@@ -1,6 +1,19 @@
<script lang="ts">
import { showCommandPalette, showSearch, theme, sourceMode } from '$lib/stores/app';
import { showCommandPalette, showSearch, theme, sourceMode, viewMode, activeNotebook, activeTag } from '$lib/stores/app';
import { setTheme, reindex } from '$lib/api';
import { darkThemes } from '$lib/platform';
// onNavigate runs the parent's view-change handler (refreshes the note list and reveals it
// if it was hidden), so opening a view here behaves exactly like clicking it in the sidebar.
let { onNavigate = () => {} }: { onNavigate?: () => void } = $props();
function openView(mode: 'all' | 'quickaccess' | 'tasks' | 'daily' | 'trash') {
$viewMode = mode;
$activeNotebook = null;
$activeTag = null;
$showCommandPalette = false;
onNavigate();
}
interface Command {
id: string;
@@ -25,6 +38,31 @@
$showSearch = true;
}
},
{
id: 'open-all-notes',
label: 'Open All Notes',
action: () => openView('all')
},
{
id: 'open-quick-access',
label: 'Open Quick Access',
action: () => openView('quickaccess')
},
{
id: 'open-tasks',
label: 'Open Tasks',
action: () => openView('tasks')
},
{
id: 'open-daily',
label: 'Open Daily Notes',
action: () => openView('daily')
},
{
id: 'open-trash',
label: 'Open Trash (restore deleted notes)',
action: () => openView('trash')
},
{
id: 'theme-light',
label: 'Switch to Light Theme',
@@ -51,7 +89,6 @@
action: () => {
$theme = 'system';
setTheme('system');
applyTheme('system');
$showCommandPalette = false;
}
},
@@ -127,10 +164,15 @@
}
});
function handleEscape(e: KeyboardEvent) {
if (e.key !== 'Escape') return;
e.preventDefault();
e.stopPropagation();
$showCommandPalette = false;
}
function handleKeydown(e: KeyboardEvent) {
if (e.key === 'Escape') {
$showCommandPalette = false;
} else if (e.key === 'ArrowDown') {
if (e.key === 'ArrowDown') {
e.preventDefault();
selectedIndex = Math.min(selectedIndex + 1, filteredCommands.length - 1);
} else if (e.key === 'ArrowUp') {
@@ -142,15 +184,14 @@
}
function applyTheme(t: string) {
const darkThemes = ['dark', 'solarized-dark', 'catppuccin', 'nord', 'tokyo-night', 'github-dark', 'dracula', 'blueberry', 'forest-green', 'gruvbox', 'midnight-tide', 'cherry-blossom', 'synthwave', 'ember', 'moonlit', 'dark-coffee', 'crimson'];
const namedThemes = ['solarized-light', 'solarized-dark', 'catppuccin', 'nord', 'tokyo-night', 'github-light', 'github-dark', 'dracula', 'blueberry', 'forest-green', 'gruvbox', 'midnight-tide', 'cherry-blossom', 'synthwave', 'ember', 'moonlit', 'light-coffee', 'dark-coffee', 'cotton-candy', 'crimson', 'cloud', 'peach'];
const namedThemes = ['solarized-light', 'solarized-dark', 'catppuccin', 'nord', 'tokyo-night', 'github-light', 'github-dark', 'dracula', 'blueberry', 'forest-green', 'gruvbox', 'midnight-tide', 'cherry-blossom', 'synthwave', 'ember', 'moonlit', 'light-coffee', 'dark-coffee', 'cotton-candy', 'crimson', 'cloud', 'peach', 'material-dark', 'material-light', 'monokai', 'rose-pine', 'everforest', 'horizon', 'cyberpunk', 'black', 'one-dark'];
const root = document.documentElement;
root.classList.remove('dark');
root.removeAttribute('data-theme');
if (namedThemes.includes(t)) {
root.setAttribute('data-theme', t);
if (darkThemes.includes(t)) root.classList.add('dark');
} else if (t === 'dark' || (t === 'system' && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
} else if (t === 'dark') {
root.classList.add('dark');
}
}
@@ -158,7 +199,7 @@
{#if $showCommandPalette}
<!-- svelte-ignore a11y_no_static_element_interactions -->
<div class="palette-overlay" onclick={() => ($showCommandPalette = false)} onkeydown={handleKeydown}>
<div class="palette-overlay" onclick={() => ($showCommandPalette = false)} onkeydowncapture={handleEscape} onkeydown={handleKeydown}>
<!-- svelte-ignore a11y_no_static_element_interactions -->
<div class="palette-panel" onclick={(e) => e.stopPropagation()} onkeydown={(e) => e.stopPropagation()}>
<div class="palette-input-wrapper">
File diff suppressed because it is too large. Load diff
+104 -144
View File
@@ -1,32 +1,34 @@
<script lang="ts">
import { onDestroy } from 'svelte';
import { onDestroy, untrack } from 'svelte';
import { getGraphData } from '$lib/api';
import { activeNotePath, appConfig } from '$lib/stores/app';
import { isMobile } from '$lib/platform';
import { applyGraphRepulsion } from '$lib/utils/graph-layout';
import { buildGraphTopology, getGraphNeighborhood } from '$lib/utils/graph-topology';
let { onclose, onnavigate }: {
onclose: () => void;
onnavigate: (path: string, title: string) => void;
} = $props();
const isMobile = /android|iphone|ipad|ipod/i.test(navigator.userAgent);
let canvas = $state<HTMLCanvasElement>(null!);
let loading = $state(true);
let searchQuery = $state('');
let localMode = $state(true); // default: show only active note's neighborhood
const dataPromise = getGraphData();
const dataPromise = getGraphData($appConfig!.active_vault!);
interface GraphNode { id: string; title: string; path: string; x: number; y: number; vx: number; vy: number; }
interface GraphEdge { sourceIdx: number; targetIdx: number; bidirectional: boolean; }
interface LabelRect { x: number; y: number; w: number; h: number; }
let nodes: GraphNode[] = [];
let edges: GraphEdge[] = [];
let nodes = $state.raw<GraphNode[]>([]);
let edges = $state.raw<GraphEdge[]>([]);
let nodeIndexMap: Map<string, number> = new Map();
let connectedSet: Set<number> = new Set();
let nodeDegree: number[] = [];
let searchMatchSet: Set<number> | null = null;
let incidentEdges = $state.raw<number[][]>([]);
let searchMatchSet = $state.raw<Set<number> | null>(null);
let folderColorMap = new Map<string, string>();
let pan = { x: 0, y: 0 };
@@ -40,14 +42,18 @@
let hoveredIdx = -1;
let hoveredNeighborSet: Set<number> = new Set();
let hoveredEdgeSet: Set<number> = new Set();
let glowPhase = 0;
let activeNodeIdx = -1;
let activeNodeIdx = $state(-1);
// Svelte caches this until the active node or graph topology changes.
let localNeighborhood = $derived(getGraphNeighborhood(activeNodeIdx, edges, incidentEdges));
let navigatedFromGraph = false;
// Combined animation loop
// Physics runs in short yielded batches; the completed graph is static.
let physicsRemaining = 0;
let animFrameId = 0;
let lastGlowTs = 0;
let physicsStep: Generator<void> | null = null;
const layoutChannel = new MessageChannel();
let layoutScheduled = false;
let disposed = false;
let drawFrame: number | null = null;
// DPI fix
let dpr = 1;
@@ -114,35 +120,9 @@
function updateHoveredState(node: GraphNode | null) {
hoveredNode = node;
hoveredIdx = node ? nodes.indexOf(node) : -1;
hoveredNeighborSet = new Set();
hoveredEdgeSet = new Set();
if (hoveredIdx < 0) return;
hoveredNeighborSet.add(hoveredIdx);
for (let i = 0; i < edges.length; i++) {
const e = edges[i];
if (e.sourceIdx === hoveredIdx || e.targetIdx === hoveredIdx) {
hoveredEdgeSet.add(i);
hoveredNeighborSet.add(e.sourceIdx);
hoveredNeighborSet.add(e.targetIdx);
}
}
}
// Nodes/edges visible in local mode (active note + direct neighbours)
function computeLocalSets(): { nodeSet: Set<number>; edgeSet: Set<number> } {
const nodeSet = new Set<number>();
const edgeSet = new Set<number>();
if (activeNodeIdx < 0) return { nodeSet, edgeSet };
nodeSet.add(activeNodeIdx);
for (let i = 0; i < edges.length; i++) {
const e = edges[i];
if (e.sourceIdx === activeNodeIdx || e.targetIdx === activeNodeIdx) {
edgeSet.add(i);
nodeSet.add(e.sourceIdx);
nodeSet.add(e.targetIdx);
}
}
return { nodeSet, edgeSet };
const neighborhood = getGraphNeighborhood(hoveredIdx, edges, incidentEdges);
hoveredNeighborSet = neighborhood.nodeSet;
hoveredEdgeSet = neighborhood.edgeSet;
}
function updateSearchMatch() {
@@ -157,6 +137,7 @@
loading = true;
try {
const data = await dataPromise;
if (disposed) return;
const w = canvasW || 800;
const h = canvasH || 600;
@@ -173,15 +154,13 @@
};
});
connectedSet = new Set();
nodeDegree = new Array(nodes.length).fill(0);
edges = data.edges.map(e => {
connectedSet.add(e.source);
connectedSet.add(e.target);
nodeDegree[e.source] = (nodeDegree[e.source] || 0) + 1;
nodeDegree[e.target] = (nodeDegree[e.target] || 0) + 1;
return { sourceIdx: e.source, targetIdx: e.target, bidirectional: e.bidirectional };
});
edges = data.edges.map(e => ({
sourceIdx: e.source, targetIdx: e.target, bidirectional: e.bidirectional,
}));
const topology = buildGraphTopology(nodes.length, edges);
connectedSet = topology.connectedSet;
nodeDegree = topology.nodeDegree;
incidentEdges = topology.incidentEdges;
buildFolderColors();
updateSearchMatch();
@@ -189,21 +168,16 @@
} catch (e) {
console.error('Failed to build graph:', e);
}
loading = false;
startSimulation();
}
function centerOnActiveNote() {
if (!canvas || nodes.length === 0 || activeNodeIdx < 0) return;
const activeNode = nodes[activeNodeIdx];
const neighborhood: GraphNode[] = [activeNode];
for (const edge of edges) {
if (edge.sourceIdx === activeNodeIdx) neighborhood.push(nodes[edge.targetIdx]);
else if (edge.targetIdx === activeNodeIdx) neighborhood.push(nodes[edge.sourceIdx]);
}
const neighborhood = localNeighborhood.nodeSet;
const w = canvasW, h = canvasH, padding = 100;
let minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity;
for (const n of neighborhood) {
for (const i of neighborhood) {
const n = nodes[i];
if (n.x < minX) minX = n.x; if (n.y < minY) minY = n.y;
if (n.x > maxX) maxX = n.x; if (n.y > maxY) maxY = n.y;
}
@@ -229,87 +203,64 @@
function focusActive() {
if (activeNodeIdx >= 0) centerOnActiveNote(); else fitToView();
draw();
requestDraw();
}
function startSimulation() {
// Initial settle - enough for a rough layout, camera set after full physics
for (let i = 0; i < 80; i++) simulate();
// Show the full graph while physics finishes settling
fitToView();
draw();
// Queue remaining physics - camera will snap to active note when done
physicsRemaining = Math.min(400, Math.max(150, nodes.length * 3));
startAnimLoop();
// Keep the original initial layout; omit the animated settling tail.
physicsRemaining = nodes.length > 0 ? 80 : 0;
physicsStep = null;
if (physicsRemaining === 0) {
loading = false;
requestDraw();
} else {
startLayoutLoop();
}
}
function startAnimLoop() {
if (animFrameId) cancelAnimationFrame(animFrameId);
lastGlowTs = 0;
function startLayoutLoop() {
if (disposed || layoutScheduled || physicsRemaining === 0) return;
function loop(ts: number) {
let needsDraw = false;
// Physics batch
if (physicsRemaining > 0) {
const batch = Math.min(20, physicsRemaining);
for (let i = 0; i < batch; i++) simulate();
physicsRemaining -= batch;
// When physics is fully settled, snap camera to active note
if (physicsRemaining === 0) {
if (activeNodeIdx >= 0) centerOnActiveNote(); else fitToView();
function loop() {
layoutScheduled = false;
if (disposed) return;
// Yield between repulsion rows, including within a large physics step.
const deadline = performance.now() + 8;
do {
physicsStep ??= simulate();
if (physicsStep.next().done) {
physicsStep = null;
physicsRemaining--;
}
needsDraw = true;
}
} while (physicsRemaining > 0 && performance.now() < deadline);
// Glow pulse for active node - throttled to ~30fps
if (activeNodeIdx >= 0) {
const elapsed = lastGlowTs > 0 ? Math.min(ts - lastGlowTs, 100) : 16.67;
if (lastGlowTs === 0 || ts - lastGlowTs >= 33) {
glowPhase += 0.04 * (elapsed / 16.67);
lastGlowTs = ts;
needsDraw = true;
}
}
if (needsDraw) draw();
if (physicsRemaining > 0 || activeNodeIdx >= 0) {
animFrameId = requestAnimationFrame(loop);
if (physicsRemaining === 0) {
loading = false;
if (activeNodeIdx >= 0) centerOnActiveNote(); else fitToView();
requestDraw();
} else {
animFrameId = 0;
layoutScheduled = true;
layoutChannel.port2.postMessage(null);
}
}
animFrameId = requestAnimationFrame(loop);
// A queued task yields to input without waiting for a display frame or timer clamp.
layoutChannel.port1.onmessage = loop;
layoutScheduled = true;
layoutChannel.port2.postMessage(null);
}
function simulate() {
const nodeCount = nodes.length;
function* simulate(): Generator<void> {
const graphNodes = nodes;
const nodeCount = graphNodes.length;
if (nodeCount === 0) return;
const w = canvasW || 800, h = canvasH || 600;
const centerX = w / 2, centerY = h / 2;
// Repulsion
for (let i = 0; i < nodeCount; i++) {
const a = nodes[i];
for (let j = i + 1; j < nodeCount; j++) {
const b = nodes[j];
const dx = b.x - a.x, dy = b.y - a.y;
const distSq = dx * dx + dy * dy;
if (distSq > 360000) continue;
const d = distSq || 1;
const force = 1500 / d;
const dist = Math.sqrt(d);
const fx = (dx / dist) * force, fy = (dy / dist) * force;
a.vx -= fx; a.vy -= fy; b.vx += fx; b.vy += fy;
}
}
yield* applyGraphRepulsion(graphNodes);
// Spring attraction along edges
for (const edge of edges) {
const a = nodes[edge.sourceIdx], b = nodes[edge.targetIdx];
const a = graphNodes[edge.sourceIdx], b = graphNodes[edge.targetIdx];
const dx = b.x - a.x, dy = b.y - a.y;
const dist = Math.sqrt(dx * dx + dy * dy) || 1;
const force = (dist - 130) * 0.012;
@@ -319,22 +270,30 @@
// Center gravity - weaker for isolated nodes so they spread instead of clustering
for (let i = 0; i < nodeCount; i++) {
const node = nodes[i];
const node = graphNodes[i];
const gravity = (nodeDegree[i] || 0) === 0 ? 0.0002 : 0.0008;
node.vx += (centerX - node.x) * gravity;
node.vy += (centerY - node.y) * gravity;
}
// Damping + integration
for (const node of nodes) {
for (const node of graphNodes) {
if (node === dragging) continue;
node.vx *= 0.85; node.vy *= 0.85;
node.x += node.vx; node.y += node.vy;
}
}
function requestDraw() {
if (disposed || drawFrame !== null) return;
drawFrame = requestAnimationFrame(() => {
drawFrame = null;
draw();
});
}
function draw() {
if (!canvas) return;
if (disposed || !canvas || loading) return;
const ctx = canvas.getContext('2d');
if (!ctx) return;
@@ -346,12 +305,12 @@
const { border: borderColor, text: textColor, textSec, accent, bg: bgColor } = getStyles();
const activePath = $activeNotePath || '';
const pulse = 0.5 + 0.5 * Math.sin(glowPhase);
const isHovering = hoveredIdx >= 0;
const isSearching = searchMatchSet !== null;
// Local mode: restrict which nodes/edges are visible
const { nodeSet: localNodeSet, edgeSet: localEdgeSet } = localMode ? computeLocalSets() : { nodeSet: null as Set<number> | null, edgeSet: null as Set<number> | null };
const localNodeSet = localMode ? localNeighborhood.nodeSet : null;
const localEdgeSet = localMode ? localNeighborhood.edgeSet : null;
// ── Edges ──────────────────────────────────────────────────────────────
if (isHovering) {
@@ -498,12 +457,11 @@
const radius = getNodeRadius(i, isActive);
// Active glow ring - opacity pulse, no radius change
// Keep the active note highlighted without redrawing an idle graph.
if (isActive) {
const glowR = radius + 12;
const glow = ctx.createRadialGradient(node.x, node.y, radius, node.x, node.y, glowR);
const glowAlpha = Math.round((0.25 + pulse * 0.45) * 255).toString(16).padStart(2, '0');
glow.addColorStop(0, accent + glowAlpha);
glow.addColorStop(0, accent + '80');
glow.addColorStop(1, accent + '00');
ctx.globalAlpha = 1;
ctx.beginPath();
@@ -525,9 +483,9 @@
}
ctx.fill();
// Active outer ring - static, alpha pulse only
// Static active outer ring.
if (isActive) {
ctx.globalAlpha = 0.35 + pulse * 0.3;
ctx.globalAlpha = 0.5;
ctx.beginPath();
ctx.arc(node.x, node.y, radius + 3, 0, Math.PI * 2);
ctx.strokeStyle = accent;
@@ -588,7 +546,7 @@
}
function getNodeAt(clientX: number, clientY: number): GraphNode | null {
if (!canvas) return null;
if (!canvas || loading) return null;
const rect = canvas.getBoundingClientRect();
const x = (clientX - rect.left - pan.x) / zoom;
const y = (clientY - rect.top - pan.y) / zoom;
@@ -618,18 +576,17 @@
dragging.x = (e.clientX - rect.left - pan.x) / zoom;
dragging.y = (e.clientY - rect.top - pan.y) / zoom;
dragging.vx = 0; dragging.vy = 0;
draw();
requestDraw();
} else if (panning) {
pan.x = e.clientX - panStart.x;
pan.y = e.clientY - panStart.y;
draw();
requestDraw();
} else if (!dragging) {
const node = getNodeAt(e.clientX, e.clientY);
if (node !== hoveredNode) {
updateHoveredState(node);
if (canvas) canvas.style.cursor = node ? 'pointer' : 'grab';
// Restart loop if it stopped (for immediate hover redraws)
if (!animFrameId) draw();
if (!layoutScheduled) requestDraw();
}
}
}
@@ -654,7 +611,7 @@
zoom = Math.max(0.2, Math.min(5, zoom * (e.deltaY > 0 ? 0.9 : 1.1)));
pan.x = mx - (mx - pan.x) * (zoom / oldZoom);
pan.y = my - (my - pan.y) * (zoom / oldZoom);
draw();
requestDraw();
}
function handleKeydown(e: KeyboardEvent) {
@@ -693,11 +650,11 @@
dragging.x = (t.clientX - rect.left - pan.x) / zoom;
dragging.y = (t.clientY - rect.top - pan.y) / zoom;
dragging.vx = 0; dragging.vy = 0;
draw();
requestDraw();
} else if (panning) {
pan.x = t.clientX - panStart.x;
pan.y = t.clientY - panStart.y;
draw();
requestDraw();
}
} else if (e.touches.length === 2) {
const dx = e.touches[0].clientX - e.touches[1].clientX;
@@ -712,7 +669,7 @@
zoom = Math.max(0.2, Math.min(5, zoom * (dist / lastTouchDist)));
pan.x = mx - (mx - pan.x) * (zoom / oldZoom);
pan.y = my - (my - pan.y) * (zoom / oldZoom);
draw();
requestDraw();
}
lastTouchDist = dist;
}
@@ -755,20 +712,23 @@
navigatedFromGraph = false;
centerOnActiveNote();
}
if (newIdx >= 0 && !animFrameId && canvas) startAnimLoop();
else if (newIdx < 0 && !animFrameId && canvas) draw(); // remove stale glow immediately
if (!layoutScheduled && canvas) untrack(requestDraw);
});
// React to search query changes
$effect(() => {
const _q = searchQuery; // track
updateSearchMatch();
if (canvas && !animFrameId) draw();
if (activeNodeIdx >= 0 && !animFrameId && canvas) startAnimLoop();
if (canvas && !layoutScheduled) untrack(requestDraw);
});
onDestroy(() => {
if (animFrameId) cancelAnimationFrame(animFrameId);
disposed = true;
if (drawFrame !== null) cancelAnimationFrame(drawFrame);
drawFrame = null;
layoutChannel.port1.onmessage = null;
layoutChannel.port1.close();
layoutChannel.port2.close();
});
</script>
@@ -799,7 +759,7 @@
<div class="graph-stats">
{#if !loading}
{#if localMode && activeNodeIdx >= 0}
{computeLocalSets().nodeSet.size} notes · {computeLocalSets().edgeSet.size} links
{localNeighborhood.nodeSet.size} notes · {localNeighborhood.edgeSet.size} links
{:else}
{nodes.length} notes · {edges.length} links
{/if}
+189
View File
@@ -0,0 +1,189 @@
<script lang="ts">
import { tick } from 'svelte';
import SnapshotDocument from './SnapshotDocument.svelte';
import { comparableBody, compareHistory, splitSnapshot, type HistoryComparison, type HistoryRow } from '$lib/utils/history-comparison';
let { raw, current, selected, loading, error, canRestore, onRetry, onRestore, renderSnapshot }: {
raw: string | null;
current: string;
selected: string | null;
loading: boolean;
error: string | null;
canRestore: boolean;
onRetry: () => void;
onRestore: () => void;
renderSnapshot: (body: string) => string;
} = $props();
let view = $state<'changes' | 'snapshot'>('changes');
let source = $state(false);
let comparison = $state<HistoryComparison | null>(null);
let comparing = $state(false);
let comparisonError = $state<string | null>(null);
let request = 0;
const snapshot = $derived(splitSnapshot(raw ?? ''));
const rendered = $derived.by(() => {
if (view !== 'snapshot' || source || raw === null) return { html: '', error: '' };
try {
return { html: renderSnapshot(snapshot.body), error: '' };
} catch (cause) {
return { html: '', error: `Could not render this snapshot: ${String(cause)}` };
}
});
$effect(() => {
const content = raw;
const working = current;
const body = snapshot.body;
const generation = ++request;
comparison = null;
comparisonError = null;
comparing = content !== null;
if (content !== null) {
compareHistory(comparableBody(working), comparableBody(body)).then((result) => {
if (generation !== request) return;
comparison = result;
}).catch((cause) => {
if (generation === request) comparisonError = `Could not compare this version: ${String(cause)}`;
}).finally(() => {
if (generation === request) comparing = false;
});
}
return () => { request++; };
});
async function navigateTabs(event: KeyboardEvent) {
if (!['ArrowLeft', 'ArrowRight', 'Home', 'End'].includes(event.key)) return;
event.preventDefault();
view = event.key === 'Home' ? 'changes' : event.key === 'End' ? 'snapshot' : view === 'changes' ? 'snapshot' : 'changes';
await tick();
document.getElementById(`history-tab-${view}`)?.focus();
}
</script>
{#snippet lines(rows: HistoryRow[])}
{#each rows as row}
<div class="diff-line {row.kind}">
<span class="line-number" aria-label="Current note line">{row.currentLine ?? ''}</span>
<span class="line-number" aria-label="Snapshot line">{row.snapshotLine ?? ''}</span>
<span class="line-sign" aria-label={row.kind === 'added' ? 'Added by restoring' : row.kind === 'removed' ? 'Removed by restoring' : 'Unchanged'}>{row.kind === 'added' ? '+' : row.kind === 'removed' ? '−' : ' '}</span>
<span class="line-text">{row.text || ' '}{#if !row.newline}<span class="line-ending">No final newline</span>{/if}</span>
</div>
{/each}
{/snippet}
<section class="history-review" aria-label="Version review">
<div class="review-header">
<div class="review-heading">
<strong>{selected ?? 'Version History'}</strong>
<span>Read-only. Your current note stays unchanged.</span>
</div>
<div class="review-tabs" role="tablist" aria-label="Version view" tabindex="-1" onkeydown={navigateTabs}>
<button id="history-tab-changes" role="tab" aria-selected={view === 'changes'} aria-controls="history-changes" tabindex={view === 'changes' ? 0 : -1} onclick={() => view = 'changes'}>Changes</button>
<button id="history-tab-snapshot" role="tab" aria-selected={view === 'snapshot'} aria-controls="history-snapshot" tabindex={view === 'snapshot' ? 0 : -1} onclick={() => view = 'snapshot'}>Snapshot</button>
</div>
</div>
{#if loading}
<p class="review-status" role="status">Loading version…</p>
{:else if error}
<div class="review-status" role="alert"><p>{error}</p><button class="review-button" onclick={onRetry}>Retry</button></div>
{:else if raw === null}
<p class="review-status">Select a version to review.</p>
{:else if view === 'changes'}
<div id="history-changes" class="review-panel" role="tabpanel" aria-labelledby="history-tab-changes" tabindex="0">
<div class="comparison-heading">
<span>Current note → selected version</span>
{#if comparison}<span class="comparison-count"><span class="added-count">+{comparison.added}</span> <span class="removed-count">−{comparison.removed}</span> lines</span>{/if}
</div>
{#if comparing}
<p class="review-status" role="status">Comparing…</p>
{:else if comparisonError}
<p class="review-status" role="alert">{comparisonError}</p>
{:else if comparison && comparison.added === 0 && comparison.removed === 0}
<p class="review-status">No content changes. Metadata is not restored.</p>
{:else if comparison}
<div class="history-diff">
{#key raw}
{#each comparison.chunks as chunk}
{#if chunk.kind === 'unchanged'}
<details class="unchanged-lines"><summary>{chunk.rows.length} unchanged {chunk.rows.length === 1 ? 'line' : 'lines'}</summary>{@render lines(chunk.rows)}</details>
{:else}
{@render lines(chunk.rows)}
{/if}
{/each}
{/key}
</div>
{/if}
</div>
{:else}
<div id="history-snapshot" class="review-panel" role="tabpanel" aria-labelledby="history-tab-snapshot" tabindex="0">
<div class="snapshot-heading"><span>Selected snapshot</span><button class="source-toggle" aria-pressed={source} onclick={() => source = !source}>{source ? 'Rendered view' : 'View source'}</button></div>
{#if snapshot.body === ''}
<p class="review-status">This snapshot is empty.</p>
{:else if source}
<textarea class="snapshot-source" readonly aria-label="Snapshot Markdown, read-only" value={snapshot.body}></textarea>
{:else if rendered.error}
<p class="review-status" role="alert">{rendered.error} View source to inspect the stored body.</p>
{:else}
<SnapshotDocument html={rendered.html} />
{/if}
</div>
{/if}
{#if raw !== null && snapshot.metadata}
<details class="history-metadata"><summary>Metadata (not restored)</summary><pre>{snapshot.metadata}</pre></details>
{/if}
{#if selected}
<div class="review-actions"><span>Restore replaces the current note’s content only.</span><button class="history-restore-btn" disabled={!canRestore} onclick={onRestore}>Restore this version</button></div>
{/if}
</section>
<style>
.history-review { display: flex; flex-direction: column; flex: 1; min-width: 0; min-height: 0; background: var(--bg-primary); }
.review-header { display: flex; align-items: center; justify-content: space-between; gap: 12px; padding: 12px 16px; border-bottom: 1px solid var(--border-light); flex-shrink: 0; flex-wrap: wrap; }
.review-heading { display: flex; flex-direction: column; gap: 4px; min-width: 0; }
.review-heading strong { font-size: 13px; overflow-wrap: anywhere; }
.review-heading > span { font-size: 12px; color: var(--text-secondary); }
.review-tabs { display: flex; gap: 2px; padding: 2px; border: 1px solid var(--border-color); border-radius: 6px; }
.review-tabs button, .source-toggle, .review-button { padding: 6px 10px; border: none; border-radius: 4px; background: transparent; color: var(--text-secondary); font-size: 12px; cursor: pointer; }
.review-tabs button[aria-selected="true"] { background: var(--accent-light); color: var(--accent); }
.review-tabs button:focus-visible, .source-toggle:focus-visible, .review-button:focus-visible, summary:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
.review-panel { flex: 1; min-height: 0; overflow: auto; outline-offset: -2px; }
.review-panel:focus-visible { outline: 2px solid var(--accent); }
.comparison-heading, .snapshot-heading { display: flex; justify-content: space-between; align-items: center; gap: 12px; padding: 10px 16px; font-size: 12px; color: var(--text-secondary); border-bottom: 1px solid var(--border-light); flex-wrap: wrap; }
.comparison-count { font-family: var(--font-mono, monospace); }
.added-count { color: var(--success); } .removed-count { color: var(--danger, #dc2626); }
.review-status { margin: 0; padding: 20px 16px; color: var(--text-secondary); font-size: 13px; line-height: 1.6; overflow-wrap: anywhere; }
.review-button { margin-top: 8px; border: 1px solid var(--border-color); background: var(--bg-secondary); color: var(--text-primary); }
.history-diff { padding: 8px 0; font-family: var(--font-mono, monospace); font-size: 12px; line-height: 1.6; }
.diff-line { display: grid; grid-template-columns: 3.5em 3.5em 1.6em minmax(0, 1fr); align-items: start; padding: 1px 12px 1px 4px; }
.diff-line.added { background: color-mix(in srgb, var(--success) 12%, var(--bg-primary)); }
.diff-line.removed { background: color-mix(in srgb, var(--danger, #dc2626) 12%, var(--bg-primary)); }
.line-number { padding-right: 8px; text-align: right; color: var(--text-tertiary); user-select: none; font-size: 10px; }
.line-sign { color: var(--text-secondary); user-select: none; }
.added .line-sign { color: var(--success); } .removed .line-sign { color: var(--danger, #dc2626); }
.line-text { white-space: pre-wrap; overflow-wrap: anywhere; }
.line-ending { display: block; color: var(--text-secondary); font-style: italic; font-size: 10px; }
.unchanged-lines > summary { padding: 7px 16px; color: var(--text-secondary); background: var(--bg-secondary); cursor: pointer; font-family: var(--font-sans, inherit); font-size: 12px; }
.snapshot-source { display: block; width: 100%; min-height: 100%; margin: 0; padding: 16px; resize: none; border: none; background: var(--bg-primary); color: var(--text-primary); font-family: var(--font-mono, monospace); font-size: 13px; line-height: 1.6; }
.snapshot-source:focus-visible { outline: 2px solid var(--accent); outline-offset: -2px; }
.history-metadata { flex-shrink: 0; border-top: 1px solid var(--border-light); font-size: 12px; color: var(--text-secondary); max-height: 30%; overflow: auto; }
.history-metadata > summary { cursor: pointer; padding: 8px 16px; }
.history-metadata pre { margin: 0; padding: 0 16px 12px; font-family: var(--font-mono, monospace); font-size: 11px; white-space: pre-wrap; overflow-wrap: anywhere; }
.review-actions { display: flex; align-items: center; justify-content: space-between; gap: 12px; padding: 10px 16px; padding-bottom: calc(10px + env(safe-area-inset-bottom, 0px)); border-top: 1px solid var(--border-light); background: var(--bg-secondary); flex-shrink: 0; flex-wrap: wrap; }
.review-actions > span { font-size: 11px; color: var(--text-secondary); }
.history-restore-btn { padding: 8px 14px; border: 1px solid var(--accent); border-radius: 6px; color: var(--accent); background: var(--accent-light); font-size: 12px; font-weight: 500; cursor: pointer; }
.history-restore-btn:hover:not(:disabled) { background: var(--accent); color: var(--bg-primary); }
.history-restore-btn:disabled { opacity: 0.45; cursor: not-allowed; }
.history-restore-btn:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
@media (max-width: 600px) {
.review-header { padding: 10px 12px; }
.review-tabs { width: 100%; }
.review-tabs button { flex: 1; min-height: 44px; }
.source-toggle, .review-button, .history-restore-btn { min-height: 44px; }
.diff-line { grid-template-columns: 2.8em 2.8em 1.4em minmax(0, 1fr); padding-right: 8px; }
.review-actions { padding: 10px 12px; padding-bottom: calc(10px + env(safe-area-inset-bottom, 0px)); }
.review-actions > span, .history-restore-btn { width: 100%; }
}
</style>
+386
View File
@@ -0,0 +1,386 @@
<script lang="ts">
import { onMount } from 'svelte';
let { src, alt = '', onclose }: {
src: string;
alt?: string;
onclose: () => void;
} = $props();
const MIN_SCALE = 1;
const MAX_SCALE = 5;
const DOUBLE_TAP_MS = 300;
const TAP_MOVE_THRESHOLD = 6;
type Point = { x: number; y: number };
type ViewerGesture =
| { kind: 'pan'; start: Point; pan: Point }
| { kind: 'pinch'; distance: number; imagePoint: Point };
let canvasElement = $state<HTMLDivElement | null>(null);
let imageElement = $state<HTMLImageElement | null>(null);
let closeButton = $state<HTMLButtonElement | null>(null);
let scale = $state(1);
let panX = $state(0);
let panY = $state(0);
let interacting = $state(false);
let gesture: ViewerGesture | null = null;
let touchMoved = false;
let lastTapAt = 0;
let zoomPercent = $derived(Math.round(scale * 100));
function clamp(value: number, min: number, max: number): number {
return Math.min(max, Math.max(min, value));
}
function midpoint(first: Touch, second: Touch): Point {
return {
x: (first.clientX + second.clientX) / 2,
y: (first.clientY + second.clientY) / 2,
};
}
function touchDistance(first: Touch, second: Touch): number {
return Math.hypot(second.clientX - first.clientX, second.clientY - first.clientY);
}
function panLimits(nextScale: number): Point {
const canvasWidth = canvasElement?.clientWidth ?? window.innerWidth;
const canvasHeight = canvasElement?.clientHeight ?? window.innerHeight;
const imageWidth = imageElement?.clientWidth ?? 0;
const imageHeight = imageElement?.clientHeight ?? 0;
return {
x: Math.max(0, (imageWidth * nextScale - canvasWidth) / 2),
y: Math.max(0, (imageHeight * nextScale - canvasHeight) / 2),
};
}
function applyTransform(nextScale: number, nextPanX: number, nextPanY: number) {
const clampedScale = clamp(nextScale, MIN_SCALE, MAX_SCALE);
const limits = panLimits(clampedScale);
scale = clampedScale;
panX = clamp(nextPanX, -limits.x, limits.x);
panY = clamp(nextPanY, -limits.y, limits.y);
}
function resetViewer() {
interacting = false;
gesture = null;
applyTransform(MIN_SCALE, 0, 0);
}
function zoomAt(point: Point, nextScale: number) {
const canvasRect = canvasElement?.getBoundingClientRect();
const centerX = canvasRect ? canvasRect.left + canvasRect.width / 2 : window.innerWidth / 2;
const centerY = canvasRect ? canvasRect.top + canvasRect.height / 2 : window.innerHeight / 2;
const imageX = (point.x - centerX - panX) / scale;
const imageY = (point.y - centerY - panY) / scale;
applyTransform(
nextScale,
point.x - centerX - imageX * nextScale,
point.y - centerY - imageY * nextScale,
);
}
function beginPan(touch: Touch) {
gesture = {
kind: 'pan',
start: { x: touch.clientX, y: touch.clientY },
pan: { x: panX, y: panY },
};
}
function beginPinch(first: Touch, second: Touch) {
const point = midpoint(first, second);
const canvasRect = canvasElement?.getBoundingClientRect();
const centerX = canvasRect ? canvasRect.left + canvasRect.width / 2 : window.innerWidth / 2;
const centerY = canvasRect ? canvasRect.top + canvasRect.height / 2 : window.innerHeight / 2;
gesture = {
kind: 'pinch',
distance: Math.max(1, touchDistance(first, second)),
imagePoint: {
x: (point.x - centerX - panX) / scale,
y: (point.y - centerY - panY) / scale,
},
};
}
function handleTouchStart(event: TouchEvent) {
event.preventDefault();
interacting = true;
if (event.touches.length >= 2) {
touchMoved = true;
beginPinch(event.touches[0], event.touches[1]);
return;
}
if (event.touches.length === 1) {
touchMoved = false;
beginPan(event.touches[0]);
}
}
function handleTouchMove(event: TouchEvent) {
event.preventDefault();
if (event.touches.length >= 2) {
if (gesture?.kind !== 'pinch') beginPinch(event.touches[0], event.touches[1]);
if (gesture?.kind !== 'pinch') return;
const point = midpoint(event.touches[0], event.touches[1]);
const canvasRect = canvasElement?.getBoundingClientRect();
const centerX = canvasRect ? canvasRect.left + canvasRect.width / 2 : window.innerWidth / 2;
const centerY = canvasRect ? canvasRect.top + canvasRect.height / 2 : window.innerHeight / 2;
const nextScale = clamp(
scale * (touchDistance(event.touches[0], event.touches[1]) / gesture.distance),
MIN_SCALE,
MAX_SCALE,
);
gesture.distance = Math.max(1, touchDistance(event.touches[0], event.touches[1]));
applyTransform(
nextScale,
point.x - centerX - gesture.imagePoint.x * nextScale,
point.y - centerY - gesture.imagePoint.y * nextScale,
);
touchMoved = true;
return;
}
if (event.touches.length === 1 && gesture?.kind === 'pan') {
const dx = event.touches[0].clientX - gesture.start.x;
const dy = event.touches[0].clientY - gesture.start.y;
if (Math.hypot(dx, dy) > TAP_MOVE_THRESHOLD) touchMoved = true;
applyTransform(scale, gesture.pan.x + dx, gesture.pan.y + dy);
}
}
function handleTouchEnd(event: TouchEvent) {
event.preventDefault();
if (event.touches.length >= 2) {
beginPinch(event.touches[0], event.touches[1]);
return;
}
if (event.touches.length === 1) {
beginPan(event.touches[0]);
touchMoved = true;
return;
}
interacting = false;
gesture = null;
if (!touchMoved && event.changedTouches.length > 0) {
const now = performance.now();
const touch = event.changedTouches[0];
if (now - lastTapAt <= DOUBLE_TAP_MS) {
if (scale > MIN_SCALE + 0.01) resetViewer();
else zoomAt({ x: touch.clientX, y: touch.clientY }, 2);
lastTapAt = 0;
} else {
lastTapAt = now;
}
}
}
function handleTouchCancel(event: TouchEvent) {
event.preventDefault();
interacting = false;
gesture = null;
touchMoved = false;
applyTransform(scale, panX, panY);
}
function attachTouchGestures(node: HTMLElement) {
node.addEventListener('touchstart', handleTouchStart, { passive: false });
node.addEventListener('touchmove', handleTouchMove, { passive: false });
node.addEventListener('touchend', handleTouchEnd, { passive: false });
node.addEventListener('touchcancel', handleTouchCancel, { passive: false });
return {
destroy() {
node.removeEventListener('touchstart', handleTouchStart);
node.removeEventListener('touchmove', handleTouchMove);
node.removeEventListener('touchend', handleTouchEnd);
node.removeEventListener('touchcancel', handleTouchCancel);
},
};
}
onMount(() => {
closeButton?.focus();
const handleResize = () => applyTransform(scale, panX, panY);
window.addEventListener('resize', handleResize);
return () => window.removeEventListener('resize', handleResize);
});
</script>
<div
class="image-viewer"
role="dialog"
aria-modal="true"
aria-label={alt ? `Image viewer: ${alt}` : 'Image viewer'}
tabindex="-1"
onkeydown={(event) => {
if (event.key === 'Escape') {
event.preventDefault();
onclose();
}
}}
>
<!-- svelte-ignore a11y_no_static_element_interactions -->
<div
class="image-viewer-canvas"
bind:this={canvasElement}
use:attachTouchGestures
onclick={(event) => {
if (event.target === event.currentTarget) onclose();
}}
onkeydown={(event) => {
if (event.target === event.currentTarget && (event.key === 'Enter' || event.key === ' ')) onclose();
}}
>
<img
bind:this={imageElement}
class:interacting
crossorigin="anonymous"
src={src}
alt={alt}
draggable="false"
style:transform={`translate3d(${panX}px, ${panY}px, 0) scale(${scale})`}
onload={resetViewer}
/>
</div>
<div class="image-viewer-controls">
<button
type="button"
class="image-viewer-reset"
onclick={resetViewer}
disabled={scale === MIN_SCALE && panX === 0 && panY === 0}
aria-label={`Reset zoom, currently ${zoomPercent}%`}
>
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
<path d="M3 12a9 9 0 1 0 3-6.7" />
<path d="M3 4v6h6" />
</svg>
<span>{zoomPercent}%</span>
</button>
<button bind:this={closeButton} type="button" class="image-viewer-close" onclick={onclose} aria-label="Close image viewer">
<svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" aria-hidden="true">
<path d="M18 6 6 18M6 6l12 12" />
</svg>
</button>
</div>
<div class="image-viewer-hint" aria-hidden="true">Pinch to zoom · drag to move · double-tap to zoom or reset</div>
<span class="sr-only" aria-live="polite">Zoom {zoomPercent}%</span>
</div>
<style>
.image-viewer {
position: fixed;
inset: 0;
z-index: 10000;
background: #06080c;
color: #fff;
overflow: hidden;
overscroll-behavior: contain;
}
.image-viewer-canvas {
position: absolute;
inset: 0;
display: flex;
align-items: center;
justify-content: center;
touch-action: none;
user-select: none;
-webkit-user-select: none;
}
.image-viewer-canvas img {
display: block;
max-width: calc(100vw - 24px);
max-height: calc(100dvh - 24px);
object-fit: contain;
transform-origin: center center;
transition: transform 160ms ease-out;
will-change: transform;
-webkit-user-drag: none;
user-select: none;
}
.image-viewer-canvas img.interacting {
transition: none;
}
.image-viewer-controls {
position: absolute;
inset: max(12px, env(safe-area-inset-top)) max(12px, env(safe-area-inset-right)) auto max(12px, env(safe-area-inset-left));
display: flex;
align-items: center;
justify-content: space-between;
pointer-events: none;
}
.image-viewer-controls button {
min-height: 44px;
border: 1px solid rgba(255, 255, 255, 0.18);
background: rgba(20, 23, 30, 0.86);
color: #fff;
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.3);
pointer-events: auto;
}
.image-viewer-reset {
display: flex;
align-items: center;
gap: 8px;
padding: 0 14px;
border-radius: 10px;
font: inherit;
font-size: 13px;
font-weight: 600;
}
.image-viewer-reset:disabled {
opacity: 0.45;
}
.image-viewer-close {
display: grid;
place-items: center;
width: 44px;
padding: 0;
border-radius: 50%;
}
.image-viewer-hint {
position: absolute;
left: 50%;
bottom: max(18px, calc(env(safe-area-inset-bottom) + 10px));
transform: translateX(-50%);
width: max-content;
max-width: calc(100vw - 32px);
padding: 8px 12px;
border-radius: 8px;
background: rgba(20, 23, 30, 0.82);
color: rgba(255, 255, 255, 0.72);
font-size: 12px;
line-height: 1.35;
text-align: center;
pointer-events: none;
}
.sr-only {
position: absolute;
width: 1px;
height: 1px;
padding: 0;
margin: -1px;
overflow: hidden;
clip: rect(0, 0, 0, 0);
white-space: nowrap;
border: 0;
}
@media (prefers-reduced-motion: reduce) {
.image-viewer-canvas img {
transition: none;
}
}
</style>
Loaded 100 of 210 files, more files were not shown because too many files have changed in this diff. Show more