mirror of
https://gitlab.com/ArkHost/HelixNotes.git
synced 2026-11-18 10:28:20 +01:00
feat: add localization, daily templates and safer multimodal AI
Prepare unreleased 1.3.8 features while retaining version 1.3.7. Add nine interface languages, themed selectors and a community translation workflow. Add vault-scoped daily-note templates with sync and backup support. Add provider model discovery, opt-in image input and validated streaming completion with sanitized errors. Validation: 419 frontend tests, 311 Rust tests, Svelte/TypeScript checks, formatting, Clippy, production frontend build and Android ARM64 Rust compile check. Real-provider and rebuilt native-app verification remain pending.
This commit is contained in:
1 parent
0007726f02
commit
622cb1f397
81 files changed
+15984
-1469
No files matched your search
@@ -0,0 +1,33 @@
|
||||
## Language
|
||||
|
||||
- English name:
|
||||
- Native name (as it should appear in the language selector):
|
||||
- Language/region code (for example `de`, `fr`, `pt-BR`):
|
||||
- Text direction: left-to-right / right-to-left
|
||||
|
||||
## Translation file
|
||||
|
||||
Attach the translated `.json` file here, or a ZIP containing it. Start with the complete English catalog, not the short example.
|
||||
|
||||
[Translation guide](https://gitlab.com/ArkHost/HelixNotes/-/blob/main/docs/translations/README.md) · [English catalog](https://gitlab.com/ArkHost/HelixNotes/-/blob/main/src/lib/i18n/locales/en.json)
|
||||
|
||||
- English catalog version or Git commit used:
|
||||
- Complete translation or partial? Which sections remain in English?
|
||||
|
||||
## Checks
|
||||
|
||||
- [ ] Message keys and argument names such as `{value0}` and `{count}` are unchanged.
|
||||
- [ ] Plural messages keep an `other` branch and include the forms this language needs.
|
||||
- [ ] The file is valid UTF-8 JSON, without comments or trailing commas.
|
||||
- [ ] Untranslated values are left in English rather than removed.
|
||||
- [ ] I wrote this translation or have permission to contribute it.
|
||||
|
||||
No build or merge request is required. The maintainer will validate and integrate the translation.
|
||||
|
||||
## Notes
|
||||
|
||||
Terminology questions, regional differences, screenshots or clipped labels, if any:
|
||||
|
||||
## Credit (optional)
|
||||
|
||||
Name or handle to credit, or leave blank:
|
||||
@@ -164,10 +164,13 @@ All releases: [gitlab.com/ArkHost/HelixNotes/-/releases](https://gitlab.com/ArkH
|
||||
- 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)
|
||||
- [Provider model discovery and opt-in image input](docs/ai-models-and-images.md) (1.3.8, unreleased)
|
||||
- **Optional WebDAV sync** to your own server (Nextcloud, ownCloud, a NAS): manual or automatic, with keep-both conflict copies
|
||||
- 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 built-in palettes), accent colors, fonts including bundled Ubuntu and Ubuntu Mono, 80-200% interface scale
|
||||
- [Daily-note templates](docs/daily-note-templates.md), with per-vault Markdown import/editing and date/title placeholders, applied only to new notes
|
||||
- Interface languages: English, Russian, Dutch, German, Spanish, French, Italian, Portuguese (Portugal) and Portuguese (Brazil), with live switching
|
||||
- Local plain-text files, no company cloud
|
||||
|
||||
### Version history
|
||||
@@ -192,6 +195,12 @@ With **Close to tray** enabled and a tray icon available, closing the main windo
|
||||
|
||||
Full documentation: [helixnotes.com/docs](https://helixnotes.com/docs.html)
|
||||
|
||||
## Contributing translations
|
||||
|
||||
Want HelixNotes in your language? Copy the [English JSON catalog](src/lib/i18n/locales/en.json), translate its values, and attach the file to a GitLab issue using the **Translation** template. No build or programming experience is required.
|
||||
|
||||
See the [translation guide and example file](docs/translations/README.md) for placeholders, plural forms and submission instructions.
|
||||
|
||||
## Tech Stack
|
||||
|
||||
- **Frontend**: SvelteKit (Svelte 5) + TailwindCSS v4 + TipTap v3
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
# AI models and image input
|
||||
|
||||
These changes are planned for 1.3.8 and are not in the published 1.3.7 packages.
|
||||
|
||||
## Choose a model
|
||||
|
||||
In Settings → AI, select OpenAI or Anthropic and enter an API key. HelixNotes fetches the provider's model catalog after a short pause. **Refresh models** fetches it again.
|
||||
|
||||
Catalog requests send the key to that provider's fixed HTTPS models endpoint. They do not send notes or generate a paid completion. Anthropic pagination is handled automatically. Catalog responses have size, count and timeout limits; redirects are not followed. Keys and provider error bodies are not included in catalog error messages.
|
||||
|
||||
Fetching a catalog never changes the selected model. Choose an entry or enter its ID in **Model ID (manual fallback)**. A saved ID remains available even if it is absent from the catalog or discovery fails. Model choices are remembered separately for each provider. Turning AI off retains saved keys and choices but disables AI requests.
|
||||
|
||||
OpenAI's catalog does not consistently describe chat or vision support. HelixNotes filters out recognizably non-chat model families, but a listed model can still be unavailable to your account or incompatible with the chat endpoint. Manual IDs remain available for models the filter misses. There are no automatic model substitutions or paid retries.
|
||||
|
||||
Ollama and OpenAI-compatible servers keep their manual model-ID and base-URL settings. Requests go to that URL, which is not necessarily on this device. Use the final server URL; AI requests do not follow redirects. **Test connection** is a separate, explicit request that generates a short reply and may incur provider charges.
|
||||
|
||||
## Include images
|
||||
|
||||
Open AI Actions in a note, with or without a text selection. **Images from this note** lists eligible local PNG, JPEG and WebP file references, including managed attachments. All checkboxes start unchecked each time the menu opens.
|
||||
|
||||
1. Check up to four images. The list covers the current note, even when only some text is selected.
|
||||
2. Review the disclosure showing the destination, model and number of images.
|
||||
3. Choose an AI action, **Describe selected images**, or a custom prompt.
|
||||
|
||||
Only checked files are included. An image elsewhere in the note is not sent unless you check it. Selecting checkboxes alone does not start an AI request. Remote URLs, data-URI images, PDFs, GIFs and other unsupported files are not offered as image inputs. The AI backend never fetches image URLs.
|
||||
|
||||
The chosen model and server must accept image input. OpenAI, Anthropic, and compatible vision models on Ollama/OpenAI-compatible servers receive actual image content blocks, not just Markdown links. Unsupported requests fail visibly; HelixNotes does not silently retry them without images.
|
||||
|
||||
### File and request limits
|
||||
|
||||
- Images must resolve inside the note's configured vault. Private hidden paths outside `.helixnotes/attachments` are rejected.
|
||||
- Each source file is limited to 10 MiB and 20 megapixels. Reads, decoder allocation and encoded output are bounded.
|
||||
- Images are oriented, reduced to at most 1,568 pixels on either side, and re-encoded in memory as PNG or JPEG. Small images are not enlarged. Encoded files are limited to 4 MiB each.
|
||||
- Only a still-image rendition is sent, not an animation sequence. This is not PDF, audio or video analysis.
|
||||
- Re-encoding omits source-file metadata. Source files, filenames and note references are not rewritten. Small text or fine detail can become less readable after resizing.
|
||||
- Prompt text and the custom prompt together are limited to 2 MiB. Images can increase token usage and cost.
|
||||
|
||||
Image requests check the provider, model and configured server against the settings shown in the requesting window. If those settings have changed, the request is rejected rather than sent to an unexpected destination.
|
||||
|
||||
## Review before applying
|
||||
|
||||
Rich-editor selections retain their Markdown structure, including image-only selections. Source-mode requests send the selected text, or the whole note when the selection is empty.
|
||||
|
||||
Images, reference definitions and PDF embeds use protected placeholders. An AI response that removes or duplicates a placeholder cannot be applied. A result also cannot be applied after switching or editing the originating note. Applying to an existing note requires a successful save and history snapshot first.
|
||||
|
||||
Only successfully completed text responses can be applied. OpenAI-compatible streams must report `finish_reason: "stop"` followed by `[DONE]`. Anthropic streams must report `end_turn` or `stop_sequence` followed by `message_stop`. Missing completion events, malformed payloads, output limits, refusals and tool requests block application, even if partial text is visible. Compatible servers must follow that completion contract; HelixNotes does not treat a dropped connection as success.
|
||||
|
||||
Streaming errors use fixed application messages rather than provider error bodies. Connection errors omit server URLs, which may contain credentials or query secrets.
|
||||
|
||||
Requests and attachment selection do not themselves edit notes or create history versions. Review the generated text before applying it. Closing the menu stops displaying the response; it does not promise cancellation of a request already sent to the provider.
|
||||
|
||||
## Verification and release checks
|
||||
|
||||
Automated tests cover provider payload shapes, catalog parsing/pagination, key-safe errors, bounded image preparation, vault/private-file checks, resizing, unchanged source bytes, media restoration, and Unicode split across streaming chunks. Loopback HTTP tests also exercise the production stream receiver for successful completion, malformed events, unsuccessful finish reasons, missing terminators, disconnections, output bounds and sanitized provider errors. Browser tests use a mocked native boundary for model settings and both editor modes.
|
||||
|
||||
No paid provider inference calls were used for these checks. Before release, test with real provider accounts, supported vision models, rebuilt desktop/mobile apps and representative screenshots. Browser mocks do not prove provider acceptance, native webview behavior or model accuracy.
|
||||
@@ -0,0 +1,65 @@
|
||||
# Daily-note templates
|
||||
|
||||
Open **Settings → General → Daily note template** in the vault you want to configure.
|
||||
|
||||
- **Create template** opens a Markdown editor. Save to enable it.
|
||||
- **Import Markdown file…** imports a copy of a UTF-8 `.md` file. The source file is not changed. Later edits to the source are not imported automatically.
|
||||
- **Edit** changes the saved copy. Saving enables the template.
|
||||
- **Disable template** stops applying it without deleting its contents. **Enable template** uses that saved body again.
|
||||
- **Reload from disk** reads changes made in another window, by sync or in an external editor. Cancel editing first; copy any unsaved draft you want to keep before cancelling.
|
||||
|
||||
## Example
|
||||
|
||||
```markdown
|
||||
# {{title}}
|
||||
|
||||
Date: {{date}}
|
||||
|
||||
## Priorities
|
||||
- [ ]
|
||||
|
||||
## Notes
|
||||
|
||||
## End-of-day review
|
||||
```
|
||||
|
||||
Only two placeholders are supported:
|
||||
|
||||
| Placeholder | Value |
|
||||
| --- | --- |
|
||||
| `{{date}}` | The selected calendar date as `YYYY-MM-DD`. This can be a past or future date, not necessarily today. |
|
||||
| `{{title}}` | The daily-note title using the format selected in Settings. |
|
||||
|
||||
Placeholders are case-sensitive. Unknown placeholders remain literal text. There are no scripts or executable expressions.
|
||||
|
||||
The body layout is preserved, including headings, blank lines and Markdown hard breaks. No extra title heading is inserted. Links and attachment paths are copied as written; importing a template does not import its attachments or rewrite its links.
|
||||
|
||||
## What stays unchanged
|
||||
|
||||
The template applies only when creating a daily note. Opening an existing daily note never replaces or appends to its contents, even if the template has since changed or cannot be read.
|
||||
|
||||
Imported frontmatter is not copied. Each new daily note receives its own ID, timestamps, configured title and `daily` tag. Changing the interface language does not translate or rewrite the saved template or its draft.
|
||||
|
||||
The template must fit within 256 KiB, including its stored metadata. Invalid UTF-8, oversized files and disk errors are reported instead of silently creating a partial note. Concurrent creation of the same day publishes one complete note without overwriting an existing file.
|
||||
|
||||
## Storage, sync and backups
|
||||
|
||||
The saved template belongs to the vault, not the device-wide application settings:
|
||||
|
||||
```text
|
||||
.helixnotes/daily-template.md
|
||||
```
|
||||
|
||||
It is excluded from normal note lists, search and Tasks. Its checklist items appear in Tasks only after they have been copied into an actual daily note.
|
||||
|
||||
Disabling retains the body in the same file, with this frontmatter flag:
|
||||
|
||||
```yaml
|
||||
helixnotes_daily_template_enabled: false
|
||||
```
|
||||
|
||||
The file is included in the next WebDAV sync. Conflicting copies retain their original template text and are kept under `.helixnotes`; they are not automatically chosen as the active template.
|
||||
|
||||
New backups include the saved template even when attachments are excluded. Restoring a new backup restores its template state too, including whether it was disabled or absent. Older backups that do not record template state leave the current template alone.
|
||||
|
||||
Saving checks that the file still matches the version loaded by Settings. If it changed elsewhere, the save is rejected and your draft remains in the editor. Reload the latest copy before deciding what to save.
|
||||
@@ -0,0 +1,68 @@
|
||||
# Translate HelixNotes
|
||||
|
||||
You can contribute a translation without building the app or writing code. Translate a JSON file and attach it to a [GitLab issue](https://gitlab.com/ArkHost/HelixNotes/-/issues/new).
|
||||
|
||||
## Files to use
|
||||
|
||||
- **Full template:** [`en.json`](../../src/lib/i18n/locales/en.json). Copy this file to start a translation. Use GitLab's **Open raw** or download button to save the JSON, not the surrounding web page.
|
||||
- **Short example:** [`example.json`](example.json). This shows the format, but is not a complete language file.
|
||||
- **Existing translation:** [`ru.json`](../../src/lib/i18n/locales/ru.json), including Russian plural forms.
|
||||
|
||||
The English file is the reference. Download the latest version before you start, and note the app version or Git commit you used. You can also improve an existing translation. See [`languages.json`](../../src/lib/i18n/languages.json) for the supported language codes and native names.
|
||||
|
||||
Portuguese has separate [`pt-PT.json`](../../src/lib/i18n/locales/pt-PT.json) and [`pt-BR.json`](../../src/lib/i18n/locales/pt-BR.json) catalogs. Keep regional wording such as *ficheiro/arquivo*, *guardar/salvar* and *palavra-passe/senha* appropriate to each variant.
|
||||
|
||||
## Translate the values
|
||||
|
||||
Name your copy after the language code, for example `de.json` for German or `pt-BR.json` for Brazilian Portuguese. Save it as UTF-8.
|
||||
|
||||
Keep the keys on the left unchanged. Translate the text on the right:
|
||||
|
||||
```json
|
||||
{
|
||||
"ui.save": "Speichern",
|
||||
"ui.cancel": "Abbrechen",
|
||||
"ui.create_note": "Notiz „{value0}“ erstellen",
|
||||
"count.notes": "{count, plural, one {# Notiz} other {# Notizen}}"
|
||||
}
|
||||
```
|
||||
|
||||
Keep argument names such as `{value0}`, `{title}`, `{error}` and `{count}` unchanged. You can move them within the sentence. The app replaces them with actual values.
|
||||
|
||||
For plural messages, translate every branch and keep `other`. Add any plural categories your language needs: `zero`, `one`, `two`, `few`, `many`, `other`. Russian, for example:
|
||||
|
||||
```json
|
||||
{
|
||||
"count.notes": "{count, plural, one {# заметка} few {# заметки} many {# заметок} other {# заметки}}"
|
||||
}
|
||||
```
|
||||
|
||||
`#` inserts the count. Do not replace it with a fixed number.
|
||||
|
||||
### Keep these unchanged
|
||||
|
||||
- Message keys and argument names.
|
||||
- Shortcut codes such as `Ctrl`, `Shift`, `Enter` and `Alt`.
|
||||
- Product names, URLs, file extensions and literal Markdown syntax where they identify an actual format or command.
|
||||
- JSON punctuation. Use double quotes; escape a double quote inside a value as `\"`. JSON does not support comments or trailing commas.
|
||||
|
||||
Use consistent terminology for notes, notebooks, vaults, tags and backups. Prefer clear wording over a literal translation. Do not add HTML to messages. ICU uses apostrophes for quoting; a literal apostrophe can be escaped as `''` when needed.
|
||||
|
||||
An incomplete translation is welcome. Leave untranslated values in English instead of deleting their keys, and say which sections remain unfinished.
|
||||
|
||||
## Submit through a GitLab issue
|
||||
|
||||
1. Open a new issue and select the **Translation** description template.
|
||||
2. Use a title such as `Translation: German (de)`.
|
||||
3. Give the English language name, native name and language/region code.
|
||||
4. Attach your translated JSON file. If GitLab refuses the extension, attach a ZIP containing it.
|
||||
5. State which English catalog version you used, whether the translation is complete, and any wording or layout concerns.
|
||||
6. Say how you would like to be credited, if at all.
|
||||
|
||||
You do not need to make a merge request or edit the app's language selector. The maintainer reviews the file, runs catalog checks, registers the language and includes it in a future release. Attaching a file to an issue does not immediately install it in the app.
|
||||
|
||||
If you can test a development build, screenshots of clipped labels are useful. If you cannot, submit the file anyway. Right-to-left languages also need layout testing before release.
|
||||
|
||||
## Maintainer checks
|
||||
|
||||
See the [implementation guide](../../src/lib/i18n/README.md) for registering a language and running validation. Check catalog keys, ICU syntax, argument names, plural forms, native labels and layout before shipping. Do not modify user notes as part of language integration.
|
||||
@@ -0,0 +1,10 @@
|
||||
{
|
||||
"language.title": "Language",
|
||||
"language.description": "Choose the interface language. Your notes are not translated.",
|
||||
"language.system": "System default",
|
||||
"ui.save": "Save",
|
||||
"ui.cancel": "Cancel",
|
||||
"ui.settings": "Settings",
|
||||
"ui.create_note": "Create note \"{value0}\"",
|
||||
"count.notes": "{count, plural, one {# note} other {# notes}}"
|
||||
}
|
||||
@@ -72,6 +72,7 @@
|
||||
"diff": "^9.0.0",
|
||||
"dompurify": "^3.4.13",
|
||||
"highlight.js": "^11.11.1",
|
||||
"intl-messageformat": "^11.2.15",
|
||||
"katex": "^0.16.28",
|
||||
"lowlight": "^3.3.0",
|
||||
"markdown-it": "^14.3.0",
|
||||
|
||||
Generated
+28
@@ -119,6 +119,9 @@ importers:
|
||||
highlight.js:
|
||||
specifier: ^11.11.1
|
||||
version: 11.11.1
|
||||
intl-messageformat:
|
||||
specifier: ^11.2.15
|
||||
version: 11.2.15
|
||||
katex:
|
||||
specifier: ^0.16.28
|
||||
version: 0.16.28
|
||||
@@ -385,6 +388,15 @@ packages:
|
||||
cpu: [x64]
|
||||
os: [win32]
|
||||
|
||||
'@formatjs/fast-memoize@3.1.7':
|
||||
resolution: {integrity: sha512-zXfhLpvA6T7+efdt9JLbBwZ00tT7NsBMDVnDu8rpHeNNv8KfRZAMo2gkG0k9lK/Nzc//3kJ9pImsfuJxk3KhUA==}
|
||||
|
||||
'@formatjs/icu-messageformat-parser@3.5.18':
|
||||
resolution: {integrity: sha512-wX1efcL8d7K5QapOTRsP/OLTA/kpwe4LwqWyNxDNg5iRs8i9jJbCyxB5P8jc4KOW5oiLzz2DJr+BRY5xMV9+bA==}
|
||||
|
||||
'@formatjs/icu-skeleton-parser@2.1.11':
|
||||
resolution: {integrity: sha512-j8cUmOJzVgkHuS0QiQ6ga76UIoLOFSAMWhs7aZJztH3aAdCOAE6vpC8KVvFB4cU10ON0y2/5oOVmPJ43s2lTwA==}
|
||||
|
||||
'@iconify/types@2.0.0':
|
||||
resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==}
|
||||
|
||||
@@ -1455,6 +1467,9 @@ packages:
|
||||
resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==}
|
||||
engines: {node: '>=12'}
|
||||
|
||||
intl-messageformat@11.2.15:
|
||||
resolution: {integrity: sha512-W4VNytsXyWgW5lvVchmsb9xgA5rSKqoflu3/IQ9UCtB0z4R+Bx9MoEkwFT/+30RCl/KzUoH0QGGe9lppF5SuvQ==}
|
||||
|
||||
is-reference@3.0.3:
|
||||
resolution: {integrity: sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==}
|
||||
|
||||
@@ -2026,6 +2041,14 @@ snapshots:
|
||||
'@esbuild/win32-x64@0.28.2':
|
||||
optional: true
|
||||
|
||||
'@formatjs/fast-memoize@3.1.7': {}
|
||||
|
||||
'@formatjs/icu-messageformat-parser@3.5.18':
|
||||
dependencies:
|
||||
'@formatjs/icu-skeleton-parser': 2.1.11
|
||||
|
||||
'@formatjs/icu-skeleton-parser@2.1.11': {}
|
||||
|
||||
'@iconify/types@2.0.0': {}
|
||||
|
||||
'@iconify/utils@3.1.4':
|
||||
@@ -3031,6 +3054,11 @@ snapshots:
|
||||
|
||||
internmap@2.0.3: {}
|
||||
|
||||
intl-messageformat@11.2.15:
|
||||
dependencies:
|
||||
'@formatjs/fast-memoize': 3.1.7
|
||||
'@formatjs/icu-messageformat-parser': 3.5.18
|
||||
|
||||
is-reference@3.0.3:
|
||||
dependencies:
|
||||
'@types/estree': 1.0.9
|
||||
|
||||
Generated
+1
@@ -1780,6 +1780,7 @@ version = "1.3.7"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"arboard",
|
||||
"base64 0.22.1",
|
||||
"chrono",
|
||||
"dirs",
|
||||
"fs4",
|
||||
|
||||
@@ -51,12 +51,14 @@ rayon = "1"
|
||||
quick-xml = "0.41"
|
||||
urlencoding = "2"
|
||||
sha2 = "0.10"
|
||||
base64 = "0.22"
|
||||
image = { version = "0.25", default-features = false, features = ["png", "jpeg", "webp", "gif"] }
|
||||
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]
|
||||
[target.'cfg(unix)'.dependencies]
|
||||
libc = "0.2"
|
||||
|
||||
[target.'cfg(target_os = "ios")'.dependencies]
|
||||
@@ -68,4 +70,3 @@ tauri-plugin-single-instance = "2"
|
||||
tauri-plugin-window-state = "2"
|
||||
arboard = { version = "3", features = ["image-data", "wayland-data-control"] }
|
||||
png = "0.17"
|
||||
image = { version = "0.25", default-features = false, features = ["png", "jpeg", "webp", "gif"] }
|
||||
+158
-212
@@ -3,11 +3,72 @@ use serde_json::json;
|
||||
use tauri::{AppHandle, Emitter};
|
||||
|
||||
use crate::types::AiStreamEvent;
|
||||
pub mod images;
|
||||
pub mod models;
|
||||
use images::AiImage;
|
||||
mod sse;
|
||||
mod stream;
|
||||
|
||||
async fn receive_stream(
|
||||
app: &AppHandle,
|
||||
response: reqwest::Response,
|
||||
request_id: &str,
|
||||
protocol: stream::Protocol,
|
||||
) -> Result<(), String> {
|
||||
stream::receive(response, protocol, |text| {
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "text".into(),
|
||||
text: Some(text),
|
||||
error: None,
|
||||
},
|
||||
);
|
||||
})
|
||||
.await?;
|
||||
// This is the only success event; errors are emitted once by ai_request.
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "done".into(),
|
||||
text: None,
|
||||
error: None,
|
||||
},
|
||||
);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
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";
|
||||
|
||||
fn request_client() -> Result<Client, String> {
|
||||
Client::builder()
|
||||
.redirect(reqwest::redirect::Policy::none())
|
||||
.connect_timeout(std::time::Duration::from_secs(10))
|
||||
.timeout(std::time::Duration::from_secs(180))
|
||||
.build()
|
||||
.map_err(|_| "Could not initialize AI connection".into())
|
||||
}
|
||||
|
||||
fn connection_error(_: reqwest::Error) -> String {
|
||||
// reqwest errors may contain configured URLs, including credentials or query secrets.
|
||||
"AI connection failed. Check the connection and configured server.".into()
|
||||
}
|
||||
|
||||
fn http_error(status: reqwest::StatusCode) -> String {
|
||||
let hint = match status.as_u16() {
|
||||
401 | 403 => "Check the API key and account permissions.",
|
||||
429 => "Check rate limits and account quota.",
|
||||
400 | 404 => "Check the model ID and its support for this request, including images.",
|
||||
_ => "The provider or configured server could not complete the request.",
|
||||
};
|
||||
// Error bodies can echo credentials or image data. Do not broadcast them.
|
||||
format!("AI API returned HTTP {}. {hint}", status.as_u16())
|
||||
}
|
||||
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn ai_request(
|
||||
app: AppHandle,
|
||||
@@ -18,6 +79,7 @@ pub fn ai_request(
|
||||
user_message: String,
|
||||
request_id: String,
|
||||
base_url: Option<String>,
|
||||
images: Vec<AiImage>,
|
||||
) {
|
||||
std::thread::spawn(move || {
|
||||
let rt = tokio::runtime::Runtime::new().unwrap();
|
||||
@@ -38,6 +100,7 @@ pub fn ai_request(
|
||||
&system_prompt,
|
||||
&user_message,
|
||||
&request_id,
|
||||
&images,
|
||||
)
|
||||
.await
|
||||
}
|
||||
@@ -52,6 +115,7 @@ pub fn ai_request(
|
||||
&system_prompt,
|
||||
&user_message,
|
||||
&request_id,
|
||||
&images,
|
||||
)
|
||||
.await
|
||||
}
|
||||
@@ -69,6 +133,7 @@ pub fn ai_request(
|
||||
&system_prompt,
|
||||
&user_message,
|
||||
&request_id,
|
||||
&images,
|
||||
)
|
||||
.await
|
||||
}
|
||||
@@ -81,6 +146,7 @@ pub fn ai_request(
|
||||
&system_prompt,
|
||||
&user_message,
|
||||
&request_id,
|
||||
&images,
|
||||
)
|
||||
.await
|
||||
}
|
||||
@@ -118,7 +184,14 @@ fn openai_request_body(
|
||||
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 family = model.strip_prefix("ft:").unwrap_or(model);
|
||||
let reasoning = family
|
||||
.strip_prefix("gpt-")
|
||||
.and_then(|s| s.split(['.', '-']).next()?.parse::<u32>().ok())
|
||||
.is_some_and(|version| version >= 5)
|
||||
|| family
|
||||
.strip_prefix('o')
|
||||
.is_some_and(|s| s.starts_with(|c: char| c.is_ascii_digit()));
|
||||
let token_key = if reasoning {
|
||||
"max_completion_tokens"
|
||||
} else {
|
||||
@@ -137,6 +210,22 @@ fn openai_request_body(
|
||||
body
|
||||
}
|
||||
|
||||
fn user_content(provider: &str, text: &str, images: &[AiImage]) -> serde_json::Value {
|
||||
if images.is_empty() {
|
||||
return json!(text);
|
||||
}
|
||||
let mut blocks = vec![json!({"type":"text","text":text})];
|
||||
for image in images {
|
||||
if provider == "anthropic" {
|
||||
blocks.push(json!({"type":"image","source":{"type":"base64","media_type":image.media_type,"data":image.data}}));
|
||||
} else {
|
||||
blocks.push(json!({"type":"image_url","image_url":{"url":format!("data:{};base64,{}",image.media_type,image.data)}}));
|
||||
}
|
||||
}
|
||||
json!(blocks)
|
||||
}
|
||||
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
async fn stream_anthropic(
|
||||
app: &AppHandle,
|
||||
api_key: &str,
|
||||
@@ -144,8 +233,9 @@ async fn stream_anthropic(
|
||||
system_prompt: &str,
|
||||
user_message: &str,
|
||||
request_id: &str,
|
||||
images: &[AiImage],
|
||||
) -> Result<(), String> {
|
||||
let client = Client::new();
|
||||
let client = request_client()?;
|
||||
|
||||
let body = json!({
|
||||
"model": model,
|
||||
@@ -155,7 +245,7 @@ async fn stream_anthropic(
|
||||
"messages": [
|
||||
{
|
||||
"role": "user",
|
||||
"content": user_message
|
||||
"content": user_content("anthropic", user_message, images)
|
||||
}
|
||||
]
|
||||
});
|
||||
@@ -168,108 +258,16 @@ async fn stream_anthropic(
|
||||
.json(&body)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| format!("Request failed: {}", e))?;
|
||||
.map_err(connection_error)?;
|
||||
|
||||
if !response.status().is_success() {
|
||||
let status = response.status();
|
||||
let body_text = response.text().await.unwrap_or_default();
|
||||
return Err(format!("API error {}: {}", status, body_text));
|
||||
return Err(http_error(response.status()));
|
||||
}
|
||||
|
||||
// Parse SSE stream
|
||||
use futures::StreamExt;
|
||||
let mut stream = response.bytes_stream();
|
||||
let mut buffer = String::new();
|
||||
|
||||
while let Some(chunk) = stream.next().await {
|
||||
let chunk = chunk.map_err(|e| format!("Stream error: {}", e))?;
|
||||
buffer.push_str(&String::from_utf8_lossy(&chunk));
|
||||
|
||||
// Process complete SSE events from buffer
|
||||
while let Some(event_end) = buffer.find("\n\n") {
|
||||
let event_str = buffer[..event_end].to_string();
|
||||
buffer = buffer[event_end + 2..].to_string();
|
||||
|
||||
for line in event_str.lines() {
|
||||
if let Some(data) = line.strip_prefix("data: ") {
|
||||
if data == "[DONE]" {
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "done".to_string(),
|
||||
text: None,
|
||||
error: None,
|
||||
},
|
||||
);
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if let Ok(parsed) = serde_json::from_str::<serde_json::Value>(data) {
|
||||
let event_type = parsed["type"].as_str().unwrap_or("");
|
||||
|
||||
match event_type {
|
||||
"content_block_delta" => {
|
||||
if let Some(text) = parsed["delta"]["text"].as_str() {
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "text".to_string(),
|
||||
text: Some(text.to_string()),
|
||||
error: None,
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
"message_stop" => {
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "done".to_string(),
|
||||
text: None,
|
||||
error: None,
|
||||
},
|
||||
);
|
||||
return Ok(());
|
||||
}
|
||||
"error" => {
|
||||
let msg = parsed["error"]["message"]
|
||||
.as_str()
|
||||
.unwrap_or("Unknown API error");
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "error".to_string(),
|
||||
text: None,
|
||||
error: Some(msg.to_string()),
|
||||
},
|
||||
);
|
||||
return Err(msg.to_string());
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "done".to_string(),
|
||||
text: None,
|
||||
error: None,
|
||||
},
|
||||
);
|
||||
|
||||
Ok(())
|
||||
receive_stream(app, response, request_id, stream::Protocol::Anthropic).await
|
||||
}
|
||||
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
async fn stream_openai(
|
||||
app: &AppHandle,
|
||||
url: &str,
|
||||
@@ -278,10 +276,12 @@ async fn stream_openai(
|
||||
system_prompt: &str,
|
||||
user_message: &str,
|
||||
request_id: &str,
|
||||
images: &[AiImage],
|
||||
) -> Result<(), String> {
|
||||
let client = Client::new();
|
||||
let client = request_client()?;
|
||||
|
||||
let body = openai_request_body(model, Some(system_prompt), user_message, true, 4096);
|
||||
let mut body = openai_request_body(model, Some(system_prompt), user_message, true, 4096);
|
||||
body["messages"][1]["content"] = user_content("openai", user_message, images);
|
||||
|
||||
let mut req = client.post(url).header("content-type", "application/json");
|
||||
|
||||
@@ -289,107 +289,13 @@ async fn stream_openai(
|
||||
req = req.header("Authorization", format!("Bearer {}", key));
|
||||
}
|
||||
|
||||
let response = req
|
||||
.json(&body)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| format!("Request failed: {}", e))?;
|
||||
let response = req.json(&body).send().await.map_err(connection_error)?;
|
||||
|
||||
if !response.status().is_success() {
|
||||
let status = response.status();
|
||||
let body_text = response.text().await.unwrap_or_default();
|
||||
return Err(format!("API error {}: {}", status, body_text));
|
||||
return Err(http_error(response.status()));
|
||||
}
|
||||
|
||||
use futures::StreamExt;
|
||||
let mut stream = response.bytes_stream();
|
||||
let mut buffer = String::new();
|
||||
|
||||
while let Some(chunk) = stream.next().await {
|
||||
let chunk = chunk.map_err(|e| format!("Stream error: {}", e))?;
|
||||
buffer.push_str(&String::from_utf8_lossy(&chunk));
|
||||
|
||||
while let Some(event_end) = buffer.find("\n\n") {
|
||||
let event_str = buffer[..event_end].to_string();
|
||||
buffer = buffer[event_end + 2..].to_string();
|
||||
|
||||
for line in event_str.lines() {
|
||||
if let Some(data) = line.strip_prefix("data: ") {
|
||||
if data == "[DONE]" {
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "done".to_string(),
|
||||
text: None,
|
||||
error: None,
|
||||
},
|
||||
);
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if let Ok(parsed) = serde_json::from_str::<serde_json::Value>(data) {
|
||||
// OpenAI streaming: choices[0].delta.content
|
||||
if let Some(content) = parsed["choices"][0]["delta"]["content"].as_str() {
|
||||
if !content.is_empty() {
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "text".to_string(),
|
||||
text: Some(content.to_string()),
|
||||
error: None,
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// Check finish_reason
|
||||
if let Some(reason) = parsed["choices"][0]["finish_reason"].as_str() {
|
||||
if reason == "stop" || reason == "length" {
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "done".to_string(),
|
||||
text: None,
|
||||
error: None,
|
||||
},
|
||||
);
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
|
||||
// Check for error in stream
|
||||
if let Some(err) = parsed["error"]["message"].as_str() {
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "error".to_string(),
|
||||
text: None,
|
||||
error: Some(err.to_string()),
|
||||
},
|
||||
);
|
||||
return Err(err.to_string());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let _ = app.emit(
|
||||
"ai-stream",
|
||||
AiStreamEvent {
|
||||
request_id: request_id.to_owned(),
|
||||
event_type: "done".to_string(),
|
||||
text: None,
|
||||
error: None,
|
||||
},
|
||||
);
|
||||
|
||||
Ok(())
|
||||
receive_stream(app, response, request_id, stream::Protocol::OpenAi).await
|
||||
}
|
||||
|
||||
pub async fn test_connection(
|
||||
@@ -423,7 +329,7 @@ pub async fn test_connection(
|
||||
}
|
||||
|
||||
async fn test_anthropic(api_key: &str, model: &str) -> Result<String, String> {
|
||||
let client = Client::new();
|
||||
let client = request_client()?;
|
||||
|
||||
let body = json!({
|
||||
"model": model,
|
||||
@@ -444,19 +350,17 @@ async fn test_anthropic(api_key: &str, model: &str) -> Result<String, String> {
|
||||
.json(&body)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| format!("Connection failed: {}", e))?;
|
||||
.map_err(connection_error)?;
|
||||
|
||||
if response.status().is_success() {
|
||||
Ok("Connection successful".to_string())
|
||||
} else {
|
||||
let status = response.status();
|
||||
let body_text = response.text().await.unwrap_or_default();
|
||||
Err(format!("API error {}: {}", status, body_text))
|
||||
Err(http_error(response.status()))
|
||||
}
|
||||
}
|
||||
|
||||
async fn test_openai(url: &str, api_key: Option<&str>, model: &str) -> Result<String, String> {
|
||||
let client = Client::new();
|
||||
let client = request_client()?;
|
||||
let body = openai_request_body(model, None, "Hi", false, 20);
|
||||
|
||||
let mut req = client.post(url).header("content-type", "application/json");
|
||||
@@ -465,18 +369,12 @@ async fn test_openai(url: &str, api_key: Option<&str>, model: &str) -> Result<St
|
||||
req = req.header("Authorization", format!("Bearer {}", key));
|
||||
}
|
||||
|
||||
let response = req
|
||||
.json(&body)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| format!("Connection failed: {}", e))?;
|
||||
let response = req.json(&body).send().await.map_err(connection_error)?;
|
||||
|
||||
if response.status().is_success() {
|
||||
Ok("Connection successful".to_string())
|
||||
} else {
|
||||
let status = response.status();
|
||||
let body_text = response.text().await.unwrap_or_default();
|
||||
Err(format!("API error {}: {}", status, body_text))
|
||||
Err(http_error(response.status()))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -484,6 +382,54 @@ async fn test_openai(url: &str, api_key: Option<&str>, model: &str) -> Result<St
|
||||
mod request_tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn vision_blocks_are_provider_specific_and_text_only_stays_a_string() {
|
||||
assert_eq!(user_content("openai", "Text only", &[]), json!("Text only"));
|
||||
let images = vec![AiImage {
|
||||
media_type: "image/png",
|
||||
data: "PIXELS".into(),
|
||||
}];
|
||||
let openai = user_content("openai", "Describe", &images);
|
||||
assert_eq!(
|
||||
openai[1]["image_url"]["url"],
|
||||
"data:image/png;base64,PIXELS"
|
||||
);
|
||||
let anthropic = user_content("anthropic", "Describe", &images);
|
||||
assert_eq!(anthropic[1]["source"]["type"], "base64");
|
||||
assert_eq!(anthropic[1]["source"]["media_type"], "image/png");
|
||||
assert_eq!(anthropic[1]["source"]["data"], "PIXELS");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn connection_and_http_errors_never_include_urls_or_provider_payloads() {
|
||||
let url =
|
||||
reqwest::Url::parse("https://user:private-password@example.invalid/?key=private-key")
|
||||
.unwrap();
|
||||
let error = Client::new()
|
||||
.get("not a URL")
|
||||
.build()
|
||||
.unwrap_err()
|
||||
.with_url(url);
|
||||
assert!(error.to_string().contains("private-key"));
|
||||
let safe = connection_error(error);
|
||||
assert!(!safe.contains("private"));
|
||||
assert!(!safe.contains("example.invalid"));
|
||||
for code in [400, 401, 403, 404, 429, 500] {
|
||||
let safe = http_error(reqwest::StatusCode::from_u16(code).unwrap());
|
||||
assert!(safe.contains(&code.to_string()));
|
||||
assert!(safe.len() < 256);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn future_gpt_and_reasoning_ids_use_modern_output_limits() {
|
||||
for model in ["gpt-99-next", "o3", "o12-mini"] {
|
||||
let body = openai_request_body(model, None, "Hi", true, 4096);
|
||||
assert!(body.get("max_completion_tokens").is_some());
|
||||
assert!(body.get("temperature").is_none());
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn gpt6_streaming_requests_use_supported_parameters() {
|
||||
let body = openai_request_body(
|
||||
|
||||
@@ -0,0 +1,327 @@
|
||||
//! Explicitly selected local images. No URL fetching, data-URI passthrough or metadata uploads.
|
||||
use base64::{engine::general_purpose::STANDARD, Engine};
|
||||
use image::{ImageDecoder, ImageFormat, ImageReader};
|
||||
use std::{
|
||||
fs,
|
||||
io::{Cursor, Read},
|
||||
path::{Component, Path},
|
||||
};
|
||||
|
||||
pub const MAX_IMAGES: usize = 4;
|
||||
const MAX_INPUT: u64 = 10 * 1024 * 1024;
|
||||
const MAX_OUTPUT: usize = 4 * 1024 * 1024;
|
||||
const MAX_PIXELS: u64 = 20_000_000;
|
||||
const MAX_SIDE: u32 = 1568;
|
||||
|
||||
pub struct AiImage {
|
||||
pub media_type: &'static str,
|
||||
pub data: String,
|
||||
}
|
||||
|
||||
fn check_lexical_scope(root: &Path, configured: &Path, requested: &Path) -> Result<(), String> {
|
||||
if !requested.is_absolute() {
|
||||
return Err("AI context paths must be absolute local paths".into());
|
||||
}
|
||||
#[cfg(windows)]
|
||||
let (root, configured, requested) = (
|
||||
std::path::PathBuf::from(root.to_string_lossy().to_lowercase()),
|
||||
std::path::PathBuf::from(configured.to_string_lossy().to_lowercase()),
|
||||
std::path::PathBuf::from(requested.to_string_lossy().to_lowercase()),
|
||||
);
|
||||
#[cfg(windows)]
|
||||
let (root, configured, requested) = (root.as_path(), configured.as_path(), requested.as_path());
|
||||
let relative = requested
|
||||
.strip_prefix(root)
|
||||
.or_else(|_| requested.strip_prefix(configured))
|
||||
.map_err(|_| "AI context paths must stay inside the configured vault")?;
|
||||
if relative
|
||||
.components()
|
||||
.any(|part| matches!(part, Component::ParentDir))
|
||||
{
|
||||
return Err("AI context paths must not traverse outside their approved scope".into());
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn allowed_target(
|
||||
vault: &Path,
|
||||
configured: &Path,
|
||||
requested: &Path,
|
||||
) -> Result<std::path::PathBuf, String> {
|
||||
// Reject other roots (including UNC shares) before filesystem resolution.
|
||||
check_lexical_scope(vault, configured, requested)?;
|
||||
let target = fs::canonicalize(requested).map_err(|_| "AI image could not be resolved")?;
|
||||
let relative = target
|
||||
.strip_prefix(vault)
|
||||
.map_err(|_| "AI images must stay inside the note's configured vault")?;
|
||||
if relative.starts_with(".helixnotes/attachments") {
|
||||
for folder in [
|
||||
vault.join(".helixnotes"),
|
||||
vault.join(".helixnotes/attachments"),
|
||||
] {
|
||||
if !fs::symlink_metadata(folder).is_ok_and(|meta| meta.file_type().is_dir()) {
|
||||
return Err("AI attachments must not use linked metadata directories".into());
|
||||
}
|
||||
}
|
||||
} else if relative.components().any(|part| match part {
|
||||
Component::Normal(name) => name.to_string_lossy().starts_with('.'),
|
||||
_ => true,
|
||||
}) {
|
||||
return Err("Private vault metadata cannot be sent to AI".into());
|
||||
}
|
||||
if !target.is_file() {
|
||||
return Err("AI image must be a regular file".into());
|
||||
}
|
||||
Ok(target)
|
||||
}
|
||||
|
||||
fn encode(bytes: &[u8]) -> Result<AiImage, String> {
|
||||
let format =
|
||||
image::guess_format(bytes).map_err(|_| "AI attachment is not a supported image")?;
|
||||
if !matches!(
|
||||
format,
|
||||
ImageFormat::Png | ImageFormat::Jpeg | ImageFormat::WebP
|
||||
) {
|
||||
return Err("AI images must be PNG, JPEG or WebP".into());
|
||||
}
|
||||
let mut limits = image::Limits::default();
|
||||
limits.max_alloc = Some(96 * 1024 * 1024);
|
||||
let mut header = ImageReader::with_format(Cursor::new(bytes), format);
|
||||
header.limits(limits.clone());
|
||||
let (width, height) = header
|
||||
.into_dimensions()
|
||||
.map_err(|_| "Could not read AI image dimensions within the memory limit")?;
|
||||
if width == 0 || height == 0 || u64::from(width) * u64::from(height) > MAX_PIXELS {
|
||||
return Err("AI image exceeds the 20 megapixel limit".into());
|
||||
}
|
||||
let mut reader = ImageReader::with_format(Cursor::new(bytes), format);
|
||||
reader.limits(limits);
|
||||
let mut decoder = reader
|
||||
.into_decoder()
|
||||
.map_err(|_| "Could not decode AI image within the memory limit")?;
|
||||
let orientation = decoder
|
||||
.orientation()
|
||||
.map_err(|_| "Could not read AI image orientation")?;
|
||||
let mut decoded = image::DynamicImage::from_decoder(decoder)
|
||||
.map_err(|_| "Could not decode AI image within the memory limit")?;
|
||||
decoded.apply_orientation(orientation);
|
||||
let resized = if width > MAX_SIDE || height > MAX_SIDE {
|
||||
decoded.thumbnail(MAX_SIDE, MAX_SIDE)
|
||||
} else {
|
||||
decoded
|
||||
};
|
||||
let mut encoded = Cursor::new(Vec::new());
|
||||
resized
|
||||
.write_to(&mut encoded, ImageFormat::Png)
|
||||
.map_err(|_| "Could not encode AI image")?;
|
||||
let mut data = encoded.into_inner();
|
||||
let mut media_type = "image/png";
|
||||
if data.len() > MAX_OUTPUT {
|
||||
data.clear();
|
||||
image::codecs::jpeg::JpegEncoder::new_with_quality(&mut data, 85)
|
||||
.encode_image(&image::DynamicImage::ImageRgb8(resized.to_rgb8()))
|
||||
.map_err(|_| "Could not encode AI image")?;
|
||||
media_type = "image/jpeg";
|
||||
}
|
||||
if data.len() > MAX_OUTPUT {
|
||||
return Err("AI image exceeds the encoded size limit".into());
|
||||
}
|
||||
Ok(AiImage {
|
||||
media_type,
|
||||
data: STANDARD.encode(data),
|
||||
})
|
||||
}
|
||||
|
||||
pub fn prepare(vault: &str, note: &str, paths: &[String]) -> Result<Vec<AiImage>, String> {
|
||||
if paths.len() > MAX_IMAGES {
|
||||
return Err("Select at most four AI images".into());
|
||||
}
|
||||
let root = fs::canonicalize(vault).map_err(|_| "Invalid AI note vault")?;
|
||||
check_lexical_scope(&root, Path::new(vault), Path::new(note))?;
|
||||
let note = fs::canonicalize(note).map_err(|_| "Save the note before including AI images")?;
|
||||
if !note.starts_with(&root)
|
||||
|| note.starts_with(root.join(".helixnotes"))
|
||||
|| !note.is_file()
|
||||
|| note.extension().and_then(|s| s.to_str()) != Some("md")
|
||||
{
|
||||
return Err("AI image context must be a note in the configured vault".into());
|
||||
}
|
||||
let mut seen = std::collections::HashSet::new();
|
||||
let mut result = Vec::new();
|
||||
for requested in paths {
|
||||
let target = allowed_target(&root, Path::new(vault), Path::new(requested))?;
|
||||
if !seen.insert(target.clone()) {
|
||||
continue;
|
||||
}
|
||||
let mut options = fs::OpenOptions::new();
|
||||
options.read(true);
|
||||
#[cfg(unix)]
|
||||
{
|
||||
use std::os::unix::fs::OpenOptionsExt;
|
||||
options.custom_flags(libc::O_NOFOLLOW);
|
||||
}
|
||||
let file = options
|
||||
.open(target)
|
||||
.map_err(|_| "Could not open AI image")?;
|
||||
if !file
|
||||
.metadata()
|
||||
.is_ok_and(|meta| meta.is_file() && meta.len() <= MAX_INPUT)
|
||||
{
|
||||
return Err("AI image exceeds the 10 MiB source limit or is not a file".into());
|
||||
}
|
||||
let mut bytes = Vec::new();
|
||||
file.take(MAX_INPUT + 1)
|
||||
.read_to_end(&mut bytes)
|
||||
.map_err(|_| "Could not read AI image")?;
|
||||
if bytes.len() as u64 > MAX_INPUT {
|
||||
return Err("AI image exceeds the 10 MiB source limit".into());
|
||||
}
|
||||
result.push(encode(&bytes)?);
|
||||
}
|
||||
Ok(result)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
fn fixture() -> (tempfile::TempDir, String, String) {
|
||||
let root = tempfile::tempdir().unwrap();
|
||||
let note = root.path().join("Note.md");
|
||||
fs::write(¬e, "Note").unwrap();
|
||||
let image = root.path().join("screen.png");
|
||||
image::RgbaImage::from_pixel(32, 16, image::Rgba([10, 20, 30, 255]))
|
||||
.save(&image)
|
||||
.unwrap();
|
||||
(
|
||||
root,
|
||||
note.to_string_lossy().into_owned(),
|
||||
image.to_string_lossy().into_owned(),
|
||||
)
|
||||
}
|
||||
#[test]
|
||||
fn prepares_pixels_not_file_paths_and_deduplicates_images() {
|
||||
let (root, note, path) = fixture();
|
||||
let result = prepare(root.path().to_str().unwrap(), ¬e, &[path.clone(), path]).unwrap();
|
||||
assert_eq!(result.len(), 1);
|
||||
assert_eq!(result[0].media_type, "image/png");
|
||||
let bytes = STANDARD.decode(&result[0].data).unwrap();
|
||||
let decoded = image::load_from_memory(&bytes).unwrap();
|
||||
assert_eq!((decoded.width(), decoded.height()), (32, 16));
|
||||
}
|
||||
#[test]
|
||||
fn rejects_external_files_urls_data_uris_and_private_metadata() {
|
||||
let (root, note, path) = fixture();
|
||||
let outside = tempfile::tempdir().unwrap();
|
||||
let outside_file = outside.path().join("screen.png");
|
||||
fs::copy(&path, &outside_file).unwrap();
|
||||
let hidden = root.path().join(".helixnotes/private.png");
|
||||
fs::create_dir_all(hidden.parent().unwrap()).unwrap();
|
||||
fs::copy(&path, &hidden).unwrap();
|
||||
for p in [
|
||||
outside_file.to_string_lossy().into_owned(),
|
||||
hidden.to_string_lossy().into_owned(),
|
||||
"https://example.com/a.png".into(),
|
||||
"data:image/png;base64,abcd".into(),
|
||||
] {
|
||||
assert!(prepare(root.path().to_str().unwrap(), ¬e, &[p]).is_err());
|
||||
}
|
||||
}
|
||||
#[test]
|
||||
fn allows_managed_attachments_but_rejects_missing_context_and_excess_images() {
|
||||
let (root, note, path) = fixture();
|
||||
let managed = root.path().join(".helixnotes/attachments/screen.png");
|
||||
fs::create_dir_all(managed.parent().unwrap()).unwrap();
|
||||
fs::copy(&path, &managed).unwrap();
|
||||
assert!(prepare(
|
||||
root.path().to_str().unwrap(),
|
||||
¬e,
|
||||
&[managed.to_string_lossy().into_owned()]
|
||||
)
|
||||
.is_ok());
|
||||
assert!(prepare(
|
||||
root.path().to_str().unwrap(),
|
||||
"missing.md",
|
||||
std::slice::from_ref(&path)
|
||||
)
|
||||
.is_err());
|
||||
assert!(prepare(root.path().to_str().unwrap(), ¬e, &vec![path; 5]).is_err());
|
||||
}
|
||||
#[test]
|
||||
fn rejects_other_roots_and_traversal_before_probing_files() {
|
||||
let (root, note, _) = fixture();
|
||||
let missing_outside = root
|
||||
.path()
|
||||
.parent()
|
||||
.unwrap()
|
||||
.join("missing-outside/image.png");
|
||||
let error = prepare(
|
||||
root.path().to_str().unwrap(),
|
||||
¬e,
|
||||
&[missing_outside.to_string_lossy().into_owned()],
|
||||
)
|
||||
.err()
|
||||
.unwrap();
|
||||
assert!(error.contains("inside the configured vault"));
|
||||
let traversal = root.path().join("../missing-outside/image.png");
|
||||
let error = prepare(
|
||||
root.path().to_str().unwrap(),
|
||||
¬e,
|
||||
&[traversal.to_string_lossy().into_owned()],
|
||||
)
|
||||
.err()
|
||||
.unwrap();
|
||||
assert!(error.contains("must not traverse"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rejects_oversized_and_disguised_files() {
|
||||
let (root, note, path) = fixture();
|
||||
fs::write(&path, b"not image bytes").unwrap();
|
||||
assert!(prepare(
|
||||
root.path().to_str().unwrap(),
|
||||
¬e,
|
||||
std::slice::from_ref(&path)
|
||||
)
|
||||
.is_err());
|
||||
fs::File::create(&path)
|
||||
.unwrap()
|
||||
.set_len(MAX_INPUT + 1)
|
||||
.unwrap();
|
||||
assert!(prepare(root.path().to_str().unwrap(), ¬e, &[path]).is_err());
|
||||
}
|
||||
#[test]
|
||||
fn downsizes_large_images_without_modifying_source_files() {
|
||||
let (root, note, path) = fixture();
|
||||
image::RgbaImage::from_pixel(2000, 1000, image::Rgba([10, 20, 30, 255]))
|
||||
.save(&path)
|
||||
.unwrap();
|
||||
let original = fs::read(&path).unwrap();
|
||||
let result = prepare(
|
||||
root.path().to_str().unwrap(),
|
||||
¬e,
|
||||
std::slice::from_ref(&path),
|
||||
)
|
||||
.unwrap();
|
||||
let decoded = image::load_from_memory(&STANDARD.decode(&result[0].data).unwrap()).unwrap();
|
||||
assert_eq!((decoded.width(), decoded.height()), (1568, 784));
|
||||
assert_eq!(fs::read(path).unwrap(), original);
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
#[test]
|
||||
fn symlinks_cannot_send_images_from_outside_the_vault() {
|
||||
use std::os::unix::fs::symlink;
|
||||
let (root, note, _) = fixture();
|
||||
let outside = tempfile::tempdir().unwrap();
|
||||
let target = outside.path().join("image.png");
|
||||
fs::write(&target, "secret").unwrap();
|
||||
let link = root.path().join("link.png");
|
||||
symlink(target, &link).unwrap();
|
||||
assert!(prepare(
|
||||
root.path().to_str().unwrap(),
|
||||
¬e,
|
||||
&[link.to_string_lossy().into_owned()]
|
||||
)
|
||||
.is_err());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,264 @@
|
||||
//! Provider catalogs, fetched without sending prompts or note data.
|
||||
use futures::StreamExt;
|
||||
use reqwest::{redirect::Policy, Client};
|
||||
use serde::Serialize;
|
||||
use serde_json::Value;
|
||||
use std::{
|
||||
collections::{BTreeMap, HashSet},
|
||||
time::Duration,
|
||||
};
|
||||
|
||||
const MAX_RESPONSE: usize = 1024 * 1024;
|
||||
const MAX_MODELS: usize = 2000;
|
||||
|
||||
#[derive(Debug, Clone, Serialize, PartialEq, Eq)]
|
||||
pub struct AiModel {
|
||||
pub id: String,
|
||||
pub name: String,
|
||||
/// None means the provider did not advertise the capability, not lack of support.
|
||||
pub vision: Option<bool>,
|
||||
}
|
||||
|
||||
fn chat_candidate(id: &str) -> bool {
|
||||
let id = id.strip_prefix("ft:").unwrap_or(id);
|
||||
let family = id.starts_with("gpt-")
|
||||
|| id.starts_with("chatgpt-")
|
||||
|| id
|
||||
.strip_prefix('o')
|
||||
.is_some_and(|s| s.starts_with(|c: char| c.is_ascii_digit()));
|
||||
family
|
||||
&& ![
|
||||
"realtime",
|
||||
"audio",
|
||||
"transcribe",
|
||||
"tts",
|
||||
"embedding",
|
||||
"image",
|
||||
"codex",
|
||||
"search",
|
||||
"moderation",
|
||||
]
|
||||
.iter()
|
||||
.any(|kind| id.contains(kind))
|
||||
}
|
||||
|
||||
fn parse_models(provider: &str, page: &Value) -> Result<Vec<AiModel>, String> {
|
||||
let data = page["data"]
|
||||
.as_array()
|
||||
.ok_or("Invalid model-list response")?;
|
||||
if data.len() > MAX_MODELS {
|
||||
return Err("Provider model list exceeds the limit".into());
|
||||
}
|
||||
let mut result = Vec::new();
|
||||
for item in data {
|
||||
let Some(id) = item["id"]
|
||||
.as_str()
|
||||
.filter(|id| !id.is_empty() && id.len() <= 200 && !id.chars().any(char::is_control))
|
||||
else {
|
||||
continue;
|
||||
};
|
||||
if item["lifecycle"] == "retired" || (provider == "openai" && !chat_candidate(id)) {
|
||||
continue;
|
||||
}
|
||||
let name = item["display_name"]
|
||||
.as_str()
|
||||
.filter(|s| !s.is_empty() && s.len() <= 200 && !s.chars().any(char::is_control))
|
||||
.unwrap_or(id);
|
||||
result.push(AiModel {
|
||||
id: id.into(),
|
||||
name: name.into(),
|
||||
vision: item["capabilities"]["image_input"]["supported"].as_bool(),
|
||||
});
|
||||
}
|
||||
Ok(result)
|
||||
}
|
||||
|
||||
pub async fn fetch_models(provider: &str, key: &str) -> Result<Vec<AiModel>, String> {
|
||||
let url = match provider {
|
||||
"openai" => "https://api.openai.com/v1/models",
|
||||
"anthropic" => "https://api.anthropic.com/v1/models",
|
||||
_ => return Err("Model discovery supports OpenAI and Anthropic".into()),
|
||||
};
|
||||
let client = Client::builder()
|
||||
.redirect(Policy::none())
|
||||
.connect_timeout(Duration::from_secs(5))
|
||||
.timeout(Duration::from_secs(20))
|
||||
.build()
|
||||
.map_err(|_| "Could not initialize model discovery")?;
|
||||
fetch_at(&client, provider, key.trim(), url).await
|
||||
}
|
||||
|
||||
async fn fetch_at(
|
||||
client: &Client,
|
||||
provider: &str,
|
||||
key: &str,
|
||||
url: &str,
|
||||
) -> Result<Vec<AiModel>, String> {
|
||||
if key.is_empty() {
|
||||
return Err("Enter an API key before fetching models".into());
|
||||
}
|
||||
if key.len() > 8192 {
|
||||
return Err("API key exceeds the length limit".into());
|
||||
}
|
||||
let mut cursor: Option<String> = None;
|
||||
let mut cursors = HashSet::new();
|
||||
let mut models = BTreeMap::new();
|
||||
for _ in 0..20 {
|
||||
let mut request = client.get(url);
|
||||
if provider == "anthropic" {
|
||||
request = request
|
||||
.header("x-api-key", key)
|
||||
.header("anthropic-version", "2023-06-01")
|
||||
.query(&[("limit", "100")]);
|
||||
if let Some(after) = &cursor {
|
||||
request = request.query(&[("after_id", after)]);
|
||||
}
|
||||
} else {
|
||||
request = request.bearer_auth(key);
|
||||
}
|
||||
// Never return provider bodies or reqwest's debug representation: invalid-key
|
||||
// responses can echo credentials. Fixed endpoints and no redirects keep keys scoped.
|
||||
let response = request
|
||||
.send()
|
||||
.await
|
||||
.map_err(|_| "Could not reach the provider model catalog")?;
|
||||
if !response.status().is_success() {
|
||||
return Err(format!(
|
||||
"Model catalog returned HTTP {}. Check the API key and account permissions.",
|
||||
response.status().as_u16()
|
||||
));
|
||||
}
|
||||
let mut bytes = Vec::new();
|
||||
let mut stream = response.bytes_stream();
|
||||
while let Some(chunk) = stream.next().await {
|
||||
let chunk = chunk.map_err(|_| "Could not read the provider model catalog")?;
|
||||
if bytes.len() + chunk.len() > MAX_RESPONSE {
|
||||
return Err("Provider model list exceeds the size limit".into());
|
||||
}
|
||||
bytes.extend_from_slice(&chunk);
|
||||
}
|
||||
let page: Value =
|
||||
serde_json::from_slice(&bytes).map_err(|_| "Invalid model-list response")?;
|
||||
for model in parse_models(provider, &page)? {
|
||||
models.insert(model.id.clone(), model);
|
||||
}
|
||||
if models.len() > MAX_MODELS {
|
||||
return Err("Provider model list exceeds the limit".into());
|
||||
}
|
||||
if provider != "anthropic" || page["has_more"] != true {
|
||||
let mut result: Vec<_> = models.into_values().collect();
|
||||
result.sort_by_cached_key(|m| (m.name.to_lowercase(), m.id.clone()));
|
||||
return Ok(result);
|
||||
}
|
||||
let next = page["last_id"]
|
||||
.as_str()
|
||||
.filter(|id| !id.is_empty() && id.len() <= 200)
|
||||
.ok_or("Provider pagination cursor is missing")?
|
||||
.to_string();
|
||||
if !cursors.insert(next.clone()) {
|
||||
return Err("Provider repeated its pagination cursor".into());
|
||||
}
|
||||
cursor = Some(next);
|
||||
}
|
||||
Err("Provider model catalog has too many pages".into())
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use serde_json::json;
|
||||
use std::io::{Read, Write};
|
||||
|
||||
#[test]
|
||||
fn openai_filters_non_chat_families_without_freezing_model_versions() {
|
||||
let result = parse_models("openai", &json!({"data":[
|
||||
{"id":"gpt-99-next"},{"id":"o12"},{"id":"ft:gpt-4o:org:custom"},
|
||||
{"id":"gpt-image-1"},{"id":"gpt-4o-realtime-preview"},{"id":"text-embedding-3-small"},
|
||||
{"id":"gpt-5-codex"},{"id":"gpt-audio"},{"id":"whisper-1"}
|
||||
]})).unwrap();
|
||||
assert_eq!(
|
||||
result.iter().map(|m| m.id.as_str()).collect::<Vec<_>>(),
|
||||
["gpt-99-next", "o12", "ft:gpt-4o:org:custom"]
|
||||
);
|
||||
assert!(result.iter().all(|m| m.vision.is_none()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn anthropic_preserves_reported_capability_and_excludes_retired_models() {
|
||||
let result = parse_models("anthropic", &json!({"data":[
|
||||
{"id":"claude-future","display_name":"Future Claude","capabilities":{"image_input":{"supported":true}}},
|
||||
{"id":"claude-old","lifecycle":"retired"},{"id":"claude-legacy"}
|
||||
]})).unwrap();
|
||||
assert_eq!(result.len(), 2);
|
||||
assert_eq!(result[0].vision, Some(true));
|
||||
assert_eq!(result[1].vision, None);
|
||||
assert!(parse_models("openai", &json!({"unexpected":[]})).is_err());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn paginates_with_scoped_headers_and_deduplicates_ids() {
|
||||
let listener = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
|
||||
let url = format!("http://{}/models", listener.local_addr().unwrap());
|
||||
let server = std::thread::spawn(move || {
|
||||
for (i, body) in [
|
||||
r#"{"data":[{"id":"claude-a"}],"has_more":true,"last_id":"claude-a"}"#,
|
||||
r#"{"data":[{"id":"claude-a"},{"id":"claude-b"}],"has_more":false}"#,
|
||||
]
|
||||
.into_iter()
|
||||
.enumerate()
|
||||
{
|
||||
let (mut socket, _) = listener.accept().unwrap();
|
||||
let mut bytes = [0; 8192];
|
||||
let count = socket.read(&mut bytes).unwrap();
|
||||
let request = String::from_utf8_lossy(&bytes[..count]);
|
||||
assert!(request.contains("x-api-key: fake-key"));
|
||||
assert!(!request.contains("authorization:"));
|
||||
if i == 1 {
|
||||
assert!(request.contains("after_id=claude-a"));
|
||||
}
|
||||
write!(
|
||||
socket,
|
||||
"HTTP/1.1 200 OK\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{}",
|
||||
body.len(),
|
||||
body
|
||||
)
|
||||
.unwrap();
|
||||
}
|
||||
});
|
||||
let result = fetch_at(&Client::new(), "anthropic", "fake-key", &url)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(result.len(), 2);
|
||||
server.join().unwrap();
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn authentication_failures_do_not_echo_keys() {
|
||||
let listener = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
|
||||
let url = format!("http://{}/models", listener.local_addr().unwrap());
|
||||
let server = std::thread::spawn(move || {
|
||||
let (mut socket, _) = listener.accept().unwrap();
|
||||
let mut bytes = [0; 4096];
|
||||
let _ = socket.read(&mut bytes);
|
||||
let body = "secret-key-should-not-appear";
|
||||
write!(
|
||||
socket,
|
||||
"HTTP/1.1 401 Unauthorized\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{}",
|
||||
body.len(),
|
||||
body
|
||||
)
|
||||
.unwrap();
|
||||
});
|
||||
let error = fetch_at(
|
||||
&Client::builder().redirect(Policy::none()).build().unwrap(),
|
||||
"openai",
|
||||
"secret-key-should-not-appear",
|
||||
&url,
|
||||
)
|
||||
.await
|
||||
.unwrap_err();
|
||||
assert!(error.contains("401"));
|
||||
assert!(!error.contains("secret-key"));
|
||||
server.join().unwrap();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
//! Decode UTF-8 after a complete SSE event, never at arbitrary network chunk boundaries.
|
||||
#[derive(Default)]
|
||||
pub struct Events {
|
||||
bytes: Vec<u8>,
|
||||
output: usize,
|
||||
}
|
||||
impl Events {
|
||||
pub fn record_text(&mut self, text: &str) -> Result<(), String> {
|
||||
self.output += text.len();
|
||||
if self.output > 2 * 1024 * 1024 {
|
||||
return Err("AI response exceeds the text limit".into());
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
pub fn push(&mut self, chunk: &[u8]) -> Result<Vec<String>, String> {
|
||||
if self.bytes.len() + chunk.len() > 8 * 1024 * 1024 {
|
||||
return Err("AI stream buffer exceeds the size limit".into());
|
||||
}
|
||||
self.bytes.extend_from_slice(chunk);
|
||||
let mut result = Vec::new();
|
||||
loop {
|
||||
let lf = self
|
||||
.bytes
|
||||
.windows(2)
|
||||
.position(|b| b == b"\n\n")
|
||||
.map(|p| (p, 2));
|
||||
let crlf = self
|
||||
.bytes
|
||||
.windows(4)
|
||||
.position(|b| b == b"\r\n\r\n")
|
||||
.map(|p| (p, 4));
|
||||
let boundary = lf.into_iter().chain(crlf).min_by_key(|(offset, _)| *offset);
|
||||
let Some((end, delimiter)) = boundary else {
|
||||
break;
|
||||
};
|
||||
if end > 4 * 1024 * 1024 {
|
||||
return Err("AI stream event exceeds the size limit".into());
|
||||
}
|
||||
let event = std::str::from_utf8(&self.bytes[..end])
|
||||
.map_err(|_| "AI stream contains invalid UTF-8")?
|
||||
.to_string();
|
||||
self.bytes.drain(..end + delimiter);
|
||||
result.push(event);
|
||||
}
|
||||
if self.bytes.len() > 4 * 1024 * 1024 {
|
||||
return Err("AI stream event exceeds the size limit".into());
|
||||
}
|
||||
Ok(result)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
#[test]
|
||||
fn every_byte_boundary_preserves_unicode_and_crlf() {
|
||||
let input = "data: {\"text\":\"Привет café 👋\"}\r\n\r\n";
|
||||
for split in 0..input.len() {
|
||||
let mut decoder = Events::default();
|
||||
let mut events = decoder.push(&input.as_bytes()[..split]).unwrap();
|
||||
events.extend(decoder.push(&input.as_bytes()[split..]).unwrap());
|
||||
assert_eq!(events, ["data: {\"text\":\"Привет café 👋\"}"]);
|
||||
}
|
||||
}
|
||||
#[test]
|
||||
fn handles_multiple_events_and_refuses_unbounded_partial_data() {
|
||||
let mut decoder = Events::default();
|
||||
assert_eq!(
|
||||
decoder.push(b"data: a\n\ndata: b\n\n").unwrap(),
|
||||
["data: a", "data: b"]
|
||||
);
|
||||
assert!(decoder.push(&vec![b'x'; 4 * 1024 * 1024 + 1]).is_err());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,196 @@
|
||||
//! Validate provider completion before a streamed draft becomes eligible for application.
|
||||
//! All errors are app-owned strings: never forward provider payloads or transport URLs.
|
||||
use futures::StreamExt;
|
||||
use serde_json::Value;
|
||||
|
||||
use super::sse;
|
||||
|
||||
const INVALID: &str = "AI returned an invalid streaming response. The result cannot be applied.";
|
||||
const INCOMPLETE: &str =
|
||||
"AI stream ended before successful completion. The result cannot be applied.";
|
||||
const PROVIDER_ERROR: &str = "The AI provider reported a streaming error. Check the model, account and request, then try again.";
|
||||
const OUTPUT_LIMIT: &str = "AI response reached its output limit. Use a smaller selection.";
|
||||
|
||||
#[derive(Clone, Copy)]
|
||||
pub(super) enum Protocol {
|
||||
OpenAi,
|
||||
Anthropic,
|
||||
}
|
||||
|
||||
struct Completion {
|
||||
protocol: Protocol,
|
||||
stopped: bool,
|
||||
complete: bool,
|
||||
has_text: bool,
|
||||
}
|
||||
|
||||
impl Completion {
|
||||
fn new(protocol: Protocol) -> Self {
|
||||
Self {
|
||||
protocol,
|
||||
stopped: false,
|
||||
complete: false,
|
||||
has_text: false,
|
||||
}
|
||||
}
|
||||
|
||||
fn event(&mut self, event: &str) -> Result<Option<String>, String> {
|
||||
// SSE joins multiple data fields with a newline. Comments, event names, IDs
|
||||
// and retry fields are not JSON payloads. A space after ':' is optional.
|
||||
let fields: Vec<_> = event
|
||||
.lines()
|
||||
.filter_map(|line| {
|
||||
line.strip_prefix("data:")
|
||||
.map(|s| s.strip_prefix(' ').unwrap_or(s))
|
||||
})
|
||||
.collect();
|
||||
if fields.is_empty() {
|
||||
return Ok(None);
|
||||
}
|
||||
if self.complete {
|
||||
return Err(INVALID.into());
|
||||
}
|
||||
let data = fields.join("\n");
|
||||
if data == "[DONE]" {
|
||||
if !matches!(self.protocol, Protocol::OpenAi) || !self.stopped || !self.has_text {
|
||||
return Err(INCOMPLETE.into());
|
||||
}
|
||||
self.complete = true;
|
||||
return Ok(None);
|
||||
}
|
||||
let value: Value = serde_json::from_str(&data).map_err(|_| INVALID)?;
|
||||
if !value.is_object() {
|
||||
return Err(INVALID.into());
|
||||
}
|
||||
// Do not include the error's type, message or other provider-controlled data.
|
||||
if value.get("error").is_some_and(|error| !error.is_null()) || value["type"] == "error" {
|
||||
return Err(PROVIDER_ERROR.into());
|
||||
}
|
||||
let text = match self.protocol {
|
||||
Protocol::OpenAi => self.openai(&value)?,
|
||||
Protocol::Anthropic => self.anthropic(&value)?,
|
||||
};
|
||||
if let Some(text) = &text {
|
||||
self.has_text |= !text.trim().is_empty();
|
||||
}
|
||||
Ok(text)
|
||||
}
|
||||
|
||||
fn openai(&mut self, value: &Value) -> Result<Option<String>, String> {
|
||||
let choices = value["choices"].as_array().ok_or(INVALID)?;
|
||||
// A final usage-only event is permitted, including between stop and [DONE].
|
||||
if choices.is_empty() && value["usage"].is_object() {
|
||||
return Ok(None);
|
||||
}
|
||||
if choices.len() != 1 || self.stopped {
|
||||
return Err(INVALID.into());
|
||||
}
|
||||
let choice = &choices[0];
|
||||
if choice.get("index").is_some_and(|index| index != 0) {
|
||||
return Err(INVALID.into());
|
||||
}
|
||||
let delta = choice["delta"].as_object().ok_or(INVALID)?;
|
||||
if delta.get("refusal").is_some_and(|v| !v.is_null()) {
|
||||
return Err(
|
||||
"The AI provider refused this request. The result cannot be applied.".into(),
|
||||
);
|
||||
}
|
||||
if ["tool_calls", "function_call"]
|
||||
.iter()
|
||||
.any(|key| delta.get(*key).is_some_and(|v| !v.is_null()))
|
||||
{
|
||||
return Err("AI returned a tool request instead of replacement text. The result cannot be applied.".into());
|
||||
}
|
||||
let text = match delta.get("content") {
|
||||
None | Some(Value::Null) => None,
|
||||
Some(Value::String(text)) => Some(text.clone()),
|
||||
_ => return Err(INVALID.into()),
|
||||
};
|
||||
match choice.get("finish_reason") {
|
||||
None | Some(Value::Null) => {}
|
||||
Some(Value::String(reason)) if reason == "stop" => self.stopped = true,
|
||||
Some(Value::String(reason)) if reason == "length" => return Err(OUTPUT_LIMIT.into()),
|
||||
Some(Value::String(_)) => {
|
||||
return Err(
|
||||
"AI response did not finish successfully. The result cannot be applied.".into(),
|
||||
)
|
||||
}
|
||||
_ => return Err(INVALID.into()),
|
||||
}
|
||||
Ok(text)
|
||||
}
|
||||
|
||||
fn anthropic(&mut self, value: &Value) -> Result<Option<String>, String> {
|
||||
let kind = value["type"].as_str().ok_or(INVALID)?;
|
||||
if self.stopped && !matches!(kind, "message_stop" | "ping") {
|
||||
return Err(INVALID.into());
|
||||
}
|
||||
match kind {
|
||||
"content_block_start" => {
|
||||
let block = &value["content_block"];
|
||||
match block["type"].as_str().ok_or(INVALID)? {
|
||||
"text" => Ok(Some(block["text"].as_str().ok_or(INVALID)?.into())),
|
||||
"thinking" | "redacted_thinking" => Ok(None),
|
||||
_ => Err("AI returned unsupported content instead of replacement text. The result cannot be applied.".into()),
|
||||
}
|
||||
}
|
||||
"content_block_delta" => {
|
||||
let delta = &value["delta"];
|
||||
match delta["type"].as_str().ok_or(INVALID)? {
|
||||
"text_delta" => Ok(Some(delta["text"].as_str().ok_or(INVALID)?.into())),
|
||||
"thinking_delta" | "signature_delta" => Ok(None),
|
||||
_ => Err(INVALID.into()),
|
||||
}
|
||||
}
|
||||
"message_delta" => {
|
||||
match value["delta"]["stop_reason"].as_str().ok_or(INVALID)? {
|
||||
"end_turn" | "stop_sequence" => self.stopped = true,
|
||||
"max_tokens" => return Err(OUTPUT_LIMIT.into()),
|
||||
_ => return Err(
|
||||
"AI response did not finish successfully. The result cannot be applied."
|
||||
.into(),
|
||||
),
|
||||
}
|
||||
Ok(None)
|
||||
}
|
||||
"message_stop" => {
|
||||
if !self.stopped || !self.has_text {
|
||||
return Err(INCOMPLETE.into());
|
||||
}
|
||||
self.complete = true;
|
||||
Ok(None)
|
||||
}
|
||||
// Anthropic may add informational events; they cannot mark completion.
|
||||
_ => Ok(None),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) async fn receive(
|
||||
response: reqwest::Response,
|
||||
protocol: Protocol,
|
||||
mut on_text: impl FnMut(String),
|
||||
) -> Result<(), String> {
|
||||
let mut stream = response.bytes_stream();
|
||||
let mut decoder = sse::Events::default();
|
||||
let mut completion = Completion::new(protocol);
|
||||
while let Some(chunk) = stream.next().await {
|
||||
let chunk = chunk.map_err(|_| "AI stream connection failed")?;
|
||||
for event in decoder.push(&chunk)? {
|
||||
if let Some(text) = completion.event(&event)? {
|
||||
decoder.record_text(&text)?;
|
||||
if !text.is_empty() {
|
||||
on_text(text);
|
||||
}
|
||||
}
|
||||
}
|
||||
if completion.complete {
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
Err(INCOMPLETE.into())
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
#[path = "stream_tests.rs"]
|
||||
mod tests;
|
||||
@@ -0,0 +1,319 @@
|
||||
use super::*;
|
||||
use serde_json::json;
|
||||
use std::io::{Read, Write};
|
||||
|
||||
fn data(value: Value) -> String {
|
||||
format!("data: {value}\n\n")
|
||||
}
|
||||
|
||||
fn openai_text(text: &str) -> String {
|
||||
data(json!({"choices":[{"index":0,"delta":{"content":text},"finish_reason":null}]}))
|
||||
}
|
||||
|
||||
fn openai_stop(reason: &str) -> String {
|
||||
data(json!({"choices":[{"index":0,"delta":{},"finish_reason":reason}]}))
|
||||
}
|
||||
|
||||
fn anthropic_text(text: &str) -> String {
|
||||
data(json!({"type":"content_block_delta","index":0,"delta":{"type":"text_delta","text":text}}))
|
||||
}
|
||||
|
||||
fn anthropic_stop(reason: &str) -> String {
|
||||
data(
|
||||
json!({"type":"message_delta","delta":{"stop_reason":reason},"usage":{"output_tokens":10}}),
|
||||
)
|
||||
}
|
||||
|
||||
fn anthropic_done() -> String {
|
||||
data(json!({"type":"message_stop"}))
|
||||
}
|
||||
|
||||
async fn request(body: &str, protocol: Protocol) -> (Result<(), String>, String) {
|
||||
mock_response(body.as_bytes(), body.len(), protocol).await
|
||||
}
|
||||
|
||||
async fn mock_response(
|
||||
body: &[u8],
|
||||
declared_length: usize,
|
||||
protocol: Protocol,
|
||||
) -> (Result<(), String>, String) {
|
||||
// Loopback only: exercise the production HTTP-body/SSE/completion path without
|
||||
// provider credentials, paid calls, or a native UI mock that invents 'done'.
|
||||
let listener = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
|
||||
let url = format!("http://{}/stream", listener.local_addr().unwrap());
|
||||
let body = body.to_vec();
|
||||
let server = std::thread::spawn(move || {
|
||||
let (mut socket, _) = listener.accept().unwrap();
|
||||
socket
|
||||
.set_read_timeout(Some(std::time::Duration::from_secs(5)))
|
||||
.unwrap();
|
||||
let mut request = Vec::new();
|
||||
while !request.ends_with(b"\r\n\r\n") {
|
||||
let mut bytes = [0; 1024];
|
||||
let count = socket.read(&mut bytes).unwrap();
|
||||
assert!(count > 0, "client closed before sending request headers");
|
||||
request.extend_from_slice(&bytes[..count]);
|
||||
assert!(request.len() <= 8192);
|
||||
}
|
||||
write!(socket, "HTTP/1.1 200 OK\r\nContent-Type: text/event-stream\r\nContent-Length: {declared_length}\r\nConnection: close\r\n\r\n").unwrap();
|
||||
// The receiver can reject an invalid stream before the server finishes writing.
|
||||
let _ = socket.write_all(&body);
|
||||
});
|
||||
let response = reqwest::Client::builder()
|
||||
.no_proxy()
|
||||
.timeout(std::time::Duration::from_secs(5))
|
||||
.build()
|
||||
.unwrap()
|
||||
.get(url)
|
||||
.send()
|
||||
.await
|
||||
.unwrap();
|
||||
let mut text = String::new();
|
||||
let result = receive(response, protocol, |chunk| text.push_str(&chunk)).await;
|
||||
server.join().unwrap();
|
||||
(result, text)
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn openai_requires_successful_stop_and_done_and_allows_usage_metadata() {
|
||||
let wire = data(json!({"choices":[{"index":0,"delta":{"role":"assistant"}}]}))
|
||||
+ &openai_text("Привет café 👋")
|
||||
+ &openai_stop("stop")
|
||||
+ &data(json!({"choices":[],"usage":{"completion_tokens":10}}))
|
||||
+ "data: [DONE]\n\n";
|
||||
let (result, text) = request(&wire, Protocol::OpenAi).await;
|
||||
assert_eq!(result, Ok(()));
|
||||
assert_eq!(text, "Привет café 👋");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn openai_rejects_all_unsuccessful_finish_reasons() {
|
||||
for reason in [
|
||||
"length",
|
||||
"content_filter",
|
||||
"tool_calls",
|
||||
"function_call",
|
||||
"unknown-secret",
|
||||
] {
|
||||
let wire = openai_text("Partial replacement") + &openai_stop(reason) + "data: [DONE]\n\n";
|
||||
let (result, _) = request(&wire, Protocol::OpenAi).await;
|
||||
let error = result.unwrap_err();
|
||||
assert!(!error.contains("unknown-secret"));
|
||||
if reason == "length" {
|
||||
assert_eq!(error, OUTPUT_LIMIT);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn openai_rejects_missing_terminal_events_and_empty_replacements() {
|
||||
for wire in [
|
||||
openai_text("Partial") + "data: [DONE]\n\n",
|
||||
openai_text("Partial") + &openai_stop("stop"),
|
||||
openai_text("Partial"),
|
||||
"data: [DONE]\n\n".into(),
|
||||
openai_text(" \n") + &openai_stop("stop") + "data: [DONE]\n\n",
|
||||
] {
|
||||
assert!(request(&wire, Protocol::OpenAi).await.0.is_err());
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn malformed_json_and_invalid_shapes_cannot_be_skipped_before_done() {
|
||||
for invalid in [
|
||||
"{broken secret",
|
||||
"[]",
|
||||
"null",
|
||||
"{}",
|
||||
r#"{"choices":"secret"}"#,
|
||||
r#"{"choices":[{"delta":{"content":42}}]}"#,
|
||||
] {
|
||||
for protocol in [Protocol::OpenAi, Protocol::Anthropic] {
|
||||
let (prefix, suffix) = match protocol {
|
||||
Protocol::OpenAi => (
|
||||
openai_text("Partial"),
|
||||
openai_stop("stop") + "data: [DONE]\n\n",
|
||||
),
|
||||
Protocol::Anthropic => (
|
||||
anthropic_text("Partial"),
|
||||
anthropic_stop("end_turn") + &anthropic_done(),
|
||||
),
|
||||
};
|
||||
let wire = format!("{prefix}data: {invalid}\n\n{suffix}");
|
||||
let error = request(&wire, protocol).await.0.unwrap_err();
|
||||
assert_eq!(error, INVALID);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn errors_after_stop_but_before_done_still_block_application() {
|
||||
let wire = openai_text("Draft")
|
||||
+ &openai_stop("stop")
|
||||
+ &data(json!({"error":{"message":"secret key and private prompt"}}))
|
||||
+ "data: [DONE]\n\n";
|
||||
assert_eq!(
|
||||
request(&wire, Protocol::OpenAi).await.0.unwrap_err(),
|
||||
PROVIDER_ERROR
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn anthropic_requires_successful_stop_reason_and_message_stop() {
|
||||
for reason in ["end_turn", "stop_sequence"] {
|
||||
let wire = data(json!({"type":"message_start","message":{"role":"assistant"}}))
|
||||
+ &data(
|
||||
json!({"type":"content_block_start","content_block":{"type":"text","text":""}}),
|
||||
)
|
||||
+ &anthropic_text("Привет café 👋")
|
||||
+ &data(json!({"type":"content_block_stop","index":0}))
|
||||
+ &anthropic_stop(reason)
|
||||
+ &data(json!({"type":"ping"}))
|
||||
+ &anthropic_done();
|
||||
let (result, text) = request(&wire, Protocol::Anthropic).await;
|
||||
assert_eq!(result, Ok(()));
|
||||
assert_eq!(text, "Привет café 👋");
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn anthropic_rejects_refusals_limits_tools_pauses_and_unknown_reasons() {
|
||||
for reason in [
|
||||
"max_tokens",
|
||||
"refusal",
|
||||
"tool_use",
|
||||
"pause_turn",
|
||||
"model_context_window_exceeded",
|
||||
"unknown-secret",
|
||||
] {
|
||||
let wire = anthropic_text("Partial") + &anthropic_stop(reason) + &anthropic_done();
|
||||
let error = request(&wire, Protocol::Anthropic).await.0.unwrap_err();
|
||||
assert!(!error.contains("unknown-secret"));
|
||||
if reason == "max_tokens" {
|
||||
assert_eq!(error, OUTPUT_LIMIT);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn anthropic_rejects_missing_terminal_events_empty_text_and_openai_done() {
|
||||
for wire in [
|
||||
anthropic_text("Partial") + &anthropic_done(),
|
||||
anthropic_text("Partial") + &anthropic_stop("end_turn"),
|
||||
anthropic_text("Partial") + "data: [DONE]\n\n",
|
||||
anthropic_stop("end_turn") + &anthropic_done(),
|
||||
anthropic_text(" \n") + &anthropic_stop("end_turn") + &anthropic_done(),
|
||||
] {
|
||||
assert!(request(&wire, Protocol::Anthropic).await.0.is_err());
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn refusals_and_tool_payloads_are_never_replacement_text() {
|
||||
for delta in [
|
||||
json!({"refusal":"secret refusal"}),
|
||||
json!({"tool_calls":[]}),
|
||||
json!({"function_call":{"name":"secret"}}),
|
||||
] {
|
||||
let wire = openai_text("Partial")
|
||||
+ &data(json!({"choices":[{"delta":delta,"finish_reason":"stop"}]}))
|
||||
+ "data: [DONE]\n\n";
|
||||
let error = request(&wire, Protocol::OpenAi).await.0.unwrap_err();
|
||||
assert!(!error.contains("secret"));
|
||||
}
|
||||
let wire = anthropic_text("Partial")
|
||||
+ &data(
|
||||
json!({"type":"content_block_start","content_block":{"type":"tool_use","input":{"secret":"private"}}}),
|
||||
)
|
||||
+ &anthropic_stop("end_turn")
|
||||
+ &anthropic_done();
|
||||
assert!(request(&wire, Protocol::Anthropic).await.0.is_err());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn provider_error_payloads_are_replaced_with_a_fixed_safe_message() {
|
||||
for payload in [
|
||||
json!({"error":{"type":"secret-key","message":"private prompt data:image/png;base64,PRIVATE"}}),
|
||||
json!({"error":"secret-key"}),
|
||||
json!({"type":"error","message":"secret-key"}),
|
||||
] {
|
||||
for protocol in [Protocol::OpenAi, Protocol::Anthropic] {
|
||||
let error = request(&data(payload.clone()), protocol)
|
||||
.await
|
||||
.0
|
||||
.unwrap_err();
|
||||
assert_eq!(error, PROVIDER_ERROR);
|
||||
assert!(!error.contains("PRIVATE"));
|
||||
assert!(!error.contains("secret-key"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn supports_optional_sse_spacing_comments_and_multiline_data() {
|
||||
let wire = ": keepalive\r\n\r\nevent: message\r\nid: 1\r\ndata:{\r\ndata: \"choices\": [{\"delta\":{\"content\":\"OK\"}}]}\r\n\r\n".to_string()
|
||||
+ &openai_stop("stop").replace('\n', "\r\n") + "data:[DONE]\r\n\r\n";
|
||||
let (result, text) = request(&wire, Protocol::OpenAi).await;
|
||||
assert_eq!(result, Ok(()));
|
||||
assert_eq!(text, "OK");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn completion_validation_survives_every_utf8_chunk_boundary_for_both_providers() {
|
||||
for (protocol, wire) in [
|
||||
(
|
||||
Protocol::OpenAi,
|
||||
openai_text("Привет café 👋") + &openai_stop("stop") + "data: [DONE]\n\n",
|
||||
),
|
||||
(
|
||||
Protocol::Anthropic,
|
||||
anthropic_text("Привет café 👋") + &anthropic_stop("end_turn") + &anthropic_done(),
|
||||
),
|
||||
] {
|
||||
for split in 0..wire.len() {
|
||||
let mut decoder = sse::Events::default();
|
||||
let mut completion = Completion::new(protocol);
|
||||
let mut text = String::new();
|
||||
for bytes in [&wire.as_bytes()[..split], &wire.as_bytes()[split..]] {
|
||||
for event in decoder.push(bytes).unwrap() {
|
||||
if let Some(chunk) = completion.event(&event).unwrap() {
|
||||
text.push_str(&chunk);
|
||||
}
|
||||
}
|
||||
}
|
||||
assert!(completion.complete);
|
||||
assert_eq!(text, "Привет café 👋");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn disconnected_http_body_and_invalid_utf8_fail_closed() {
|
||||
let body = openai_text("Partial");
|
||||
assert!(
|
||||
mock_response(body.as_bytes(), body.len() + 100, Protocol::OpenAi)
|
||||
.await
|
||||
.0
|
||||
.is_err()
|
||||
);
|
||||
assert!(
|
||||
request(&(body.clone() + "data: {partial"), Protocol::OpenAi)
|
||||
.await
|
||||
.0
|
||||
.is_err()
|
||||
);
|
||||
let bytes = [body.as_bytes(), b"data: \xff\n\n"].concat();
|
||||
assert!(mock_response(&bytes, bytes.len(), Protocol::OpenAi)
|
||||
.await
|
||||
.0
|
||||
.is_err());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn output_size_limits_remain_enforced_before_completion() {
|
||||
let wire =
|
||||
openai_text(&"x".repeat(2 * 1024 * 1024 + 1)) + &openai_stop("stop") + "data: [DONE]\n\n";
|
||||
let (result, text) = request(&wire, Protocol::OpenAi).await;
|
||||
assert!(result.unwrap_err().contains("text limit"));
|
||||
assert!(text.is_empty());
|
||||
}
|
||||
+77
-3
@@ -21,12 +21,18 @@ const MAX_NAME_BYTES: usize = 256 * 1024 * 1024;
|
||||
const MAX_PATH_COMPONENTS: usize = 64;
|
||||
const MANIFEST: &str = ".helixnotes-backup.json";
|
||||
|
||||
#[cfg(test)]
|
||||
mod daily_template_tests;
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
#[serde(deny_unknown_fields)]
|
||||
struct BackupManifest {
|
||||
version: u32,
|
||||
vault: String,
|
||||
attachments: bool,
|
||||
/// None is a pre-template backup: leave the current template alone on restore.
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
daily_template: Option<bool>,
|
||||
}
|
||||
|
||||
fn vault_id(vault: &Path) -> Result<String, String> {
|
||||
@@ -69,7 +75,10 @@ fn excluded_path(path: &Path, vault: &Path, backup_dir: &Path, attachments: bool
|
||||
let first = parts.next().expect("non-root entry").as_os_str();
|
||||
if first == ".helixnotes" {
|
||||
return match parts.next() {
|
||||
None => !attachments,
|
||||
None => false,
|
||||
Some(part) if part.as_os_str() == "daily-template.md" && parts.next().is_none() => {
|
||||
false
|
||||
}
|
||||
Some(part) if part.as_os_str() == "attachments" && attachments => {
|
||||
parts.any(|part| part.as_os_str().to_string_lossy().starts_with('.'))
|
||||
}
|
||||
@@ -122,6 +131,7 @@ pub fn create_backup(
|
||||
return Err("Backup directory must not be the vault root".to_string());
|
||||
}
|
||||
let id = vault_id(&vault)?;
|
||||
let has_template = crate::vault::daily_template::read(vault_path)?.is_some();
|
||||
let now = Utc::now();
|
||||
let timestamp = now.format("%Y-%m-%dT%H-%M-%S").to_string();
|
||||
let filename = format!("helixnotes-backup-{timestamp}-{id}-{}.zip", Uuid::new_v4());
|
||||
@@ -142,6 +152,7 @@ pub fn create_backup(
|
||||
version: 1,
|
||||
vault: id,
|
||||
attachments: include_attachments,
|
||||
daily_template: Some(has_template),
|
||||
},
|
||||
)
|
||||
.map_err(|e| e.to_string())?;
|
||||
@@ -372,6 +383,7 @@ fn install_staged(
|
||||
previous: &Path,
|
||||
backup_dir: &Path,
|
||||
attachments: bool,
|
||||
template: Option<bool>,
|
||||
) -> Result<(), String> {
|
||||
let nested = backup_dir
|
||||
.strip_prefix(vault)
|
||||
@@ -396,6 +408,10 @@ fn install_staged(
|
||||
let attachments_path = vault.join(".helixnotes/attachments");
|
||||
let mut displaced_attachments = false;
|
||||
let mut installed_attachments = false;
|
||||
let template_path = vault.join(crate::vault::daily_template::RELATIVE_PATH);
|
||||
let previous_template = previous.join("daily-template.md");
|
||||
let mut displaced_template = false;
|
||||
let mut installed_template = false;
|
||||
let operation = (|| -> io::Result<()> {
|
||||
fs::create_dir(&previous_entries)?;
|
||||
fs::create_dir(&held_history)?;
|
||||
@@ -447,6 +463,20 @@ fn install_staged(
|
||||
fs::rename(contents.join(".helixnotes/attachments"), &attachments_path)?;
|
||||
installed_attachments = true;
|
||||
}
|
||||
if let Some(enabled) = template {
|
||||
if fs::symlink_metadata(&template_path).is_ok() {
|
||||
fs::rename(&template_path, &previous_template)?;
|
||||
displaced_template = true;
|
||||
}
|
||||
if enabled {
|
||||
fs::create_dir_all(vault.join(".helixnotes"))?;
|
||||
fs::rename(
|
||||
contents.join(crate::vault::daily_template::RELATIVE_PATH),
|
||||
&template_path,
|
||||
)?;
|
||||
installed_template = true;
|
||||
}
|
||||
}
|
||||
if let Some(relative) = nested {
|
||||
if held_output {
|
||||
let destination = vault.join(relative);
|
||||
@@ -489,6 +519,11 @@ fn install_staged(
|
||||
failures.join("; ")
|
||||
));
|
||||
}
|
||||
if installed_template {
|
||||
if let Err(e) = remove_entry(&template_path) {
|
||||
failures.push(format!("remove new daily template: {e}"));
|
||||
}
|
||||
}
|
||||
if installed_attachments {
|
||||
if let Err(e) = remove_entry(&attachments_path) {
|
||||
failures.push(format!("remove new attachments: {e}"));
|
||||
@@ -514,6 +549,11 @@ fn install_staged(
|
||||
failures.push(format!("restore original {:?}: {e}", name));
|
||||
}
|
||||
}
|
||||
if displaced_template {
|
||||
if let Err(e) = fs::rename(&previous_template, &template_path) {
|
||||
failures.push(format!("restore daily template: {e}"));
|
||||
}
|
||||
}
|
||||
if displaced_attachments {
|
||||
if let Err(e) = fs::rename(&previous_attachments, &attachments_path) {
|
||||
failures.push(format!("restore attachments: {e}"));
|
||||
@@ -634,6 +674,15 @@ pub fn restore_backup(
|
||||
Some(component) if component.as_os_str() == "attachments" => {
|
||||
legacy_attachments = true;
|
||||
}
|
||||
Some(component)
|
||||
if component.as_os_str() == "daily-template.md"
|
||||
&& parts.next().is_none()
|
||||
&& !directory =>
|
||||
{
|
||||
if item.size() > crate::vault::daily_template::MAX_BYTES as u64 {
|
||||
return Err("Daily template exceeds the 256 KiB limit".into());
|
||||
}
|
||||
}
|
||||
_ => return Err(format!("Archive contains unsupported app metadata: {name}")),
|
||||
}
|
||||
} else if first.as_os_str().to_string_lossy().starts_with('.')
|
||||
@@ -710,11 +759,28 @@ pub fn restore_backup(
|
||||
}
|
||||
}
|
||||
// An archive holding only its manifest would replace the vault with nothing.
|
||||
if seen.keys().all(|entry| entry == Path::new(MANIFEST)) {
|
||||
if seen.keys().all(|entry| {
|
||||
entry == Path::new(MANIFEST)
|
||||
|| entry == Path::new(".helixnotes")
|
||||
|| entry == Path::new(crate::vault::daily_template::RELATIVE_PATH)
|
||||
}) {
|
||||
return Err(
|
||||
"This backup contains no notes, so restoring it would empty the vault".to_string(),
|
||||
);
|
||||
}
|
||||
let has_template = seen.contains_key(Path::new(crate::vault::daily_template::RELATIVE_PATH));
|
||||
let template = match manifest.as_ref().and_then(|meta| meta.daily_template) {
|
||||
Some(enabled) if enabled != has_template => {
|
||||
return Err("Daily template does not match the backup manifest".into())
|
||||
}
|
||||
Some(enabled) => Some(enabled),
|
||||
None => has_template.then_some(true),
|
||||
};
|
||||
if has_template {
|
||||
let file = File::open(contents.join(crate::vault::daily_template::RELATIVE_PATH))
|
||||
.map_err(|e| e.to_string())?;
|
||||
crate::vault::daily_template::read_from(file)?;
|
||||
}
|
||||
let attachments = if let Some(meta) = manifest {
|
||||
if meta.version != 1
|
||||
|| meta.vault.len() != 64
|
||||
@@ -736,13 +802,21 @@ pub fn restore_backup(
|
||||
return Err("Cannot replace attachments containing the backup output".to_string());
|
||||
}
|
||||
}
|
||||
}
|
||||
if attachments || template.is_some() {
|
||||
let internals = vault.join(".helixnotes");
|
||||
if fs::symlink_metadata(&internals).is_ok_and(|meta| !meta.file_type().is_dir()) {
|
||||
return Err("Vault app metadata directory is not a real directory".to_string());
|
||||
}
|
||||
}
|
||||
if template.is_some()
|
||||
&& fs::symlink_metadata(vault.join(crate::vault::daily_template::RELATIVE_PATH))
|
||||
.is_ok_and(|meta| meta.file_type().is_dir())
|
||||
{
|
||||
return Err("Daily template destination must not be a directory".into());
|
||||
}
|
||||
drop(archive);
|
||||
let result = install_staged(&vault, &contents, &previous, &output, attachments);
|
||||
let result = install_staged(&vault, &contents, &previous, &output, attachments, template);
|
||||
if result
|
||||
.as_ref()
|
||||
.is_err_and(|message| message.contains("rollback incomplete"))
|
||||
|
||||
@@ -0,0 +1,192 @@
|
||||
use super::{create_backup, restore_backup};
|
||||
use crate::vault::daily_template as template;
|
||||
use std::{fs, io::Write};
|
||||
use zip::write::SimpleFileOptions;
|
||||
|
||||
fn archive(path: &std::path::Path, entries: &[(&str, &[u8])]) {
|
||||
let file = fs::File::create(path).unwrap();
|
||||
let mut writer = zip::ZipWriter::new(file);
|
||||
for (name, bytes) in entries {
|
||||
writer
|
||||
.start_file(*name, SimpleFileOptions::default())
|
||||
.unwrap();
|
||||
writer.write_all(bytes).unwrap();
|
||||
}
|
||||
writer.finish().unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn templates_are_backed_up_without_attachments_and_restore_enabled_and_disabled_state() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let output = tempfile::tempdir().unwrap();
|
||||
let vault = dir.path().to_str().unwrap();
|
||||
fs::write(dir.path().join("Note.md"), "Original note\n").unwrap();
|
||||
template::set(vault, Some("# {{title}}\n- [ ] Task\n"), None).unwrap();
|
||||
let snapshot = create_backup(vault, output.path(), false).unwrap();
|
||||
let current = template::read(vault).unwrap();
|
||||
template::set(vault, Some("Later template"), current.as_deref()).unwrap();
|
||||
fs::write(dir.path().join("Note.md"), "Edited note\n").unwrap();
|
||||
restore_backup(vault, output.path(), &snapshot.path).unwrap();
|
||||
let restored = template::DailyTemplate::from_raw(template::read(vault).unwrap());
|
||||
assert!(restored.enabled);
|
||||
assert_eq!(restored.content, "# {{title}}\n- [ ] Task\n");
|
||||
assert_eq!(
|
||||
fs::read_to_string(dir.path().join("Note.md")).unwrap(),
|
||||
"Original note\n"
|
||||
);
|
||||
let disabled = template::set(vault, None, restored.raw.as_deref()).unwrap();
|
||||
let snapshot = create_backup(vault, output.path(), false).unwrap();
|
||||
template::set(vault, Some("Enabled later"), disabled.as_deref()).unwrap();
|
||||
restore_backup(vault, output.path(), &snapshot.path).unwrap();
|
||||
let restored = template::DailyTemplate::from_raw(template::read(vault).unwrap());
|
||||
assert!(!restored.enabled);
|
||||
assert_eq!(restored.content, "# {{title}}\n- [ ] Task\n");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn restoring_a_new_snapshot_without_a_template_restores_that_absence() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let output = tempfile::tempdir().unwrap();
|
||||
let vault = dir.path().to_str().unwrap();
|
||||
fs::write(dir.path().join("Note.md"), "Note").unwrap();
|
||||
let snapshot = create_backup(vault, output.path(), false).unwrap();
|
||||
template::set(vault, Some("Added after backup"), None).unwrap();
|
||||
restore_backup(vault, output.path(), &snapshot.path).unwrap();
|
||||
assert_eq!(template::read(vault).unwrap(), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn legacy_backups_leave_the_existing_template_untouched() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let output = tempfile::tempdir().unwrap();
|
||||
let vault = dir.path().to_str().unwrap();
|
||||
template::set(vault, Some("Keep this template"), None).unwrap();
|
||||
let path = output.path().join("legacy.zip");
|
||||
let manifest = serde_json::to_vec(&serde_json::json!({
|
||||
"version": 1, "vault": super::vault_id(dir.path()).unwrap(), "attachments": false,
|
||||
}))
|
||||
.unwrap();
|
||||
for with_manifest in [false, true] {
|
||||
let mut entries: Vec<(&str, &[u8])> = vec![("Note.md", b"Legacy note")];
|
||||
if with_manifest {
|
||||
entries.push((super::MANIFEST, &manifest));
|
||||
}
|
||||
archive(&path, &entries);
|
||||
restore_backup(vault, output.path(), path.to_str().unwrap()).unwrap();
|
||||
assert_eq!(
|
||||
template::read(vault).unwrap().as_deref(),
|
||||
Some("Keep this template")
|
||||
);
|
||||
}
|
||||
assert_eq!(
|
||||
template::read(vault).unwrap().as_deref(),
|
||||
Some("Keep this template")
|
||||
);
|
||||
assert_eq!(
|
||||
fs::read_to_string(dir.path().join("Note.md")).unwrap(),
|
||||
"Legacy note"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn template_only_backups_cannot_erase_the_current_notes() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let output = tempfile::tempdir().unwrap();
|
||||
let vault = dir.path().to_str().unwrap();
|
||||
template::set(vault, Some("Only a template"), None).unwrap();
|
||||
let snapshot = create_backup(vault, output.path(), false).unwrap();
|
||||
fs::write(dir.path().join("Keep.md"), "Keep me").unwrap();
|
||||
assert!(restore_backup(vault, output.path(), &snapshot.path).is_err());
|
||||
assert_eq!(
|
||||
fs::read_to_string(dir.path().join("Keep.md")).unwrap(),
|
||||
"Keep me"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn oversized_and_binary_templates_are_rejected_before_the_live_vault_changes() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let output = tempfile::tempdir().unwrap();
|
||||
let vault = dir.path().to_str().unwrap();
|
||||
fs::write(dir.path().join("Keep.md"), "Keep me").unwrap();
|
||||
template::set(vault, Some("Original template"), None).unwrap();
|
||||
for bytes in [vec![b'x'; template::MAX_BYTES + 1], vec![0xff]] {
|
||||
let path = output.path().join("bad.zip");
|
||||
archive(
|
||||
&path,
|
||||
&[
|
||||
("Note.md", b"Replacement"),
|
||||
(template::RELATIVE_PATH, &bytes),
|
||||
],
|
||||
);
|
||||
assert!(restore_backup(vault, output.path(), path.to_str().unwrap()).is_err());
|
||||
assert_eq!(
|
||||
fs::read_to_string(dir.path().join("Keep.md")).unwrap(),
|
||||
"Keep me"
|
||||
);
|
||||
assert_eq!(
|
||||
template::read(vault).unwrap().as_deref(),
|
||||
Some("Original template")
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn failed_install_rolls_back_the_template_notes_and_historical_backups() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let output = tempfile::tempdir().unwrap();
|
||||
let vault = dir.path().to_str().unwrap();
|
||||
fs::write(dir.path().join("Keep.md"), "Keep me").unwrap();
|
||||
fs::create_dir(dir.path().join("History")).unwrap();
|
||||
let historical = dir.path().join("History/helixnotes-backup-kept.zip");
|
||||
fs::write(&historical, "Historical backup").unwrap();
|
||||
template::set(vault, Some("Original template"), None).unwrap();
|
||||
let path = output.path().join("rollback.zip");
|
||||
// Installation reaches the template swap, then cannot reinsert the historical ZIP
|
||||
// because the archive replaced its containing directory with a regular file.
|
||||
archive(
|
||||
&path,
|
||||
&[
|
||||
("History", b"not a directory"),
|
||||
("Replacement.md", b"Replacement"),
|
||||
(template::RELATIVE_PATH, b"New template"),
|
||||
],
|
||||
);
|
||||
assert!(restore_backup(vault, output.path(), path.to_str().unwrap()).is_err());
|
||||
assert_eq!(
|
||||
fs::read_to_string(dir.path().join("Keep.md")).unwrap(),
|
||||
"Keep me"
|
||||
);
|
||||
assert_eq!(
|
||||
template::read(vault).unwrap().as_deref(),
|
||||
Some("Original template")
|
||||
);
|
||||
assert_eq!(fs::read_to_string(historical).unwrap(), "Historical backup");
|
||||
assert!(!dir.path().join("Replacement.md").exists());
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
#[test]
|
||||
fn template_restore_cannot_write_through_a_metadata_directory_symlink() {
|
||||
use std::os::unix::fs::symlink;
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let output = tempfile::tempdir().unwrap();
|
||||
let outside = tempfile::tempdir().unwrap();
|
||||
let vault = dir.path().to_str().unwrap();
|
||||
fs::write(dir.path().join("Keep.md"), "Keep me").unwrap();
|
||||
let path = output.path().join("template.zip");
|
||||
archive(
|
||||
&path,
|
||||
&[
|
||||
("Note.md", b"Replacement"),
|
||||
(template::RELATIVE_PATH, b"Template"),
|
||||
],
|
||||
);
|
||||
symlink(outside.path(), dir.path().join(".helixnotes")).unwrap();
|
||||
assert!(restore_backup(vault, output.path(), path.to_str().unwrap()).is_err());
|
||||
assert_eq!(
|
||||
fs::read_to_string(dir.path().join("Keep.md")).unwrap(),
|
||||
"Keep me"
|
||||
);
|
||||
assert!(fs::read_dir(outside.path()).unwrap().next().is_none());
|
||||
}
|
||||
+232
-8
@@ -2,6 +2,7 @@ use crate::asset_scope;
|
||||
use crate::search::SearchIndex;
|
||||
use crate::state::AppState;
|
||||
use crate::types::*;
|
||||
use crate::vault::daily_template::DailyTemplate;
|
||||
use crate::vault::operations;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::sync::Arc;
|
||||
@@ -490,6 +491,36 @@ pub fn complete_window_close<R: Runtime>(
|
||||
window.destroy().map_err(|error| error.to_string())
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
pub fn set_language<R: Runtime>(
|
||||
app: AppHandle<R>,
|
||||
state: State<'_, AppState>,
|
||||
language: String,
|
||||
) -> Result<(), String> {
|
||||
if language != "system" && !crate::i18n::supported_languages().contains(&language) {
|
||||
return Err("Unsupported interface language".to_string());
|
||||
}
|
||||
let mut config = state.config.lock().map_err(|e| e.to_string())?;
|
||||
let previous = std::mem::replace(&mut config.language, language.clone());
|
||||
if let Err(error) = save_app_config(&config) {
|
||||
config.language = previous;
|
||||
return Err(error);
|
||||
}
|
||||
drop(config);
|
||||
#[cfg(desktop)]
|
||||
if let Some(tray) = app.tray_by_id("helixnotes") {
|
||||
match crate::localized_tray_menu(&app, &language) {
|
||||
Ok(menu) => {
|
||||
let _ = tray.set_menu(Some(menu));
|
||||
}
|
||||
Err(error) => log::error!("Could not update tray language: {error}"),
|
||||
}
|
||||
}
|
||||
// Detached note windows share this device's language, without touching vault state.
|
||||
let _ = app.emit("language-changed", &language);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
pub fn set_theme(state: State<'_, AppState>, theme: String) -> Result<(), String> {
|
||||
let mut config = state.config.lock().map_err(|e| e.to_string())?;
|
||||
@@ -996,14 +1027,99 @@ pub async fn create_daily_note(
|
||||
.map_err(|error| error.to_string())?
|
||||
.daily_title_format
|
||||
.clone();
|
||||
let _write_guard = state.note_save.lock().await;
|
||||
let entry = operations::create_daily_note(&vault_path, date.as_deref(), &title_format)?;
|
||||
let write_guard = state.note_save.clone().lock_owned().await;
|
||||
let entry = tauri::async_runtime::spawn_blocking(move || {
|
||||
let _write_guard = write_guard;
|
||||
operations::create_daily_note(&vault_path, date.as_deref(), &title_format)
|
||||
})
|
||||
.await
|
||||
.map_err(|e| e.to_string())??;
|
||||
|
||||
index_note_bg(search, &entry.path);
|
||||
|
||||
Ok(entry)
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
pub async fn get_daily_note_template(
|
||||
state: State<'_, AppState>,
|
||||
vault_path: String,
|
||||
) -> Result<DailyTemplate, String> {
|
||||
state.validate_vault(&vault_path)?;
|
||||
let guard = state.note_save.clone().lock_owned().await;
|
||||
tauri::async_runtime::spawn_blocking(move || {
|
||||
let _guard = guard;
|
||||
crate::vault::daily_template::read(&vault_path).map(DailyTemplate::from_raw)
|
||||
})
|
||||
.await
|
||||
.map_err(|e| e.to_string())?
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
pub async fn set_daily_note_template(
|
||||
state: State<'_, AppState>,
|
||||
vault_path: String,
|
||||
template: Option<String>,
|
||||
expected_template: Option<String>,
|
||||
) -> Result<DailyTemplate, String> {
|
||||
let guard = state.note_save.clone().lock_owned().await;
|
||||
state.validate_vault(&vault_path)?;
|
||||
tauri::async_runtime::spawn_blocking(move || {
|
||||
let _guard = guard;
|
||||
crate::vault::daily_template::set(
|
||||
&vault_path,
|
||||
template.as_deref(),
|
||||
expected_template.as_deref(),
|
||||
)
|
||||
.map(DailyTemplate::from_raw)
|
||||
})
|
||||
.await
|
||||
.map_err(|e| e.to_string())?
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
pub async fn import_daily_note_template<R: Runtime>(
|
||||
app: AppHandle<R>,
|
||||
state: State<'_, AppState>,
|
||||
vault_path: String,
|
||||
title: String,
|
||||
expected_template: Option<String>,
|
||||
) -> Result<Option<DailyTemplate>, String> {
|
||||
state.validate_vault(&vault_path)?;
|
||||
// Pick inside this command: callers cannot nominate an arbitrary external path.
|
||||
// Do not hold the note-save lock while a user is choosing a file.
|
||||
let text = tauri::async_runtime::spawn_blocking(move || {
|
||||
use tauri_plugin_dialog::DialogExt;
|
||||
let Some(source) = app
|
||||
.dialog()
|
||||
.file()
|
||||
.set_title(title)
|
||||
.add_filter("Markdown", &["md"])
|
||||
.blocking_pick_file()
|
||||
else {
|
||||
return Ok::<_, String>(None);
|
||||
};
|
||||
let mut options = tauri_plugin_fs::OpenOptions::new();
|
||||
options.read(true);
|
||||
let file = app.fs().open(source, options).map_err(|e| e.to_string())?;
|
||||
crate::vault::daily_template::read_from(file).map(Some)
|
||||
})
|
||||
.await
|
||||
.map_err(|e| e.to_string())??;
|
||||
let Some(text) = text else {
|
||||
return Ok(None);
|
||||
};
|
||||
let guard = state.note_save.clone().lock_owned().await;
|
||||
state.validate_vault(&vault_path)?;
|
||||
tauri::async_runtime::spawn_blocking(move || {
|
||||
let _guard = guard;
|
||||
crate::vault::daily_template::set(&vault_path, Some(&text), expected_template.as_deref())
|
||||
.map(|raw| Some(DailyTemplate::from_raw(raw)))
|
||||
})
|
||||
.await
|
||||
.map_err(|e| e.to_string())?
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
pub async fn rename_note<R: Runtime>(
|
||||
app: AppHandle<R>,
|
||||
@@ -3961,6 +4077,30 @@ pub async fn get_note_version_content(
|
||||
|
||||
// ── AI ──
|
||||
|
||||
#[tauri::command]
|
||||
pub async fn fetch_ai_models(
|
||||
provider: String,
|
||||
api_key: String,
|
||||
) -> Result<Vec<crate::ai::models::AiModel>, String> {
|
||||
crate::ai::models::fetch_models(&provider, &api_key).await
|
||||
}
|
||||
|
||||
#[derive(serde::Deserialize)]
|
||||
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||
pub struct AiImageContext {
|
||||
vault_path: String,
|
||||
note_path: String,
|
||||
paths: Vec<String>,
|
||||
}
|
||||
|
||||
#[derive(serde::Deserialize)]
|
||||
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||
pub struct AiRequestConfig {
|
||||
provider: Option<String>,
|
||||
model: String,
|
||||
base_url: Option<String>,
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn set_ai_settings(
|
||||
@@ -3974,8 +4114,20 @@ pub fn set_ai_settings(
|
||||
openai_compatible_base_url: Option<String>,
|
||||
openai_compatible_api_key: Option<String>,
|
||||
) -> Result<(), String> {
|
||||
let mut config = state.config.lock().map_err(|e| e.to_string())?;
|
||||
let key = api_key.filter(|k| !k.is_empty());
|
||||
let mut current = state.config.lock().map_err(|e| e.to_string())?;
|
||||
let mut config = current.clone();
|
||||
let key = api_key
|
||||
.map(|key| key.trim().to_string())
|
||||
.filter(|key| !key.is_empty());
|
||||
let model = model.trim().to_string();
|
||||
if model.len() > 512
|
||||
|| key.as_ref().is_some_and(|key| key.len() > 8192)
|
||||
|| writing_style
|
||||
.as_ref()
|
||||
.is_some_and(|style| style.len() > 256 * 1024)
|
||||
{
|
||||
return Err("AI settings exceed the size limit".into());
|
||||
}
|
||||
match provider.as_deref() {
|
||||
Some("openai") => config.openai_api_key = key,
|
||||
Some("ollama") => {
|
||||
@@ -3987,12 +4139,23 @@ pub fn set_ai_settings(
|
||||
openai_compatible_base_url.filter(|u| !u.trim().is_empty());
|
||||
config.openai_compatible_api_key = openai_compatible_api_key.filter(|k| !k.is_empty());
|
||||
}
|
||||
_ => config.ai_api_key = key,
|
||||
Some("anthropic") => config.ai_api_key = key,
|
||||
None => {} // Turning AI off must not erase saved credentials.
|
||||
_ => return Err("Unsupported AI provider".into()),
|
||||
}
|
||||
let remembered = (!model.is_empty()).then(|| model.clone());
|
||||
match provider.as_deref() {
|
||||
Some("openai") => config.openai_model = remembered,
|
||||
Some("anthropic") => config.anthropic_model = remembered,
|
||||
Some("ollama") => config.ollama_model = remembered,
|
||||
Some("openai_compatible") => config.openai_compatible_model = remembered,
|
||||
_ => {}
|
||||
}
|
||||
config.ai_provider = provider;
|
||||
config.ai_model = model;
|
||||
config.ai_writing_style = writing_style.filter(|s| !s.trim().is_empty());
|
||||
save_app_config(&config)?;
|
||||
*current = config;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -4004,7 +4167,7 @@ pub fn test_ai_connection(app: AppHandle) -> Result<(), String> {
|
||||
let provider = config
|
||||
.ai_provider
|
||||
.clone()
|
||||
.unwrap_or_else(|| "anthropic".to_string());
|
||||
.ok_or("AI is disabled. Choose a provider in Settings.")?;
|
||||
let key = match provider.as_str() {
|
||||
"ollama" => Some(config.ollama_api_key.clone().unwrap_or_default()),
|
||||
"openai_compatible" => {
|
||||
@@ -4021,6 +4184,14 @@ pub fn test_ai_connection(app: AppHandle) -> Result<(), String> {
|
||||
};
|
||||
(provider, key, model, base_url)
|
||||
};
|
||||
if model.trim().is_empty()
|
||||
|| !matches!(
|
||||
provider.as_str(),
|
||||
"openai" | "anthropic" | "ollama" | "openai_compatible"
|
||||
)
|
||||
{
|
||||
return Err("Choose an AI provider and model in Settings".into());
|
||||
}
|
||||
|
||||
std::thread::spawn(move || {
|
||||
use tauri::Emitter;
|
||||
@@ -4267,20 +4438,25 @@ pub fn sync_now(app: AppHandle) -> Result<(), String> {
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
pub fn ai_ask(
|
||||
pub async fn ai_ask(
|
||||
app: AppHandle,
|
||||
action: String,
|
||||
text: String,
|
||||
custom_prompt: Option<String>,
|
||||
request_id: String,
|
||||
image_context: Option<AiImageContext>,
|
||||
expected_config: Option<AiRequestConfig>,
|
||||
) -> Result<(), String> {
|
||||
if text.len() + custom_prompt.as_ref().map_or(0, String::len) > 2 * 1024 * 1024 {
|
||||
return Err("AI text exceeds the 2 MiB request limit".into());
|
||||
}
|
||||
let (provider, api_key, model, writing_style, base_url) = {
|
||||
let state = app.state::<AppState>();
|
||||
let config = state.config.lock().map_err(|e| e.to_string())?;
|
||||
let provider = config
|
||||
.ai_provider
|
||||
.clone()
|
||||
.unwrap_or_else(|| "anthropic".to_string());
|
||||
.ok_or("AI is disabled. Choose a provider in Settings.")?;
|
||||
let key = match provider.as_str() {
|
||||
"ollama" => Some(config.ollama_api_key.clone().unwrap_or_default()),
|
||||
"openai_compatible" => {
|
||||
@@ -4299,6 +4475,49 @@ pub fn ai_ask(
|
||||
(provider, key, model, style, base_url)
|
||||
};
|
||||
|
||||
if let Some(expected) = expected_config {
|
||||
let relevant_base = matches!(provider.as_str(), "ollama" | "openai_compatible");
|
||||
if expected.provider.as_deref() != Some(provider.as_str())
|
||||
|| expected.model != model
|
||||
|| (relevant_base && expected.base_url != base_url)
|
||||
{
|
||||
return Err(
|
||||
"AI settings changed. Reopen AI actions before sending this request.".into(),
|
||||
);
|
||||
}
|
||||
} else if image_context.is_some() {
|
||||
return Err("Confirm the AI destination before including images".into());
|
||||
}
|
||||
if model.trim().is_empty() {
|
||||
return Err("Choose an AI model in Settings before starting".into());
|
||||
}
|
||||
if !matches!(
|
||||
provider.as_str(),
|
||||
"openai" | "anthropic" | "ollama" | "openai_compatible"
|
||||
) {
|
||||
return Err("Unsupported AI provider".into());
|
||||
}
|
||||
let images = if let Some(context) = image_context {
|
||||
let state = app.state::<AppState>();
|
||||
state.validate_vault(&context.vault_path)?;
|
||||
let guard = state.note_save.clone().lock_owned().await;
|
||||
tauri::async_runtime::spawn_blocking(move || {
|
||||
let _guard = guard;
|
||||
crate::ai::images::prepare(&context.vault_path, &context.note_path, &context.paths)
|
||||
})
|
||||
.await
|
||||
.map_err(|_| "AI image preparation failed")??
|
||||
} else {
|
||||
Vec::new()
|
||||
};
|
||||
|
||||
if writing_style
|
||||
.as_ref()
|
||||
.is_some_and(|style| style.len() > 256 * 1024)
|
||||
|| model.len() > 512
|
||||
{
|
||||
return Err("AI settings exceed the size limit".into());
|
||||
}
|
||||
let mut system_prompt = "You are a helpful writing assistant inside a note-taking app called HelixNotes. \
|
||||
You help users improve, rewrite, summarize, and transform their text. \
|
||||
Return ONLY the resulting text - no explanations, no markdown code fences, no preamble. \
|
||||
@@ -4313,7 +4532,11 @@ pub fn ai_ask(
|
||||
));
|
||||
}
|
||||
|
||||
if action == "describe_images" && images.is_empty() {
|
||||
return Err("Select images before requesting a description".into());
|
||||
}
|
||||
let user_message = match action.as_str() {
|
||||
"describe_images" => format!("Describe the attached images, including readable text and relevant details. Preserve the existing text and every media placeholder; add descriptions alongside them:\n\n{}", text),
|
||||
"improve" => format!("Improve the writing quality of this text while keeping the same meaning and tone:\n\n{}", text),
|
||||
"fix_grammar" => format!("Fix all grammar, spelling, and punctuation errors in this text. Keep the original style:\n\n{}", text),
|
||||
"shorter" => format!("Make this text more concise while keeping the key points:\n\n{}", text),
|
||||
@@ -4343,6 +4566,7 @@ pub fn ai_ask(
|
||||
user_message,
|
||||
request_id,
|
||||
base_url,
|
||||
images,
|
||||
);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -0,0 +1,151 @@
|
||||
//! Native labels and supported preferences share the frontend's bundled locale registry.
|
||||
use std::sync::OnceLock;
|
||||
|
||||
pub fn supported_languages() -> &'static [String] {
|
||||
static LANGUAGES: OnceLock<Vec<String>> = OnceLock::new();
|
||||
LANGUAGES.get_or_init(|| {
|
||||
let registry: Vec<serde_json::Value> =
|
||||
serde_json::from_str(include_str!("../../src/lib/i18n/languages.json"))
|
||||
.expect("invalid bundled language registry");
|
||||
registry
|
||||
.into_iter()
|
||||
.map(|entry| {
|
||||
entry["code"]
|
||||
.as_str()
|
||||
.expect("missing language code")
|
||||
.to_string()
|
||||
})
|
||||
.collect()
|
||||
})
|
||||
}
|
||||
|
||||
#[cfg(any(desktop, test))]
|
||||
fn resolve_tag(tag: &str) -> Option<&'static str> {
|
||||
let tag = tag
|
||||
.trim()
|
||||
.split(['.', '@'])
|
||||
.next()
|
||||
.unwrap_or_default()
|
||||
.replace('_', "-")
|
||||
.to_ascii_lowercase();
|
||||
if let Some(exact) = supported_languages()
|
||||
.iter()
|
||||
.find(|code| code.to_ascii_lowercase() == tag)
|
||||
{
|
||||
return Some(exact);
|
||||
}
|
||||
let mut parts = tag.split('-');
|
||||
let base = parts.next()?;
|
||||
if base == "pt" {
|
||||
return Some(if parts.any(|part| part == "br") {
|
||||
"pt-BR"
|
||||
} else {
|
||||
"pt-PT"
|
||||
});
|
||||
}
|
||||
supported_languages()
|
||||
.iter()
|
||||
.find(|code| code.as_str() == base)
|
||||
.map(String::as_str)
|
||||
}
|
||||
|
||||
#[cfg(any(desktop, test))]
|
||||
type Catalogs = std::collections::HashMap<&'static str, std::collections::HashMap<String, String>>;
|
||||
|
||||
#[cfg(any(desktop, test))]
|
||||
fn catalogs() -> &'static Catalogs {
|
||||
static CATALOGS: OnceLock<Catalogs> = OnceLock::new();
|
||||
CATALOGS.get_or_init(|| {
|
||||
[
|
||||
("en", include_str!("../../src/lib/i18n/locales/en.json")),
|
||||
("ru", include_str!("../../src/lib/i18n/locales/ru.json")),
|
||||
("nl", include_str!("../../src/lib/i18n/locales/nl.json")),
|
||||
("de", include_str!("../../src/lib/i18n/locales/de.json")),
|
||||
("es", include_str!("../../src/lib/i18n/locales/es.json")),
|
||||
("fr", include_str!("../../src/lib/i18n/locales/fr.json")),
|
||||
("it", include_str!("../../src/lib/i18n/locales/it.json")),
|
||||
(
|
||||
"pt-PT",
|
||||
include_str!("../../src/lib/i18n/locales/pt-PT.json"),
|
||||
),
|
||||
(
|
||||
"pt-BR",
|
||||
include_str!("../../src/lib/i18n/locales/pt-BR.json"),
|
||||
),
|
||||
]
|
||||
.into_iter()
|
||||
.map(|(code, source)| {
|
||||
(
|
||||
code,
|
||||
serde_json::from_str(source).expect("invalid bundled language catalog"),
|
||||
)
|
||||
})
|
||||
.collect()
|
||||
})
|
||||
}
|
||||
|
||||
#[cfg(any(desktop, test))]
|
||||
pub fn text(language: &str, key: &'static str) -> &'static str {
|
||||
let locale =
|
||||
if language == "system" || !supported_languages().iter().any(|code| code == language) {
|
||||
sys_locale::get_locale()
|
||||
.and_then(|tag| resolve_tag(&tag))
|
||||
.unwrap_or("en")
|
||||
} else {
|
||||
resolve_tag(language).unwrap_or("en")
|
||||
};
|
||||
catalogs()
|
||||
.get(locale)
|
||||
.and_then(|catalog| catalog.get(key))
|
||||
.or_else(|| catalogs().get("en").and_then(|catalog| catalog.get(key)))
|
||||
.map(String::as_str)
|
||||
.unwrap_or(key)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn native_labels_share_the_frontend_catalogs() {
|
||||
assert_eq!(text("en", "native.quit"), "Quit");
|
||||
assert_eq!(text("ru", "native.quit"), "Выйти");
|
||||
assert_eq!(text("ru", "native.show"), "Показать HelixNotes");
|
||||
assert_eq!(text("ru", "unknown.key"), "unknown.key");
|
||||
for (code, quit) in [
|
||||
("nl", "Afsluiten"),
|
||||
("de", "Beenden"),
|
||||
("es", "Salir"),
|
||||
("fr", "Quitter"),
|
||||
("it", "Esci"),
|
||||
("pt-PT", "Sair"),
|
||||
("pt-BR", "Sair"),
|
||||
] {
|
||||
assert_eq!(text(code, "native.quit"), quit, "{code}");
|
||||
}
|
||||
for code in supported_languages() {
|
||||
assert!(catalogs().contains_key(code.as_str()), "missing {code}");
|
||||
}
|
||||
assert_eq!(supported_languages().len(), catalogs().len());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn native_locale_matching_preserves_portuguese_regions() {
|
||||
for (tag, expected) in [
|
||||
("nl-BE", "nl"),
|
||||
("de_AT.UTF-8", "de"),
|
||||
("es-MX", "es"),
|
||||
("fr-CA", "fr"),
|
||||
("it-CH", "it"),
|
||||
("ru_RU", "ru"),
|
||||
("pt", "pt-PT"),
|
||||
("pt-PT", "pt-PT"),
|
||||
("pt-AO", "pt-PT"),
|
||||
("pt_BR.UTF-8", "pt-BR"),
|
||||
("pt-Latn-BR", "pt-BR"),
|
||||
] {
|
||||
assert_eq!(resolve_tag(tag), Some(expected), "{tag}");
|
||||
}
|
||||
assert_eq!(resolve_tag("ja-JP"), None);
|
||||
}
|
||||
}
|
||||
+23
-3
@@ -3,6 +3,7 @@ mod asset_scope;
|
||||
mod backup;
|
||||
mod commands;
|
||||
mod history;
|
||||
mod i18n;
|
||||
mod image_proxy;
|
||||
mod search;
|
||||
mod state;
|
||||
@@ -165,6 +166,7 @@ pub fn run() {
|
||||
#[cfg(desktop)]
|
||||
commands::complete_window_close,
|
||||
commands::set_theme,
|
||||
commands::set_language,
|
||||
commands::set_system_themes,
|
||||
commands::set_accent_color,
|
||||
commands::save_custom_theme,
|
||||
@@ -191,6 +193,9 @@ pub fn run() {
|
||||
commands::create_note,
|
||||
commands::duplicate_note,
|
||||
commands::create_daily_note,
|
||||
commands::get_daily_note_template,
|
||||
commands::set_daily_note_template,
|
||||
commands::import_daily_note_template,
|
||||
commands::rename_note,
|
||||
commands::delete_note,
|
||||
commands::move_note,
|
||||
@@ -248,6 +253,7 @@ pub fn run() {
|
||||
commands::create_version,
|
||||
commands::set_ai_settings,
|
||||
commands::test_ai_connection,
|
||||
commands::fetch_ai_models,
|
||||
commands::ai_ask,
|
||||
commands::set_sync_settings,
|
||||
commands::test_sync_connection,
|
||||
@@ -392,11 +398,25 @@ pub fn run() {
|
||||
});
|
||||
}
|
||||
|
||||
#[cfg(desktop)]
|
||||
fn localized_tray_menu<R: tauri::Runtime>(
|
||||
app: &tauri::AppHandle<R>,
|
||||
language: &str,
|
||||
) -> tauri::Result<tauri::menu::Menu<R>> {
|
||||
let show = MenuItemBuilder::with_id("show", i18n::text(language, "native.show")).build(app)?;
|
||||
let quit = MenuItemBuilder::with_id("quit", i18n::text(language, "native.quit")).build(app)?;
|
||||
MenuBuilder::new(app).items(&[&show, &quit]).build()
|
||||
}
|
||||
|
||||
#[cfg(desktop)]
|
||||
fn setup_tray(app: &mut tauri::App) -> Result<(), Box<dyn std::error::Error>> {
|
||||
let show = MenuItemBuilder::with_id("show", "Show HelixNotes").build(app)?;
|
||||
let quit = MenuItemBuilder::with_id("quit", "Quit").build(app)?;
|
||||
let menu = MenuBuilder::new(app).items(&[&show, &quit]).build()?;
|
||||
let language = app
|
||||
.state::<AppState>()
|
||||
.config
|
||||
.lock()
|
||||
.map(|config| config.language.clone())
|
||||
.unwrap_or_default();
|
||||
let menu = localized_tray_menu(app.handle(), &language)?;
|
||||
|
||||
let _tray = TrayIconBuilder::with_id("helixnotes")
|
||||
.icon(
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
// conflict copies so nothing is ever lost.
|
||||
//
|
||||
// Synced set: every `*.md` in the vault tree, `.helixnotes/attachments/`,
|
||||
// `.helixnotes/notebook_icons.json`, and `.helixnotes/tag_styles.json`. Search indexes,
|
||||
// `.helixnotes/notebook_icons.json`, `.helixnotes/tag_styles.json` and the daily template. Search indexes,
|
||||
// trash, history, other metadata, and the manifest itself remain local-only.
|
||||
|
||||
use crate::state::AppState;
|
||||
@@ -22,6 +22,9 @@ use std::path::{Path, PathBuf};
|
||||
use tauri::{Emitter, Manager};
|
||||
use walkdir::WalkDir;
|
||||
|
||||
#[cfg(test)]
|
||||
mod daily_template_tests;
|
||||
|
||||
/// Folder listings requested at once unless the settings say otherwise. A handful hides most of
|
||||
/// the round-trip time and stays polite to a small server.
|
||||
pub const DEFAULT_LISTING_PARALLELISM: usize = 6;
|
||||
@@ -252,7 +255,7 @@ fn conflict_relpath(relpath: &str, stamp: &str) -> String {
|
||||
// title. A note without a title of its own already takes it from the file name.
|
||||
fn conflict_copy(relpath: &str, bytes: Vec<u8>, stamp: &str) -> Vec<u8> {
|
||||
use crate::vault::{frontmatter, operations};
|
||||
if !relpath.ends_with(".md") {
|
||||
if !relpath.ends_with(".md") || relpath.starts_with(".helixnotes/") {
|
||||
return bytes;
|
||||
}
|
||||
let Ok(raw) = std::str::from_utf8(&bytes) else {
|
||||
@@ -335,7 +338,7 @@ struct LocalFile {
|
||||
}
|
||||
|
||||
/// The synced set: `*.md` anywhere outside `.helixnotes/`, everything under
|
||||
/// `.helixnotes/attachments/`, plus notebook icon and tag style mappings. Applied to BOTH local
|
||||
/// `.helixnotes/attachments/`, plus the daily template, notebook icon and tag style mappings. Applied to BOTH local
|
||||
/// and remote so pointing at a folder with unrelated files never imports them.
|
||||
fn is_synced_relpath(rel: &str) -> bool {
|
||||
// On a case-insensitive disk `.HelixNotes/history/x.md` lands in the app's own folder, so any
|
||||
@@ -350,6 +353,7 @@ fn is_synced_relpath(rel: &str) -> bool {
|
||||
rel.starts_with(".helixnotes/attachments/")
|
||||
|| rel == ".helixnotes/notebook_icons.json"
|
||||
|| rel == ".helixnotes/tag_styles.json"
|
||||
|| rel == crate::vault::daily_template::RELATIVE_PATH
|
||||
} else {
|
||||
rel.ends_with(".md")
|
||||
}
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
use super::{conflict_copy, is_synced_relpath, scan_local};
|
||||
use crate::vault::daily_template as template;
|
||||
use std::fs;
|
||||
|
||||
#[test]
|
||||
fn sync_includes_only_the_designated_template_metadata_file() {
|
||||
assert!(is_synced_relpath(template::RELATIVE_PATH));
|
||||
for path in [
|
||||
".helixnotes/history/daily-template.md",
|
||||
".helixnotes/daily-template.json",
|
||||
".helixnotes/other.md",
|
||||
".HelixNotes/daily-template.md",
|
||||
] {
|
||||
assert!(!is_synced_relpath(path), "{path}");
|
||||
}
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let vault = dir.path().to_str().unwrap();
|
||||
template::set(vault, Some("{{date}}\n- [ ] Task"), None).unwrap();
|
||||
fs::write(dir.path().join(".helixnotes/private.md"), "Private").unwrap();
|
||||
fs::write(dir.path().join("Note.md"), "Note").unwrap();
|
||||
let files = scan_local(vault).unwrap();
|
||||
assert_eq!(files.len(), 2);
|
||||
assert!(files.contains_key(template::RELATIVE_PATH));
|
||||
assert!(files.contains_key("Note.md"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn metadata_conflict_copies_preserve_template_bytes_instead_of_rewriting_note_titles() {
|
||||
let raw = b"---\nhelixnotes_daily_template_enabled: false\ntitle: Not a note\n---\n# {{title}}\n{{date}}\n".to_vec();
|
||||
assert_eq!(
|
||||
conflict_copy(
|
||||
".helixnotes/daily-template (conflict x).md",
|
||||
raw.clone(),
|
||||
"x"
|
||||
),
|
||||
raw
|
||||
);
|
||||
}
|
||||
@@ -184,6 +184,8 @@ pub struct AppConfig {
|
||||
#[serde(default)]
|
||||
pub active_bookmark_id: Option<String>,
|
||||
pub theme: String,
|
||||
/// Device-local interface preference; never written into vault data.
|
||||
pub language: 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")]
|
||||
@@ -276,6 +278,10 @@ pub struct AppConfig {
|
||||
pub openai_compatible_api_key: Option<String>,
|
||||
#[serde(default = "default_ai_model")]
|
||||
pub ai_model: String,
|
||||
pub anthropic_model: Option<String>,
|
||||
pub openai_model: Option<String>,
|
||||
pub ollama_model: Option<String>,
|
||||
pub openai_compatible_model: Option<String>,
|
||||
#[serde(default)]
|
||||
pub ai_writing_style: Option<String>,
|
||||
#[serde(default)]
|
||||
@@ -368,6 +374,7 @@ impl Default for AppConfig {
|
||||
active_vault: None,
|
||||
active_bookmark_id: None,
|
||||
theme: "system".to_string(),
|
||||
language: "system".to_string(),
|
||||
system_light_theme: default_system_light_theme(),
|
||||
system_dark_theme: default_system_dark_theme(),
|
||||
accent_color: None,
|
||||
@@ -412,6 +419,10 @@ impl Default for AppConfig {
|
||||
openai_compatible_base_url: None,
|
||||
openai_compatible_api_key: None,
|
||||
ai_model: default_ai_model(),
|
||||
anthropic_model: None,
|
||||
openai_model: None,
|
||||
ollama_model: None,
|
||||
openai_compatible_model: None,
|
||||
ai_writing_style: None,
|
||||
default_view_mode: false,
|
||||
new_notes_in_source_mode: false,
|
||||
@@ -651,6 +662,25 @@ mod startup_view_tests {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn existing_configs_default_system_language() {
|
||||
let mut value = serde_json::to_value(AppConfig::default()).unwrap();
|
||||
value.as_object_mut().unwrap().remove("language");
|
||||
let config: AppConfig = serde_json::from_value(value).unwrap();
|
||||
assert_eq!(config.language, "system");
|
||||
for language in crate::i18n::supported_languages()
|
||||
.iter()
|
||||
.map(String::as_str)
|
||||
.chain(["system"])
|
||||
{
|
||||
let mut config = config.clone();
|
||||
config.language = language.to_string();
|
||||
let roundtrip: AppConfig =
|
||||
serde_json::from_str(&serde_json::to_string(&config).unwrap()).unwrap();
|
||||
assert_eq!(roundtrip.language, language);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn existing_configs_default_system_theme_pair() {
|
||||
let mut value = serde_json::to_value(AppConfig::default()).unwrap();
|
||||
|
||||
@@ -0,0 +1,295 @@
|
||||
//! A vault-owned Markdown template, deliberately outside the note/task/search tree.
|
||||
use std::fs;
|
||||
use std::io::Read;
|
||||
use std::path::PathBuf;
|
||||
|
||||
pub const RELATIVE_PATH: &str = ".helixnotes/daily-template.md";
|
||||
pub const MAX_BYTES: usize = 256 * 1024;
|
||||
const DISABLED_HEADER: &str = "---\nhelixnotes_daily_template_enabled: false\n---\n";
|
||||
|
||||
#[derive(Debug, serde::Serialize)]
|
||||
pub struct DailyTemplate {
|
||||
/// The exact stored bytes, used as a compare-and-swap revision.
|
||||
pub raw: Option<String>,
|
||||
pub content: String,
|
||||
pub enabled: bool,
|
||||
}
|
||||
|
||||
impl DailyTemplate {
|
||||
pub fn from_raw(raw: Option<String>) -> Self {
|
||||
let enabled = raw.as_deref().is_some_and(is_enabled);
|
||||
let content = raw.as_deref().map(body).unwrap_or_default().to_string();
|
||||
Self {
|
||||
raw,
|
||||
content,
|
||||
enabled,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn is_enabled(raw: &str) -> bool {
|
||||
let parsed = gray_matter::Matter::<super::frontmatter::BoundedYaml>::new()
|
||||
.parse(raw.strip_prefix('\u{feff}').unwrap_or(raw));
|
||||
parsed
|
||||
.data
|
||||
.and_then(|data| data.deserialize::<serde_json::Value>().ok())
|
||||
.and_then(|data| {
|
||||
data.get("helixnotes_daily_template_enabled")
|
||||
.and_then(serde_json::Value::as_bool)
|
||||
})
|
||||
.unwrap_or(true)
|
||||
}
|
||||
|
||||
fn path(vault: &str, create_parent: bool) -> Result<Option<PathBuf>, String> {
|
||||
let root = fs::canonicalize(vault).map_err(|e| format!("Invalid vault: {e}"))?;
|
||||
if !root.is_dir() {
|
||||
return Err("Vault is not a directory".into());
|
||||
}
|
||||
let parent = root.join(".helixnotes");
|
||||
if create_parent {
|
||||
match fs::create_dir(&parent) {
|
||||
Ok(()) => {}
|
||||
Err(e) if e.kind() == std::io::ErrorKind::AlreadyExists => {}
|
||||
Err(e) => return Err(e.to_string()),
|
||||
}
|
||||
}
|
||||
match fs::symlink_metadata(&parent) {
|
||||
Ok(meta) if meta.file_type().is_dir() => {}
|
||||
Ok(_) => return Err("Vault metadata directory must not be a symlink or file".into()),
|
||||
Err(e) if e.kind() == std::io::ErrorKind::NotFound => return Ok(None),
|
||||
Err(e) => return Err(e.to_string()),
|
||||
}
|
||||
let target = root.join(RELATIVE_PATH);
|
||||
match fs::symlink_metadata(&target) {
|
||||
Ok(meta) if !meta.file_type().is_file() => {
|
||||
return Err("Daily template must be a regular file, not a symlink".into())
|
||||
}
|
||||
Err(e) if e.kind() != std::io::ErrorKind::NotFound => return Err(e.to_string()),
|
||||
_ => {}
|
||||
}
|
||||
Ok(Some(target))
|
||||
}
|
||||
|
||||
/// Bound the read itself, including Android document-provider streams and growing files.
|
||||
pub fn read_from(reader: impl Read) -> Result<String, String> {
|
||||
let mut bytes = Vec::new();
|
||||
reader
|
||||
.take((MAX_BYTES + 1) as u64)
|
||||
.read_to_end(&mut bytes)
|
||||
.map_err(|e| e.to_string())?;
|
||||
if bytes.len() > MAX_BYTES {
|
||||
return Err("Daily template exceeds the 256 KiB limit".into());
|
||||
}
|
||||
String::from_utf8(bytes).map_err(|_| "Daily template must be UTF-8 text".into())
|
||||
}
|
||||
|
||||
pub fn read(vault: &str) -> Result<Option<String>, String> {
|
||||
let Some(target) = path(vault, false)? else {
|
||||
return Ok(None);
|
||||
};
|
||||
let mut options = fs::OpenOptions::new();
|
||||
options.read(true);
|
||||
#[cfg(unix)]
|
||||
{
|
||||
use std::os::unix::fs::OpenOptionsExt;
|
||||
options.custom_flags(libc::O_NOFOLLOW);
|
||||
}
|
||||
match options.open(target) {
|
||||
Ok(file) => read_from(file).map(Some),
|
||||
Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(None),
|
||||
Err(e) => Err(format!("Could not read daily template: {e}")),
|
||||
}
|
||||
}
|
||||
|
||||
/// Ignore a leading UTF-8 BOM and complete YAML frontmatter, without trimming the body.
|
||||
/// An unmatched Markdown horizontal rule is ordinary body text, not metadata.
|
||||
pub fn body(raw: &str) -> &str {
|
||||
let raw = raw.strip_prefix('\u{feff}').unwrap_or(raw);
|
||||
let mut lines = raw.split_inclusive('\n');
|
||||
let Some(first) = lines.next() else {
|
||||
return raw;
|
||||
};
|
||||
if first.trim_end_matches(['\r', '\n']) != "---" {
|
||||
return raw;
|
||||
}
|
||||
let mut offset = first.len();
|
||||
for line in lines {
|
||||
offset += line.len();
|
||||
if matches!(line.trim_end_matches(['\r', '\n']), "---" | "...") {
|
||||
return &raw[offset..];
|
||||
}
|
||||
}
|
||||
raw
|
||||
}
|
||||
|
||||
/// Compare-and-swap prevents a stale Settings window from replacing another window's edit.
|
||||
pub fn set(
|
||||
vault: &str,
|
||||
template: Option<&str>,
|
||||
expected: Option<&str>,
|
||||
) -> Result<Option<String>, String> {
|
||||
if template.is_some_and(|text| text.len() > MAX_BYTES - DISABLED_HEADER.len()) {
|
||||
return Err("Daily template exceeds the 256 KiB limit".into());
|
||||
}
|
||||
let current = read(vault)?;
|
||||
if current.as_deref() != expected {
|
||||
return Err(
|
||||
"Daily template changed on disk. Reload it before saving; your draft was not written."
|
||||
.into(),
|
||||
);
|
||||
}
|
||||
let Some(target) = path(vault, template.is_some())? else {
|
||||
return Ok(None);
|
||||
};
|
||||
if let Some(raw) = template {
|
||||
let text = body(raw);
|
||||
super::operations::replace_file_atomically(&target, text.as_bytes())?;
|
||||
Ok(Some(text.to_string()))
|
||||
} else if let Some(raw) = current {
|
||||
// Disabling must not destroy the only copy of a template created in Settings.
|
||||
let disabled = format!("{DISABLED_HEADER}{}", body(&raw));
|
||||
if disabled.len() > MAX_BYTES {
|
||||
return Err("Daily template exceeds the 256 KiB limit".into());
|
||||
}
|
||||
super::operations::replace_file_atomically(&target, disabled.as_bytes())?;
|
||||
Ok(Some(disabled))
|
||||
} else {
|
||||
Ok(None)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn expand(raw: &str, date: &str, title: &str) -> String {
|
||||
// Values come from the selected calendar date and configured title format, not note text.
|
||||
body(raw)
|
||||
.replace("{{date}}", date)
|
||||
.replace("{{title}}", title)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn vault_local_template_can_be_saved_replaced_and_disabled() {
|
||||
let a = tempfile::tempdir().unwrap();
|
||||
let b = tempfile::tempdir().unwrap();
|
||||
let vault = a.path().to_str().unwrap();
|
||||
assert_eq!(read(vault).unwrap(), None);
|
||||
assert_eq!(
|
||||
set(vault, Some("# {{title}}\n\n- [ ] Plan \n"), None)
|
||||
.unwrap()
|
||||
.as_deref(),
|
||||
Some("# {{title}}\n\n- [ ] Plan \n")
|
||||
);
|
||||
assert_eq!(read(b.path().to_str().unwrap()).unwrap(), None);
|
||||
let old = read(vault).unwrap();
|
||||
assert_eq!(
|
||||
set(vault, Some(""), old.as_deref()).unwrap(),
|
||||
Some(String::new())
|
||||
);
|
||||
let disabled = set(vault, None, Some("")).unwrap().unwrap();
|
||||
assert!(!is_enabled(&disabled));
|
||||
assert_eq!(body(&disabled), "");
|
||||
assert!(a.path().join(RELATIVE_PATH).exists());
|
||||
assert_eq!(
|
||||
set(vault, Some("enabled again"), Some(&disabled))
|
||||
.unwrap()
|
||||
.as_deref(),
|
||||
Some("enabled again")
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn disabling_keeps_the_saved_body_and_reenabling_restores_it() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let vault = dir.path().to_str().unwrap();
|
||||
let original = "# {{title}}\n\n- [ ] My plan \n";
|
||||
set(vault, Some(original), None).unwrap();
|
||||
let disabled = set(vault, None, Some(original)).unwrap().unwrap();
|
||||
let state = DailyTemplate::from_raw(Some(disabled.clone()));
|
||||
assert!(!state.enabled);
|
||||
assert_eq!(state.content, original);
|
||||
assert_eq!(
|
||||
set(vault, Some(&state.content), Some(&disabled))
|
||||
.unwrap()
|
||||
.as_deref(),
|
||||
Some(original)
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn stale_updates_and_disables_leave_the_latest_template_untouched() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let vault = dir.path().to_str().unwrap();
|
||||
set(vault, Some("original"), None).unwrap();
|
||||
set(vault, Some("newer"), Some("original")).unwrap();
|
||||
assert!(set(vault, Some("stale"), Some("original")).is_err());
|
||||
assert!(set(vault, None, Some("original")).is_err());
|
||||
assert_eq!(read(vault).unwrap().as_deref(), Some("newer"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn strips_only_leading_complete_frontmatter_and_preserves_body_bytes() {
|
||||
let raw =
|
||||
"\u{feff}---\r\nid: source\r\ntitle: Source\r\n---\r\n\r\n## Plan\r\n- [ ] Task \r\n";
|
||||
assert_eq!(body(raw), "\r\n## Plan\r\n- [ ] Task \r\n");
|
||||
assert_eq!(body("---\nA horizontal rule\n"), "---\nA horizontal rule\n");
|
||||
assert_eq!(
|
||||
body("Text\n---\nid: not metadata\n---\n"),
|
||||
"Text\n---\nid: not metadata\n---\n"
|
||||
);
|
||||
assert_eq!(body("---\n---\n"), "");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn substitutes_only_the_two_documented_tokens() {
|
||||
assert_eq!(
|
||||
expand(
|
||||
"# {{title}}\n{{date}} / {{date}} / {{unknown}}\n",
|
||||
"2026-02-03",
|
||||
"February 3, 2026"
|
||||
),
|
||||
"# February 3, 2026\n2026-02-03 / 2026-02-03 / {{unknown}}\n"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn bounds_reads_and_writes_and_requires_utf8() {
|
||||
assert_eq!(
|
||||
read_from(vec![b'x'; MAX_BYTES].as_slice()).unwrap().len(),
|
||||
MAX_BYTES
|
||||
);
|
||||
assert!(read_from(vec![b'x'; MAX_BYTES + 1].as_slice()).is_err());
|
||||
assert!(read_from([0xff].as_slice()).is_err());
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let vault = dir.path().to_str().unwrap();
|
||||
assert!(set(vault, Some(&"x".repeat(MAX_BYTES + 1)), None).is_err());
|
||||
assert!(!dir.path().join(RELATIVE_PATH).exists());
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
#[test]
|
||||
fn refuses_linked_metadata_and_linked_templates_without_touching_the_target() {
|
||||
use std::os::unix::fs::symlink;
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let outside = tempfile::tempdir().unwrap();
|
||||
let vault = dir.path().to_str().unwrap();
|
||||
fs::write(outside.path().join("daily-template.md"), "outside").unwrap();
|
||||
symlink(outside.path(), dir.path().join(".helixnotes")).unwrap();
|
||||
assert!(read(vault).is_err());
|
||||
assert!(set(vault, Some("bad"), None).is_err());
|
||||
fs::remove_file(dir.path().join(".helixnotes")).unwrap();
|
||||
fs::create_dir(dir.path().join(".helixnotes")).unwrap();
|
||||
symlink(
|
||||
outside.path().join("daily-template.md"),
|
||||
dir.path().join(RELATIVE_PATH),
|
||||
)
|
||||
.unwrap();
|
||||
assert!(read(vault).is_err());
|
||||
assert!(set(vault, Some("bad"), None).is_err());
|
||||
assert_eq!(
|
||||
fs::read_to_string(outside.path().join("daily-template.md")).unwrap(),
|
||||
"outside"
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,118 @@
|
||||
use super::{daily_template as template, operations};
|
||||
use std::collections::HashSet;
|
||||
use std::fs;
|
||||
|
||||
#[test]
|
||||
fn daily_template_uses_the_selected_date_fresh_metadata_and_exact_body_layout() {
|
||||
let root = tempfile::tempdir().unwrap();
|
||||
let vault = root.path().to_str().unwrap();
|
||||
let source = "---\r\nid: template-id\r\ntitle: Do not copy\r\ntags: [private]\r\npinned: true\r\ncreated: 2000-01-01\r\n---\r\n## {{title}}\r\n\r\nDate: {{date}} \r\n- [ ] Plan\r\n<table><tr><td>keep</td></tr></table>\r\n";
|
||||
template::set(vault, Some(source), None).unwrap();
|
||||
let entry = operations::create_daily_note(vault, Some("2020-02-29"), "long").unwrap();
|
||||
assert_eq!(
|
||||
entry.relative_path.replace('\\', "/"),
|
||||
"Daily/2020-02-29.md"
|
||||
);
|
||||
assert_eq!(entry.meta.title, "February 29, 2020");
|
||||
assert_ne!(entry.meta.id, "template-id");
|
||||
uuid::Uuid::parse_str(&entry.meta.id).unwrap();
|
||||
assert_eq!(entry.meta.tags, ["daily"]);
|
||||
assert!(!entry.meta.pinned);
|
||||
assert!(
|
||||
entry.meta.created > chrono::DateTime::parse_from_rfc3339("2020-01-01T00:00:00Z").unwrap()
|
||||
);
|
||||
let raw = fs::read_to_string(&entry.path).unwrap();
|
||||
assert_eq!(template::body(&raw), "## February 29, 2020\r\n\r\nDate: 2020-02-29 \r\n- [ ] Plan\r\n<table><tr><td>keep</td></tr></table>\r\n");
|
||||
assert!(!raw.contains("template-id"));
|
||||
assert_eq!(
|
||||
template::read(vault).unwrap().as_deref(),
|
||||
Some(template::body(source))
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn existing_daily_notes_are_never_retemplated_even_if_the_template_is_broken() {
|
||||
let root = tempfile::tempdir().unwrap();
|
||||
let vault = root.path().to_str().unwrap();
|
||||
template::set(vault, Some("First {{date}}\n"), None).unwrap();
|
||||
let first = operations::create_daily_note(vault, Some("2026-06-01"), "iso").unwrap();
|
||||
let original = fs::read(&first.path).unwrap();
|
||||
fs::write(root.path().join(template::RELATIVE_PATH), [0xff]).unwrap();
|
||||
let reopened = operations::create_daily_note(vault, Some("2026-06-01"), "eu").unwrap();
|
||||
assert_eq!(reopened.meta.id, first.meta.id);
|
||||
assert_eq!(fs::read(&first.path).unwrap(), original);
|
||||
assert!(operations::create_daily_note(vault, Some("2026-06-02"), "iso").is_err());
|
||||
assert!(!root.path().join("Daily/2026-06-02.md").exists());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn disable_and_reenable_preserve_the_template_without_touching_existing_notes() {
|
||||
let root = tempfile::tempdir().unwrap();
|
||||
let vault = root.path().to_str().unwrap();
|
||||
let saved = template::set(vault, Some("{{title}} — {{date}}\n"), None).unwrap();
|
||||
let first = operations::create_daily_note(vault, Some("2026-07-01"), "iso").unwrap();
|
||||
let before = fs::read(&first.path).unwrap();
|
||||
let disabled = template::set(vault, None, saved.as_deref()).unwrap();
|
||||
let blank = operations::create_daily_note(vault, Some("2026-07-02"), "iso").unwrap();
|
||||
assert_eq!(
|
||||
template::body(&fs::read_to_string(blank.path).unwrap()),
|
||||
"\n"
|
||||
);
|
||||
let state = template::DailyTemplate::from_raw(disabled.clone());
|
||||
assert!(!state.enabled);
|
||||
template::set(vault, Some(&state.content), disabled.as_deref()).unwrap();
|
||||
let next = operations::create_daily_note(vault, Some("2026-07-03"), "iso").unwrap();
|
||||
assert_eq!(
|
||||
template::body(&fs::read_to_string(next.path).unwrap()),
|
||||
"2026-07-03 — 2026-07-03\n"
|
||||
);
|
||||
assert_eq!(fs::read(&first.path).unwrap(), before);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn concurrent_daily_creation_publishes_one_complete_note_and_cleans_temporary_files() {
|
||||
let root = tempfile::tempdir().unwrap();
|
||||
let vault = root.path().to_str().unwrap();
|
||||
template::set(vault, Some("# {{title}}\n\n{{date}}\n"), None).unwrap();
|
||||
let entries = std::thread::scope(|scope| {
|
||||
let workers: Vec<_> = (0..6)
|
||||
.map(|_| {
|
||||
scope.spawn(|| {
|
||||
operations::create_daily_note(vault, Some("2026-08-01"), "iso").unwrap()
|
||||
})
|
||||
})
|
||||
.collect();
|
||||
workers
|
||||
.into_iter()
|
||||
.map(|worker| worker.join().unwrap())
|
||||
.collect::<Vec<_>>()
|
||||
});
|
||||
assert_eq!(
|
||||
entries
|
||||
.iter()
|
||||
.map(|entry| &entry.meta.id)
|
||||
.collect::<HashSet<_>>()
|
||||
.len(),
|
||||
1
|
||||
);
|
||||
assert_eq!(fs::read_dir(root.path().join("Daily")).unwrap().count(), 1);
|
||||
assert_eq!(
|
||||
template::body(&fs::read_to_string(&entries[0].path).unwrap()),
|
||||
"# 2026-08-01\n\n2026-08-01\n"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn template_checkboxes_do_not_become_notes_or_tasks_and_vaults_are_independent() {
|
||||
let a = tempfile::tempdir().unwrap();
|
||||
let b = tempfile::tempdir().unwrap();
|
||||
let vault = a.path().to_str().unwrap();
|
||||
template::set(vault, Some("- [ ] Template-only task\n"), None).unwrap();
|
||||
assert!(operations::scan_notes(vault, None).unwrap().is_empty());
|
||||
let note = operations::create_daily_note(b.path().to_str().unwrap(), Some("2026-01-01"), "iso")
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
template::body(&fs::read_to_string(note.path).unwrap()),
|
||||
"\n"
|
||||
);
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
pub mod daily_template;
|
||||
pub mod frontmatter;
|
||||
pub mod import;
|
||||
pub mod operations;
|
||||
@@ -5,5 +6,7 @@ pub mod operations;
|
||||
mod portal_watcher;
|
||||
pub mod watcher;
|
||||
|
||||
#[cfg(test)]
|
||||
mod daily_template_tests;
|
||||
#[cfg(test)]
|
||||
mod note_import_tests;
|
||||
@@ -1132,8 +1132,10 @@ pub fn create_daily_note(
|
||||
};
|
||||
|
||||
let dir = Path::new(vault_path).join("Daily");
|
||||
if fs::symlink_metadata(&dir).is_err() {
|
||||
fs::create_dir(&dir).map_err(|e| e.to_string())?;
|
||||
match fs::create_dir(&dir) {
|
||||
Ok(()) => {}
|
||||
Err(error) if error.kind() == std::io::ErrorKind::AlreadyExists => {}
|
||||
Err(error) => return Err(error.to_string()),
|
||||
}
|
||||
let dir = ensure_vault_content_dir(vault_path, &dir)?;
|
||||
let file_path = dir.join(format!("{}.md", date_str));
|
||||
@@ -1162,14 +1164,23 @@ pub fn create_daily_note(
|
||||
modified: now,
|
||||
};
|
||||
|
||||
let raw = frontmatter::update_note_raw(&meta, "\n");
|
||||
match fs::OpenOptions::new()
|
||||
.write(true)
|
||||
.create_new(true)
|
||||
.open(&file_path)
|
||||
{
|
||||
Ok(mut file) => file.write_all(raw.as_bytes()).map_err(|e| e.to_string())?,
|
||||
Err(error) if error.kind() == std::io::ErrorKind::AlreadyExists => {
|
||||
let body = super::daily_template::read(vault_path)?
|
||||
.filter(|raw| super::daily_template::is_enabled(raw))
|
||||
.map(|raw| super::daily_template::expand(&raw, &date_str, &meta.title))
|
||||
.unwrap_or_else(|| "\n".to_string());
|
||||
// A template owns its body layout: do not insert another heading or copy its metadata.
|
||||
let raw = format!("{}{}", frontmatter::serialize_frontmatter(&meta), body);
|
||||
let mut temporary = tempfile::Builder::new()
|
||||
.prefix(".helixnotes-daily-")
|
||||
.tempfile_in(&dir)
|
||||
.map_err(|e| e.to_string())?;
|
||||
temporary
|
||||
.write_all(raw.as_bytes())
|
||||
.map_err(|e| e.to_string())?;
|
||||
temporary.as_file().sync_all().map_err(|e| e.to_string())?;
|
||||
match temporary.persist_noclobber(&file_path) {
|
||||
Ok(_) => {}
|
||||
Err(error) if error.error.kind() == std::io::ErrorKind::AlreadyExists => {
|
||||
if fs::symlink_metadata(&file_path)
|
||||
.map_err(|e| e.to_string())?
|
||||
.file_type()
|
||||
@@ -1180,7 +1191,7 @@ pub fn create_daily_note(
|
||||
ensure_note_path(vault_path, &file_path)?;
|
||||
return read_note_entry(&file_path, vault_root);
|
||||
}
|
||||
Err(error) => return Err(error.to_string()),
|
||||
Err(error) => return Err(error.error.to_string()),
|
||||
}
|
||||
|
||||
let relative = file_path
|
||||
|
||||
+34
-1
@@ -1,4 +1,5 @@
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
import type { Language } from './i18n/core';
|
||||
import type { ExternalNoteReference } from "./editor/externalNote";
|
||||
import type {
|
||||
AppConfig,
|
||||
@@ -52,6 +53,10 @@ export async function cancelWindowClose(): Promise<void> {
|
||||
return invoke("cancel_window_close");
|
||||
}
|
||||
|
||||
export async function setLanguage(language: Language): Promise<void> {
|
||||
return invoke("set_language", { language });
|
||||
}
|
||||
|
||||
export async function setTheme(theme: string): Promise<void> {
|
||||
return invoke("set_theme", { theme });
|
||||
}
|
||||
@@ -191,6 +196,24 @@ export async function createDailyNote(vaultPath: string, date?: string): Promise
|
||||
return invoke("create_daily_note", { vaultPath, date: date ?? null });
|
||||
}
|
||||
|
||||
export interface DailyNoteTemplate {
|
||||
raw: string | null;
|
||||
content: string;
|
||||
enabled: boolean;
|
||||
}
|
||||
|
||||
export async function getDailyNoteTemplate(vaultPath: string): Promise<DailyNoteTemplate> {
|
||||
return invoke("get_daily_note_template", { vaultPath });
|
||||
}
|
||||
|
||||
export async function setDailyNoteTemplate(vaultPath: string, template: string | null, expectedTemplate: string | null): Promise<DailyNoteTemplate> {
|
||||
return invoke("set_daily_note_template", { vaultPath, template, expectedTemplate });
|
||||
}
|
||||
|
||||
export async function importDailyNoteTemplate(vaultPath: string, title: string, expectedTemplate: string | null): Promise<DailyNoteTemplate | null> {
|
||||
return invoke("import_daily_note_template", { vaultPath, title, expectedTemplate });
|
||||
}
|
||||
|
||||
export async function renameNote(
|
||||
vaultPath: string,
|
||||
path: string,
|
||||
@@ -610,13 +633,23 @@ export async function testAiConnection(): Promise<void> {
|
||||
return invoke("test_ai_connection");
|
||||
}
|
||||
|
||||
export interface AiModel { id: string; name: string; vision: boolean | null }
|
||||
export interface AiImageContext { vaultPath: string; notePath: string; paths: string[] }
|
||||
export interface AiRequestConfig { provider: string | null; model: string; baseUrl: string | null }
|
||||
|
||||
export async function fetchAiModels(provider: string, apiKey: string): Promise<AiModel[]> {
|
||||
return invoke("fetch_ai_models", { provider, apiKey });
|
||||
}
|
||||
|
||||
export async function aiAsk(
|
||||
action: string,
|
||||
text: string,
|
||||
customPrompt: string | null,
|
||||
requestId: string,
|
||||
imageContext: AiImageContext | null = null,
|
||||
expectedConfig: AiRequestConfig | null = null,
|
||||
): Promise<void> {
|
||||
return invoke("ai_ask", { action, text, customPrompt, requestId });
|
||||
return invoke("ai_ask", { action, text, customPrompt, requestId, imageContext, expectedConfig });
|
||||
}
|
||||
|
||||
export async function getInstallType(): Promise<string> {
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
<script lang="ts">
|
||||
import { t } from '$lib/i18n';
|
||||
import type { AiImageCandidate } from '$lib/utils/ai-media';
|
||||
let { images, selected = $bindable([]), destination }: { images: AiImageCandidate[]; selected: string[]; destination: string } = $props();
|
||||
function toggle(path: string, checked: boolean) {
|
||||
selected = checked ? [...selected, path].slice(0, 4) : selected.filter(item => item !== path);
|
||||
}
|
||||
</script>
|
||||
|
||||
<section class="ai-image-options" aria-labelledby="ai-image-title">
|
||||
<h4 id="ai-image-title">{$t('ai.vision.title')}</h4>
|
||||
<p>{$t('ai.vision.help')}</p>
|
||||
{#if images.length}
|
||||
<div class="image-list">
|
||||
{#each images as image (image.path)}
|
||||
<label><input type="checkbox" checked={selected.includes(image.path)} disabled={selected.length >= 4 && !selected.includes(image.path)} onchange={(event) => toggle(image.path, event.currentTarget.checked)} /><span dir="auto">{image.name}</span></label>
|
||||
{/each}
|
||||
</div>
|
||||
{:else}<p>{$t('ai.vision.none')}</p>{/if}
|
||||
{#if selected.length}<p class="disclosure" role="status">{$t('ai.vision.privacy', { provider: destination, count: selected.length })}</p>{/if}
|
||||
</section>
|
||||
|
||||
<style>
|
||||
.ai-image-options { margin: 6px 8px 8px; padding: 10px; border: 1px solid var(--border-color); border-radius: 8px; }
|
||||
h4 { margin: 0 0 6px; font-size: 13px; color: var(--text-primary); }
|
||||
p { margin: 6px 0; font-size: 12px; line-height: 1.5; color: var(--text-secondary); overflow-wrap: anywhere; }
|
||||
.image-list { max-height: 144px; overflow-y: auto; }
|
||||
label { display: flex; align-items: center; gap: 8px; padding: 5px 0; font-size: 12px; color: var(--text-primary); cursor: pointer; }
|
||||
span { min-width: 0; overflow-wrap: anywhere; }
|
||||
input { appearance: none; flex-shrink: 0; width: 16px; height: 16px; border: 1px solid var(--border-color); border-radius: 3px; background: var(--bg-secondary); cursor: pointer; }
|
||||
input:checked { background: var(--accent); border-color: var(--accent); }
|
||||
input:checked::after { content: '✓'; display: block; text-align: center; line-height: 14px; color: var(--bg-primary); font-size: 12px; }
|
||||
input:disabled { opacity: .5; cursor: default; }
|
||||
input:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
|
||||
.disclosure { color: var(--text-primary); }
|
||||
</style>
|
||||
@@ -0,0 +1,65 @@
|
||||
<script lang="ts">
|
||||
import { t } from '$lib/i18n';
|
||||
import { fetchAiModels, type AiModel } from '$lib/api';
|
||||
import ThemedSelect from './ThemedSelect.svelte';
|
||||
let { provider, apiKey, value, onchange }: { provider: string; apiKey: string; value: string; onchange: (model: string) => Promise<void> } = $props();
|
||||
const owner = $derived(provider);
|
||||
const key = $derived(apiKey.trim());
|
||||
const model = $derived(value);
|
||||
let models = $state<AiModel[]>([]);
|
||||
let loading = $state(false);
|
||||
let fetched = $state(false);
|
||||
let error = $state('');
|
||||
let draft = $state('');
|
||||
let generation = 0;
|
||||
$effect(() => { draft = model; });
|
||||
async function refresh() {
|
||||
const request = ++generation;
|
||||
const p = owner, k = key;
|
||||
if (!k) return;
|
||||
loading = true; error = '';
|
||||
try {
|
||||
const result = await fetchAiModels(p, k);
|
||||
if (request !== generation) return;
|
||||
models = result; fetched = true;
|
||||
} catch (cause) { if (request === generation) error = String(cause); }
|
||||
finally { if (request === generation) loading = false; }
|
||||
}
|
||||
$effect(() => {
|
||||
owner; key;
|
||||
generation++; models = []; fetched = false; error = ''; loading = false;
|
||||
// Debounce key entry. Never cache credentials or automatically choose a paid model.
|
||||
const timer = key ? setTimeout(() => void refresh(), 800) : null;
|
||||
return () => { generation++; if (timer !== null) clearTimeout(timer); };
|
||||
});
|
||||
async function choose(next: string) {
|
||||
const p = owner, k = key;
|
||||
try { await onchange(next.trim()); }
|
||||
catch (cause) { if (p === owner && k === key) { error = String(cause); draft = next.trim(); } }
|
||||
}
|
||||
const options = $derived([
|
||||
...(model && !models.some(item => item.id === model) ? [{ value: model, label: `${model} (${$t('ai.models.saved')})` }] : []),
|
||||
...models.map(item => ({ value: item.id, label: item.name === item.id ? item.id : `${item.name} · ${item.id}` })),
|
||||
]);
|
||||
</script>
|
||||
|
||||
<div class="ai-model-picker">
|
||||
<p class="hint">{$t('ai.models.help')}</p>
|
||||
{#if options.length}<ThemedSelect id="ai-provider-model" label={$t('ui.model')} value={model} {options} onchange={choose} />{/if}
|
||||
<button type="button" id="ai-models-refresh" disabled={loading || !key} onclick={refresh}>{$t(loading ? 'ai.models.loading' : 'ai.models.refresh')}</button>
|
||||
{#if !key}<p class="hint">{$t('ai.models.needKey')}</p>{/if}
|
||||
{#if fetched && !models.length}<p class="hint" role="status">{$t('ai.models.empty')}</p>{/if}
|
||||
{#if error}<p class="hint" role="alert">{$t('ai.models.failed', { error })}</p>{/if}
|
||||
<label for="ai-manual-model">{$t('ai.models.manual')}</label>
|
||||
<input id="ai-manual-model" type="text" maxlength="512" bind:value={draft} placeholder={$t('ui.enter_model_name')} onblur={() => { if (draft.trim() !== model) void choose(draft); }} onkeydown={(e) => { if (e.key === 'Enter') { e.preventDefault(); void choose(draft); } }} />
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.hint { margin: 8px 0; color: var(--text-secondary); font-size: 12px; line-height: 1.5; overflow-wrap: anywhere; }
|
||||
label { display: block; margin: 12px 0 6px; color: var(--text-primary); font-size: 13px; }
|
||||
input { width: 100%; box-sizing: border-box; padding: 10px 12px; border: 1px solid var(--border-color); border-radius: 8px; background: var(--bg-secondary); color: var(--text-primary); font: inherit; font-size: 13px; }
|
||||
button { margin-top: 8px; padding: 8px 12px; border: 1px solid var(--border-color); border-radius: 8px; background: var(--bg-secondary); color: var(--text-primary); font: inherit; font-size: 13px; cursor: pointer; }
|
||||
button:disabled { opacity: .6; cursor: default; }
|
||||
button:hover:not(:disabled) { background: var(--bg-hover); }
|
||||
button:focus-visible, input:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
|
||||
</style>
|
||||
@@ -1,4 +1,6 @@
|
||||
<script lang="ts">
|
||||
import { t as ui } from '$lib/i18n';
|
||||
import { message as showMessage } from '@tauri-apps/plugin-dialog';
|
||||
import { onMount, onDestroy, tick, untrack } from 'svelte';
|
||||
import { MediaQuery } from 'svelte/reactivity';
|
||||
import { listen } from '@tauri-apps/api/event';
|
||||
@@ -725,6 +727,10 @@
|
||||
if (isMobile) $mobileView = 'editor';
|
||||
} catch (e) {
|
||||
console.error('Failed to create/open daily note:', e);
|
||||
if (navigationIsCurrent(token)) {
|
||||
await showMessage(`${$ui('ui.could_not_open_this_note')}\n\n${String(e)}`, { title: $ui('ui.daily_note'), kind: 'error' })
|
||||
.catch(error => console.error('Could not display daily-note error:', error));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1253,7 +1259,7 @@
|
||||
<div class="mobile-header">
|
||||
{#if tabletLayout}
|
||||
<button class="mobile-header-btn" class:active={!tabletNavHidden} onclick={() => setTabletNavHidden(!tabletNavHidden)}
|
||||
title={tabletNavHidden ? 'Show side panel' : 'Hide side panel'} aria-label={tabletNavHidden ? 'Show side panel' : 'Hide side panel'} aria-pressed={!tabletNavHidden}>
|
||||
title={tabletNavHidden ? $ui("ui.show_side_panel") : $ui("ui.hide_side_panel")} aria-label={tabletNavHidden ? $ui("ui.show_side_panel") : $ui("ui.hide_side_panel")} aria-pressed={!tabletNavHidden}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<rect x="3" y="3" width="18" height="18" rx="2"/><line x1="9" y1="3" x2="9" y2="21"/>
|
||||
</svg>
|
||||
@@ -1262,7 +1268,7 @@
|
||||
{#if tabletLayout && tabletNavHidden}
|
||||
<!-- The hidden column has no title or back step to show. -->
|
||||
{:else if $mobileView !== 'sidebar'}
|
||||
<button class="mobile-header-btn" bind:this={mobileBackButton} onclick={mobileBack} aria-label="Go back">
|
||||
<button class="mobile-header-btn" bind:this={mobileBackButton} onclick={mobileBack} aria-label={$ui("ui.go_back")}>
|
||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M15 18l-6-6 6-6"/>
|
||||
</svg>
|
||||
@@ -1283,7 +1289,7 @@
|
||||
{#if $mobileView === 'sidebar'}
|
||||
HelixNotes
|
||||
{:else}
|
||||
{#if $viewMode === 'notebook'}{$activeNotebook?.name ?? 'Notebook'}{:else if $viewMode === 'tag' && $activeTag}<TagLabel name={$activeTag} size={16} />{:else if $viewMode === 'quickaccess'}Quick Access{:else if $viewMode === 'daily'}Daily Notes{:else if $viewMode === 'tasks'}Tasks{:else if $viewMode === 'trash'}Trash{:else}All Notes{/if}
|
||||
{#if $viewMode === 'notebook'}{$activeNotebook?.name ?? 'Notebook'}{:else if $viewMode === 'tag' && $activeTag}<TagLabel name={$activeTag} size={16} />{:else if $viewMode === 'quickaccess'}{$ui("ui.quick_access")}{:else if $viewMode === 'daily'}{$ui("ui.daily_notes")}{:else if $viewMode === 'tasks'}{$ui("ui.tasks")}{:else if $viewMode === 'trash'}{$ui("ui.trash")}{:else}{$ui("ui.all_notes")}{/if}
|
||||
{/if}
|
||||
</span>
|
||||
{#if $globalUpdateAvailable && $mobileView === 'sidebar'}
|
||||
@@ -1294,7 +1300,7 @@
|
||||
{/if}
|
||||
<div class="mobile-header-actions">
|
||||
{#if $mobileView === 'editor' || (tabletLayout && $activeNotePath)}
|
||||
<button class="mobile-header-btn" class:active={$readOnly} disabled={isTrashedNote($activeNotePath, ownerVault)} onclick={() => ($readOnly = !$readOnly)} title={$readOnly ? 'Edit' : 'View'} aria-label={$readOnly ? 'Edit' : 'View'}>
|
||||
<button class="mobile-header-btn" class:active={$readOnly} disabled={isTrashedNote($activeNotePath, ownerVault)} onclick={() => ($readOnly = !$readOnly)} title={$readOnly ? $ui("ui.edit") : $ui("ui.view")} aria-label={$readOnly ? $ui("ui.edit") : $ui("ui.view")}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
{#if $readOnly}
|
||||
<path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z" />
|
||||
@@ -1305,17 +1311,17 @@
|
||||
{/if}
|
||||
</svg>
|
||||
</button>
|
||||
<button class="mobile-header-btn" onclick={() => editor?.openNoteSearch()} title="Find in note" aria-label="Find in note">
|
||||
<button class="mobile-header-btn" onclick={() => editor?.openNoteSearch()} title={$ui("ui.find_in_note")} aria-label={$ui("ui.find_in_note")}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/>
|
||||
</svg>
|
||||
</button>
|
||||
{#snippet secondaryNoteActions(inMenu: boolean)}
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitemcheckbox' : undefined} aria-checked={inMenu ? !!$activeNote?.meta.pinned : undefined} class:active={$activeNote?.meta.pinned} onclick={() => { if ($activeNote) { $activeNote.meta.pinned = !$activeNote.meta.pinned; editor?.markEdited(); } }} title="Pin">
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitemcheckbox' : undefined} aria-checked={inMenu ? !!$activeNote?.meta.pinned : undefined} class:active={$activeNote?.meta.pinned} onclick={() => { if ($activeNote) { $activeNote.meta.pinned = !$activeNote.meta.pinned; editor?.markEdited(); } }} title={$ui("ui.pin")}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M12 17v5"/><path d="M9 2h6l-1 7h4l-2 4H8l-2-4h4L9 2z"/>
|
||||
</svg>
|
||||
{#if inMenu}<span>Pin</span>{/if}
|
||||
{#if inMenu}<span>{$ui("ui.pin")}</span>{/if}
|
||||
</button>
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitemcheckbox' : undefined} aria-checked={inMenu ? isQuickAccess : undefined} class:active={isQuickAccess} onclick={async () => {
|
||||
if (!noteRelativePath) return;
|
||||
@@ -1325,55 +1331,55 @@
|
||||
const qaNotes = await getQuickAccess(ownerVault!);
|
||||
if (ownerIsCurrent()) $quickAccessPaths = qaNotes.map(n => n.relative_path);
|
||||
} catch (e) { console.error('Quick access toggle failed:', e); }
|
||||
}} title="Quick Access">
|
||||
}} title={$ui("ui.quick_access")}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill={isQuickAccess ? 'currentColor' : 'none'} stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2" />
|
||||
</svg>
|
||||
{#if inMenu}<span>Quick Access</span>{/if}
|
||||
{#if inMenu}<span>{$ui("ui.quick_access")}</span>{/if}
|
||||
</button>
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitem' : undefined} class:active={outlineOpen} onclick={() => editor?.toggleOutlinePanel()}
|
||||
title="Outline" aria-label="Outline" aria-expanded={outlineOpen} aria-controls={outlinePanelId || undefined}>
|
||||
title={$ui("ui.outline")} aria-label={$ui("ui.outline")} aria-expanded={outlineOpen} aria-controls={outlinePanelId || undefined}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<line x1="4" y1="6" x2="20" y2="6"/><line x1="8" y1="12" x2="20" y2="12"/><line x1="8" y1="18" x2="20" y2="18"/><circle cx="4" cy="12" r="1" fill="currentColor"/><circle cx="4" cy="18" r="1" fill="currentColor"/>
|
||||
</svg>
|
||||
{#if inMenu}<span>Outline</span>{/if}
|
||||
{#if inMenu}<span>{$ui("ui.outline")}</span>{/if}
|
||||
</button>
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitem' : undefined} onclick={() => editor?.toggleHistoryPanel()} title="History">
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitem' : undefined} onclick={() => editor?.toggleHistoryPanel()} title={$ui("ui.history")}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/>
|
||||
</svg>
|
||||
{#if inMenu}<span>History</span>{/if}
|
||||
{#if inMenu}<span>{$ui("ui.history")}</span>{/if}
|
||||
</button>
|
||||
{#if $appConfig?.enable_wiki_links}
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitem' : undefined} onclick={() => editor?.toggleGraphView()} title="Graph View">
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitem' : undefined} onclick={() => editor?.toggleGraphView()} title={$ui("ui.graph_view")}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<circle cx="6" cy="6" r="3"/><circle cx="18" cy="6" r="3"/><circle cx="6" cy="18" r="3"/><circle cx="18" cy="18" r="3"/>
|
||||
<line x1="8.5" y1="7.5" x2="15.5" y2="16.5"/><line x1="15.5" y1="7.5" x2="8.5" y2="16.5"/>
|
||||
</svg>
|
||||
{#if inMenu}<span>Graph View</span>{/if}
|
||||
{#if inMenu}<span>{$ui("ui.graph_view")}</span>{/if}
|
||||
</button>
|
||||
{/if}
|
||||
{#if $appConfig?.ai_provider}
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitem' : undefined} onclick={() => editor?.triggerAiMenu()} title="AI Actions">
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitem' : undefined} onclick={() => editor?.triggerAiMenu()} title={$ui("ui.ai_actions")}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M12 8V4l-2-2"/><rect x="4" y="8" width="16" height="12" rx="2"/><path d="M2 14h2"/><path d="M20 14h2"/><path d="M9 13v2"/><path d="M15 13v2"/>
|
||||
</svg>
|
||||
{#if inMenu}<span>AI Actions</span>{/if}
|
||||
{#if inMenu}<span>{$ui("ui.ai_actions")}</span>{/if}
|
||||
</button>
|
||||
{/if}
|
||||
{#if activeVaultConfig($appConfig)?.sync_provider === 'webdav'}
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitem' : undefined} class:active={$syncState.running} onclick={triggerSyncNow} disabled={$syncState.running} title={$syncState.error ? `Sync error: ${$syncState.error}` : ($syncState.running ? 'Syncing...' : 'Sync now')}>
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitem' : undefined} class:active={$syncState.running} onclick={triggerSyncNow} disabled={$syncState.running} title={$syncState.error ? $ui("ui.sync_error", { value0: $syncState.error }) : ($syncState.running ? $ui("ui.syncing") : $ui("ui.sync_now"))}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class:sync-spin={$syncState.running}>
|
||||
<path d="M21 2v6h-6"/><path d="M3 12a9 9 0 0115-6.7L21 8"/><path d="M3 22v-6h6"/><path d="M21 12a9 9 0 01-15 6.7L3 16"/>
|
||||
</svg>
|
||||
{#if inMenu}<span>{$syncState.running ? 'Syncing...' : $syncState.error ? 'Sync error: retry' : 'Sync now'}</span>{/if}
|
||||
{#if inMenu}<span>{$syncState.running ? $ui("ui.syncing") : $syncState.error ? $ui("ui.sync_error_retry") : $ui("ui.sync_now")}</span>{/if}
|
||||
</button>
|
||||
{/if}
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitem' : undefined} class:active={$sourceMode} onclick={() => ($sourceMode = !$sourceMode)} title={$sourceMode ? 'Rich Editor' : 'Source Mode'}>
|
||||
<button class={inMenu ? 'mobile-note-menu-item' : 'mobile-header-btn'} type="button" role={inMenu ? 'menuitem' : undefined} class:active={$sourceMode} onclick={() => ($sourceMode = !$sourceMode)} title={$sourceMode ? $ui("ui.rich_editor") : $ui("ui.source_mode")}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<polyline points="16 18 22 12 16 6" /><polyline points="8 6 2 12 8 18" />
|
||||
</svg>
|
||||
{#if inMenu}<span>{$sourceMode ? 'Rich Editor' : 'Source Mode'}</span>{/if}
|
||||
{#if inMenu}<span>{$sourceMode ? $ui("ui.rich_editor") : $ui("ui.source_mode")}</span>{/if}
|
||||
</button>
|
||||
{/snippet}
|
||||
{#if tabletLayout}
|
||||
@@ -1381,13 +1387,13 @@
|
||||
{:else}
|
||||
<div class="mobile-note-menu-wrapper" bind:this={mobileNoteMenuWrapper}>
|
||||
<button class="mobile-header-btn" class:active={mobileNoteMenuOpen} type="button" bind:this={mobileNoteMenuTrigger}
|
||||
title="More note actions" aria-label="More note actions" aria-haspopup="menu" aria-expanded={mobileNoteMenuOpen} aria-controls="mobile-note-menu" onclick={toggleMobileNoteMenu}>
|
||||
title={$ui("ui.more_note_actions")} aria-label={$ui("ui.more_note_actions")} aria-haspopup="menu" aria-expanded={mobileNoteMenuOpen} aria-controls="mobile-note-menu" onclick={toggleMobileNoteMenu}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true">
|
||||
<circle cx="5" cy="12" r="2"/><circle cx="12" cy="12" r="2"/><circle cx="19" cy="12" r="2"/>
|
||||
</svg>
|
||||
</button>
|
||||
{#if mobileNoteMenuOpen}
|
||||
<div class="mobile-note-menu" id="mobile-note-menu" bind:this={mobileNoteMenu} role="menu" aria-label="Note actions" tabindex="-1"
|
||||
<div class="mobile-note-menu" id="mobile-note-menu" bind:this={mobileNoteMenu} role="menu" aria-label={$ui("ui.note_actions")} tabindex="-1"
|
||||
onkeydown={handleMobileNoteMenuKeydown} onclickcapture={() => closeMobileNoteMenu(true)}>
|
||||
{@render secondaryNoteActions(true)}
|
||||
</div>
|
||||
@@ -1396,13 +1402,13 @@
|
||||
{/if}
|
||||
{/if}
|
||||
{#if tabletLayout || $mobileView !== 'editor'}
|
||||
<button class="mobile-header-btn" onclick={() => ($showSearch = true)} title="Search">
|
||||
<button class="mobile-header-btn" onclick={() => ($showSearch = true)} title={$ui("ui.search")}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<circle cx="11" cy="11" r="8" />
|
||||
<line x1="21" y1="21" x2="16.65" y2="16.65" />
|
||||
</svg>
|
||||
</button>
|
||||
<button class="mobile-header-btn" onclick={handleDailyNote} title="Daily Note">
|
||||
<button class="mobile-header-btn" onclick={handleDailyNote} title={$ui("ui.daily_note")}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<rect x="3" y="4" width="18" height="18" rx="2" ry="2" />
|
||||
<line x1="16" y1="2" x2="16" y2="6" />
|
||||
@@ -1410,14 +1416,14 @@
|
||||
<line x1="3" y1="10" x2="21" y2="10" />
|
||||
</svg>
|
||||
</button>
|
||||
<button class="mobile-header-btn" onclick={() => ($showInfo = true)} title="Info">
|
||||
<button class="mobile-header-btn" onclick={() => ($showInfo = true)} title={$ui("ui.info")}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<circle cx="12" cy="12" r="10" />
|
||||
<line x1="12" y1="16" x2="12" y2="12" />
|
||||
<line x1="12" y1="8" x2="12.01" y2="8" />
|
||||
</svg>
|
||||
</button>
|
||||
<button class="mobile-header-btn" onclick={() => ($showSettings = true)} title="Settings">
|
||||
<button class="mobile-header-btn" onclick={() => ($showSettings = true)} title={$ui("ui.settings")}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<circle cx="12" cy="12" r="3" />
|
||||
<path d="M19.4 15a1.65 1.65 0 00.33 1.82l.06.06a2 2 0 01-2.83 2.83l-.06-.06a1.65 1.65 0 00-1.82-.33 1.65 1.65 0 00-1 1.51V21a2 2 0 01-4 0v-.09A1.65 1.65 0 009 19.4a1.65 1.65 0 00-1.82.33l-.06.06a2 2 0 01-2.83-2.83l.06-.06A1.65 1.65 0 004.68 15a1.65 1.65 0 00-1.51-1H3a2 2 0 010-4h.09A1.65 1.65 0 004.6 9a1.65 1.65 0 00-.33-1.82l-.06-.06a2 2 0 012.83-2.83l.06.06A1.65 1.65 0 009 4.68a1.65 1.65 0 001-1.51V3a2 2 0 014 0v.09a1.65 1.65 0 001 1.51 1.65 1.65 0 001.82-.33l.06-.06a2 2 0 012.83 2.83l-.06.06A1.65 1.65 0 0019.4 9a1.65 1.65 0 001.51 1H21a2 2 0 010 4h-.09a1.65 1.65 0 00-1.51 1z" />
|
||||
@@ -1449,12 +1455,12 @@
|
||||
<div class="focus-topbar" class:macos={isMac} onmousedown={(e) => { if (!(e.target as HTMLElement).closest('button')) appWindow.startDragging(); }}>
|
||||
<span class="focus-title">{$activeNote?.meta.title || 'Untitled'}</span>
|
||||
<div class="focus-controls">
|
||||
<button class="focus-btn focus-active" onclick={() => ($focusMode = false)} title="Exit focus mode (Escape)">
|
||||
<button class="focus-btn focus-active" onclick={() => ($focusMode = false)} title={$ui("ui.exit_focus_mode_escape")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M8 3v3a2 2 0 01-2 2H3m18 0h-3a2 2 0 01-2-2V3m0 18v-3a2 2 0 012-2h3M3 16h3a2 2 0 012 2v3"/>
|
||||
</svg>
|
||||
</button>
|
||||
<button class="focus-btn" class:focus-active={$readOnly} onclick={() => ($readOnly = !$readOnly)} title={$readOnly ? 'Switch to Edit Mode' : 'Switch to View Mode'}>
|
||||
<button class="focus-btn" class:focus-active={$readOnly} onclick={() => ($readOnly = !$readOnly)} title={$readOnly ? $ui("ui.switch_to_edit_mode") : $ui("ui.switch_to_view_mode")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
{#if $readOnly}
|
||||
<path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z" />
|
||||
@@ -1467,13 +1473,13 @@
|
||||
</svg>
|
||||
</button>
|
||||
{#if !isMac}
|
||||
<button class="focus-btn" onmousedown={(e) => e.stopPropagation()} onclick={() => appWindow.minimize()} title="Minimize">
|
||||
<button class="focus-btn" onmousedown={(e) => e.stopPropagation()} onclick={() => appWindow.minimize()} title={$ui("ui.minimize")}>
|
||||
<svg width="10" height="10" viewBox="0 0 10 10"><line x1="1" y1="5" x2="9" y2="5" stroke="currentColor" stroke-width="1.2" stroke-linecap="round"/></svg>
|
||||
</button>
|
||||
<button class="focus-btn" onmousedown={(e) => e.stopPropagation()} onclick={() => appWindow.toggleMaximize()} title="Maximize">
|
||||
<button class="focus-btn" onmousedown={(e) => e.stopPropagation()} onclick={() => appWindow.toggleMaximize()} title={$ui("ui.maximize")}>
|
||||
<svg width="10" height="10" viewBox="0 0 10 10"><rect x="1" y="1" width="8" height="8" rx="1" fill="none" stroke="currentColor" stroke-width="1.2"/></svg>
|
||||
</button>
|
||||
<button class="focus-btn focus-close" onmousedown={(e) => e.stopPropagation()} onclick={() => appWindow.close()} title="Close">
|
||||
<button class="focus-btn focus-close" onmousedown={(e) => e.stopPropagation()} onclick={() => appWindow.close()} title={$ui("ui.close")}>
|
||||
<svg width="10" height="10" viewBox="0 0 10 10"><line x1="1.5" y1="1.5" x2="8.5" y2="8.5" stroke="currentColor" stroke-width="1.2" stroke-linecap="round"/><line x1="8.5" y1="1.5" x2="1.5" y2="8.5" stroke="currentColor" stroke-width="1.2" stroke-linecap="round"/></svg>
|
||||
</button>
|
||||
{/if}
|
||||
@@ -1500,7 +1506,7 @@
|
||||
<ResizeHandle onResize={handleNotelistResize} />
|
||||
{:else}
|
||||
<div class="notelist-restore-panel">
|
||||
<button class="notelist-restore-btn" onclick={revealNoteList} title={`Show notes list (${isMac ? '⌘' : 'Ctrl'}+Shift+\\)`} aria-label="Show notes list">
|
||||
<button class="notelist-restore-btn" onclick={revealNoteList} title={$ui("ui.show_notes_list_shift", { value0: isMac ? '⌘' : 'Ctrl' })} aria-label={$ui("ui.show_notes_list")}>
|
||||
<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<line x1="4" y1="6" x2="16" y2="6" />
|
||||
<line x1="4" y1="12" x2="16" y2="12" />
|
||||
@@ -1519,7 +1525,7 @@
|
||||
<svg width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M9 11l3 3L22 4"/><path d="M21 12v7a2 2 0 01-2 2H5a2 2 0 01-2-2V5a2 2 0 012-2h11"/>
|
||||
</svg>
|
||||
<p>Select a task to open its note</p>
|
||||
<p>{$ui("ui.select_a_task_to_open_its_note")}</p>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { t as ui, label as uiLabel } from '$lib/i18n';
|
||||
import { showCommandPalette, showSearch, theme, sourceMode, viewMode, activeNotebook, activeTag } from '$lib/stores/app';
|
||||
import { setTheme, reindex } from '$lib/api';
|
||||
import { darkThemes } from '$lib/platform';
|
||||
@@ -152,7 +153,7 @@
|
||||
|
||||
let filteredCommands = $derived(
|
||||
query.trim()
|
||||
? commands.filter((c) => c.label.toLowerCase().includes(query.toLowerCase()))
|
||||
? commands.filter((c) => $uiLabel(c.label).toLocaleLowerCase().includes(query.toLocaleLowerCase()) || c.label.toLowerCase().includes(query.toLowerCase()))
|
||||
: commands
|
||||
);
|
||||
|
||||
@@ -209,7 +210,7 @@
|
||||
<input
|
||||
bind:this={inputEl}
|
||||
type="text"
|
||||
placeholder="Type a command..."
|
||||
placeholder={$ui("ui.type_a_command")}
|
||||
bind:value={query}
|
||||
onkeydown={handleKeydown}
|
||||
/>
|
||||
@@ -223,7 +224,7 @@
|
||||
onclick={() => cmd.action()}
|
||||
onmouseenter={() => (selectedIndex = i)}
|
||||
>
|
||||
<span class="cmd-label">{cmd.label}</span>
|
||||
<span class="cmd-label">{$uiLabel(cmd.label)}</span>
|
||||
{#if cmd.shortcut}
|
||||
<span class="cmd-shortcut">{cmd.shortcut}</span>
|
||||
{/if}
|
||||
|
||||
@@ -0,0 +1,135 @@
|
||||
<script lang="ts">
|
||||
import { t } from '$lib/i18n';
|
||||
import { getDailyNoteTemplate, setDailyNoteTemplate, importDailyNoteTemplate, type DailyNoteTemplate } from '$lib/api';
|
||||
|
||||
let { vaultPath }: { vaultPath: string } = $props();
|
||||
// Parent store updates (e.g. a language change) must not reset an in-progress draft.
|
||||
const currentVault = $derived(vaultPath);
|
||||
let value = $state<DailyNoteTemplate>({ raw: null, content: '', enabled: false });
|
||||
let loaded = $state(false);
|
||||
let loading = $state(false);
|
||||
let busy = $state(false);
|
||||
let editing = $state(false);
|
||||
let draft = $state('');
|
||||
let message = $state<'dailyTemplate.saved' | 'dailyTemplate.disabled' | null>(null);
|
||||
let error = $state<{ key: 'dailyTemplate.loadFailed' | 'dailyTemplate.saveFailed' | 'dailyTemplate.importFailed'; detail: string } | null>(null);
|
||||
let generation = 0;
|
||||
|
||||
async function load(vault: string) {
|
||||
const request = ++generation;
|
||||
loading = true;
|
||||
loaded = false;
|
||||
error = null;
|
||||
try {
|
||||
const next = await getDailyNoteTemplate(vault);
|
||||
if (request !== generation) return;
|
||||
value = next;
|
||||
loaded = true;
|
||||
} catch (cause) {
|
||||
if (request === generation) error = { key: 'dailyTemplate.loadFailed', detail: String(cause) };
|
||||
} finally { if (request === generation) loading = false; }
|
||||
}
|
||||
|
||||
$effect(() => {
|
||||
const vault = currentVault;
|
||||
value = { raw: null, content: '', enabled: false };
|
||||
editing = false;
|
||||
draft = '';
|
||||
busy = false;
|
||||
message = null;
|
||||
void load(vault);
|
||||
return () => { generation++; };
|
||||
});
|
||||
|
||||
function edit() {
|
||||
draft = value.raw === null ? '# {{title}}\n\n' : value.content;
|
||||
error = null;
|
||||
message = null;
|
||||
editing = true;
|
||||
}
|
||||
|
||||
async function save(template: string | null) {
|
||||
if (!loaded || busy) return;
|
||||
const request = generation;
|
||||
const vault = vaultPath;
|
||||
busy = true;
|
||||
error = null;
|
||||
message = null;
|
||||
try {
|
||||
const next = await setDailyNoteTemplate(vault, template, value.raw);
|
||||
if (request !== generation) return;
|
||||
value = next;
|
||||
editing = false;
|
||||
message = template === null ? 'dailyTemplate.disabled' : 'dailyTemplate.saved';
|
||||
} catch (cause) {
|
||||
if (request === generation) error = { key: 'dailyTemplate.saveFailed', detail: String(cause) };
|
||||
} finally { if (request === generation) busy = false; }
|
||||
}
|
||||
|
||||
async function importFile() {
|
||||
if (!loaded || busy || editing) return;
|
||||
const request = generation;
|
||||
const vault = vaultPath;
|
||||
busy = true;
|
||||
error = null;
|
||||
message = null;
|
||||
try {
|
||||
const next = await importDailyNoteTemplate(vault, $t('dailyTemplate.import'), value.raw);
|
||||
if (request !== generation || next === null) return; // File picker cancelled.
|
||||
value = next;
|
||||
message = 'dailyTemplate.saved';
|
||||
} catch (cause) {
|
||||
if (request === generation) error = { key: 'dailyTemplate.importFailed', detail: String(cause) };
|
||||
} finally { if (request === generation) busy = false; }
|
||||
}
|
||||
</script>
|
||||
|
||||
<section class="daily-template" aria-labelledby="daily-template-title" aria-busy={loading || busy}>
|
||||
<h3 id="daily-template-title">{$t('dailyTemplate.title')}</h3>
|
||||
<p class="description">{$t('dailyTemplate.description')}</p>
|
||||
<p class="description">{$t('dailyTemplate.tokens', { dateToken: '{{date}}', titleToken: '{{title}}' })}</p>
|
||||
{#if loading}
|
||||
<p class="description" role="status">{$t('ui.loading')}</p>
|
||||
{:else if loaded}
|
||||
<p class="status">{$t(value.enabled ? 'dailyTemplate.enabled' : value.raw === null ? 'dailyTemplate.none' : 'dailyTemplate.disabled')}</p>
|
||||
<div class="actions">
|
||||
<button type="button" id="daily-template-import" disabled={busy || editing} onclick={importFile}>{$t('dailyTemplate.import')}</button>
|
||||
<button type="button" id="daily-template-edit" disabled={busy || editing} onclick={edit}>{$t(value.raw === null ? 'dailyTemplate.create' : 'ui.edit')}</button>
|
||||
{#if value.raw !== null}
|
||||
<button type="button" id="daily-template-toggle" disabled={busy || editing} onclick={() => save(value.enabled ? null : value.content)}>{$t(value.enabled ? 'dailyTemplate.disable' : 'dailyTemplate.enable')}</button>
|
||||
{/if}
|
||||
<button type="button" id="daily-template-reload" disabled={busy || editing} onclick={() => { message = null; void load(vaultPath); }}>{$t('ui.reload_from_disk')}</button>
|
||||
</div>
|
||||
{/if}
|
||||
{#if editing}
|
||||
<label for="daily-template-editor">{$t('dailyTemplate.editorLabel')}</label>
|
||||
<textarea id="daily-template-editor" bind:value={draft} disabled={busy} rows="10" spellcheck="false" placeholder={$t('dailyTemplate.placeholder')}></textarea>
|
||||
<div class="actions">
|
||||
<button type="button" id="daily-template-save" disabled={busy} onclick={() => save(draft)}>{$t(busy ? 'ui.saving' : 'ui.save')}</button>
|
||||
<button type="button" id="daily-template-cancel" disabled={busy} onclick={() => { editing = false; error = null; }}>{$t('ui.cancel')}</button>
|
||||
</div>
|
||||
{/if}
|
||||
{#if error}
|
||||
<p class="error" role="alert">{$t(error.key, { error: error.detail })}</p>
|
||||
{#if !loaded}<button type="button" disabled={loading} onclick={() => load(vaultPath)}>{$t('ui.retry')}</button>{/if}
|
||||
{/if}
|
||||
{#if message}<p class="description" role="status">{$t(message)}</p>{/if}
|
||||
<p class="location">{$t('dailyTemplate.storage')} <code>.helixnotes/daily-template.md</code></p>
|
||||
</section>
|
||||
|
||||
<style>
|
||||
.daily-template { margin-bottom: 24px; }
|
||||
h3 { margin-bottom: 12px; font-size: 12px; font-weight: 600; text-transform: uppercase; letter-spacing: 0.05em; color: var(--text-tertiary); }
|
||||
.description, .location { margin: 8px 0; font-size: 13px; line-height: 1.5; color: var(--text-secondary); }
|
||||
.status { margin: 12px 0; font-size: 13px; color: var(--text-primary); }
|
||||
.actions { display: flex; flex-wrap: wrap; gap: 8px; margin: 12px 0; }
|
||||
button { min-width: 0; max-width: 100%; min-height: 36px; overflow-wrap: anywhere; padding: 8px 12px; border: 1px solid var(--border-color); border-radius: 8px; background: var(--bg-secondary); color: var(--text-primary); font: inherit; font-size: 13px; cursor: pointer; }
|
||||
button:hover:not(:disabled) { background: var(--bg-hover); }
|
||||
button:disabled { opacity: 0.6; cursor: default; }
|
||||
button:focus-visible, textarea:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
|
||||
label { display: block; margin: 12px 0 8px; font-size: 13px; color: var(--text-primary); }
|
||||
textarea { display: block; width: 100%; min-height: 180px; box-sizing: border-box; resize: vertical; border: 1px solid var(--border-color); border-radius: 8px; padding: 12px; background: var(--bg-secondary); color: var(--text-primary); font-family: var(--font-mono, monospace); font-size: 13px; line-height: 1.6; }
|
||||
.error { margin-top: 8px; color: var(--text-primary); font-size: 13px; overflow-wrap: anywhere; }
|
||||
.location { overflow-wrap: anywhere; }
|
||||
code { font-size: 12px; white-space: normal; }
|
||||
</style>
|
||||
+417
-403
File diff suppressed because it is too large.
Load diff
@@ -1,4 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { t as ui } from '$lib/i18n';
|
||||
import { onDestroy, untrack } from 'svelte';
|
||||
import { getGraphData } from '$lib/api';
|
||||
import { activeNotePath, appConfig } from '$lib/stores/app';
|
||||
@@ -743,7 +744,7 @@
|
||||
<div class="graph-overlay" onkeydown={handleKeydown}>
|
||||
<div class="graph-panel" class:mobile={isMobile}>
|
||||
<div class="graph-header">
|
||||
<h3>Graph View</h3>
|
||||
<h3>{$ui("ui.graph_view")}</h3>
|
||||
<div class="graph-search">
|
||||
<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/>
|
||||
@@ -752,11 +753,11 @@
|
||||
<input
|
||||
type="text"
|
||||
bind:value={searchQuery}
|
||||
placeholder="Filter notes..."
|
||||
placeholder={$ui("ui.filter_notes")}
|
||||
class:active={!!searchQuery}
|
||||
/>
|
||||
{#if searchQuery}
|
||||
<button class="graph-search-clear" aria-label="Clear search" onclick={() => { searchQuery = ''; }}>
|
||||
<button class="graph-search-clear" aria-label={$ui("ui.clear_search")} onclick={() => { searchQuery = ''; }}>
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round">
|
||||
<line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/>
|
||||
</svg>
|
||||
@@ -766,19 +767,19 @@
|
||||
<div class="graph-stats">
|
||||
{#if !loading}
|
||||
{#if localMode && activeNodeIdx >= 0}
|
||||
{localNeighborhood.nodeSet.size} notes · {localNeighborhood.edgeSet.size} links
|
||||
{$ui("ui.notes_links", { value0: localNeighborhood.nodeSet.size, value1: localNeighborhood.edgeSet.size })}
|
||||
{:else}
|
||||
{nodes.length} notes · {edges.length} links
|
||||
{$ui("ui.notes_links", { value0: nodes.length, value1: edges.length })}
|
||||
{/if}
|
||||
{#if searchMatchSet}
|
||||
· <span class="search-count">{searchMatchSet.size} matched</span>
|
||||
· <span class="search-count">{$ui("ui.matched", { value0: searchMatchSet.size })}</span>
|
||||
{/if}
|
||||
{/if}
|
||||
</div>
|
||||
<button
|
||||
class="graph-btn"
|
||||
class:active={localMode}
|
||||
title={localMode ? 'Show all notes' : 'Show local graph'}
|
||||
title={localMode ? $ui("ui.show_all_notes") : $ui("ui.show_local_graph")}
|
||||
onclick={() => { localMode = !localMode; focusActive(); }}
|
||||
>
|
||||
<!-- network/local icon -->
|
||||
@@ -787,7 +788,7 @@
|
||||
<line x1="12" y1="7" x2="5" y2="17"/><line x1="12" y1="7" x2="19" y2="17"/>
|
||||
</svg>
|
||||
</button>
|
||||
<button class="graph-btn" onclick={focusActive} title="Focus active note">
|
||||
<button class="graph-btn" onclick={focusActive} title={$ui("ui.focus_active_note")}>
|
||||
<svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<circle cx="12" cy="12" r="3"/>
|
||||
<line x1="12" y1="2" x2="12" y2="6"/>
|
||||
@@ -796,7 +797,7 @@
|
||||
<line x1="18" y1="12" x2="22" y2="12"/>
|
||||
</svg>
|
||||
</button>
|
||||
<button class="graph-close" aria-label="Close graph" onclick={onclose}>
|
||||
<button class="graph-close" aria-label={$ui("ui.close_graph")} onclick={onclose}>
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/>
|
||||
</svg>
|
||||
@@ -809,7 +810,7 @@
|
||||
<circle cx="12" cy="12" r="10" opacity="0.25"/>
|
||||
<path d="M12 2a10 10 0 019.95 9"/>
|
||||
</svg>
|
||||
Building graph...
|
||||
{$ui("ui.building_graph")}
|
||||
</div>
|
||||
{/if}
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { t as ui, tr as uiText } from '$lib/i18n';
|
||||
import { tick } from 'svelte';
|
||||
import SnapshotDocument from './SnapshotDocument.svelte';
|
||||
import { comparableBody, compareHistory, splitSnapshot, type HistoryComparison, type HistoryRow } from '$lib/utils/history-comparison';
|
||||
@@ -44,7 +45,7 @@
|
||||
if (generation !== request) return;
|
||||
comparison = result;
|
||||
}).catch((cause) => {
|
||||
if (generation === request) comparisonError = `Could not compare this version: ${String(cause)}`;
|
||||
if (generation === request) comparisonError = uiText("ui.could_not_compare_this_version", { value0: String(cause) });
|
||||
}).finally(() => {
|
||||
if (generation === request) comparing = false;
|
||||
});
|
||||
@@ -64,50 +65,50 @@
|
||||
{#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>
|
||||
<span class="line-number" aria-label={$ui("ui.current_note_line")}>{row.currentLine ?? ''}</span>
|
||||
<span class="line-number" aria-label={$ui("ui.snapshot_line")}>{row.snapshotLine ?? ''}</span>
|
||||
<span class="line-sign" aria-label={row.kind === 'added' ? $ui("ui.added_by_restoring") : row.kind === 'removed' ? $ui("ui.removed_by_restoring") : $ui("ui.unchanged")}>{row.kind === 'added' ? '+' : row.kind === 'removed' ? '−' : ' '}</span>
|
||||
<span class="line-text">{row.text || ' '}{#if !row.newline}<span class="line-ending">{$ui("ui.no_final_newline")}</span>{/if}</span>
|
||||
</div>
|
||||
{/each}
|
||||
{/snippet}
|
||||
|
||||
<section class="history-review" aria-label="Version review">
|
||||
<section class="history-review" aria-label={$ui("ui.version_review")}>
|
||||
<div class="review-header">
|
||||
<div class="review-heading">
|
||||
<strong>{selected ?? 'Version History'}</strong>
|
||||
<span>Read-only. Your current note stays unchanged.</span>
|
||||
<span>{$ui("ui.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 class="review-tabs" role="tablist" aria-label={$ui("ui.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'}>{$ui("ui.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'}>{$ui("ui.snapshot")}</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{#if loading}
|
||||
<p class="review-status" role="status">Loading version…</p>
|
||||
<p class="review-status" role="status">{$ui("ui.loading_version")}</p>
|
||||
{:else if error}
|
||||
<div class="review-status" role="alert"><p>{error}</p><button class="review-button" onclick={onRetry}>Retry</button></div>
|
||||
<div class="review-status" role="alert"><p>{error}</p><button class="review-button" onclick={onRetry}>{$ui("ui.retry")}</button></div>
|
||||
{:else if raw === null}
|
||||
<p class="review-status">Select a version to review.</p>
|
||||
<p class="review-status">{$ui("ui.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}
|
||||
<span>{$ui("ui.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> {$ui("ui.lines")}</span>{/if}
|
||||
</div>
|
||||
{#if comparing}
|
||||
<p class="review-status" role="status">Comparing…</p>
|
||||
<p class="review-status" role="status">{$ui("ui.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>
|
||||
<p class="review-status">{$ui("ui.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>
|
||||
<details class="unchanged-lines"><summary>{$ui("ui.unchanged_9bc74a", { value0: chunk.rows.length, value1: chunk.rows.length === 1 ? 'line' : 'lines' })}</summary>{@render lines(chunk.rows)}</details>
|
||||
{:else}
|
||||
{@render lines(chunk.rows)}
|
||||
{/if}
|
||||
@@ -118,13 +119,13 @@
|
||||
</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>
|
||||
<div class="snapshot-heading"><span>{$ui("ui.selected_snapshot")}</span><button class="source-toggle" aria-pressed={source} onclick={() => source = !source}>{source ? $ui("ui.rendered_view") : $ui("ui.view_source")}</button></div>
|
||||
{#if snapshot.body === ''}
|
||||
<p class="review-status">This snapshot is empty.</p>
|
||||
<p class="review-status">{$ui("ui.this_snapshot_is_empty")}</p>
|
||||
{:else if source}
|
||||
<textarea class="snapshot-source" readonly aria-label="Snapshot Markdown, read-only" value={snapshot.body}></textarea>
|
||||
<textarea class="snapshot-source" readonly aria-label={$ui("ui.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>
|
||||
<p class="review-status" role="alert">{$ui("ui.view_source_to_inspect_the_stored_body", { value0: rendered.error })}</p>
|
||||
{:else}
|
||||
<SnapshotDocument html={rendered.html} />
|
||||
{/if}
|
||||
@@ -132,10 +133,10 @@
|
||||
{/if}
|
||||
|
||||
{#if raw !== null && snapshot.metadata}
|
||||
<details class="history-metadata"><summary>Metadata (not restored)</summary><pre>{snapshot.metadata}</pre></details>
|
||||
<details class="history-metadata"><summary>{$ui("ui.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>
|
||||
<div class="review-actions"><span>{$ui("ui.restore_replaces_the_current_note_s_content_only")}</span><button class="history-restore-btn" disabled={!canRestore} onclick={onRestore}>{$ui("ui.restore_this_version")}</button></div>
|
||||
{/if}
|
||||
</section>
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { t as ui } from '$lib/i18n';
|
||||
import { onMount } from 'svelte';
|
||||
|
||||
let { src, alt = '', onclose }: {
|
||||
@@ -212,7 +213,7 @@
|
||||
class="image-viewer"
|
||||
role="dialog"
|
||||
aria-modal="true"
|
||||
aria-label={alt ? `Image viewer: ${alt}` : 'Image viewer'}
|
||||
aria-label={alt ? $ui("ui.image_viewer", { value0: alt }) : $ui("ui.image_viewer_d3a265")}
|
||||
tabindex="-1"
|
||||
onkeydown={(event) => {
|
||||
if (event.key === 'Escape') {
|
||||
@@ -251,7 +252,7 @@
|
||||
class="image-viewer-reset"
|
||||
onclick={resetViewer}
|
||||
disabled={scale === MIN_SCALE && panX === 0 && panY === 0}
|
||||
aria-label={`Reset zoom, currently ${zoomPercent}%`}
|
||||
aria-label={$ui("ui.reset_zoom_currently", { value0: 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" />
|
||||
@@ -259,15 +260,15 @@
|
||||
</svg>
|
||||
<span>{zoomPercent}%</span>
|
||||
</button>
|
||||
<button bind:this={closeButton} type="button" class="image-viewer-close" onclick={onclose} aria-label="Close image viewer">
|
||||
<button bind:this={closeButton} type="button" class="image-viewer-close" onclick={onclose} aria-label={$ui("ui.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 class="image-viewer-hint" aria-hidden="true">{$ui("ui.pinch_to_zoom_drag_to_move_double_tap_to_zoom_or_reset")}</div>
|
||||
<span class="sr-only" aria-live="polite">{$ui("ui.zoom", { value0: zoomPercent })}</span>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { t as ui, label as uiLabel } from '$lib/i18n';
|
||||
import { showInfo } from '$lib/stores/app';
|
||||
import { openUrl } from '$lib/api';
|
||||
import { getVersion } from '@tauri-apps/api/app';
|
||||
@@ -114,8 +115,8 @@
|
||||
<div class="info-overlay" onclick={closeFromOverlay} onkeydowncapture={handleEscape} onkeydown={handleEscape}>
|
||||
<div class="info-panel">
|
||||
<div class="info-header">
|
||||
<h2>Info</h2>
|
||||
<button class="close-btn" onclick={close} aria-label="Close info">
|
||||
<h2>{$ui("ui.info")}</h2>
|
||||
<button class="close-btn" onclick={close} aria-label={$ui("ui.close_info")}>
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<line x1="18" y1="6" x2="6" y2="18" />
|
||||
<line x1="6" y1="6" x2="18" y2="18" />
|
||||
@@ -126,8 +127,8 @@
|
||||
<div class="info-body">
|
||||
{#if !isMobile}
|
||||
<div class="info-tabs">
|
||||
<button class="info-tab" class:active={activeTab === 'shortcuts'} onclick={() => activeTab = 'shortcuts'}>Shortcuts</button>
|
||||
<button class="info-tab" class:active={activeTab === 'about'} onclick={() => activeTab = 'about'}>About</button>
|
||||
<button class="info-tab" class:active={activeTab === 'shortcuts'} onclick={() => activeTab = 'shortcuts'}>{$ui("ui.shortcuts")}</button>
|
||||
<button class="info-tab" class:active={activeTab === 'about'} onclick={() => activeTab = 'about'}>{$ui("ui.about")}</button>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
@@ -145,31 +146,31 @@
|
||||
</div>
|
||||
<h3 class="app-name">HelixNotes</h3>
|
||||
<p class="app-version">v{appVersion}</p>
|
||||
<p class="app-description">A local markdown note-taking app.</p>
|
||||
<p class="app-description">{$ui("ui.a_local_markdown_note_taking_app")}</p>
|
||||
|
||||
|
||||
|
||||
<div class="info-credits">
|
||||
<p>Created by <strong>Yuri Karamian</strong></p>
|
||||
<p>{$ui("ui.created_by")} <strong>{$ui("ui.yuri_karamian")}</strong></p>
|
||||
<button class="info-link" onclick={() => openLink('https://helixnotes.com')}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<circle cx="12" cy="12" r="10" />
|
||||
<line x1="2" y1="12" x2="22" y2="12" />
|
||||
<path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z" />
|
||||
</svg>
|
||||
helixnotes.com
|
||||
{$ui("ui.helixnotes_com")}
|
||||
</button>
|
||||
</div>
|
||||
{:else}
|
||||
<div class="shortcuts-section">
|
||||
{#if !isMobile}
|
||||
<p class="shortcuts-hint">Click a shortcut to rebind it, right-click to reset.</p>
|
||||
<p class="shortcuts-hint">{$ui("ui.click_a_shortcut_to_rebind_it_right_click_to_reset")}</p>
|
||||
{/if}
|
||||
{#each actionGroups as group}
|
||||
<h4 class="shortcuts-group-title">{group.title}</h4>
|
||||
<h4 class="shortcuts-group-title">{$uiLabel(group.title)}</h4>
|
||||
{#each group.actions as action}
|
||||
<div class="shortcut-row">
|
||||
<span class="shortcut-desc">{action.label}</span>
|
||||
<span class="shortcut-desc">{$uiLabel(action.label)}</span>
|
||||
{#if isMobile}
|
||||
<span class="shortcut-keys">{#each bindingToKeys($keybindings[action.id]) as key, i}{#if i > 0}+{/if}<kbd>{key}</kbd>{/each}</span>
|
||||
{:else}
|
||||
@@ -177,14 +178,14 @@
|
||||
class="shortcut-key-btn"
|
||||
class:capturing={capturingId === action.id}
|
||||
class:conflict={conflictId === action.id}
|
||||
title="Click to rebind · right-click to reset"
|
||||
title={$ui("ui.click_to_rebind_right_click_to_reset")}
|
||||
onclick={() => startCapture(action.id)}
|
||||
oncontextmenu={(e) => resetKey(e, action.id)}
|
||||
>
|
||||
{#if capturingId === action.id}
|
||||
<span class="capture-prompt">Press keys…</span>
|
||||
<span class="capture-prompt">{$ui("ui.press_keys")}</span>
|
||||
{:else if conflictId === action.id}
|
||||
<span class="conflict-msg">Already in use</span>
|
||||
<span class="conflict-msg">{$ui("ui.already_in_use")}</span>
|
||||
{:else}
|
||||
<span class="shortcut-keys">{#each bindingToKeys($keybindings[action.id]) as key, i}{#if i > 0}+{/if}<kbd>{key}</kbd>{/each}</span>
|
||||
{/if}
|
||||
@@ -193,33 +194,33 @@
|
||||
</div>
|
||||
{/each}
|
||||
{/each}
|
||||
<div class="shortcut-row"><span class="shortcut-desc">Close panel / exit focus</span><span class="shortcut-keys"><kbd>Esc</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">{$ui("ui.close_panel_exit_focus")}</span><span class="shortcut-keys"><kbd>Esc</kbd></span></div>
|
||||
|
||||
<h4 class="shortcuts-group-title">Formatting</h4>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">Bold</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>B</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">Italic</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>I</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">Underline</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>U</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">Strikethrough</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Shift</kbd>+<kbd>X</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">Code</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>E</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">Link</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>K</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">Collapsible section</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>.</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">Undo</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Z</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">Redo</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Shift</kbd>+<kbd>Z</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">Move line up / down</span><span class="shortcut-keys"><kbd>Alt</kbd>+<kbd>↑↓</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">Move list item up / down</span><span class="shortcut-keys"><kbd>Alt</kbd>+<kbd>Shift</kbd>+<kbd>↑↓</kbd></span></div>
|
||||
<h4 class="shortcuts-group-title">{$ui("ui.formatting")}</h4>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">{$ui("ui.bold")}</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>B</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">{$ui("ui.italic")}</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>I</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">{$ui("ui.underline")}</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>U</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">{$ui("ui.strikethrough")}</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Shift</kbd>+<kbd>X</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">{$ui("ui.code")}</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>E</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">{$ui("ui.link")}</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>K</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">{$ui("ui.collapsible_section_17c25e")}</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>.</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">{$ui("ui.undo")}</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Z</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">{$ui("ui.redo")}</span><span class="shortcut-keys"><kbd>{modKey}</kbd>+<kbd>Shift</kbd>+<kbd>Z</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">{$ui("ui.move_line_up_down")}</span><span class="shortcut-keys"><kbd>Alt</kbd>+<kbd>↑↓</kbd></span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">{$ui("ui.move_list_item_up_down")}</span><span class="shortcut-keys"><kbd>Alt</kbd>+<kbd>Shift</kbd>+<kbd>↑↓</kbd></span></div>
|
||||
|
||||
<h4 class="shortcuts-group-title">Editor Commands</h4>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">Slash commands</span><span class="shortcut-keys"><kbd>/</kbd></span></div>
|
||||
<div class="shortcut-row command-detail"><span class="shortcut-desc">Headings, lists, code block, table, blockquote, collapsible section, horizontal rule</span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">Wiki-link to note</span><span class="shortcut-keys"><kbd>[[</kbd></span></div>
|
||||
<div class="shortcut-row command-detail"><span class="shortcut-desc">Type <kbd>[[</kbd> to search and link to another note. Close with <kbd>]]</kbd> or pick from the list.</span></div>
|
||||
<h4 class="shortcuts-group-title">{$ui("ui.editor_commands")}</h4>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">{$ui("ui.slash_commands")}</span><span class="shortcut-keys"><kbd>/</kbd></span></div>
|
||||
<div class="shortcut-row command-detail"><span class="shortcut-desc">{$ui("ui.headings_lists_code_block_table_blockquote_collapsible_section_b82c40")}</span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">{$ui("ui.wiki_link_to_note")}</span><span class="shortcut-keys"><kbd>[[</kbd></span></div>
|
||||
<div class="shortcut-row command-detail"><span class="shortcut-desc">{$ui("ui.type")} <kbd>[[</kbd> {$ui("ui.to_search_and_link_to_another_note_close_with")} <kbd>]]</kbd> {$ui("ui.or_pick_from_the_list")}</span></div>
|
||||
|
||||
<h4 class="shortcuts-group-title">Editor Features</h4>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">Right-click in editor for formatting menu</span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">Right-click a table cell for table options</span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">Right-click a link to open, copy, edit, or remove</span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">Click an image to resize (small / medium / full)</span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">Drag & drop images, PDFs, or files into the editor</span></div>
|
||||
<h4 class="shortcuts-group-title">{$ui("ui.editor_features")}</h4>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">{$ui("ui.right_click_in_editor_for_formatting_menu")}</span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">{$ui("ui.right_click_a_table_cell_for_table_options")}</span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">{$ui("ui.right_click_a_link_to_open_copy_edit_or_remove")}</span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">{$ui("ui.click_an_image_to_resize_small_medium_full")}</span></div>
|
||||
<div class="shortcut-row"><span class="shortcut-desc">{$ui("ui.drag_drop_images_pdfs_or_files_into_the_editor")}</span></div>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
<script lang="ts">
|
||||
import { t as ui, label as uiLabel, locale, tr as uiText } from '$lib/i18n';
|
||||
import { message as showMessage } from '@tauri-apps/plugin-dialog';
|
||||
import { onDestroy, tick, untrack } from 'svelte';
|
||||
import { get } from 'svelte/store';
|
||||
import {
|
||||
@@ -78,10 +80,10 @@
|
||||
let calYear = $state(new Date().getFullYear());
|
||||
let dailyDates = $state<Set<string>>(new Set());
|
||||
|
||||
const calMonthNames = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
|
||||
const calMonthNames = $derived(Array.from({ length: 12 }, (_, month) => new Intl.DateTimeFormat($locale, { month: 'long' }).format(new Date(2024, month, 1))));
|
||||
// 0 = Sunday, 1 = Monday (default). Day names + grid offset follow the setting.
|
||||
const weekStartsOn = $derived($appConfig?.week_start === 'sunday' ? 0 : 1);
|
||||
const DOW = ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'];
|
||||
const DOW = $derived(Array.from({ length: 7 }, (_, day) => new Intl.DateTimeFormat($locale, { weekday: 'short' }).format(new Date(2024, 0, 7 + day))));
|
||||
const calDayNames = $derived([...DOW.slice(weekStartsOn), ...DOW.slice(0, weekStartsOn)]);
|
||||
|
||||
function calDays(): Array<{ day: number; date: string; current: boolean }> {
|
||||
@@ -136,6 +138,10 @@
|
||||
await refresh();
|
||||
} catch (e) {
|
||||
console.error('Failed to open daily note:', e);
|
||||
if (navigationIsCurrent(token)) {
|
||||
await showMessage(`${uiText('ui.could_not_open_this_note')}\n\n${String(e)}`, { title: uiText('ui.daily_note'), kind: 'error' })
|
||||
.catch(error => console.error('Could not display daily-note error:', error));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -216,6 +222,7 @@
|
||||
let listRows = $derived(buildNoteListRows(
|
||||
$sortedNotes,
|
||||
groupingActive ? ($sortMode === 'created' ? 'created' : 'modified') : null,
|
||||
new Date(), $locale,
|
||||
));
|
||||
|
||||
let listContainer = $state<HTMLDivElement>(null!);
|
||||
@@ -455,14 +462,14 @@
|
||||
});
|
||||
|
||||
let viewTitle = $derived.by(() => {
|
||||
if ($viewMode === 'all') return 'All Notes';
|
||||
if ($viewMode === 'notebook') return $activeNotebook?.name ?? 'Notebook';
|
||||
if ($viewMode === 'all') return $ui("ui.all_notes");
|
||||
if ($viewMode === 'notebook') return $activeNotebook?.relative_path === '' ? $ui('ui.unfiled_notes') : $activeNotebook?.name ?? $ui('ui.notebooks');
|
||||
if ($viewMode === 'tag') return `#${$activeTag}`;
|
||||
if ($viewMode === 'quickaccess') return 'Quick Access';
|
||||
if ($viewMode === 'daily') return 'Daily Notes';
|
||||
if ($viewMode === 'tasks') return 'Tasks';
|
||||
if ($viewMode === 'trash') return 'Trash';
|
||||
return 'Notes';
|
||||
if ($viewMode === 'quickaccess') return $ui("ui.quick_access");
|
||||
if ($viewMode === 'daily') return $ui("ui.daily_notes");
|
||||
if ($viewMode === 'tasks') return $ui("ui.tasks");
|
||||
if ($viewMode === 'trash') return $ui("ui.trash");
|
||||
return $ui("ui.notes_704400");
|
||||
});
|
||||
|
||||
// Note list cache: avoids re-scanning when switching views
|
||||
@@ -795,7 +802,7 @@
|
||||
update(meta);
|
||||
if ($activeNotePath === path && $activeNote) {
|
||||
if (!(await onUpdateActiveNote({ pinned: meta.pinned, tags: meta.tags }))) {
|
||||
throw new Error('Note still has unsaved changes');
|
||||
throw new Error(uiText("error.unsaved"));
|
||||
}
|
||||
} else {
|
||||
await saveNote(ownerVault!, path, meta, current.content, current.raw);
|
||||
@@ -1232,7 +1239,7 @@
|
||||
</span>
|
||||
<div class="list-actions">
|
||||
{#if !isMobile}
|
||||
<button class="icon-btn" onclick={() => ($notelistCollapsed = true)} title={`Hide notes list (${modKey}+Shift+\\)`} aria-label="Hide notes list">
|
||||
<button class="icon-btn" onclick={() => ($notelistCollapsed = true)} title={$ui("ui.hide_notes_list_shift", { value0: modKey })} aria-label={$ui("ui.hide_notes_list")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<line x1="8" y1="6" x2="20" y2="6" />
|
||||
<line x1="8" y1="12" x2="20" y2="12" />
|
||||
@@ -1243,26 +1250,26 @@
|
||||
{/if}
|
||||
{#if $viewMode !== 'tasks'}
|
||||
{#if isAndroid}
|
||||
<button class="icon-btn" class:active-toggle={multiSelectMode} onclick={() => { multiSelectMode = !multiSelectMode; if (!multiSelectMode) clearSelection(); }} title="Multi-select">
|
||||
<button class="icon-btn" class:active-toggle={multiSelectMode} onclick={() => { multiSelectMode = !multiSelectMode; if (!multiSelectMode) clearSelection(); }} title={$ui("ui.multi_select")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<rect x="3" y="3" width="7" height="7" rx="1" /><rect x="3" y="14" width="7" height="7" rx="1" />{#if multiSelectMode}<polyline points="6 6.5 7 7.5 9 5.5" stroke-width="2" /><polyline points="6 17.5 7 18.5 9 16.5" stroke-width="2" />{/if}<line x1="14" y1="6.5" x2="21" y2="6.5" /><line x1="14" y1="17.5" x2="21" y2="17.5" />
|
||||
</svg>
|
||||
</button>
|
||||
{/if}
|
||||
<button class="icon-btn" onclick={openSortMenu} title="Sort: {$sortMode}">
|
||||
<button class="icon-btn" onclick={openSortMenu} title={$ui("ui.sort", { value0: $sortMode })}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<line x1="4" y1="6" x2="11" y2="6" /><line x1="4" y1="12" x2="15" y2="12" /><line x1="4" y1="18" x2="20" y2="18" />
|
||||
</svg>
|
||||
</button>
|
||||
{#if $viewMode === 'all' && ($sortMode === 'created' || $sortMode === 'modified')}
|
||||
<button class="icon-btn" class:active-toggle={$groupNotesByDate} onclick={() => { $groupNotesByDate = !$groupNotesByDate; }} title="Group by date">
|
||||
<button class="icon-btn" class:active-toggle={$groupNotesByDate} onclick={() => { $groupNotesByDate = !$groupNotesByDate; }} title={$ui("ui.group_by_date")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<line x1="8" y1="6" x2="21" y2="6" /><line x1="8" y1="12" x2="21" y2="12" /><line x1="8" y1="18" x2="21" y2="18" /><line x1="3" y1="6" x2="3.01" y2="6" /><line x1="3" y1="12" x2="3.01" y2="12" /><line x1="3" y1="18" x2="3.01" y2="18" />
|
||||
</svg>
|
||||
</button>
|
||||
{/if}
|
||||
{#if $viewMode !== 'trash' && $viewMode !== 'quickaccess'}
|
||||
<button class={isMobile ? 'mobile-create-btn' : 'icon-btn'} onclick={handleCreateNote} title={`New note (${modKey}+N)`}>
|
||||
<button class={isMobile ? 'mobile-create-btn' : 'icon-btn'} onclick={handleCreateNote} title={$ui("ui.new_note_n", { value0: modKey })}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width={isMobile ? '3' : '2'} stroke-linecap="round" stroke-linejoin="round">
|
||||
<line x1="12" y1="5" x2="12" y2="19" /><line x1="5" y1="12" x2="19" y2="12" />
|
||||
</svg>
|
||||
@@ -1274,23 +1281,23 @@
|
||||
|
||||
{#if selectedPaths.size > 0}
|
||||
<div class="selection-bar">
|
||||
<span class="selection-count">{selectedPaths.size} selected</span>
|
||||
<span class="selection-count">{$ui("ui.selected", { value0: selectedPaths.size })}</span>
|
||||
<div class="selection-actions">
|
||||
{#if $viewMode === 'trash'}
|
||||
<button class="selection-action" onclick={handleBatchRestore} title="Restore selected">
|
||||
<button class="selection-action" onclick={handleBatchRestore} title={$ui("ui.restore_selected")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8"/><path d="M3 3v5h5"/></svg>
|
||||
Restore
|
||||
{$ui("ui.restore")}
|
||||
</button>
|
||||
<button class="selection-action danger" onclick={handleBatchPermanentDelete} title="Delete permanently">
|
||||
<button class="selection-action danger" onclick={handleBatchPermanentDelete} title={$ui("ui.delete_permanently")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"/><path d="M19 6l-2 14a2 2 0 0 1-2 2H9a2 2 0 0 1-2-2L5 6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/></svg>
|
||||
Delete
|
||||
{$ui("ui.delete_action")}
|
||||
</button>
|
||||
{:else}
|
||||
<button class="selection-action" onclick={() => { batchMovePicker = true; }}>Move</button>
|
||||
<button class="selection-action" onclick={() => openBatchTagEdit()}>Tag</button>
|
||||
<button class="selection-action danger" onclick={handleBatchDelete}>Delete</button>
|
||||
<button class="selection-action" onclick={() => { batchMovePicker = true; }}>{$ui("ui.move")}</button>
|
||||
<button class="selection-action" onclick={() => openBatchTagEdit()}>{$ui("ui.tag")}</button>
|
||||
<button class="selection-action danger" onclick={handleBatchDelete}>{$ui('ui.delete_action')}</button>
|
||||
{/if}
|
||||
<button class="selection-close" onclick={clearSelection} title="Clear selection">
|
||||
<button class="selection-close" onclick={clearSelection} title={$ui("ui.clear_selection")}>
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>
|
||||
</button>
|
||||
</div>
|
||||
@@ -1302,13 +1309,13 @@
|
||||
<div class="batch-move-overlay" onclick={closeBatchMoveOverlay} onkeydown={(e) => { if (e.key === 'Escape') batchMovePicker = false; }}>
|
||||
<div class="batch-move-picker" role="dialog" aria-modal="true" aria-labelledby="batch-move-title" tabindex="-1">
|
||||
<div class="batch-move-header">
|
||||
<span id="batch-move-title">Move {selectedPaths.size} notes to...</span>
|
||||
<button class="selection-close" onclick={() => batchMovePicker = false} aria-label="Close move picker">
|
||||
<span id="batch-move-title">{$ui("ui.move_notes_to", { value0: selectedPaths.size })}</span>
|
||||
<button class="selection-close" onclick={() => batchMovePicker = false} aria-label={$ui("ui.close_move_picker")}>
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>
|
||||
</button>
|
||||
</div>
|
||||
{#if flatNotebookList.length === 0}
|
||||
<div class="context-empty">No notebooks available</div>
|
||||
<div class="context-empty">{$ui("ui.no_notebooks_available")}</div>
|
||||
{:else}
|
||||
<div class="move-picker-list">
|
||||
{#each flatNotebookList as nb}
|
||||
@@ -1330,8 +1337,8 @@
|
||||
<div class="batch-move-overlay" onclick={closeBatchTagOverlay} onkeydown={(e) => { if (e.key === 'Escape') batchTagEdit = false; }}>
|
||||
<div class="batch-move-picker" role="dialog" aria-modal="true" aria-labelledby="batch-tags-title" tabindex="-1">
|
||||
<div class="batch-move-header">
|
||||
<span id="batch-tags-title">Tags for {selectedPaths.size} notes</span>
|
||||
<button class="selection-close" onclick={() => batchTagEdit = false} aria-label="Close tag editor">
|
||||
<span id="batch-tags-title">{$ui("ui.tags_for_notes", { value0: selectedPaths.size })}</span>
|
||||
<button class="selection-close" onclick={() => batchTagEdit = false} aria-label={$ui("ui.close_tag_editor")}>
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>
|
||||
</button>
|
||||
</div>
|
||||
@@ -1339,7 +1346,7 @@
|
||||
<div class="tag-edit-input-row">
|
||||
<TagSuggestInput
|
||||
existing={tagEditTags}
|
||||
placeholder="Add tag to all..."
|
||||
placeholder={$ui("ui.add_tag_to_all")}
|
||||
onsubmit={(t) => addTagToBatch(t)}
|
||||
oncancel={() => batchTagEdit = false}
|
||||
/>
|
||||
@@ -1349,14 +1356,14 @@
|
||||
{#each tagEditTags as tag, i (tagIterationKey(tag, i))}
|
||||
<div class="tag-edit-item">
|
||||
<span class="tag-edit-name"><TagLabel name={tag} size={12} /></span>
|
||||
<button class="tag-edit-remove" onclick={() => removeTagFromBatch(tag)} title="Remove from all">
|
||||
<button class="tag-edit-remove" onclick={() => removeTagFromBatch(tag)} title={$ui("ui.remove_from_all")}>
|
||||
<svg width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>
|
||||
</button>
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
{:else}
|
||||
<div class="context-empty">No common tags</div>
|
||||
<div class="context-empty">{$ui("ui.no_common_tags")}</div>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
@@ -1371,11 +1378,11 @@
|
||||
{#if $viewMode === 'daily'}
|
||||
<div class="cal">
|
||||
<div class="cal-nav">
|
||||
<button class="cal-nav-btn" onclick={calPrev} title="Previous month">
|
||||
<button class="cal-nav-btn" onclick={calPrev} title={$ui("ui.previous_month")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="15 18 9 12 15 6"/></svg>
|
||||
</button>
|
||||
<button class="cal-title" onclick={calToday}>{calMonthNames[calMonth]} {calYear}</button>
|
||||
<button class="cal-nav-btn" onclick={calNext} title="Next month">
|
||||
<button class="cal-title" onclick={calToday}>{$uiLabel(calMonthNames[calMonth])} {calYear}</button>
|
||||
<button class="cal-nav-btn" onclick={calNext} title={$ui("ui.next_month")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="9 18 15 12 9 6"/></svg>
|
||||
</button>
|
||||
</div>
|
||||
@@ -1405,12 +1412,12 @@
|
||||
{#if $sortedNotes.length === 0 && $viewMode !== 'daily' && $viewMode !== 'tasks' && (!($viewMode === 'trash') || trashNotebooks.length === 0)}
|
||||
<div class="empty-state">
|
||||
{#if $viewMode === 'trash'}
|
||||
<p>Trash is empty</p>
|
||||
<p>{$ui("ui.trash_is_empty")}</p>
|
||||
{:else if $viewMode === 'quickaccess'}
|
||||
<p>No starred notes</p>
|
||||
<p>{$ui("ui.no_starred_notes")}</p>
|
||||
{:else}
|
||||
<p>No notes yet</p>
|
||||
<button class="btn-link" onclick={handleCreateNote}>Create your first note</button>
|
||||
<p>{$ui("ui.no_notes_yet")}</p>
|
||||
<button class="btn-link" onclick={handleCreateNote}>{$ui("ui.create_your_first_note")}</button>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
@@ -1427,18 +1434,18 @@
|
||||
{#if trashBusy === nb.path}
|
||||
<div class="note-preview trash-busy">
|
||||
<svg class="spinner" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round"><path d="M12 2a10 10 0 0 1 10 10"/></svg>
|
||||
Working...
|
||||
{$ui("ui.working")}
|
||||
</div>
|
||||
{:else}
|
||||
<div class="note-preview">{nb.note_count} {nb.note_count === 1 ? 'note' : 'notes'}</div>
|
||||
<div class="note-preview">{$ui("count.notes", { count: nb.note_count })}</div>
|
||||
<div class="trash-notebook-actions">
|
||||
<button class="trash-nb-btn restore" onclick={() => handleRestoreNotebook(nb)} title="Restore notebook">
|
||||
<button class="trash-nb-btn restore" onclick={() => handleRestoreNotebook(nb)} title={$ui("ui.restore_notebook")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="1 4 1 10 7 10"/><path d="M3.51 15a9 9 0 105.64-11.36L1 10"/></svg>
|
||||
Restore
|
||||
{$ui("ui.restore")}
|
||||
</button>
|
||||
<button class="trash-nb-btn delete" onclick={() => handleDeleteNotebook(nb)} title="Delete permanently">
|
||||
<button class="trash-nb-btn delete" onclick={() => handleDeleteNotebook(nb)} title={$ui("ui.delete_permanently")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"/><path d="M19 6l-1 14H6L5 6"/><path d="M10 11v6"/><path d="M14 11v6"/><path d="M9 6V4h6v2"/></svg>
|
||||
Delete
|
||||
{$ui("ui.delete_action")}
|
||||
</button>
|
||||
</div>
|
||||
{/if}
|
||||
@@ -1566,7 +1573,7 @@
|
||||
{#if getNotebookPath(note)}
|
||||
<span class="note-notebook">{getNotebookPath(note)}</span>
|
||||
{/if}
|
||||
{#if showDates}<span class="note-date-compact" title={`Created ${formatDate(note.meta.created)}\nModified ${formatDate(note.meta.modified)}`}>{formatRelativeTime($sortMode === 'created' ? note.meta.created : note.meta.modified)}</span>{/if}
|
||||
{#if showDates}<span class="note-date-compact" title={$ui("ui.created_modified", { value0: formatDate(note.meta.created, $locale), value1: formatDate(note.meta.modified, $locale) })}>{formatRelativeTime($sortMode === 'created' ? note.meta.created : note.meta.modified, $locale)}</span>{/if}
|
||||
</div>
|
||||
{:else}
|
||||
<div class="note-title">
|
||||
@@ -1590,7 +1597,7 @@
|
||||
<span class="note-notebook">{getNotebookPath(note)}</span>
|
||||
{#if showDates}<span class="note-meta-sep">·</span>{/if}
|
||||
{/if}
|
||||
{#if showDates}<span class="note-date" title={`Created ${formatDate(note.meta.created)}\nModified ${formatDate(note.meta.modified)}`}>{formatRelativeTime($sortMode === 'created' ? note.meta.created : note.meta.modified)}</span>{/if}
|
||||
{#if showDates}<span class="note-date" title={$ui("ui.created_modified", { value0: formatDate(note.meta.created, $locale), value1: formatDate(note.meta.modified, $locale) })}>{formatRelativeTime($sortMode === 'created' ? note.meta.created : note.meta.modified, $locale)}</span>{/if}
|
||||
</span>
|
||||
{/if}
|
||||
{#if note.meta.tags.length > 0}
|
||||
@@ -1604,10 +1611,10 @@
|
||||
{/if}
|
||||
{#if $viewMode === 'trash'}
|
||||
<span class="trash-row-actions">
|
||||
<span class="trash-row-btn" role="button" tabindex="0" onclick={(e) => { e.stopPropagation(); handleRestore(note); }} title="Restore" onkeydown={(e) => { if (e.key === 'Enter') { e.stopPropagation(); handleRestore(note); } }}>
|
||||
<span class="trash-row-btn" role="button" tabindex="0" onclick={(e) => { e.stopPropagation(); handleRestore(note); }} title={$ui("ui.restore")} onkeydown={(e) => { if (e.key === 'Enter') { e.stopPropagation(); handleRestore(note); } }}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8"/><path d="M3 3v5h5"/></svg>
|
||||
</span>
|
||||
<span class="trash-row-btn danger" role="button" tabindex="0" onclick={(e) => { e.stopPropagation(); handlePermanentDelete(note); }} title="Delete permanently" onkeydown={(e) => { if (e.key === 'Enter') { e.stopPropagation(); handlePermanentDelete(note); } }}>
|
||||
<span class="trash-row-btn danger" role="button" tabindex="0" onclick={(e) => { e.stopPropagation(); handlePermanentDelete(note); }} title={$ui("ui.delete_permanently")} onkeydown={(e) => { if (e.key === 'Enter') { e.stopPropagation(); handlePermanentDelete(note); } }}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"/><path d="M19 6l-2 14a2 2 0 0 1-2 2H9a2 2 0 0 1-2-2L5 6"/><path d="M10 11v6"/><path d="M14 11v6"/><path d="M9 6V4h6v2"/></svg>
|
||||
</span>
|
||||
</span>
|
||||
@@ -1621,7 +1628,7 @@
|
||||
{#each visibleRows as row, index (row.key)}
|
||||
<div class="virtual-note-row" data-row-key={row.key} use:measureRow>
|
||||
{#if row.kind === 'section'}
|
||||
<div class="note-list-section" class:first-section={windowRows.start + index === 0}>{row.label}</div>
|
||||
<div class="note-list-section" class:first-section={windowRows.start + index === 0}>{$uiLabel(row.label)}</div>
|
||||
{:else}
|
||||
{@render noteRow(row.note, row.noteIndex)}
|
||||
{/if}
|
||||
@@ -1633,29 +1640,29 @@
|
||||
</div>
|
||||
|
||||
{#if contextMenu}
|
||||
<div class="context-menu" class:mobile={isMobile} style="left: {contextMenu.x}px; top: {contextMenu.y}px" role="group" aria-label="Note actions">
|
||||
<div class="context-menu" class:mobile={isMobile} style="left: {contextMenu.x}px; top: {contextMenu.y}px" role="group" aria-label={$ui("ui.note_actions")}>
|
||||
{#if selectedPaths.size > 1 && selectedPaths.has(contextMenu.note.path)}
|
||||
<!-- Batch context menu -->
|
||||
{#if $viewMode === 'trash'}
|
||||
<button onclick={() => { contextMenu = null; handleBatchRestore(); }}>
|
||||
Restore {selectedPaths.size} notes
|
||||
{$ui("ui.restore_notes", { value0: selectedPaths.size })}
|
||||
</button>
|
||||
<button class="danger" onclick={() => { contextMenu = null; handleBatchPermanentDelete(); }}>
|
||||
Delete {selectedPaths.size} permanently
|
||||
{$ui("ui.delete_permanently_6c345b", { value0: selectedPaths.size })}
|
||||
</button>
|
||||
{:else if batchTagEdit}
|
||||
<button class="move-back" onclick={() => batchTagEdit = false}>
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<polyline points="15 18 9 12 15 6"/>
|
||||
</svg>
|
||||
Tags for {selectedPaths.size} notes
|
||||
{$ui("ui.tags_for")} {selectedPaths.size} {$ui("ui.notes")}
|
||||
</button>
|
||||
<div class="context-sep"></div>
|
||||
<div class="tag-edit-section">
|
||||
<div class="tag-edit-input-row">
|
||||
<TagSuggestInput
|
||||
existing={tagEditTags}
|
||||
placeholder="Add tag to all..."
|
||||
placeholder={$ui("ui.add_tag_to_all")}
|
||||
onsubmit={(t) => addTagToBatch(t)}
|
||||
oncancel={() => batchTagEdit = false}
|
||||
/>
|
||||
@@ -1665,14 +1672,14 @@
|
||||
{#each tagEditTags as tag, i (tagIterationKey(tag, i))}
|
||||
<div class="tag-edit-item">
|
||||
<span class="tag-edit-name"><TagLabel name={tag} size={12} /></span>
|
||||
<button class="tag-edit-remove" onclick={() => removeTagFromBatch(tag)} title="Remove from all">
|
||||
<button class="tag-edit-remove" onclick={() => removeTagFromBatch(tag)} title={$ui("ui.remove_from_all")}>
|
||||
<svg width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>
|
||||
</button>
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
{:else}
|
||||
<div class="context-empty">No common tags</div>
|
||||
<div class="context-empty">{$ui("ui.no_common_tags")}</div>
|
||||
{/if}
|
||||
</div>
|
||||
{:else}
|
||||
@@ -1680,34 +1687,34 @@
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M20.59 13.41l-7.17 7.17a2 2 0 01-2.83 0L2 12V2h10l8.59 8.59a2 2 0 010 2.82z"/><line x1="7" y1="7" x2="7.01" y2="7"/>
|
||||
</svg>
|
||||
Tags...
|
||||
{$ui("ui.tags_06d7f3")}
|
||||
</button>
|
||||
<button onclick={() => { contextMenu = null; batchMovePicker = true; }}>
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M22 19a2 2 0 01-2 2H4a2 2 0 01-2-2V5a2 2 0 012-2h5l2 3h9a2 2 0 012 2z"/>
|
||||
</svg>
|
||||
Move {selectedPaths.size} notes...
|
||||
{$ui("ui.move")} {selectedPaths.size} {$ui("ui.notes_e3e6b9")}
|
||||
</button>
|
||||
<button class="danger" onclick={() => { contextMenu = null; handleBatchDelete(); }}>
|
||||
Delete {selectedPaths.size} notes
|
||||
{$ui("ui.delete_notes", { value0: selectedPaths.size })}
|
||||
</button>
|
||||
{/if}
|
||||
{:else if $viewMode === 'trash'}
|
||||
<button onclick={() => handleRestore(contextMenu!.note)}>Restore</button>
|
||||
<button class="danger" onclick={() => handlePermanentDelete(contextMenu!.note)}>Delete Permanently</button>
|
||||
<button onclick={() => handleRestore(contextMenu!.note)}>{$ui("ui.restore")}</button>
|
||||
<button class="danger" onclick={() => handlePermanentDelete(contextMenu!.note)}>{$ui("ui.delete_permanently_a9ec7c")}</button>
|
||||
{:else if tagEditNote}
|
||||
<button class="move-back" onclick={() => tagEditNote = null}>
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<polyline points="15 18 9 12 15 6"/>
|
||||
</svg>
|
||||
Tags
|
||||
{$ui("ui.tags_848eed")}
|
||||
</button>
|
||||
<div class="context-sep"></div>
|
||||
<div class="tag-edit-section">
|
||||
<div class="tag-edit-input-row">
|
||||
<TagSuggestInput
|
||||
existing={tagEditTags}
|
||||
placeholder="Add tag..."
|
||||
placeholder={$ui("ui.add_tag")}
|
||||
onsubmit={(t) => addTagToNote(t)}
|
||||
oncancel={() => tagEditNote = null}
|
||||
/>
|
||||
@@ -1717,14 +1724,14 @@
|
||||
{#each tagEditTags as tag, i (tagIterationKey(tag, i))}
|
||||
<div class="tag-edit-item">
|
||||
<span class="tag-edit-name"><TagLabel name={tag} size={12} /></span>
|
||||
<button class="tag-edit-remove" onclick={() => removeTagFromNote(tag)} title="Remove tag">
|
||||
<button class="tag-edit-remove" onclick={() => removeTagFromNote(tag)} title={$ui("ui.remove_tag")}>
|
||||
<svg width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>
|
||||
</button>
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
{:else}
|
||||
<div class="context-empty">No tags</div>
|
||||
<div class="context-empty">{$ui("ui.no_tags")}</div>
|
||||
{/if}
|
||||
</div>
|
||||
{:else if movePickerNote}
|
||||
@@ -1732,11 +1739,11 @@
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<polyline points="15 18 9 12 15 6"/>
|
||||
</svg>
|
||||
Move to...
|
||||
{$ui("ui.move_to_d19987")}
|
||||
</button>
|
||||
<div class="context-sep"></div>
|
||||
{#if flatNotebookList.length === 0}
|
||||
<div class="context-empty">No other notebooks</div>
|
||||
<div class="context-empty">{$ui("ui.no_other_notebooks")}</div>
|
||||
{:else}
|
||||
<div class="move-picker-list">
|
||||
{#each flatNotebookList as nb}
|
||||
@@ -1754,67 +1761,67 @@
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M12 17v5"/><path d="M9 2h6l-1 7h4l-2 4H8l-2-4h4L9 2z"/>
|
||||
</svg>
|
||||
{contextMenu.note.meta.pinned ? 'Unpin Note' : 'Pin Note'}
|
||||
{contextMenu.note.meta.pinned ? $ui("ui.unpin_note_3004d5") : $ui("ui.pin_note_ae126e")}
|
||||
</button>
|
||||
<button onclick={() => openTagEdit(contextMenu!.note)}>
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M20.59 13.41l-7.17 7.17a2 2 0 01-2.83 0L2 12V2h10l8.59 8.59a2 2 0 010 2.82z"/><line x1="7" y1="7" x2="7.01" y2="7"/>
|
||||
</svg>
|
||||
Tags...
|
||||
{$ui("ui.tags_06d7f3")}
|
||||
</button>
|
||||
{#if $quickAccessPaths.includes(contextMenu.note.relative_path)}
|
||||
<button onclick={() => handleRemoveQuickAccess(contextMenu!.note)}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2" />
|
||||
</svg>
|
||||
Remove from Quick Access
|
||||
{$ui("ui.remove_from_quick_access")}
|
||||
</button>
|
||||
{:else}
|
||||
<button onclick={() => handleAddQuickAccess(contextMenu!.note)}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2" />
|
||||
</svg>
|
||||
Add to Quick Access
|
||||
{$ui("ui.add_to_quick_access")}
|
||||
</button>
|
||||
{/if}
|
||||
<button onclick={() => { const n = contextMenu!.note; contextMenu = null; openNoteWindow(ownerVault!, n.path, n.meta.title); }}>
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M18 13v6a2 2 0 01-2 2H5a2 2 0 01-2-2V8a2 2 0 012-2h6"/><polyline points="15 3 21 3 21 9"/><line x1="10" y1="14" x2="21" y2="3"/>
|
||||
</svg>
|
||||
Open in New Window
|
||||
{$ui("ui.open_in_new_window")}
|
||||
</button>
|
||||
{#if !isMobile}
|
||||
<button onclick={async () => { const n = contextMenu!.note; contextMenu = null; try { await revealFile(n.path); } catch (e) { console.error('Failed to reveal in file manager:', e); } }}>
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"/>
|
||||
</svg>
|
||||
Show in File Manager
|
||||
{$ui("ui.show_in_file_manager")}
|
||||
</button>
|
||||
{/if}
|
||||
<button onclick={() => startRename(contextMenu!.note)}>
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M17 3a2.85 2.85 0 114 4L7.5 20.5 2 22l1.5-5.5Z"/><path d="m15 5 4 4"/>
|
||||
</svg>
|
||||
Rename
|
||||
{$ui("ui.rename")}
|
||||
</button>
|
||||
<button onclick={() => handleDuplicate(contextMenu!.note)}>
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<rect x="8" y="8" width="13" height="13" rx="2"/><path d="M16 8V5a2 2 0 00-2-2H5a2 2 0 00-2 2v9a2 2 0 002 2h3"/>
|
||||
</svg>
|
||||
Duplicate Note
|
||||
{$ui("ui.duplicate_note")}
|
||||
</button>
|
||||
<button onclick={() => { movePickerNote = contextMenu!.note; }}>
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M22 19a2 2 0 01-2 2H4a2 2 0 01-2-2V5a2 2 0 012-2h5l2 3h9a2 2 0 012 2z"/>
|
||||
</svg>
|
||||
Move to...
|
||||
{$ui("ui.move_to_d19987")}
|
||||
</button>
|
||||
{#if isFiled(contextMenu.note)}
|
||||
<button onclick={() => unfileNote(contextMenu!.note)}>
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M22 19a2 2 0 01-2 2H4a2 2 0 01-2-2V5a2 2 0 012-2h5l2 3h9a2 2 0 012 2z"/><path d="M9 13h6"/>
|
||||
</svg>
|
||||
Unfile Note
|
||||
{$ui("ui.unfile_note")}
|
||||
</button>
|
||||
{/if}
|
||||
{#if !isMobile}
|
||||
@@ -1822,14 +1829,14 @@
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/><polyline points="10 9 9 9 8 9"/>
|
||||
</svg>
|
||||
Print / Export to PDF
|
||||
{$ui("ui.print_export_to_pdf")}
|
||||
</button>
|
||||
{/if}
|
||||
<button class="danger" onclick={() => handleDelete(contextMenu!.note)}>
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M3 6h18"/><path d="M19 6v14c0 1-1 2-2 2H7c-1 0-2-1-2-2V6"/><path d="M8 6V4c0-1 1-2 2-2h4c1 0 2 1 2 2v2"/>
|
||||
</svg>
|
||||
Move to Trash
|
||||
{$ui("ui.move_to_trash")}
|
||||
</button>
|
||||
{/if}
|
||||
</div>
|
||||
@@ -1837,13 +1844,13 @@
|
||||
|
||||
{#if sortMenu}
|
||||
<div class="sort-menu" class:mobile={isMobile} style="left: {sortMenu.x}px; top: {sortMenu.y}px">
|
||||
<div class="sort-menu-title">Sort by</div>
|
||||
<div class="sort-menu-title">{$ui("ui.sort_by")}</div>
|
||||
<button class:active={$sortMode === 'modified'} onclick={() => setSortMode('modified')}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<circle cx="12" cy="12" r="10" />
|
||||
<polyline points="12 6 12 12 16 14" />
|
||||
</svg>
|
||||
Last Modified
|
||||
{$ui("ui.last_modified")}
|
||||
{#if $sortMode === 'modified'}<span class="sort-check">✓</span>{/if}
|
||||
</button>
|
||||
<button class:active={$sortMode === 'created'} onclick={() => setSortMode('created')}>
|
||||
@@ -1853,7 +1860,7 @@
|
||||
<line x1="8" y1="2" x2="8" y2="6" />
|
||||
<line x1="3" y1="10" x2="21" y2="10" />
|
||||
</svg>
|
||||
Date Created
|
||||
{$ui("ui.date_created")}
|
||||
{#if $sortMode === 'created'}<span class="sort-check">✓</span>{/if}
|
||||
</button>
|
||||
<button class:active={$sortMode === 'title'} onclick={() => setSortMode('title')}>
|
||||
@@ -1862,7 +1869,7 @@
|
||||
<line x1="4" y1="12" x2="14" y2="12" />
|
||||
<line x1="4" y1="18" x2="18" y2="18" />
|
||||
</svg>
|
||||
Title
|
||||
{$ui("ui.title")}
|
||||
{#if $sortMode === 'title'}<span class="sort-check">✓</span>{/if}
|
||||
</button>
|
||||
<button class:active={$sortMode === 'custom'} onclick={() => setSortMode('custom')}>
|
||||
@@ -1874,7 +1881,7 @@
|
||||
<circle cx="4" cy="12" r="1" />
|
||||
<circle cx="4" cy="18" r="1" />
|
||||
</svg>
|
||||
Custom
|
||||
{$ui("ui.custom")}
|
||||
{#if $sortMode === 'custom'}<span class="sort-check">✓</span>{/if}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { t as ui, label as uiLabel } from '$lib/i18n';
|
||||
import { tick } from 'svelte';
|
||||
import { activeNote, activeNotePath, appConfig, navHistory } from '$lib/stores/app';
|
||||
import { getNoteSwitcherTitles, getQuickAccess } from '$lib/api';
|
||||
@@ -220,7 +221,7 @@
|
||||
bind:this={trigger}
|
||||
class="switcher-trigger"
|
||||
type="button"
|
||||
aria-label="Switch note"
|
||||
aria-label={$ui("ui.switch_note")}
|
||||
aria-haspopup="dialog"
|
||||
aria-expanded={open}
|
||||
onclick={toggleSwitcher}
|
||||
@@ -236,14 +237,14 @@
|
||||
bind:this={popover}
|
||||
class="switcher-popover"
|
||||
role="dialog"
|
||||
aria-label="Note switcher"
|
||||
aria-label={$ui("ui.note_switcher")}
|
||||
tabindex="-1"
|
||||
onkeydown={handlePopoverKeydown}
|
||||
>
|
||||
{#if loading}
|
||||
<div class="switcher-status">Loading notes…</div>
|
||||
<div class="switcher-status">{$ui("ui.loading_notes")}</div>
|
||||
{:else if sections.recent.length === 0 && sections.quickAccess.length === 0}
|
||||
<div class="switcher-status">No notes available</div>
|
||||
<div class="switcher-status">{$ui("ui.no_notes_available")}</div>
|
||||
{:else}
|
||||
{#each [
|
||||
{ label: 'Recent', rows: sections.recent },
|
||||
@@ -251,7 +252,7 @@
|
||||
] as section (section.label)}
|
||||
{#if section.rows.length > 0}
|
||||
<section class="switcher-section" aria-labelledby={`note-switcher-${section.label.replace(' ', '-').toLowerCase()}`}>
|
||||
<h2 id={`note-switcher-${section.label.replace(' ', '-').toLowerCase()}`}>{section.label}</h2>
|
||||
<h2 id={`note-switcher-${section.label.replace(' ', '-').toLowerCase()}`}>{$uiLabel(section.label)}</h2>
|
||||
{#each section.rows as row (row.path)}
|
||||
<div class="note-row" class:current-row={row.current} title={row.path}>
|
||||
{#if row.current}<span class="current-marker" aria-hidden="true"></span>{/if}
|
||||
@@ -268,8 +269,8 @@
|
||||
<button
|
||||
class="open-window"
|
||||
type="button"
|
||||
aria-label={`Open ${row.title} in new window`}
|
||||
title={`Open ${row.title} in new window`}
|
||||
aria-label={$ui("ui.open_in_new_window_3dff16", { value0: row.title })}
|
||||
title={$ui("ui.open_in_new_window_3dff16", { value0: row.title })}
|
||||
onclick={() => { if (loadedVaultPath) void openNoteWindow(loadedVaultPath, row.path, row.title); }}
|
||||
>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { t as ui, tr as uiText } from '$lib/i18n';
|
||||
import { onMount, onDestroy, untrack } from 'svelte';
|
||||
import { listen } from '@tauri-apps/api/event';
|
||||
import { getCurrentWebview } from '@tauri-apps/api/webview';
|
||||
@@ -141,7 +142,7 @@
|
||||
unlistenClose = closeListener;
|
||||
}
|
||||
if (!ownerVault) {
|
||||
loadError = 'This note window has no valid originating vault.';
|
||||
loadError = uiText("ui.this_note_window_has_no_valid_originating_vault");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -207,7 +208,7 @@
|
||||
else {
|
||||
$activeNote = null;
|
||||
$activeNotePath = null;
|
||||
loadError = 'This note was removed by the vault restore.';
|
||||
loadError = uiText("ui.this_note_was_removed_by_the_vault_restore");
|
||||
}
|
||||
} else if (!restored) console.error('Failed to refresh note window:', error);
|
||||
}
|
||||
@@ -261,16 +262,16 @@
|
||||
</svg>
|
||||
<span class="nw-title">{$activeNote?.meta.title || 'Loading...'}</span>
|
||||
{#if $editorDirty}
|
||||
<span class="nw-dirty-dot" title="Unsaved changes"></span>
|
||||
<span class="nw-dirty-dot" title={$ui("ui.unsaved_changes")}></span>
|
||||
{/if}
|
||||
</div>
|
||||
<div class="titlebar-actions">
|
||||
<button class="nw-btn" class:active={$sourceMode} onclick={() => ($sourceMode = !$sourceMode)} title="Toggle Source Mode">
|
||||
<button class="nw-btn" class:active={$sourceMode} onclick={() => ($sourceMode = !$sourceMode)} title={$ui("ui.toggle_source_mode")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<polyline points="16 18 22 12 16 6" /><polyline points="8 6 2 12 8 18" />
|
||||
</svg>
|
||||
</button>
|
||||
<button class="nw-btn" class:active={$readOnly} onclick={() => ($readOnly = !$readOnly)} title={$readOnly ? 'Switch to Edit Mode' : 'Switch to View Mode'}>
|
||||
<button class="nw-btn" class:active={$readOnly} onclick={() => ($readOnly = !$readOnly)} title={$readOnly ? $ui("ui.switch_to_edit_mode") : $ui("ui.switch_to_view_mode")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
{#if $readOnly}
|
||||
<path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z" />
|
||||
@@ -285,12 +286,12 @@
|
||||
</div>
|
||||
{#if !isMac}
|
||||
<div class="titlebar-controls">
|
||||
<button class="titlebar-btn" onclick={() => appWindow.minimize()} title="Minimize">
|
||||
<button class="titlebar-btn" onclick={() => appWindow.minimize()} title={$ui("ui.minimize")}>
|
||||
<svg width="10" height="10" viewBox="0 0 10 10">
|
||||
<line x1="1" y1="5" x2="9" y2="5" stroke="currentColor" stroke-width="1.2" stroke-linecap="round" />
|
||||
</svg>
|
||||
</button>
|
||||
<button class="titlebar-btn" onclick={() => appWindow.toggleMaximize()} title={maximized ? 'Restore' : 'Maximize'}>
|
||||
<button class="titlebar-btn" onclick={() => appWindow.toggleMaximize()} title={maximized ? $ui("ui.restore") : $ui("ui.maximize")}>
|
||||
{#if maximized}
|
||||
<svg width="10" height="10" viewBox="0 0 10 10">
|
||||
<rect x="2.5" y="0.5" width="7" height="7" rx="1" fill="none" stroke="currentColor" stroke-width="1.2" />
|
||||
@@ -302,7 +303,7 @@
|
||||
</svg>
|
||||
{/if}
|
||||
</button>
|
||||
<button class="titlebar-btn titlebar-close" onclick={() => appWindow.close()} title="Close">
|
||||
<button class="titlebar-btn titlebar-close" onclick={() => appWindow.close()} title={$ui("ui.close")}>
|
||||
<svg width="10" height="10" viewBox="0 0 10 10">
|
||||
<line x1="1.5" y1="1.5" x2="8.5" y2="8.5" stroke="currentColor" stroke-width="1.2" stroke-linecap="round" />
|
||||
<line x1="8.5" y1="1.5" x2="1.5" y2="8.5" stroke="currentColor" stroke-width="1.2" stroke-linecap="round" />
|
||||
@@ -314,7 +315,7 @@
|
||||
|
||||
{#if loadError}
|
||||
<div class="nw-error">
|
||||
<p>Failed to load note</p>
|
||||
<p>{$ui("ui.failed_to_load_note")}</p>
|
||||
<p class="nw-error-detail">{loadError}</p>
|
||||
</div>
|
||||
{:else}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { t as ui } from '$lib/i18n';
|
||||
import { onDestroy } from 'svelte';
|
||||
|
||||
let { onResize, label, value, min, max, controls }: {
|
||||
@@ -62,4 +63,4 @@
|
||||
role={value === undefined ? 'presentation' : 'separator'} tabindex={value === undefined ? undefined : 0}
|
||||
aria-label={label} aria-orientation={value === undefined ? undefined : 'vertical'}
|
||||
aria-valuenow={value} aria-valuemin={min} aria-valuemax={max} aria-controls={controls}
|
||||
title={value === undefined ? undefined : 'Use Left and Right arrow keys to resize'}></div>
|
||||
title={value === undefined ? undefined : $ui("ui.use_left_and_right_arrow_keys_to_resize")}></div>
|
||||
@@ -1,4 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { t as ui, tr as uiText } from '$lib/i18n';
|
||||
import { tick } from 'svelte';
|
||||
import { showSearch, appConfig, notebooks } from '$lib/stores/app';
|
||||
import { searchNotes } from '$lib/api';
|
||||
@@ -176,7 +177,7 @@
|
||||
const opened = await onSelectNote(result, notebook, () => isCurrent(generation, vault));
|
||||
if (!isCurrent(generation, vault)) return;
|
||||
if (!opened) {
|
||||
error = 'Could not open this note.';
|
||||
error = uiText("ui.could_not_open_this_note");
|
||||
return;
|
||||
}
|
||||
close();
|
||||
@@ -200,7 +201,7 @@
|
||||
|
||||
{#if $showSearch}
|
||||
<div class="search-overlay" role="presentation" onclick={close} onkeydowncapture={handleEscape}>
|
||||
<div class="search-panel" role="dialog" aria-modal="true" aria-label="Search notes" tabindex="-1" onclick={(e) => e.stopPropagation()} onkeydown={handleKeydown}>
|
||||
<div class="search-panel" role="dialog" aria-modal="true" aria-label={$ui("ui.search_notes_246ce5")} tabindex="-1" onclick={(e) => e.stopPropagation()} onkeydown={handleKeydown}>
|
||||
<div class="search-input-wrapper">
|
||||
<svg class="search-icon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<circle cx="11" cy="11" r="8" />
|
||||
@@ -209,9 +210,9 @@
|
||||
<input
|
||||
bind:this={inputEl}
|
||||
type="text"
|
||||
placeholder="Search notes..."
|
||||
placeholder={$ui("ui.search_notes_9520e1")}
|
||||
role="combobox"
|
||||
aria-label="Search notes"
|
||||
aria-label={$ui("ui.search_notes_246ce5")}
|
||||
aria-controls="global-search-results"
|
||||
aria-expanded={results.length > 0}
|
||||
aria-autocomplete="list"
|
||||
@@ -226,11 +227,11 @@
|
||||
|
||||
{#if error}<div class="search-error" role="alert">{error}</div>{/if}
|
||||
{#if composing}
|
||||
<div class="search-empty">Type to search across all notes</div>
|
||||
<div class="search-empty">{$ui("ui.type_to_search_across_all_notes")}</div>
|
||||
{:else if loading}
|
||||
<div class="search-empty" role="status">Searching…</div>
|
||||
<div class="search-empty" role="status">{$ui("ui.searching")}</div>
|
||||
{:else if results.length > 0}
|
||||
<div class="search-results" id="global-search-results" role="listbox" aria-label="Search results" bind:this={resultsEl}>
|
||||
<div class="search-results" id="global-search-results" role="listbox" aria-label={$ui("ui.search_results")} bind:this={resultsEl}>
|
||||
{#each rows as row, i (row.result.path)}
|
||||
{@const result = row.result}
|
||||
<button
|
||||
@@ -270,26 +271,26 @@
|
||||
<line x1="8" y1="8" x2="14" y2="14" />
|
||||
<line x1="14" y1="8" x2="8" y2="14" />
|
||||
</svg>
|
||||
<span>{total > 0 ? 'Results changed. Choose an earlier page.' : `No results for "${query}"`}</span>
|
||||
<span>{total > 0 ? $ui("ui.results_changed_choose_an_earlier_page") : $ui("ui.no_results_for", { value0: query })}</span>
|
||||
</div>
|
||||
{:else if !error}
|
||||
<div class="search-empty">
|
||||
<span>Type to search across all notes</span>
|
||||
<span>{$ui("ui.type_to_search_across_all_notes")}</span>
|
||||
</div>
|
||||
{/if}
|
||||
{#if total > 0}
|
||||
<div class="search-footer">
|
||||
<span class="search-count" role="status">
|
||||
{#if results.length}{offset + 1}–{offset + results.length} of {total}{:else}{total} result{total !== 1 ? 's' : ''}{/if}
|
||||
{#if results.length}{$ui("ui.of_0e1840", { value0: offset + 1, value1: offset + results.length, value2: total })}{:else}{$ui("ui.result", { value0: total, value1: total !== 1 ? 's' : '' })}{/if}
|
||||
</span>
|
||||
{#if total > PAGE_SIZE || offset > 0}
|
||||
<div class="search-pages" aria-label="Result pages">
|
||||
<button onclick={previousPage} disabled={loading || opening || offset === 0} aria-label="Previous results page">Previous</button>
|
||||
<button onclick={() => startSearch(query, offset + PAGE_SIZE, true)} disabled={loading || opening || offset + PAGE_SIZE >= total} aria-label="Next results page">Next</button>
|
||||
<div class="search-pages" aria-label={$ui("ui.result_pages")}>
|
||||
<button onclick={previousPage} disabled={loading || opening || offset === 0} aria-label={$ui("ui.previous_results_page")}>{$ui("ui.previous")}</button>
|
||||
<button onclick={() => startSearch(query, offset + PAGE_SIZE, true)} disabled={loading || opening || offset + PAGE_SIZE >= total} aria-label={$ui("ui.next_results_page")}>{$ui("ui.next")}</button>
|
||||
</div>
|
||||
{/if}
|
||||
{#if !isMobile}
|
||||
<span class="search-hints"><kbd>↑</kbd><kbd>↓</kbd> navigate <kbd>↵</kbd> open</span>
|
||||
<span class="search-hints"><kbd>↑</kbd><kbd>↓</kbd> {$ui("ui.navigate")} <kbd>↵</kbd> {$ui("ui.open")}</span>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,4 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { t as ui, label as uiLabel, tr as uiText } from '$lib/i18n';
|
||||
import { onDestroy, tick } from 'svelte';
|
||||
import { get } from 'svelte/store';
|
||||
import {
|
||||
@@ -206,11 +207,11 @@
|
||||
const [icons, styles] = appearances;
|
||||
if (notebookAppearance.acceptsSnapshot(ownerVault!, iconRevision)) {
|
||||
if (icons.status === 'fulfilled') $notebookIcons = icons.value;
|
||||
else iconError = `Could not read notebook icons: ${String(icons.reason)}`;
|
||||
else iconError = uiText("ui.could_not_read_notebook_icons", { value0: String(icons.reason) });
|
||||
}
|
||||
if (tagAppearance.acceptsSnapshot(ownerVault!, styleRevision)) {
|
||||
if (styles.status === 'fulfilled') $tagStyles = styles.value;
|
||||
else iconError = `Could not read tag appearances: ${String(styles.reason)}`;
|
||||
else iconError = uiText("ui.could_not_read_tag_appearances", { value0: String(styles.reason) });
|
||||
}
|
||||
$quickAccessPaths = qaNotes.map(n => n.relative_path);
|
||||
$rootNoteCount = rootCount;
|
||||
@@ -692,7 +693,7 @@
|
||||
try {
|
||||
const selected = await openDialog({
|
||||
multiple: false,
|
||||
filters: [{ name: 'Images', extensions: ['png', 'jpg', 'jpeg', 'gif', 'svg', 'webp', 'ico'] }]
|
||||
filters: [{ name: $ui('ui.images'), extensions: ['png', 'jpg', 'jpeg', 'gif', 'svg', 'webp', 'ico'] }]
|
||||
});
|
||||
if (!selected || !ownerIsCurrent() || !latest()) return;
|
||||
const filePath = selected as string;
|
||||
@@ -816,7 +817,7 @@
|
||||
<aside class="sidebar" class:collapsed={!isMobile && $sidebarCollapsed} class:mobile={isMobile} class:nav-empty={!anyNavItem}>
|
||||
{#if !isMobile}
|
||||
<div class="sidebar-header">
|
||||
<button class="collapse-btn" onclick={() => ($sidebarCollapsed = !$sidebarCollapsed)} title="Toggle sidebar">
|
||||
<button class="collapse-btn" onclick={() => ($sidebarCollapsed = !$sidebarCollapsed)} title={$ui("ui.toggle_sidebar")}>
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
{#if $sidebarCollapsed}
|
||||
<polyline points="9 6 15 12 9 18" />
|
||||
@@ -825,7 +826,7 @@
|
||||
{/if}
|
||||
</svg>
|
||||
</button>
|
||||
<button class="icon-btn" onclick={() => ($showSearch = true)} title={`Search (${modKey}+F)`}>
|
||||
<button class="icon-btn" onclick={() => ($showSearch = true)} title={$ui("ui.search_f", { value0: modKey })}>
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<circle cx="11" cy="11" r="8" />
|
||||
<line x1="21" y1="21" x2="16.65" y2="16.65" />
|
||||
@@ -847,7 +848,7 @@
|
||||
<path d="M16 3H5a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2V8z" />
|
||||
<polyline points="14 3 14 8 21 8" />
|
||||
</svg>
|
||||
<span>All Notes</span>
|
||||
<span>{$ui("ui.all_notes")}</span>
|
||||
</button>
|
||||
{/if}
|
||||
|
||||
@@ -860,7 +861,7 @@
|
||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2" />
|
||||
</svg>
|
||||
<span>Quick Access</span>
|
||||
<span>{$ui("ui.quick_access")}</span>
|
||||
</button>
|
||||
{/if}
|
||||
|
||||
@@ -874,7 +875,7 @@
|
||||
<path d="M9 11l3 3L22 4" />
|
||||
<path d="M21 12v7a2 2 0 01-2 2H5a2 2 0 01-2-2V5a2 2 0 012-2h11" />
|
||||
</svg>
|
||||
<span>Tasks</span>
|
||||
<span>{$ui("ui.tasks")}</span>
|
||||
</button>
|
||||
{/if}
|
||||
|
||||
@@ -890,7 +891,7 @@
|
||||
<line x1="8" y1="2" x2="8" y2="6" />
|
||||
<line x1="3" y1="10" x2="21" y2="10" />
|
||||
</svg>
|
||||
<span>Daily Notes</span>
|
||||
<span>{$ui("ui.daily_notes")}</span>
|
||||
</button>
|
||||
{/if}
|
||||
|
||||
@@ -904,7 +905,7 @@
|
||||
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<polyline points="3 6 5 6 21 6" /><path d="M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2" /><line x1="10" y1="11" x2="10" y2="17" /><line x1="14" y1="11" x2="14" y2="17" />
|
||||
</svg>
|
||||
<span>Trash</span>
|
||||
<span>{$ui("ui.trash")}</span>
|
||||
</button>
|
||||
{/if}
|
||||
</nav>
|
||||
@@ -932,10 +933,10 @@
|
||||
}
|
||||
}}
|
||||
>
|
||||
<span class="section-title">Notebooks</span>
|
||||
<span class="section-title">{$ui("ui.notebooks")}</span>
|
||||
<div class="section-actions">
|
||||
{#if allParentPaths.length > 0}
|
||||
<button class="icon-btn-sm" onclick={(e) => { e.stopPropagation(); toggleAllCollapse(); }} title={allCollapsed ? 'Expand all notebooks' : 'Collapse all notebooks'} aria-label={allCollapsed ? 'Expand all notebooks' : 'Collapse all notebooks'}>
|
||||
<button class="icon-btn-sm" onclick={(e) => { e.stopPropagation(); toggleAllCollapse(); }} title={allCollapsed ? $ui("ui.expand_all_notebooks") : $ui("ui.collapse_all_notebooks")} aria-label={allCollapsed ? $ui("ui.expand_all_notebooks") : $ui("ui.collapse_all_notebooks")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
{#if allCollapsed}
|
||||
<path d="m7 15 5 5 5-5" /><path d="m7 9 5-5 5 5" />
|
||||
@@ -945,7 +946,7 @@
|
||||
</svg>
|
||||
</button>
|
||||
{/if}
|
||||
<button class="icon-btn-sm" onclick={toggleNewNotebookInput} title={$viewMode === 'notebook' && $activeNotebook?.relative_path ? `New notebook inside ${$activeNotebook.name}` : 'New notebook'}>
|
||||
<button class="icon-btn-sm" onclick={toggleNewNotebookInput} title={$viewMode === 'notebook' && $activeNotebook?.relative_path ? $ui("ui.new_notebook_inside", { value0: $activeNotebook.name }) : $ui("ui.new_notebook")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<line x1="12" y1="5" x2="12" y2="19" /><line x1="5" y1="12" x2="19" y2="12" />
|
||||
</svg>
|
||||
@@ -956,7 +957,7 @@
|
||||
{#if showNewNotebook}
|
||||
<div class="new-notebook-input">
|
||||
{#if newNotebookParent}
|
||||
<button class="new-notebook-parent" title="Click to create a top-level notebook instead" onmousedown={(e) => { e.preventDefault(); newNotebookParent = null; }}>
|
||||
<button class="new-notebook-parent" title={$ui("ui.click_to_create_a_top_level_notebook_instead")} onmousedown={(e) => { e.preventDefault(); newNotebookParent = null; }}>
|
||||
{newNotebookParent.name}/<span class="new-notebook-parent-x" aria-hidden="true">×</span>
|
||||
</button>
|
||||
{/if}
|
||||
@@ -964,7 +965,7 @@
|
||||
bind:this={newNotebookInput}
|
||||
type="text"
|
||||
bind:value={newNotebookName}
|
||||
placeholder={newNotebookParent ? 'Sub-notebook name...' : 'Notebook name...'}
|
||||
placeholder={newNotebookParent ? $ui("ui.sub_notebook_name") : $ui("ui.notebook_name")}
|
||||
onkeydown={handleNewNotebookKeydown}
|
||||
/>
|
||||
</div>
|
||||
@@ -986,7 +987,7 @@
|
||||
<path d="M5.45 5.11 2 12v6a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2v-6l-3.45-6.89A2 2 0 0 0 16.76 4H7.24a2 2 0 0 0-1.79 1.11z" />
|
||||
</svg>
|
||||
</span>
|
||||
<span class="notebook-name">Unfiled Notes <span class="notebook-count">{$rootNoteCount}</span></span>
|
||||
<span class="notebook-name">{$ui("ui.unfiled_notes")} <span class="notebook-count">{$rootNoteCount}</span></span>
|
||||
</button>
|
||||
{/if}
|
||||
{#each sortedNotebooks as nb (nb.path)}
|
||||
@@ -996,7 +997,7 @@
|
||||
{#if isMobile && $tags.length > 0}
|
||||
<div class="tags-section-inline">
|
||||
<button class="section-header" onclick={() => tagsCollapsed = !tagsCollapsed}>
|
||||
<span class="section-title">Tags</span>
|
||||
<span class="section-title">{$ui("ui.tags_848eed")}</span>
|
||||
<span class="tag-count" style="margin-left: auto">{$tags.length}</span>
|
||||
</button>
|
||||
{#if !tagsCollapsed}
|
||||
@@ -1013,7 +1014,7 @@
|
||||
{#if !isMobile && $tags.length > 0}
|
||||
<div class="tags-section">
|
||||
<button class="section-header" onclick={() => tagsCollapsed = !tagsCollapsed}>
|
||||
<span class="section-title">Tags</span>
|
||||
<span class="section-title">{$ui("ui.tags_848eed")}</span>
|
||||
<span class="tag-count" style="margin-left: auto">{$tags.length}</span>
|
||||
</button>
|
||||
{#if !tagsCollapsed}
|
||||
@@ -1028,7 +1029,7 @@
|
||||
{/if}
|
||||
|
||||
<div class="sidebar-footer">
|
||||
<button class="icon-btn" onclick={() => ($showInfo = true)} title="Info">
|
||||
<button class="icon-btn" onclick={() => ($showInfo = true)} title={$ui("ui.info")}>
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<circle cx="12" cy="12" r="10" />
|
||||
<line x1="12" y1="16" x2="12" y2="12" />
|
||||
@@ -1036,7 +1037,7 @@
|
||||
</svg>
|
||||
</button>
|
||||
<div class="sidebar-footer-right">
|
||||
<button class="icon-btn" onclick={() => ($showSettings = true)} title="Settings">
|
||||
<button class="icon-btn" onclick={() => ($showSettings = true)} title={$ui("ui.settings")}>
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<circle cx="12" cy="12" r="3" />
|
||||
<path d="M19.4 15a1.65 1.65 0 00.33 1.82l.06.06a2 2 0 010 2.83 2 2 0 01-2.83 0l-.06-.06a1.65 1.65 0 00-1.82-.33 1.65 1.65 0 00-1 1.51V21a2 2 0 01-4 0v-.09A1.65 1.65 0 009 19.4a1.65 1.65 0 00-1.82.33l-.06.06a2 2 0 01-2.83-2.83l.06-.06A1.65 1.65 0 004.68 15a1.65 1.65 0 00-1.51-1H3a2 2 0 010-4h.09A1.65 1.65 0 004.6 9a1.65 1.65 0 00-.33-1.82l-.06-.06a2 2 0 012.83-2.83l.06.06A1.65 1.65 0 009 4.68a1.65 1.65 0 001-1.51V3a2 2 0 014 0v.09a1.65 1.65 0 001 1.51 1.65 1.65 0 001.82-.33l.06-.06a2 2 0 012.83 2.83l-.06.06A1.65 1.65 0 0019.4 9a1.65 1.65 0 001.51 1H21a2 2 0 010 4h-.09a1.65 1.65 0 00-1.51 1z" />
|
||||
@@ -1049,39 +1050,39 @@
|
||||
|
||||
{#if contextMenu}
|
||||
{#if isMobile}
|
||||
<button type="button" class="context-menu-backdrop" aria-label="Close notebook actions" onclick={closeContextMenu}></button>
|
||||
<button type="button" class="context-menu-backdrop" aria-label={$ui("ui.close_notebook_actions")} onclick={closeContextMenu}></button>
|
||||
{/if}
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
<div class="context-menu" class:mobile={isMobile} style="left: {contextMenu.x}px; top: {contextMenu.y}px" onmousedown={(e) => e.stopPropagation()}>
|
||||
<button onclick={() => startNewSubNotebook(contextMenu!.notebook)}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 19a2 2 0 01-2 2H4a2 2 0 01-2-2V5a2 2 0 012-2h5l2 3h9a2 2 0 012 2z" /><line x1="12" y1="11" x2="12" y2="17" /><line x1="9" y1="14" x2="15" y2="14" /></svg>
|
||||
New Sub-notebook
|
||||
{$ui("ui.new_sub_notebook")}
|
||||
</button>
|
||||
<button onclick={() => startRename(contextMenu!.notebook)}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7" /><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z" /></svg>
|
||||
Rename
|
||||
{$ui("ui.rename")}
|
||||
</button>
|
||||
<button onclick={() => openIconPicker(contextMenu!.notebook)}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10" /><path d="M8 14s1.5 2 4 2 4-2 4-2" /><line x1="9" y1="9" x2="9.01" y2="9" /><line x1="15" y1="9" x2="15.01" y2="9" /></svg>
|
||||
{$notebookIcons[normalizeNotebookIconKey(contextMenu.notebook.relative_path)] ? 'Change Icon...' : 'Set Icon...'}
|
||||
{$notebookIcons[normalizeNotebookIconKey(contextMenu.notebook.relative_path)] ? $ui("ui.change_icon") : $ui("ui.set_icon")}
|
||||
</button>
|
||||
<button class="danger" onclick={() => handleDelete(contextMenu!.notebook)}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6" /><path d="M19 6l-1 14a2 2 0 01-2 2H8a2 2 0 01-2-2L5 6" /><path d="M10 11v6" /><path d="M14 11v6" /><path d="M9 6V4a1 1 0 011-1h4a1 1 0 011 1v2" /></svg>
|
||||
Delete
|
||||
{$ui("ui.delete_action")}
|
||||
</button>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{#if iconPickerNotebook}
|
||||
<div class="icon-picker-overlay" class:mobile={isMobile}>
|
||||
<button class="icon-picker-backdrop" aria-label="Close icon picker" onclick={() => iconPickerNotebook = null}></button>
|
||||
<div bind:this={iconPickerElement} class="icon-picker" role="dialog" aria-modal="true" aria-label={`Choose an icon for ${iconPickerNotebook.name}`} tabindex="-1">
|
||||
<button class="icon-picker-backdrop" aria-label={$ui("ui.close_icon_picker")} onclick={() => iconPickerNotebook = null}></button>
|
||||
<div bind:this={iconPickerElement} class="icon-picker" role="dialog" aria-modal="true" aria-label={$ui("ui.choose_an_icon_for", { value0: iconPickerNotebook.name })} tabindex="-1">
|
||||
<header class="icon-picker-header">
|
||||
<div>
|
||||
<h3>Notebook icon</h3>
|
||||
<h3>{$ui("ui.notebook_icon")}</h3>
|
||||
<p>{iconPickerNotebook.name}</p>
|
||||
</div>
|
||||
<button class="icon-picker-close" aria-label="Close icon picker" onclick={() => iconPickerNotebook = null}>
|
||||
<button class="icon-picker-close" aria-label={$ui("ui.close_icon_picker")} onclick={() => iconPickerNotebook = null}>
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"><path d="M18 6 6 18M6 6l12 12" /></svg>
|
||||
</button>
|
||||
</header>
|
||||
@@ -1091,26 +1092,26 @@
|
||||
class="icon-picker-option"
|
||||
class:active={iconPickerActive === option.id}
|
||||
style:color={iconPickerColor}
|
||||
aria-label={option.label}
|
||||
title={option.label}
|
||||
aria-label={$uiLabel(option.label)}
|
||||
title={$uiLabel(option.label)}
|
||||
onclick={() => handleBuiltinIcon(iconPickerNotebook!, option.id)}
|
||||
>
|
||||
<NotebookGlyph icon={option.id} size={20} />
|
||||
<span>{option.label}</span>
|
||||
<span>{$uiLabel(option.label)}</span>
|
||||
</button>
|
||||
{/each}
|
||||
<button class="icon-picker-more" aria-expanded={iconPickerExpanded} onclick={() => iconPickerShowAll = !iconPickerExpanded}>
|
||||
{iconPickerExpanded ? 'Fewer icons' : 'More icons'}
|
||||
{iconPickerExpanded ? $ui("ui.fewer_icons") : $ui("ui.more_icons")}
|
||||
</button>
|
||||
</div>
|
||||
<div class="icon-color-section">
|
||||
<span class="icon-color-label">Color</span>
|
||||
<span class="icon-color-label">{$ui("ui.color")}</span>
|
||||
<div class="icon-swatches">
|
||||
<button
|
||||
class="icon-swatch none"
|
||||
class:active={!iconPickerColor}
|
||||
aria-label="Use default color"
|
||||
title="Default color"
|
||||
aria-label={$ui("ui.use_default_color")}
|
||||
title={$ui("ui.default_color")}
|
||||
onclick={() => handleIconColor(iconPickerNotebook!, null)}
|
||||
></button>
|
||||
{#each TAG_COLOR_PRESETS as preset (preset)}
|
||||
@@ -1118,17 +1119,17 @@
|
||||
class="icon-swatch"
|
||||
class:active={iconPickerColor === preset}
|
||||
style:background={preset}
|
||||
aria-label={`Use ${preset}`}
|
||||
aria-label={$ui("ui.use", { value0: preset })}
|
||||
title={preset}
|
||||
onclick={() => handleIconColor(iconPickerNotebook!, preset)}
|
||||
></button>
|
||||
{/each}
|
||||
<label class="icon-swatch custom" title="Custom color">
|
||||
<label class="icon-swatch custom" title={$ui("ui.custom_color")}>
|
||||
<input
|
||||
type="color"
|
||||
value={iconPickerColor?.length === 7 ? iconPickerColor : '#5b6abf'}
|
||||
oninput={(e) => handleIconColor(iconPickerNotebook!, e.currentTarget.value)}
|
||||
aria-label="Custom icon color"
|
||||
aria-label={$ui("ui.custom_icon_color")}
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
@@ -1136,15 +1137,15 @@
|
||||
<div class="icon-picker-actions">
|
||||
<button onclick={() => handleCustomIcon(iconPickerNotebook!)}>
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="18" height="18" rx="2" /><circle cx="8.5" cy="8.5" r="1.5" /><path d="m21 15-5-5L5 21" /></svg>
|
||||
Custom image...
|
||||
{$ui("ui.custom_image")}
|
||||
</button>
|
||||
{#if $notebookIcons[normalizeNotebookIconKey(iconPickerNotebook.relative_path)]}
|
||||
<button class="remove" onclick={() => handleRemoveIcon(iconPickerNotebook!)}>
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round"><path d="M4 7h16M9 7V4h6v3M7 7l1 13h8l1-13" /></svg>
|
||||
Use default
|
||||
{$ui("ui.use_default")}
|
||||
</button>
|
||||
{/if}
|
||||
<p class="icon-picker-recommendation">Colors do not apply to custom images. Recommended image size: <strong>1:1 aspect ratio</strong></p>
|
||||
<p class="icon-picker-recommendation">{$ui("ui.colors_do_not_apply_to_custom_images_recommended_image_size")} <strong>{$ui("ui.1_1_aspect_ratio")}</strong></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1152,13 +1153,13 @@
|
||||
|
||||
{#if tagContextMenu}
|
||||
{#if isMobile}
|
||||
<button type="button" class="context-menu-backdrop" aria-label="Close tag actions" onclick={() => tagContextMenu = null}></button>
|
||||
<button type="button" class="context-menu-backdrop" aria-label={$ui("ui.close_tag_actions")} onclick={() => tagContextMenu = null}></button>
|
||||
{/if}
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
<div class="context-menu" class:mobile={isMobile} style="left: {tagContextMenu.x}px; top: {tagContextMenu.y}px" onmousedown={(e) => e.stopPropagation()}>
|
||||
<button onclick={() => openTagStylePicker(tagContextMenu!.tag)}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10" /><path d="M8 14s1.5 2 4 2 4-2 4-2" /><line x1="9" y1="9" x2="9.01" y2="9" /><line x1="15" y1="9" x2="15.01" y2="9" /></svg>
|
||||
Customize...
|
||||
{$ui("ui.customize")}
|
||||
</button>
|
||||
</div>
|
||||
{/if}
|
||||
@@ -1169,7 +1170,7 @@
|
||||
|
||||
{#if trashContextMenu}
|
||||
{#if isMobile}
|
||||
<button type="button" class="context-menu-backdrop" aria-label="Close trash actions" onclick={() => trashContextMenu = null}></button>
|
||||
<button type="button" class="context-menu-backdrop" aria-label={$ui("ui.close_trash_actions")} onclick={() => trashContextMenu = null}></button>
|
||||
{/if}
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
<div class="context-menu" class:mobile={isMobile} style="left: {trashContextMenu.x}px; top: {trashContextMenu.y}px" onmousedown={(e) => e.stopPropagation()}>
|
||||
@@ -1177,7 +1178,7 @@
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<polyline points="3 6 5 6 21 6" /><path d="M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2" /><line x1="10" y1="11" x2="10" y2="17" /><line x1="14" y1="11" x2="14" y2="17" />
|
||||
</svg>
|
||||
Empty Trash
|
||||
{$ui("ui.empty_trash")}
|
||||
</button>
|
||||
</div>
|
||||
{/if}
|
||||
@@ -1186,11 +1187,11 @@
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
<div class="delete-confirm-overlay" onclick={dismissDeleteConfirm} onkeydown={(e) => { if (e.key === 'Escape') deleteConfirm = null; }}>
|
||||
<div class="delete-confirm" class:mobile={isMobile} role="alertdialog" aria-modal="true" aria-labelledby="delete-confirm-title" tabindex="-1">
|
||||
<h4 id="delete-confirm-title">Delete "{deleteConfirm.name}"?</h4>
|
||||
<p>This notebook contains {countNotesRecursive(deleteConfirm)} note{countNotesRecursive(deleteConfirm) === 1 ? '' : 's'} that will be permanently deleted.</p>
|
||||
<h4 id="delete-confirm-title">{$ui("ui.delete", { value0: deleteConfirm.name })}</h4>
|
||||
<p>{$ui("ui.this_notebook_contains_note_that_will_be_permanently_deleted", { value0: countNotesRecursive(deleteConfirm), value1: countNotesRecursive(deleteConfirm) === 1 ? '' : 's' })}</p>
|
||||
<div class="delete-confirm-actions">
|
||||
<button class="delete-confirm-cancel" onclick={() => deleteConfirm = null}>Cancel</button>
|
||||
<button class="delete-confirm-btn" onclick={() => confirmDelete(deleteConfirm!)}>Delete</button>
|
||||
<button class="delete-confirm-cancel" onclick={() => deleteConfirm = null}>{$ui("ui.cancel")}</button>
|
||||
<button class="delete-confirm-btn" onclick={() => confirmDelete(deleteConfirm!)}>{$ui('ui.delete_action')}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1213,7 +1214,7 @@
|
||||
<button
|
||||
type="button"
|
||||
class="notebook-actions-btn"
|
||||
aria-label={`Customize ${tag}`}
|
||||
aria-label={$ui("ui.customize_203d6f", { value0: tag })}
|
||||
onclick={(e) => openTagMenu(e, tag)}
|
||||
>
|
||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true"><circle cx="5" cy="12" r="1.8"/><circle cx="12" cy="12" r="1.8"/><circle cx="19" cy="12" r="1.8"/></svg>
|
||||
@@ -1340,7 +1341,7 @@
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
<span
|
||||
class="nb-drag-handle"
|
||||
title="Drag to reorder"
|
||||
title={$ui("ui.drag_to_reorder")}
|
||||
onpointerdown={(e) => nbHandleDown(e, nb)}
|
||||
>
|
||||
<svg width="12" height="12" viewBox="0 0 24 24" fill="currentColor"><circle cx="9" cy="5" r="1.6"/><circle cx="15" cy="5" r="1.6"/><circle cx="9" cy="12" r="1.6"/><circle cx="15" cy="12" r="1.6"/><circle cx="9" cy="19" r="1.6"/><circle cx="15" cy="19" r="1.6"/></svg>
|
||||
@@ -1351,7 +1352,7 @@
|
||||
<button
|
||||
type="button"
|
||||
class="notebook-actions-btn"
|
||||
aria-label={`Actions for ${nb.name}`}
|
||||
aria-label={$ui("ui.actions_for", { value0: nb.name })}
|
||||
onclick={(e) => openNotebookMenu(e, nb)}
|
||||
>
|
||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true"><circle cx="5" cy="12" r="1.8"/><circle cx="12" cy="12" r="1.8"/><circle cx="19" cy="12" r="1.8"/></svg>
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
<script lang="ts" module>
|
||||
import { tr as uiText, setUiText, setUiLabel } from '$lib/i18n';
|
||||
let diagramId = 0;
|
||||
// Mermaid has a shared configuration; serialize snapshot renders and restore it afterward.
|
||||
let diagramQueue = Promise.resolve();
|
||||
</script>
|
||||
|
||||
<script lang="ts">
|
||||
import { label as uiLabel } from '$lib/i18n';
|
||||
import createDOMPurify from 'dompurify';
|
||||
import katex from 'katex';
|
||||
import 'katex/dist/katex.min.css';
|
||||
@@ -46,6 +48,12 @@
|
||||
return node;
|
||||
}
|
||||
|
||||
function messageUi(key: Parameters<typeof uiText>[0], values?: Parameters<typeof uiText>[1]): HTMLParagraphElement {
|
||||
const node = message('');
|
||||
setUiText(node, key, values);
|
||||
return node;
|
||||
}
|
||||
|
||||
function imageSourceAllowed(source: string): boolean {
|
||||
if (/[\u0000-\u0020\u007f]/.test(source)) return false;
|
||||
if (/^(?:asset|imgproxy):\/\//i.test(source)) return true;
|
||||
@@ -83,14 +91,14 @@
|
||||
if (language) element.className = language;
|
||||
if (element.hasAttribute('data-wiki-link')) {
|
||||
element.className = 'snapshot-wiki-link';
|
||||
element.title = `Wiki link to ${element.getAttribute('data-title') || element.textContent || ''} (inactive in snapshot preview)`;
|
||||
setUiText(element, 'snapshot.wiki', { title: element.getAttribute('data-title') || element.textContent || '' }, 'title');
|
||||
element.setAttribute('aria-disabled', 'true');
|
||||
}
|
||||
if (element.hasAttribute('data-page-break')) element.className = 'snapshot-page-break';
|
||||
// Snapshot links are readable but inert: inspection cannot navigate the live note.
|
||||
if (element.tagName === 'A') {
|
||||
const href = element.getAttribute('href');
|
||||
if (href) element.title = `${element.title ? element.title + ' — ' : ''}${href} (inactive in snapshot preview)`;
|
||||
if (href) setUiText(element, 'snapshot.link', { title: element.title ? element.title + ' — ' : '', url: href }, 'title');
|
||||
element.removeAttribute('href');
|
||||
element.setAttribute('aria-disabled', 'true');
|
||||
}
|
||||
@@ -98,19 +106,19 @@
|
||||
for (const attachment of fragment.querySelectorAll<HTMLElement>('[data-pdf-src]')) {
|
||||
const name = attachment.getAttribute('data-pdf-name') || 'PDF attachment';
|
||||
const source = attachment.getAttribute('data-pdf-src') || '';
|
||||
attachment.prepend(message(`${name} — PDF attachment (inline PDF rendering is unavailable in snapshot previews). ${source}`));
|
||||
attachment.prepend(messageUi('snapshot.pdf', { name, source }));
|
||||
}
|
||||
for (const image of fragment.querySelectorAll<HTMLImageElement>('img')) {
|
||||
const source = image.getAttribute('src') || '';
|
||||
if (!imageSourceAllowed(source)) {
|
||||
image.replaceWith(message(`Image unavailable or blocked${image.alt ? ': ' + image.alt : '.'}`));
|
||||
image.replaceWith(messageUi('snapshot.imageBlocked', { alt: image.alt || source }));
|
||||
continue;
|
||||
}
|
||||
image.crossOrigin = 'anonymous';
|
||||
image.loading = 'lazy';
|
||||
image.decoding = 'async';
|
||||
image.addEventListener('error', () => {
|
||||
image.replaceWith(message(`Image could not be loaded: ${image.alt || source}`));
|
||||
image.replaceWith(messageUi('snapshot.imageFailed', { source: image.alt || source }));
|
||||
}, { once: true });
|
||||
}
|
||||
for (const item of fragment.querySelectorAll<HTMLElement>('li[data-type="taskItem"]')) {
|
||||
@@ -120,7 +128,7 @@
|
||||
checkbox.type = 'checkbox';
|
||||
checkbox.checked = item.getAttribute('data-checked') === 'true';
|
||||
checkbox.disabled = true;
|
||||
checkbox.setAttribute('aria-label', checkbox.checked ? 'Completed task' : 'Incomplete task');
|
||||
setUiText(checkbox, checkbox.checked ? 'snapshot.taskDone' : 'snapshot.taskOpen', {}, 'aria-label');
|
||||
item.className = 'snapshot-task';
|
||||
item.append(checkbox, body);
|
||||
}
|
||||
@@ -129,7 +137,7 @@
|
||||
scroll.className = 'snapshot-table';
|
||||
scroll.tabIndex = 0;
|
||||
scroll.setAttribute('role', 'region');
|
||||
scroll.setAttribute('aria-label', 'Snapshot table');
|
||||
setUiText(scroll, 'snapshot.table', {}, 'aria-label');
|
||||
table.replaceWith(scroll);
|
||||
scroll.append(table);
|
||||
}
|
||||
@@ -147,14 +155,14 @@
|
||||
payload = decodeURIComponent(stored);
|
||||
JSON.parse(payload);
|
||||
} catch {
|
||||
error = 'The stored secret payload is malformed; it cannot be previewed.';
|
||||
error = uiText("ui.the_stored_secret_payload_is_malformed_it_cannot_be_previewed");
|
||||
}
|
||||
title.textContent = readSecretTitle(payload);
|
||||
node.append(title, message('Locked encrypted content. Secrets are not unlocked in history previews.'));
|
||||
node.append(title, messageUi('snapshot.secretLocked'));
|
||||
if (error) {
|
||||
const details = document.createElement('details');
|
||||
const summary = document.createElement('summary');
|
||||
summary.textContent = 'Stored secret payload';
|
||||
setUiText(summary, "ui.stored_secret_payload");
|
||||
const code = document.createElement('pre');
|
||||
code.textContent = payload;
|
||||
details.append(summary, code);
|
||||
@@ -182,11 +190,12 @@
|
||||
icon.setAttribute('aria-hidden', 'true');
|
||||
icon.append(purifier.sanitize(calloutIcon(type), { USE_PROFILES: { svg: true }, RETURN_DOM_FRAGMENT: true }));
|
||||
const heading = document.createElement('strong');
|
||||
heading.textContent = title;
|
||||
if (node.getAttribute('data-callout-title')) heading.textContent = title;
|
||||
else setUiLabel(heading, title);
|
||||
header.append(icon, heading);
|
||||
if (title !== calloutLabel(type)) {
|
||||
const kind = document.createElement('small');
|
||||
kind.textContent = calloutLabel(type);
|
||||
setUiLabel(kind, calloutLabel(type));
|
||||
header.append(kind);
|
||||
}
|
||||
const body = document.createElement('div');
|
||||
@@ -217,7 +226,7 @@
|
||||
code.textContent = tex;
|
||||
const status = document.createElement('span');
|
||||
status.className = 'snapshot-message';
|
||||
status.textContent = ` Math could not be rendered: ${error instanceof Error ? error.message : String(error)}`;
|
||||
status.textContent = uiText("ui.math_could_not_be_rendered", { value0: error instanceof Error ? error.message : String(error) });
|
||||
node.replaceChildren(code, status);
|
||||
}
|
||||
node.removeAttribute('data-math-inline');
|
||||
@@ -232,7 +241,7 @@
|
||||
controls.className = 'snapshot-diagram';
|
||||
const button = document.createElement('button');
|
||||
button.type = 'button';
|
||||
button.textContent = '▶ Render diagram';
|
||||
button.textContent = uiText("ui.render_diagram");
|
||||
const status = document.createElement('span');
|
||||
status.className = 'snapshot-message';
|
||||
status.setAttribute('role', 'status');
|
||||
@@ -242,7 +251,7 @@
|
||||
code.parentElement!.after(controls);
|
||||
button.addEventListener('click', async () => {
|
||||
button.disabled = true;
|
||||
status.textContent = 'Rendering diagram…';
|
||||
status.textContent = uiText("ui.rendering_diagram");
|
||||
let staging: HTMLDivElement | undefined;
|
||||
let restoreConfig: (() => void) | undefined;
|
||||
let release!: () => void;
|
||||
@@ -274,7 +283,7 @@
|
||||
const data: unknown = parsed.db.getData();
|
||||
if (data && typeof data === 'object' && 'nodes' in data && Array.isArray(data.nodes)
|
||||
&& data.nodes.some((node: unknown) => node && typeof node === 'object' && 'img' in node && node.img)) {
|
||||
throw new Error('Embedded Mermaid images are not loaded in snapshot previews.');
|
||||
throw new Error(uiText("error.snapshotImages"));
|
||||
}
|
||||
}
|
||||
if (!isCurrent() || !controls.isConnected) return;
|
||||
@@ -302,18 +311,18 @@
|
||||
}
|
||||
}
|
||||
const diagram = clean.querySelector('svg');
|
||||
if (!diagram) throw new Error('No safe diagram output was produced.');
|
||||
if (!diagram) throw new Error(uiText("error.snapshotDiagram"));
|
||||
diagram.setAttribute('role', 'img');
|
||||
diagram.setAttribute('aria-label', 'Rendered snapshot diagram; source is shown above');
|
||||
setUiText(diagram, 'snapshot.diagram', {}, 'aria-label');
|
||||
output.replaceChildren(clean);
|
||||
status.textContent = blockedContent
|
||||
? 'Rendered with unsupported embedded content blocked. Original source remains above.'
|
||||
: 'Rendered. Original source remains above.';
|
||||
button.textContent = '↻ Render again';
|
||||
button.textContent = uiText("ui.render_again");
|
||||
} catch (error) {
|
||||
if (isCurrent() && controls.isConnected) {
|
||||
status.textContent = `Diagram could not be rendered: ${error instanceof Error ? error.message : String(error)} Original source remains above.`;
|
||||
button.textContent = '↻ Retry';
|
||||
status.textContent = uiText("ui.diagram_could_not_be_rendered_original_source_remains_above", { value0: error instanceof Error ? error.message : String(error) });
|
||||
button.textContent = uiText("ui.retry_ba143d");
|
||||
}
|
||||
} finally {
|
||||
staging?.remove();
|
||||
@@ -335,7 +344,7 @@
|
||||
let active = true;
|
||||
try {
|
||||
purifier ??= createDOMPurify(window);
|
||||
if (!purifier.isSupported) throw new Error('Safe HTML rendering is unavailable in this browser.');
|
||||
if (!purifier.isSupported) throw new Error(uiText("error.safeHtml"));
|
||||
const fragment = purifier.sanitize(source, {
|
||||
ALLOWED_TAGS: documentTags,
|
||||
ALLOWED_ATTR: documentAttributes,
|
||||
@@ -357,13 +366,13 @@
|
||||
if (blockedMarkup) {
|
||||
const details = document.createElement('details');
|
||||
const summary = document.createElement('summary');
|
||||
summary.textContent = 'Active or unsupported embedded content was blocked. View supplied HTML as text.';
|
||||
summary.textContent = uiText("ui.active_or_unsupported_embedded_content_was_blocked_view_suppli_a3ac67");
|
||||
const code = document.createElement('pre');
|
||||
code.textContent = source;
|
||||
details.append(summary, code);
|
||||
fragment.prepend(details);
|
||||
}
|
||||
target.replaceChildren(source.trim() ? fragment : message('This snapshot has no body content.'));
|
||||
target.replaceChildren(source.trim() ? fragment : message(uiText("snapshot.empty")));
|
||||
} catch (error) {
|
||||
const code = document.createElement('pre');
|
||||
code.textContent = source;
|
||||
@@ -373,7 +382,7 @@
|
||||
});
|
||||
</script>
|
||||
|
||||
<section class="snapshot-document" aria-label={label}>
|
||||
<section class="snapshot-document" aria-label={$uiLabel(label)}>
|
||||
<div class="snapshot-body" bind:this={root}></div>
|
||||
</section>
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<script lang="ts">
|
||||
import { onMount } from 'svelte';
|
||||
import { t as ui } from '$lib/i18n';
|
||||
import type { SourceController } from '$lib/editor/source/controller';
|
||||
|
||||
let { controller, readonly = false, numbers = false, visible = true, mobile = false }: {
|
||||
@@ -23,6 +24,7 @@
|
||||
};
|
||||
});
|
||||
$effect(() => { controller.configure(readonly, numbers); });
|
||||
$effect(() => { controller.setLabels($ui('source.placeholder'), $ui('source.label')); });
|
||||
$effect(() => { if (visible) controller.view?.requestMeasure(); });
|
||||
</script>
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { t as ui, label as uiLabel } from '$lib/i18n';
|
||||
import { onMount, onDestroy } from 'svelte';
|
||||
import { open as openDialog } from '@tauri-apps/plugin-dialog';
|
||||
import { readFile } from '@tauri-apps/plugin-fs';
|
||||
@@ -103,7 +104,7 @@
|
||||
try {
|
||||
const selected = await openDialog({
|
||||
multiple: false,
|
||||
filters: [{ name: 'Images', extensions: ['png', 'jpg', 'jpeg', 'gif', 'svg', 'webp', 'ico'] }]
|
||||
filters: [{ name: $ui('ui.images'), extensions: ['png', 'jpg', 'jpeg', 'gif', 'svg', 'webp', 'ico'] }]
|
||||
});
|
||||
if (!selected || !ownerIsCurrent() || tag !== target || !latest()) return;
|
||||
const filePath = selected as string;
|
||||
@@ -138,23 +139,23 @@
|
||||
/>
|
||||
|
||||
<div class="icon-picker-overlay" class:mobile={isMobile}>
|
||||
<button class="icon-picker-backdrop" aria-label="Close tag appearance picker" onclick={onclose}></button>
|
||||
<button class="icon-picker-backdrop" aria-label={$ui("ui.close_tag_appearance_picker")} onclick={onclose}></button>
|
||||
<div
|
||||
bind:this={dialogEl}
|
||||
class="icon-picker"
|
||||
role="dialog"
|
||||
aria-modal="true"
|
||||
aria-label={`Choose an icon and color for ${tag}`}
|
||||
aria-label={$ui("ui.choose_an_icon_and_color_for", { value0: tag })}
|
||||
tabindex="-1"
|
||||
>
|
||||
<header class="icon-picker-header">
|
||||
<div>
|
||||
<h3>Tag appearance</h3>
|
||||
<h3>{$ui("ui.tag_appearance")}</h3>
|
||||
<p>
|
||||
<TagLabel name={tag} size={14} />
|
||||
</p>
|
||||
</div>
|
||||
<button type="button" class="icon-picker-close" aria-label="Close tag appearance picker" onclick={onclose}>
|
||||
<button type="button" class="icon-picker-close" aria-label={$ui("ui.close_tag_appearance_picker")} onclick={onclose}>
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"><path d="M18 6 6 18M6 6l12 12" /></svg>
|
||||
</button>
|
||||
</header>
|
||||
@@ -165,27 +166,27 @@
|
||||
type="button"
|
||||
class="icon-picker-option"
|
||||
class:active={activeIcon === encodeBuiltinNotebookIcon(option.id)}
|
||||
aria-label={option.label}
|
||||
title={option.label}
|
||||
aria-label={$uiLabel(option.label)}
|
||||
title={$uiLabel(option.label)}
|
||||
onclick={() => handleBuiltinIcon(option.id)}
|
||||
>
|
||||
<NotebookGlyph icon={option.id} size={20} />
|
||||
<span>{option.label}</span>
|
||||
<span>{$uiLabel(option.label)}</span>
|
||||
</button>
|
||||
{/each}
|
||||
<button type="button" class="icon-picker-more" aria-expanded={expanded} onclick={() => showAll = !expanded}>
|
||||
{expanded ? 'Fewer icons' : 'More icons'}
|
||||
{expanded ? $ui("ui.fewer_icons") : $ui("ui.more_icons")}
|
||||
</button>
|
||||
</div>
|
||||
<div class="color-section">
|
||||
<span class="color-label">Color</span>
|
||||
<span class="color-label">{$ui("ui.color")}</span>
|
||||
<div class="swatches">
|
||||
<button
|
||||
type="button"
|
||||
class="swatch none"
|
||||
class:active={!activeColor}
|
||||
aria-label="Use default color"
|
||||
title="Default color"
|
||||
aria-label={$ui("ui.use_default_color")}
|
||||
title={$ui("ui.default_color")}
|
||||
onclick={() => persist({ kind: 'color', value: null })}
|
||||
></button>
|
||||
{#each TAG_COLOR_PRESETS as preset (preset)}
|
||||
@@ -194,28 +195,28 @@
|
||||
class="swatch"
|
||||
class:active={activeColor?.toLowerCase() === preset}
|
||||
style:background={preset}
|
||||
aria-label={`Use ${preset}`}
|
||||
aria-label={$ui("ui.use", { value0: preset })}
|
||||
title={preset}
|
||||
onclick={() => persist({ kind: 'color', value: preset })}
|
||||
></button>
|
||||
{/each}
|
||||
<label class="swatch custom" title="Custom color">
|
||||
<input type="color" value={colorInputValue} oninput={onColorInput} aria-label="Custom tag color" />
|
||||
<label class="swatch custom" title={$ui("ui.custom_color")}>
|
||||
<input type="color" value={colorInputValue} oninput={onColorInput} aria-label={$ui("ui.custom_tag_color")} />
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="icon-picker-actions">
|
||||
<button type="button" onclick={handleCustomIcon}>
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="18" height="18" rx="2" /><circle cx="8.5" cy="8.5" r="1.5" /><path d="m21 15-5-5L5 21" /></svg>
|
||||
Custom image...
|
||||
{$ui("ui.custom_image")}
|
||||
</button>
|
||||
{#if hasStyle}
|
||||
<button type="button" class="remove" onclick={handleReset}>
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round"><path d="M4 7h16M9 7V4h6v3M7 7l1 13h8l1-13" /></svg>
|
||||
Use default
|
||||
{$ui("ui.use_default")}
|
||||
</button>
|
||||
{/if}
|
||||
<p class="icon-picker-recommendation">Icons and colors are optional. Recommended image size: <strong>1:1</strong></p>
|
||||
<p class="icon-picker-recommendation">{$ui("ui.icons_and_colors_are_optional_recommended_image_size")} <strong>1:1</strong></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { label as uiLabel } from '$lib/i18n';
|
||||
import { onMount } from 'svelte';
|
||||
import { tags } from '$lib/stores/app';
|
||||
import TagLabel from './TagLabel.svelte';
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { t as ui, label as uiLabel, locale } from '$lib/i18n';
|
||||
import { onMount } from 'svelte';
|
||||
import { listen } from '@tauri-apps/api/event';
|
||||
import { getTasks } from '$lib/api';
|
||||
@@ -191,10 +192,10 @@
|
||||
let calYear = $state(calNow.getFullYear());
|
||||
let selectedDate = $state(formatLocalDate(calNow));
|
||||
|
||||
const calMonthNames = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
|
||||
const calMonthNames = $derived(Array.from({ length: 12 }, (_, month) => new Intl.DateTimeFormat($locale, { month: 'long' }).format(new Date(2024, month, 1))));
|
||||
// 0 = Sunday, 1 = Monday (default). Day names + grid offset follow the setting.
|
||||
const weekStartsOn = $derived($appConfig?.week_start === 'sunday' ? 0 : 1);
|
||||
const DOW = ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'];
|
||||
const DOW = $derived(Array.from({ length: 7 }, (_, day) => new Intl.DateTimeFormat($locale, { weekday: 'short' }).format(new Date(2024, 0, 7 + day))));
|
||||
const calDayNames = $derived([...DOW.slice(weekStartsOn), ...DOW.slice(0, weekStartsOn)]);
|
||||
|
||||
const tasksByDate = $derived.by(() => {
|
||||
@@ -246,9 +247,9 @@
|
||||
}
|
||||
|
||||
function agendaTitle(date: string): string {
|
||||
if (date === today) return 'Today';
|
||||
if (date === today) return $ui("ui.today");
|
||||
const [y, mo, d] = date.split('-').map(Number);
|
||||
return new Date(y, mo - 1, d).toLocaleDateString(undefined, { weekday: 'short', month: 'short', day: 'numeric' });
|
||||
return new Date(y, mo - 1, d).toLocaleDateString($locale, { weekday: 'short', month: 'short', day: 'numeric' });
|
||||
}
|
||||
|
||||
// Drag a task (from the agenda or "No due date") onto a day to (re)schedule it.
|
||||
@@ -268,24 +269,24 @@
|
||||
<div class="tasks-view" class:mobile={isMobile}>
|
||||
{#if prioMenuFor || dueMenuFor}
|
||||
<!-- svelte-ignore a11y_consider_explicit_label -->
|
||||
<button class="prio-backdrop" onclick={() => { prioMenuFor = null; dueMenuFor = null; }} aria-label="Close menu"></button>
|
||||
<button class="prio-backdrop" onclick={() => { prioMenuFor = null; dueMenuFor = null; }} aria-label={$ui("ui.close_menu")}></button>
|
||||
{/if}
|
||||
<div class="tasks-controls">
|
||||
<input class="tasks-filter" type="text" placeholder="Filter tasks…" bind:value={taskQuery} onkeydown={(e) => { if (e.key === 'Escape') taskQuery = ''; }} aria-label="Filter tasks by text" />
|
||||
<button class="tasks-ctl" class:active={dueFilter === 'today'} aria-pressed={dueFilter === 'today'} onclick={() => { dueFilter = dueFilter === 'today' ? 'all' : 'today'; if (dueFilter === 'today') calToday(); }} title="Show tasks due today">Today</button>
|
||||
<button class="tasks-ctl" class:active={dueFilter === 'overdue'} aria-pressed={dueFilter === 'overdue'} onclick={() => { dueFilter = dueFilter === 'overdue' ? 'all' : 'overdue'; }} title="Show tasks due before today">Overdue</button>
|
||||
<button class="tasks-ctl" class:active={$tasksHideCompleted} onclick={() => ($tasksHideCompleted = !$tasksHideCompleted)} title="Hide completed tasks">Hide done</button>
|
||||
<button class="tasks-ctl" class:active={$tasksOnlyFlagged} onclick={() => ($tasksOnlyFlagged = !$tasksOnlyFlagged)} title="Only show tasks with a due date or priority">Flagged</button>
|
||||
<input class="tasks-filter" type="text" placeholder={$ui("ui.filter_tasks")} bind:value={taskQuery} onkeydown={(e) => { if (e.key === 'Escape') taskQuery = ''; }} aria-label={$ui("ui.filter_tasks_by_text")} />
|
||||
<button class="tasks-ctl" class:active={dueFilter === 'today'} aria-pressed={dueFilter === 'today'} onclick={() => { dueFilter = dueFilter === 'today' ? 'all' : 'today'; if (dueFilter === 'today') calToday(); }} title={$ui("ui.show_tasks_due_today")}>{$ui("ui.today")}</button>
|
||||
<button class="tasks-ctl" class:active={dueFilter === 'overdue'} aria-pressed={dueFilter === 'overdue'} onclick={() => { dueFilter = dueFilter === 'overdue' ? 'all' : 'overdue'; }} title={$ui("ui.show_tasks_due_before_today")}>{$ui("ui.overdue")}</button>
|
||||
<button class="tasks-ctl" class:active={$tasksHideCompleted} onclick={() => ($tasksHideCompleted = !$tasksHideCompleted)} title={$ui("ui.hide_completed_tasks")}>{$ui("ui.hide_done")}</button>
|
||||
<button class="tasks-ctl" class:active={$tasksOnlyFlagged} onclick={() => ($tasksOnlyFlagged = !$tasksOnlyFlagged)} title={$ui("ui.only_show_tasks_with_a_due_date_or_priority")}>{$ui("ui.flagged")}</button>
|
||||
{#if !isAndroid}
|
||||
<div class="tasks-layout">
|
||||
<button class="tasks-ctl" class:active={viewLayout === 'list'} onclick={() => ($tasksLayout = 'list')} title="List view">List</button>
|
||||
<button class="tasks-ctl" class:active={viewLayout === 'calendar'} onclick={() => ($tasksLayout = 'calendar')} title="Calendar view">Calendar</button>
|
||||
<button class="tasks-ctl" class:active={viewLayout === 'list'} onclick={() => ($tasksLayout = 'list')} title={$ui("ui.list_view")}>{$ui("ui.list")}</button>
|
||||
<button class="tasks-ctl" class:active={viewLayout === 'calendar'} onclick={() => ($tasksLayout = 'calendar')} title={$ui("ui.calendar_view")}>{$ui("ui.calendar")}</button>
|
||||
</div>
|
||||
{/if}
|
||||
{#if viewLayout === 'list'}
|
||||
<div class="tasks-sort">
|
||||
{#each [['due', 'Due'], ['priority', 'Priority'], ['note', 'Note']] as [v, label]}
|
||||
<button class="tasks-ctl" class:active={$tasksSort === v} onclick={() => ($tasksSort = v as 'due' | 'priority' | 'note')}>{label}</button>
|
||||
<button class="tasks-ctl" class:active={$tasksSort === v} onclick={() => ($tasksSort = v as 'due' | 'priority' | 'note')}>{$ui(v === 'due' ? 'tasks.sort.due' : v === 'priority' ? 'tasks.sort.priority' : 'tasks.sort.note')}</button>
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
@@ -301,7 +302,7 @@
|
||||
ondragstart={(e) => { if (!dragMode) return; draggedTask = t; if (e.dataTransfer) { e.dataTransfer.effectAllowed = 'move'; e.dataTransfer.setData('text/plain', rowKey(t)); } }}
|
||||
ondragend={() => { draggedTask = null; dragOverDate = null; }}
|
||||
>
|
||||
<button class="task-check" class:checked={t.completed} onclick={(e) => { e.stopPropagation(); toggle(t); }} title={t.completed ? 'Mark not done' : 'Mark done'} aria-label="toggle done"></button>
|
||||
<button class="task-check" class:checked={t.completed} onclick={(e) => { e.stopPropagation(); toggle(t); }} title={t.completed ? $ui("ui.mark_not_done") : $ui("ui.mark_done")} aria-label={$ui("ui.toggle_done")}></button>
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
<!-- svelte-ignore a11y_click_events_have_key_events -->
|
||||
<div class="task-main" onclick={() => onOpenTask(t)}>
|
||||
@@ -310,16 +311,16 @@
|
||||
<button
|
||||
class="task-prio prio-{t.priority ?? 'none'}"
|
||||
class:set={!!t.priority}
|
||||
title="Set priority"
|
||||
aria-label="Set priority"
|
||||
title={$ui("ui.set_priority")}
|
||||
aria-label={$ui("ui.set_priority")}
|
||||
onclick={(e) => { e.stopPropagation(); dueMenuFor = null; prioMenuFor = prioMenuFor === rowKey(t) ? null : rowKey(t); }}
|
||||
>{t.priority ?? '!'}</button>
|
||||
{#if prioMenuFor === rowKey(t)}
|
||||
<div class="prio-menu" role="menu">
|
||||
<button class="prio-opt prio-high" onclick={(e) => { e.stopPropagation(); choosePriority(t, 'high'); }}>High</button>
|
||||
<button class="prio-opt prio-med" onclick={(e) => { e.stopPropagation(); choosePriority(t, 'med'); }}>Med</button>
|
||||
<button class="prio-opt prio-low" onclick={(e) => { e.stopPropagation(); choosePriority(t, 'low'); }}>Low</button>
|
||||
<button class="prio-opt prio-clear" onclick={(e) => { e.stopPropagation(); choosePriority(t, null); }}>None</button>
|
||||
<button class="prio-opt prio-high" onclick={(e) => { e.stopPropagation(); choosePriority(t, 'high'); }}>{$ui("ui.high")}</button>
|
||||
<button class="prio-opt prio-med" onclick={(e) => { e.stopPropagation(); choosePriority(t, 'med'); }}>{$ui("ui.med")}</button>
|
||||
<button class="prio-opt prio-low" onclick={(e) => { e.stopPropagation(); choosePriority(t, 'low'); }}>{$ui("ui.low")}</button>
|
||||
<button class="prio-opt prio-clear" onclick={(e) => { e.stopPropagation(); choosePriority(t, null); }}>{$ui("ui.none")}</button>
|
||||
</div>
|
||||
{/if}
|
||||
</span>
|
||||
@@ -328,8 +329,8 @@
|
||||
<button
|
||||
class="task-due {dueClass(t.due, t.completed)}"
|
||||
class:set={!!t.due}
|
||||
title="Set due date"
|
||||
aria-label="Set due date"
|
||||
title={$ui("ui.set_due_date")}
|
||||
aria-label={$ui("ui.set_due_date")}
|
||||
onclick={(e) => { e.stopPropagation(); prioMenuFor = null; dueMenuFor = dueMenuFor === rowKey(t) ? null : rowKey(t); }}
|
||||
>{t.due ?? 'due'}</button>
|
||||
{#if dueMenuFor === rowKey(t)}
|
||||
@@ -341,7 +342,7 @@
|
||||
onclick={(e) => e.stopPropagation()}
|
||||
onchange={(e) => { e.stopPropagation(); chooseDue(t, (e.target as HTMLInputElement).value || null); }}
|
||||
/>
|
||||
{#if t.due}<button class="prio-opt prio-clear" onclick={(e) => { e.stopPropagation(); chooseDue(t, null); }}>Clear</button>{/if}
|
||||
{#if t.due}<button class="prio-opt prio-clear" onclick={(e) => { e.stopPropagation(); chooseDue(t, null); }}>{$ui("ui.clear")}</button>{/if}
|
||||
</div>
|
||||
{/if}
|
||||
</span>
|
||||
@@ -352,16 +353,16 @@
|
||||
{/snippet}
|
||||
|
||||
{#if loading}
|
||||
<div class="tasks-empty">Loading...</div>
|
||||
<div class="tasks-empty">{$ui("ui.loading")}</div>
|
||||
{:else if viewLayout === 'calendar'}
|
||||
<div class="tasks-cal-pane">
|
||||
<div class="cal">
|
||||
<div class="cal-nav">
|
||||
<button class="cal-nav-btn" onclick={calPrev} title="Previous month" aria-label="Previous month">
|
||||
<button class="cal-nav-btn" onclick={calPrev} title={$ui("ui.previous_month")} aria-label={$ui("ui.previous_month")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="15 18 9 12 15 6"/></svg>
|
||||
</button>
|
||||
<button class="cal-title" onclick={calToday} title="Jump to today">{calMonthNames[calMonth]} {calYear}</button>
|
||||
<button class="cal-nav-btn" onclick={calNext} title="Next month" aria-label="Next month">
|
||||
<button class="cal-title" onclick={calToday} title={$ui("ui.jump_to_today")}>{$uiLabel(calMonthNames[calMonth])} {calYear}</button>
|
||||
<button class="cal-nav-btn" onclick={calNext} title={$ui("ui.next_month")} aria-label={$ui("ui.next_month")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="9 18 15 12 9 6"/></svg>
|
||||
</button>
|
||||
</div>
|
||||
@@ -394,14 +395,14 @@
|
||||
<div class="agenda-section">
|
||||
<div class="agenda-head" class:overdue={selectedDate < today}>{agendaTitle(selectedDate)}</div>
|
||||
{#if selectedDayTasks.length === 0}
|
||||
<div class="tasks-empty-sm">Nothing due.</div>
|
||||
<div class="tasks-empty-sm">{$ui("ui.nothing_due")}</div>
|
||||
{:else}
|
||||
{#each selectedDayTasks as t (rowKey(t))}{@render taskRow(t, true)}{/each}
|
||||
{/if}
|
||||
</div>
|
||||
{#if undatedTasks.length}
|
||||
<div class="agenda-section">
|
||||
<div class="agenda-head">No due date ({undatedTasks.length})</div>
|
||||
<div class="agenda-head">{$ui("ui.no_due_date", { value0: undatedTasks.length })}</div>
|
||||
{#each undatedTasks as t (rowKey(t))}{@render taskRow(t, true)}{/each}
|
||||
</div>
|
||||
{/if}
|
||||
@@ -410,11 +411,11 @@
|
||||
{:else if filtered.length === 0}
|
||||
<div class="tasks-empty">
|
||||
{#if tasks.length === 0}
|
||||
No tasks. Add <code>- [ ] something</code> to any note.
|
||||
{$ui("ui.no_tasks_add")} <code>- [ ] {$ui('tasks.example')}</code> {$ui("ui.to_any_note")}
|
||||
{:else if $tasksHideCompleted && openCount === 0}
|
||||
All tasks are complete.
|
||||
{$ui("ui.all_tasks_are_complete")}
|
||||
{:else}
|
||||
No tasks match these filters.
|
||||
{$ui("ui.no_tasks_match_these_filters")}
|
||||
{/if}
|
||||
</div>
|
||||
{:else}
|
||||
|
||||
@@ -0,0 +1,217 @@
|
||||
<script lang="ts">
|
||||
import { tick } from 'svelte';
|
||||
import { findTypeaheadIndex, moveSelectIndex, typeaheadQuery, TYPEAHEAD_TIMEOUT, type SelectOption } from '$lib/utils/select-navigation';
|
||||
|
||||
let { id, label, options, value, disabled = false, onchange }: {
|
||||
id: string;
|
||||
label: string;
|
||||
options: readonly SelectOption[];
|
||||
value: string;
|
||||
disabled?: boolean;
|
||||
onchange: (value: string) => void | Promise<void>;
|
||||
} = $props();
|
||||
|
||||
let root: HTMLDivElement;
|
||||
let trigger: HTMLButtonElement;
|
||||
let menu = $state<HTMLDivElement>();
|
||||
let open = $state(false);
|
||||
let active = $state(0);
|
||||
let query = '';
|
||||
let lastTyped = 0;
|
||||
let position = $state('visibility: hidden;');
|
||||
const selected = $derived(options.find(option => option.value === value));
|
||||
const listId = $derived(`${id}-listbox`);
|
||||
const optionId = (index: number) => `${id}-option-${index}`;
|
||||
|
||||
function show(index = options.findIndex(option => option.value === value)) {
|
||||
if (disabled || !options.length) return;
|
||||
active = Math.max(0, Math.min(options.length - 1, index));
|
||||
query = '';
|
||||
position = 'visibility: hidden;';
|
||||
open = true;
|
||||
}
|
||||
|
||||
function dismiss() {
|
||||
open = false;
|
||||
query = '';
|
||||
}
|
||||
|
||||
async function choose(index: number) {
|
||||
const option = options[index];
|
||||
if (disabled || !option) return;
|
||||
const restoreFocus = document.activeElement === trigger;
|
||||
dismiss();
|
||||
try {
|
||||
if (option.value !== value) await onchange(option.value);
|
||||
} finally {
|
||||
await tick();
|
||||
// A pending save may temporarily disable the button. Do not steal focus if
|
||||
// the user has already moved to another control while the request ran.
|
||||
if (restoreFocus && document.activeElement === document.body && !disabled) {
|
||||
trigger.focus({ preventScroll: true });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function handleKeydown(event: KeyboardEvent) {
|
||||
if (disabled || event.isComposing || event.ctrlKey || event.metaKey) return;
|
||||
if (event.key === 'Escape') {
|
||||
if (open) { event.preventDefault(); event.stopPropagation(); dismiss(); }
|
||||
return;
|
||||
}
|
||||
if (event.key === 'Tab') { dismiss(); return; }
|
||||
if (event.altKey) {
|
||||
if (event.key === 'ArrowDown') { event.preventDefault(); show(); }
|
||||
else if (event.key === 'ArrowUp' && open) {
|
||||
event.preventDefault(); event.stopPropagation(); void choose(active);
|
||||
}
|
||||
return;
|
||||
}
|
||||
const next = moveSelectIndex(active, options.length, event.key);
|
||||
if (next !== null) {
|
||||
event.preventDefault(); event.stopPropagation();
|
||||
if (!open) show(event.key === 'Home' || event.key === 'End' ? next : undefined);
|
||||
else active = next;
|
||||
return;
|
||||
}
|
||||
const now = performance.now();
|
||||
const spaceInQuery = event.key === ' ' && open && query && now - lastTyped < TYPEAHEAD_TIMEOUT;
|
||||
if (event.key === 'Enter' || (event.key === ' ' && !spaceInQuery)) {
|
||||
event.preventDefault(); event.stopPropagation();
|
||||
if (open) void choose(active); else show();
|
||||
return;
|
||||
}
|
||||
if (event.key.length === 1) {
|
||||
event.preventDefault(); event.stopPropagation();
|
||||
if (!open) show();
|
||||
query = typeaheadQuery(query, event.key, now - lastTyped);
|
||||
lastTyped = now;
|
||||
const match = findTypeaheadIndex(options, query, active);
|
||||
if (match >= 0) active = match;
|
||||
}
|
||||
}
|
||||
|
||||
function placeMenu() {
|
||||
if (!menu || !trigger) return;
|
||||
const rect = trigger.getBoundingClientRect();
|
||||
const viewport = window.visualViewport;
|
||||
const leftEdge = (viewport?.offsetLeft ?? 0) + 8;
|
||||
const topEdge = (viewport?.offsetTop ?? 0) + 8;
|
||||
const rightEdge = leftEdge + (viewport?.width ?? window.innerWidth) - 16;
|
||||
const bottomEdge = topEdge + (viewport?.height ?? window.innerHeight) - 16;
|
||||
const width = Math.min(rect.width, rightEdge - leftEdge);
|
||||
const below = bottomEdge - rect.bottom - 4;
|
||||
const above = rect.top - topEdge - 4;
|
||||
const upward = below < Math.min(240, menu.scrollHeight) && above > below;
|
||||
const height = Math.max(36, Math.min(320, upward ? above : below));
|
||||
const top = upward ? rect.top - 4 - Math.min(menu.scrollHeight + 2, height) : rect.bottom + 4;
|
||||
const left = Math.max(leftEdge, Math.min(rect.left, rightEdge - width));
|
||||
position = `left: ${left}px; top: ${top}px; width: ${width}px; max-height: ${height}px;`;
|
||||
}
|
||||
|
||||
// A portal avoids clipping by the scrollable Settings panel. The popup remains
|
||||
// app-rendered DOM, so its colors never come from the OS/native select menu.
|
||||
function portal(node: HTMLDivElement) {
|
||||
document.body.appendChild(node);
|
||||
menu = node;
|
||||
return { destroy() { node.remove(); menu = undefined; } };
|
||||
}
|
||||
|
||||
$effect(() => { if (disabled || !options.length) dismiss(); });
|
||||
|
||||
$effect(() => {
|
||||
if (!open || !menu) return;
|
||||
placeMenu();
|
||||
const outside = (event: PointerEvent) => {
|
||||
const target = event.target as Node | null;
|
||||
if (target && !root.contains(target) && !menu?.contains(target)) dismiss();
|
||||
};
|
||||
const blur = () => dismiss();
|
||||
const scroll = (event: Event) => {
|
||||
if (!(event.target instanceof Node) || !menu?.contains(event.target)) dismiss();
|
||||
};
|
||||
document.addEventListener('pointerdown', outside, true);
|
||||
document.addEventListener('scroll', scroll, true);
|
||||
window.addEventListener('resize', placeMenu);
|
||||
window.addEventListener('blur', blur);
|
||||
window.visualViewport?.addEventListener('resize', placeMenu);
|
||||
window.visualViewport?.addEventListener('scroll', placeMenu);
|
||||
const observer = new ResizeObserver(placeMenu);
|
||||
observer.observe(trigger);
|
||||
return () => {
|
||||
document.removeEventListener('pointerdown', outside, true);
|
||||
document.removeEventListener('scroll', scroll, true);
|
||||
window.removeEventListener('resize', placeMenu);
|
||||
window.removeEventListener('blur', blur);
|
||||
window.visualViewport?.removeEventListener('resize', placeMenu);
|
||||
window.visualViewport?.removeEventListener('scroll', placeMenu);
|
||||
observer.disconnect();
|
||||
};
|
||||
});
|
||||
|
||||
$effect(() => {
|
||||
if (!open || !menu) return;
|
||||
const index = Math.min(active, options.length - 1);
|
||||
void tick().then(() => {
|
||||
menu?.querySelector(`#${CSS.escape(optionId(index))}`)?.scrollIntoView({ block: 'nearest' });
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
<div class="themed-select" bind:this={root} onfocusout={(event) => {
|
||||
if (!root.contains(event.relatedTarget as Node | null)) dismiss();
|
||||
}}>
|
||||
<button {id} type="button" class="select-trigger" class:open {disabled} bind:this={trigger}
|
||||
role="combobox" aria-label={label} aria-haspopup="listbox" aria-expanded={open}
|
||||
aria-controls={open ? listId : undefined} aria-activedescendant={open ? optionId(active) : undefined}
|
||||
onclick={() => { if (open) dismiss(); else show(); }} onkeydown={handleKeydown}>
|
||||
<span lang={selected?.lang}>{selected?.label ?? value}</span>
|
||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" aria-hidden="true"><path d="m6 9 6 6 6-6"/></svg>
|
||||
</button>
|
||||
{#if open}
|
||||
<div id={listId} class="select-menu" role="listbox" aria-label={label} tabindex="-1" style={position} use:portal>
|
||||
{#each options as option, index (option.value)}
|
||||
<button id={optionId(index)} type="button" class="select-option" class:active={active === index}
|
||||
role="option" aria-selected={option.value === value} tabindex="-1" lang={option.lang}
|
||||
onpointerdown={(event) => event.preventDefault()}
|
||||
onpointermove={() => { active = index; }} onclick={() => choose(index)}>
|
||||
<span>{option.label}</span>
|
||||
{#if option.value === value}<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" aria-hidden="true"><path d="m5 12 4 4L19 6"/></svg>{/if}
|
||||
</button>
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.themed-select { width: 100%; max-width: 320px; margin-top: 10px; }
|
||||
.select-trigger {
|
||||
display: flex; align-items: center; justify-content: space-between; gap: 12px;
|
||||
width: 100%; min-height: 40px; padding: 8px 12px;
|
||||
border: 1px solid var(--border-color); border-radius: 8px;
|
||||
background: var(--bg-secondary); color: var(--text-primary);
|
||||
font: inherit; font-size: 13px; text-align: start; cursor: pointer;
|
||||
}
|
||||
.select-trigger span { min-width: 0; overflow-wrap: anywhere; }
|
||||
.select-trigger svg { flex-shrink: 0; }
|
||||
.select-trigger:hover:not(:disabled) { background: var(--bg-hover); }
|
||||
.select-trigger:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
|
||||
.select-trigger.open { border-color: var(--accent); }
|
||||
.select-trigger.open svg { transform: rotate(180deg); }
|
||||
.select-trigger:disabled { opacity: 0.6; cursor: wait; }
|
||||
.select-menu {
|
||||
position: fixed; z-index: 2100; box-sizing: border-box; overflow-y: auto; overscroll-behavior: contain;
|
||||
padding: 4px; border: 1px solid var(--border-color); border-radius: 8px;
|
||||
background: var(--bg-secondary); color: var(--text-primary); box-shadow: var(--shadow-lg);
|
||||
scrollbar-color: var(--border-color) var(--bg-secondary);
|
||||
}
|
||||
.select-option {
|
||||
display: flex; align-items: center; justify-content: space-between; gap: 12px;
|
||||
width: 100%; min-height: 36px; padding: 8px 10px; border: 0; border-radius: 4px;
|
||||
background: var(--bg-secondary); color: var(--text-primary);
|
||||
font: inherit; font-size: 13px; text-align: start; cursor: pointer;
|
||||
}
|
||||
.select-option span { min-width: 0; overflow-wrap: anywhere; }
|
||||
.select-option svg { flex-shrink: 0; color: var(--accent); }
|
||||
.select-option.active { background: var(--accent-light); color: var(--text-primary); }
|
||||
</style>
|
||||
@@ -1,4 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { t as ui } from '$lib/i18n';
|
||||
import { getCurrentWindow } from '@tauri-apps/api/window';
|
||||
import { vaultReady, focusMode, readOnly, updateAvailable, showSettings, settingsTab, appConfig, activeNotePath, activeVaultConfig, syncState } from '$lib/stores/app';
|
||||
import { syncNow } from '$lib/api';
|
||||
@@ -86,7 +87,7 @@
|
||||
{#if $updateAvailable}
|
||||
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||
<button class="update-badge" onmousedown={(e) => e.stopPropagation()} onclick={() => { $settingsTab = 'updates'; $showSettings = true; }}>
|
||||
v{$updateAvailable.version} available
|
||||
{$ui("ui.v_available", { value0: $updateAvailable.version })}
|
||||
</button>
|
||||
{/if}
|
||||
</div>
|
||||
@@ -96,19 +97,19 @@
|
||||
</div>
|
||||
{/if}
|
||||
<div class="titlebar-actions">
|
||||
<button class="switch-vault-btn" onclick={async () => { if (await onBeforeVaultSwitch()) $vaultReady = false; }} title="Manage Vaults" aria-label="Manage Vaults">
|
||||
<button class="switch-vault-btn" onclick={async () => { if (await onBeforeVaultSwitch()) $vaultReady = false; }} title={$ui("ui.manage_vaults")} aria-label={$ui("ui.manage_vaults")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<rect x="3" y="3" width="18" height="16" rx="2" />
|
||||
<circle cx="12" cy="11" r="3.5" />
|
||||
<path d="M12 7.5V6M12 16v-1.5M7 19v2M17 19v2" />
|
||||
</svg>
|
||||
</button>
|
||||
<button class="switch-vault-btn" onclick={() => ($focusMode = true)} title="Focus mode">
|
||||
<button class="switch-vault-btn" onclick={() => ($focusMode = true)} title={$ui("ui.focus_mode")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path d="M8 3H5a2 2 0 00-2 2v3m18 0V5a2 2 0 00-2-2h-3m0 18h3a2 2 0 002-2v-3M3 16v3a2 2 0 002 2h3"/>
|
||||
</svg>
|
||||
</button>
|
||||
<button class="switch-vault-btn" class:active={$readOnly} disabled={isTrashedNote($activeNotePath, $appConfig?.active_vault)} onclick={() => ($readOnly = !$readOnly)} title={$readOnly ? 'Switch to Edit Mode' : 'Switch to View Mode'}>
|
||||
<button class="switch-vault-btn" class:active={$readOnly} disabled={isTrashedNote($activeNotePath, $appConfig?.active_vault)} onclick={() => ($readOnly = !$readOnly)} title={$readOnly ? $ui("ui.switch_to_edit_mode") : $ui("ui.switch_to_view_mode")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
{#if $readOnly}
|
||||
<path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z" />
|
||||
@@ -120,7 +121,7 @@
|
||||
{/if}
|
||||
</svg>
|
||||
</button>
|
||||
<button class="switch-vault-btn" onclick={onDailyNote} title="Daily Note">
|
||||
<button class="switch-vault-btn" onclick={onDailyNote} title={$ui("ui.daily_note")}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||
<rect x="3" y="4" width="18" height="18" rx="2" ry="2" />
|
||||
<line x1="16" y1="2" x2="16" y2="6" />
|
||||
@@ -129,27 +130,27 @@
|
||||
</svg>
|
||||
</button>
|
||||
{#if activeVaultConfig($appConfig)?.sync_provider === 'webdav'}
|
||||
<button class="switch-vault-btn" class:active={$syncState.running} onclick={() => { if (!$syncState.running) syncNow().catch(() => {}); }} disabled={$syncState.running} title={$syncState.error ? `Sync error: ${$syncState.error}` : ($syncState.running ? 'Syncing vault...' : 'Sync vault now')}>
|
||||
<button class="switch-vault-btn" class:active={$syncState.running} onclick={() => { if (!$syncState.running) syncNow().catch(() => {}); }} disabled={$syncState.running} title={$syncState.error ? $ui("ui.sync_error", { value0: $syncState.error }) : ($syncState.running ? $ui("ui.syncing_vault") : $ui("ui.sync_vault_now"))}>
|
||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class:sync-spin={$syncState.running}>
|
||||
<path d="M21 2v6h-6"/><path d="M3 12a9 9 0 0115-6.7L21 8"/><path d="M3 22v-6h6"/><path d="M21 12a9 9 0 01-15 6.7L3 16"/>
|
||||
</svg>
|
||||
</button>
|
||||
{/if}
|
||||
<button class="new-note-btn" onclick={onNewNote} title={`New Note (${modKey}+N)`}>
|
||||
<button class="new-note-btn" onclick={onNewNote} title={$ui("ui.new_note_n_ae6182", { value0: modKey })}>
|
||||
<svg width="14" height="14" viewBox="0 0 14 14" fill="none">
|
||||
<path d="M7 1v12M1 7h12" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" />
|
||||
</svg>
|
||||
New Note
|
||||
{$ui("ui.new_note_4ef4ae")}
|
||||
</button>
|
||||
</div>
|
||||
{#if !isMac}
|
||||
<div class="titlebar-controls">
|
||||
<button class="titlebar-btn" onclick={minimize} title="Minimize">
|
||||
<button class="titlebar-btn" onclick={minimize} title={$ui("ui.minimize")}>
|
||||
<svg width="10" height="10" viewBox="0 0 10 10">
|
||||
<line x1="1" y1="5" x2="9" y2="5" stroke="currentColor" stroke-width="1.2" stroke-linecap="round" />
|
||||
</svg>
|
||||
</button>
|
||||
<button class="titlebar-btn" onclick={toggleMaximize} title={maximized ? 'Restore' : 'Maximize'}>
|
||||
<button class="titlebar-btn" onclick={toggleMaximize} title={maximized ? $ui("ui.restore") : $ui("ui.maximize")}>
|
||||
{#if maximized}
|
||||
<svg width="10" height="10" viewBox="0 0 10 10">
|
||||
<rect x="2.5" y="0.5" width="7" height="7" rx="1" fill="none" stroke="currentColor" stroke-width="1.2" />
|
||||
@@ -161,7 +162,7 @@
|
||||
</svg>
|
||||
{/if}
|
||||
</button>
|
||||
<button class="titlebar-btn titlebar-close" onclick={close} title="Close">
|
||||
<button class="titlebar-btn titlebar-close" onclick={close} title={$ui("ui.close")}>
|
||||
<svg width="10" height="10" viewBox="0 0 10 10">
|
||||
<line x1="1.5" y1="1.5" x2="8.5" y2="8.5" stroke="currentColor" stroke-width="1.2" stroke-linecap="round" />
|
||||
<line x1="8.5" y1="1.5" x2="1.5" y2="8.5" stroke="currentColor" stroke-width="1.2" stroke-linecap="round" />
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { t as ui, tr as uiText } from '$lib/i18n';
|
||||
import { onMount, untrack } from 'svelte';
|
||||
import { open } from '@tauri-apps/plugin-dialog';
|
||||
import { getCurrentWindow } from '@tauri-apps/api/window';
|
||||
@@ -71,7 +72,7 @@
|
||||
const bridge = (window as any).Android;
|
||||
bridge?.requestStoragePermission?.();
|
||||
} catch {
|
||||
error = 'Go to Settings > Apps > HelixNotes > Permissions and enable "All files access".';
|
||||
error = uiText("ui.go_to_settings_apps_helixnotes_permissions_and_enable_all_files_access");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -95,7 +96,7 @@
|
||||
} else if (isAndroid) {
|
||||
await openSelectedVault(fullPath);
|
||||
} else {
|
||||
const selected = await open({ directory: true, multiple: false, title: 'Choose Notes Folder' });
|
||||
const selected = await open({ directory: true, multiple: false, title: $ui('ui.choose_notes_folder') });
|
||||
if (selected) {
|
||||
await openSelectedVault(selected as string);
|
||||
}
|
||||
@@ -119,7 +120,7 @@
|
||||
} catch (e) {
|
||||
const msg = String(e);
|
||||
if (isAndroid && /os error 13|permission denied/i.test(msg)) {
|
||||
error = 'Storage permission is required. Enable file access for HelixNotes in your system settings, then try again.';
|
||||
error = uiText("ui.storage_permission_is_required_enable_file_access_for_helixnot_3ffc58");
|
||||
} else {
|
||||
error = msg;
|
||||
}
|
||||
@@ -191,7 +192,7 @@
|
||||
<div class="vault-picker" class:mobile={isMobile} onmousedown={(e) => { if (!isMobile && !(e.target as HTMLElement).closest('button, .picker-card')) appWindow.startDragging(); }}>
|
||||
{#if !isMobile}
|
||||
<div class="window-controls">
|
||||
<button class="window-close" onclick={() => appWindow.close()} title="Close">
|
||||
<button class="window-close" onclick={() => appWindow.close()} title={$ui("ui.close")}>
|
||||
<svg width="10" height="10" viewBox="0 0 10 10">
|
||||
<line x1="1.5" y1="1.5" x2="8.5" y2="8.5" stroke="currentColor" stroke-width="1.2" stroke-linecap="round" />
|
||||
<line x1="8.5" y1="1.5" x2="1.5" y2="8.5" stroke="currentColor" stroke-width="1.2" stroke-linecap="round" />
|
||||
@@ -212,24 +213,24 @@
|
||||
</svg>
|
||||
</div>
|
||||
<h1>HelixNotes</h1>
|
||||
<p class="subtitle">Local markdown notes</p>
|
||||
<p class="subtitle">{$ui("ui.local_markdown_notes")}</p>
|
||||
{#if isMobile}
|
||||
{#if isIOS}
|
||||
<p class="description">Keep notes in HelixNotes, or use an existing folder from iCloud Drive or Files.</p>
|
||||
<p class="description">{$ui("ui.keep_notes_in_helixnotes_or_use_an_existing_folder_from_icloud_4c305f")}</p>
|
||||
{:else}
|
||||
<p class="description">Choose where to store your notes. Sync with Syncthing, Nextcloud, or any file sync app.</p>
|
||||
<p class="description">{$ui("ui.choose_where_to_store_your_notes_sync_with_syncthing_nextcloud_a4b7b7")}</p>
|
||||
{/if}
|
||||
|
||||
{#if isAndroid && !hasPermission}
|
||||
<button class="btn-permission" onclick={requestPermission}>
|
||||
Grant File Access
|
||||
{$ui("ui.grant_file_access")}
|
||||
</button>
|
||||
<p class="permission-hint">Required to access Documents, Downloads, and other shared folders.</p>
|
||||
<p class="permission-hint">{$ui("ui.required_to_access_documents_downloads_and_other_shared_folders")}</p>
|
||||
{/if}
|
||||
|
||||
{#if isAndroid}
|
||||
<div class="location-selector" role="group" aria-labelledby="storage-location-label">
|
||||
<span id="storage-location-label" class="location-label">Location</span>
|
||||
<span id="storage-location-label" class="location-label">{$ui("ui.location")}</span>
|
||||
<div class="location-options">
|
||||
{#each storageLocations as loc}
|
||||
<button
|
||||
@@ -244,7 +245,7 @@
|
||||
class:active={selectedLocation === 'Custom'}
|
||||
aria-pressed={selectedLocation === 'Custom'}
|
||||
onclick={() => selectedLocation = 'Custom'}
|
||||
>Custom</button>
|
||||
>{$ui("ui.custom")}</button>
|
||||
</div>
|
||||
{#if selectedLocation === 'Custom'}
|
||||
<input class="custom-path-input" type="text" bind:value={customPath} placeholder="/storage/emulated/0/..." />
|
||||
@@ -253,12 +254,12 @@
|
||||
{/if}
|
||||
|
||||
<div class="vault-name-input">
|
||||
<label for="vault-name">Vault name</label>
|
||||
<label for="vault-name">{$ui("ui.vault_name")}</label>
|
||||
<div class="vault-name-preview"><input id="vault-name" type="text" bind:value={vaultName} placeholder="HelixNotes" /></div>
|
||||
<span class="vault-path-hint">{fullPath}</span>
|
||||
</div>
|
||||
{:else}
|
||||
<p class="description">Your notes are stored as standard Markdown (.md) files. Pick any folder - existing .md files will be recognized automatically.</p>
|
||||
<p class="description">{$ui("ui.your_notes_are_stored_as_standard_markdown_md_files_pick_any_f_ccf685")}</p>
|
||||
{/if}
|
||||
|
||||
{#if error}
|
||||
@@ -267,38 +268,38 @@
|
||||
|
||||
<button class="btn-primary" onclick={pickFolder} disabled={loading}>
|
||||
{#if loading}
|
||||
Opening...
|
||||
{$ui("ui.opening")}
|
||||
{:else if isIOS}
|
||||
Use Local Folder
|
||||
{$ui("ui.use_local_folder")}
|
||||
{:else if isMobile}
|
||||
Get Started
|
||||
{$ui("ui.get_started")}
|
||||
{:else}
|
||||
Open Notes Folder
|
||||
{$ui("ui.open_notes_folder")}
|
||||
{/if}
|
||||
</button>
|
||||
|
||||
{#if isIOS}
|
||||
<button class="btn-back" onclick={pickExternalFolder} disabled={loading}>
|
||||
Choose Folder in Files
|
||||
{$ui("ui.choose_folder_in_files")}
|
||||
</button>
|
||||
{/if}
|
||||
|
||||
{#if $appConfig?.active_vault && !initialError}
|
||||
<button class="btn-back" onclick={() => ($vaultReady = true)}>
|
||||
Back
|
||||
{$ui("ui.back")}
|
||||
</button>
|
||||
{/if}
|
||||
|
||||
{#if recentVaults.length > 0}
|
||||
<div class="recent">
|
||||
<span class="recent-label">Recent</span>
|
||||
<span class="recent-label">{$ui("ui.recent")}</span>
|
||||
{#each recentVaults as vault}
|
||||
<div class="vault-row">
|
||||
<button class="vault-item" class:current={isActiveVault(vault)} onclick={() => openRecentVault(vault)} disabled={loading}>
|
||||
<span class="vault-name">{vault.name}{#if isActiveVault(vault)}<span class="vault-current-badge">Current</span>{/if}</span>
|
||||
<span class="vault-path">{vault.bookmark_id ? `Files · ${vault.path}` : vault.path}</span>
|
||||
<span class="vault-name">{vault.name}{#if isActiveVault(vault)}<span class="vault-current-badge">{$ui("ui.current_4fc0e2")}</span>{/if}</span>
|
||||
<span class="vault-path">{vault.bookmark_id ? $ui("ui.files", { value0: vault.path }) : vault.path}</span>
|
||||
</button>
|
||||
<button class="vault-remove" title="Remove from list" aria-label="Remove from list" onclick={() => forgetVault(vault)} disabled={loading}>
|
||||
<button class="vault-remove" title={$ui("ui.remove_from_list")} aria-label={$ui("ui.remove_from_list")} onclick={() => forgetVault(vault)} disabled={loading}>
|
||||
<svg width="12" height="12" viewBox="0 0 10 10">
|
||||
<line x1="1.5" y1="1.5" x2="8.5" y2="8.5" stroke="currentColor" stroke-width="1.3" stroke-linecap="round" />
|
||||
<line x1="8.5" y1="1.5" x2="1.5" y2="8.5" stroke="currentColor" stroke-width="1.3" stroke-linecap="round" />
|
||||
|
||||
@@ -63,12 +63,12 @@ export function buildTaskMetaDecorations(doc: ProseMirrorNode): DecorationSet {
|
||||
}
|
||||
|
||||
/** Placeholder only needs the caret's empty textblock, not a recursive document emptiness scan. */
|
||||
export function focusedPlaceholderDecorations(state: EditorState): DecorationSet {
|
||||
export function focusedPlaceholderDecorations(state: EditorState, labels = { section: 'Section title...', body: 'Start writing...' }): DecorationSet {
|
||||
const { $anchor } = state.selection;
|
||||
const node = $anchor.parent;
|
||||
if (!$anchor.depth || !node.isTextblock || node.content.size) return DecorationSet.empty;
|
||||
const pos = $anchor.before();
|
||||
const placeholder = node.type.name === 'detailsSummary' ? 'Section title...' : 'Start writing...';
|
||||
const placeholder = node.type.name === 'detailsSummary' ? labels.section : labels.body;
|
||||
return DecorationSet.create(state.doc, [Decoration.node(pos, pos + node.nodeSize, {
|
||||
class: 'is-empty', 'data-placeholder': placeholder,
|
||||
})]);
|
||||
|
||||
@@ -69,6 +69,8 @@ export class SourceController {
|
||||
private configuration = new Compartment();
|
||||
private readOnly = false;
|
||||
private numbers = false;
|
||||
private placeholderText = 'Start writing...';
|
||||
private accessibleLabel = 'Markdown source';
|
||||
private extensions: Extension[];
|
||||
private onChange: (changes: ChangeDesc, edited: boolean) => void;
|
||||
state: EditorState;
|
||||
@@ -83,8 +85,6 @@ export class SourceController {
|
||||
this.extensions = [
|
||||
markdown(), history(), drawSelection(), sourceSearchDecoration, sourceTheme,
|
||||
syntaxHighlighting(sourceSyntax), indentUnit.of('\t'), EditorState.tabSize.of(4),
|
||||
placeholder('Start writing...'),
|
||||
EditorView.contentAttributes.of({ 'aria-label': 'Markdown source', tabindex: '0', spellcheck: 'false', autocapitalize: 'off' }),
|
||||
keymap.of([{ key: 'Shift-Enter', run: sourceHardBreak }, indentWithTab, ...historyKeymap, ...defaultKeymap]),
|
||||
EditorView.domEventHandlers({
|
||||
keydown: (event, view) => {
|
||||
@@ -105,9 +105,18 @@ export class SourceController {
|
||||
|
||||
private settings(): Extension[] {
|
||||
return [EditorState.readOnly.of(this.readOnly), EditorView.editable.of(!this.readOnly),
|
||||
placeholder(this.placeholderText),
|
||||
EditorView.contentAttributes.of({ 'aria-label': this.accessibleLabel, tabindex: '0', spellcheck: 'false', autocapitalize: 'off' }),
|
||||
this.numbers ? lineNumbers() : EditorView.lineWrapping];
|
||||
}
|
||||
|
||||
setLabels(placeholderText: string, accessibleLabel: string): void {
|
||||
if (placeholderText === this.placeholderText && accessibleLabel === this.accessibleLabel) return;
|
||||
this.placeholderText = placeholderText;
|
||||
this.accessibleLabel = accessibleLabel;
|
||||
this.dispatch({ effects: this.configuration.reconfigure(this.settings()) });
|
||||
}
|
||||
|
||||
configure(readOnly: boolean, numbers: boolean): void {
|
||||
if (readOnly === this.readOnly && numbers === this.numbers) return;
|
||||
this.readOnly = readOnly;
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
# Interface translations
|
||||
|
||||
English (`locales/en.json`) is the reference catalog. The app also bundles Russian, Dutch, German, Spanish, French, Italian, Portuguese (Portugal) and Portuguese (Brazil). All work offline. Settings → General → Language lists their native names from `languages.json`, alongside System default.
|
||||
|
||||
System language detection matches regional variants such as `nl-BE`, `de-AT`, `es-MX` and `fr-CA`. Portuguese keeps its regional distinction: `pt-BR` selects Brazil; bare `pt` and other Portuguese regions select Portugal. An explicit preference overrides the system language. Unsupported system languages fall back to English.
|
||||
|
||||
Community contributors can follow the [translation guide](../../../docs/translations/README.md) and attach a JSON file to a GitLab issue without changing application code.
|
||||
|
||||
The preference is saved in the device's application configuration, not the vault. A native `language-changed` event updates open note windows. Changing language does not reload the editor or change notes, filenames, tags, Markdown syntax, frontmatter keys, shortcut codes or saved option IDs.
|
||||
|
||||
## Add or change a message
|
||||
|
||||
Use a stable, descriptive key and add it to every catalog:
|
||||
|
||||
```json
|
||||
{
|
||||
"notes.moveFailed": "Could not move “{title}”: {error}"
|
||||
}
|
||||
```
|
||||
|
||||
In a Svelte component:
|
||||
|
||||
```svelte
|
||||
<script lang="ts">
|
||||
import { t as ui } from '$lib/i18n';
|
||||
</script>
|
||||
|
||||
<button title={$ui('ui.save')}>{$ui('ui.save')}</button>
|
||||
<p>{$ui('notes.moveFailed', { title, error })}</p>
|
||||
```
|
||||
|
||||
The message key is checked by TypeScript against the English catalog. Use `tr(key, values)` for event-time messages outside markup. For controls created by editor node views, use `setUiText(element, key, values, property)` so existing controls update without rebuilding the editor. The default property is `textContent`; `title`, `placeholder` and `aria-label` are also supported.
|
||||
|
||||
Command and preset data keep their canonical English labels and stable IDs. Translate those labels at their display sites with `$uiLabel(label)` (`label as uiLabel` from this module). A change to an English command/preset label must also update its canonical label in the source. Never apply this lookup to note titles, tags, custom theme names or other user-authored text.
|
||||
|
||||
## ICU messages
|
||||
|
||||
Messages use `intl-messageformat`, not string replacement. Translate complete sentences, keep argument names unchanged, and use plural branches rather than appending an English `s`:
|
||||
|
||||
```json
|
||||
{
|
||||
"count.notes": "{count, plural, one {# note} other {# notes}}"
|
||||
}
|
||||
```
|
||||
|
||||
Russian needs `one`, `few`, `many` and `other`:
|
||||
|
||||
```json
|
||||
{
|
||||
"count.notes": "{count, plural, one {# заметка} few {# заметки} many {# заметок} other {# заметки}}"
|
||||
}
|
||||
```
|
||||
|
||||
Every plural needs an `other` branch. Escape a literal apostrophe as `''` when needed by ICU syntax. Arguments are plain text: do not use `{@html}` to display translated messages containing user input. Keep markup in the component, not the catalog.
|
||||
|
||||
Missing or malformed messages in any language fall back to English. The automated tests reject missing keys, mismatched arguments and invalid ICU syntax before release. Keep European and Brazilian Portuguese vocabulary separate; do not merge their catalogs or saved preference IDs.
|
||||
|
||||
## Add a language
|
||||
|
||||
1. Copy `en.json` to a new locale file and translate its values without renaming keys.
|
||||
2. Register its import, catalog and `Locale` type in `core.ts`. Add its code and autonym to `languages.json`. Settings reads this registry; API and configuration types reuse `Language`.
|
||||
3. Add its bundled catalog to `src-tauri/src/i18n.rs`. Native preference validation reads `languages.json`. Extend both frontend and native regional matching if the new locale needs special handling.
|
||||
4. Test plural forms, long labels, dates, keyboard navigation, native tray labels, preference persistence and detached windows. Test right-to-left layout before advertising an RTL language.
|
||||
|
||||
The catalogs are initial translations. Native-speaker review is welcome, especially for terminology and longer help messages. Technical names such as font families, theme presets, providers and file formats can retain their original spelling.
|
||||
|
||||
Locale-sensitive display dates and calendar headings use `Intl`. Stored dates and text deliberately inserted into notes keep their existing format settings. Detailed operating-system and server error messages can remain in the language provided by their source; app-owned labels and message prefixes belong in the catalogs.
|
||||
|
||||
## Validation
|
||||
|
||||
Run `pnpm check`, `pnpm test`, `pnpm test:rust`, `pnpm lint:rust` and `pnpm build`. `tests/i18n.test.mjs` validates every catalog, ICU argument parity, plural forms, Portuguese regional vocabulary, apostrophe escaping, fallback, interpolation, live changes, explicit node-view bindings and date formatting. It also checks that the frontend registry and native bundled catalogs agree. Also check the installed app on each platform before release.
|
||||
@@ -0,0 +1,79 @@
|
||||
import { IntlMessageFormat } from 'intl-messageformat';
|
||||
import english from './locales/en.json' with { type: 'json' };
|
||||
import russian from './locales/ru.json' with { type: 'json' };
|
||||
import dutch from './locales/nl.json' with { type: 'json' };
|
||||
import german from './locales/de.json' with { type: 'json' };
|
||||
import spanish from './locales/es.json' with { type: 'json' };
|
||||
import french from './locales/fr.json' with { type: 'json' };
|
||||
import italian from './locales/it.json' with { type: 'json' };
|
||||
import portuguese from './locales/pt-PT.json' with { type: 'json' };
|
||||
import brazilian from './locales/pt-BR.json' with { type: 'json' };
|
||||
import registry from './languages.json' with { type: 'json' };
|
||||
|
||||
export type Locale = 'en' | 'ru' | 'nl' | 'de' | 'es' | 'fr' | 'it' | 'pt-PT' | 'pt-BR';
|
||||
export type Language = Locale | 'system';
|
||||
export type MessageKey = keyof typeof english;
|
||||
export type MessageValues = Record<string, unknown>;
|
||||
export const catalogs: Record<Locale, Record<string, string>> = {
|
||||
en: english, ru: russian, nl: dutch, de: german, es: spanish, fr: french, it: italian,
|
||||
'pt-PT': portuguese, 'pt-BR': brazilian,
|
||||
};
|
||||
export const languageOptions = registry as readonly { code: Locale; name: string }[];
|
||||
const cache = new Map<string, IntlMessageFormat>();
|
||||
|
||||
function canonicalTag(value: string): string {
|
||||
return value.trim().split(/[.@]/)[0].replace(/_/g, '-').toLowerCase();
|
||||
}
|
||||
|
||||
export function normalizeLanguage(value: unknown): Language {
|
||||
if (typeof value !== 'string') return 'system';
|
||||
const tag = canonicalTag(value);
|
||||
return languageOptions.find(option => option.code.toLowerCase() === tag)?.code ?? 'system';
|
||||
}
|
||||
|
||||
export function resolveLocale(language: unknown, systemLanguages: readonly string[] = []): Locale {
|
||||
const preference = normalizeLanguage(language);
|
||||
if (preference !== 'system') return preference;
|
||||
for (const value of systemLanguages) {
|
||||
const tag = canonicalTag(value);
|
||||
const exact = normalizeLanguage(tag);
|
||||
if (exact !== 'system') return exact;
|
||||
const [base, ...subtags] = tag.split('-');
|
||||
// Unqualified Portuguese and non-Brazilian regional variants use Portugal.
|
||||
if (base === 'pt') return subtags.includes('br') ? 'pt-BR' : 'pt-PT';
|
||||
const matched = languageOptions.find(option => option.code === base);
|
||||
if (matched) return matched.code;
|
||||
}
|
||||
return 'en';
|
||||
}
|
||||
|
||||
/** ICU interpolation is plain text, never HTML. Missing/invalid translations fall back to English. */
|
||||
export function formatMessage(locale: Locale, key: string, values: MessageValues = {}): string {
|
||||
const normalized = Object.fromEntries(Object.entries(values).map(([name, value]) => [
|
||||
name, typeof value === 'string' || typeof value === 'number' || value instanceof Date ? value : value == null ? '' : String(value),
|
||||
]));
|
||||
for (const candidate of locale === 'en' ? ['en'] as const : [locale, 'en'] as const) {
|
||||
const message = catalogs[candidate][key];
|
||||
if (message === undefined) continue;
|
||||
try {
|
||||
const cacheKey = `${candidate}:${key}`;
|
||||
let formatter = cache.get(cacheKey);
|
||||
if (!formatter) {
|
||||
formatter = new IntlMessageFormat(message, candidate, undefined, { ignoreTag: true });
|
||||
cache.set(cacheKey, formatter);
|
||||
}
|
||||
return String(formatter.format(normalized));
|
||||
} catch { /* A broken community translation must not break the interface. */ }
|
||||
}
|
||||
return key;
|
||||
}
|
||||
|
||||
// Only use this for app-owned labels (commands/presets), never note titles or note content.
|
||||
const sourceKeys = new Map(Object.entries(english).map(([key, text]) => [text.replace(/''/g, "'").toLowerCase(), key]));
|
||||
export function labelKey(source: string): MessageKey | undefined {
|
||||
return sourceKeys.get(source.toLowerCase()) as MessageKey | undefined;
|
||||
}
|
||||
export function formatLabel(locale: Locale, source: string): string {
|
||||
const key = labelKey(source);
|
||||
return key ? formatMessage(locale, key) : source;
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
import { derived, get, writable } from 'svelte/store';
|
||||
import { formatLabel, formatMessage, labelKey, normalizeLanguage, resolveLocale, type Language, type MessageKey, type MessageValues } from './core.ts';
|
||||
export { normalizeLanguage, languageOptions, type Language, type Locale } from './core.ts';
|
||||
|
||||
export const language = writable<Language>('system');
|
||||
const systemLanguages = writable<readonly string[]>(typeof navigator === 'undefined' ? [] : navigator.languages);
|
||||
if (typeof window !== 'undefined') {
|
||||
window.addEventListener('languagechange', () => systemLanguages.set(navigator.languages));
|
||||
}
|
||||
export const locale = derived([language, systemLanguages], ([$language, $systemLanguages]) => resolveLocale($language, $systemLanguages));
|
||||
export const t = derived(locale, $locale => (key: MessageKey, values?: MessageValues) => formatMessage($locale, key, values));
|
||||
export const label = derived(locale, $locale => (source: string) => formatLabel($locale, source));
|
||||
export const tr = (key: MessageKey, values?: MessageValues): string => formatMessage(get(locale), key, values);
|
||||
export const translateLabel = (source: string): string => formatLabel(get(locale), source);
|
||||
export function applyLanguage(value: unknown): void { language.set(normalizeLanguage(value)); }
|
||||
|
||||
// Node views create some app controls outside Svelte. Bind only explicitly marked UI text;
|
||||
// never walk editor content or rebuild the editor when changing language.
|
||||
const elementBindings = new WeakMap<Element, Map<string, { key: MessageKey; values: MessageValues }>>();
|
||||
const boundElements = new Set<WeakRef<Element>>();
|
||||
function renderBinding(element: Element, property: string, key: MessageKey, values: MessageValues) {
|
||||
const text = tr(key, values);
|
||||
if (property === 'textContent') element.textContent = text;
|
||||
else element.setAttribute(property, text);
|
||||
}
|
||||
export function setUiText(element: Element, key: MessageKey, values: MessageValues = {}, property = 'textContent'): void {
|
||||
let bindings = elementBindings.get(element);
|
||||
if (!bindings) {
|
||||
bindings = new Map();
|
||||
elementBindings.set(element, bindings);
|
||||
boundElements.add(new WeakRef(element));
|
||||
}
|
||||
bindings.set(property, { key, values });
|
||||
renderBinding(element, property, key, values);
|
||||
}
|
||||
export function setUiLabel(element: Element, source: string, property = 'textContent'): void {
|
||||
const key = labelKey(source);
|
||||
if (key) setUiText(element, key, {}, property);
|
||||
else if (property === 'textContent') element.textContent = source;
|
||||
else element.setAttribute(property, source);
|
||||
}
|
||||
locale.subscribe(() => {
|
||||
for (const ref of boundElements) {
|
||||
const element = ref.deref();
|
||||
if (!element) { boundElements.delete(ref); continue; }
|
||||
for (const [property, binding] of elementBindings.get(element) ?? []) {
|
||||
renderBinding(element, property, binding.key, binding.values);
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -0,0 +1,11 @@
|
||||
[
|
||||
{ "code": "en", "name": "English" },
|
||||
{ "code": "ru", "name": "Русский" },
|
||||
{ "code": "nl", "name": "Nederlands" },
|
||||
{ "code": "de", "name": "Deutsch" },
|
||||
{ "code": "es", "name": "Español" },
|
||||
{ "code": "fr", "name": "Français" },
|
||||
{ "code": "it", "name": "Italiano" },
|
||||
{ "code": "pt-PT", "name": "Português (Portugal)" },
|
||||
{ "code": "pt-BR", "name": "Português (Brasil)" }
|
||||
]
|
||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -1,3 +1,5 @@
|
||||
import type { Language } from './i18n/core';
|
||||
|
||||
export interface NoteMeta {
|
||||
id: string;
|
||||
title: string;
|
||||
@@ -110,6 +112,7 @@ export interface AppConfig {
|
||||
active_vault: string | null;
|
||||
active_bookmark_id?: string | null;
|
||||
theme: string;
|
||||
language?: Language;
|
||||
system_light_theme: string;
|
||||
system_dark_theme: string;
|
||||
accent_color: string | null;
|
||||
@@ -154,6 +157,10 @@ export interface AppConfig {
|
||||
openai_compatible_base_url: string | null;
|
||||
openai_compatible_api_key: string | null;
|
||||
ai_model: string;
|
||||
anthropic_model?: string | null;
|
||||
openai_model?: string | null;
|
||||
ollama_model?: string | null;
|
||||
openai_compatible_model?: string | null;
|
||||
ai_writing_style: string | null;
|
||||
default_view_mode: boolean;
|
||||
new_notes_in_source_mode: boolean;
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
import { markdownLanguage } from '@codemirror/lang-markdown';
|
||||
import { externalNoteReferences } from '../editor/externalNote.ts';
|
||||
import { displayMathRanges, inlineMathRanges } from '../editor/markdownParser.ts';
|
||||
import { resolveFileReference } from './paths.ts';
|
||||
|
||||
export interface AiImageCandidate { path: string; name: string }
|
||||
|
||||
/** Local image attachments only. Parsing excludes code, math, comments and remote URLs. */
|
||||
export function aiImageCandidates(markdown: string, note: string, vault: string): AiImageCandidate[] {
|
||||
const unique = new Map<string, AiImageCandidate>();
|
||||
for (const reference of externalNoteReferences(markdown)) {
|
||||
const { path } = resolveFileReference(reference.href, note, vault);
|
||||
if (!/\.(png|jpe?g|webp)$/i.test(path)) continue;
|
||||
if (!unique.has(path)) unique.set(path, { path, name: path.replace(/\\/g, '/').split('/').at(-1) || path });
|
||||
}
|
||||
return [...unique.values()];
|
||||
}
|
||||
|
||||
/** Protect complete image nodes and reference definitions, not a regex fragment of a URL. */
|
||||
export function protectAiMedia(markdown: string, nonce = crypto.randomUUID().replace(/-/g, '')): { text: string; media: Map<string, string> } {
|
||||
const ranges: { from: number; to: number }[] = [];
|
||||
const math = [...displayMathRanges(markdown), ...inlineMathRanges(markdown)];
|
||||
const parser = (markdownLanguage.parser as unknown as { configure(spec: { remove: string[] }): typeof markdownLanguage.parser }).configure({ remove: ['IndentedCode'] });
|
||||
const tree = parser.parse(markdown);
|
||||
tree.iterate({ enter(node) {
|
||||
if (math.some(range => node.from >= range.from && node.from < range.to)) return false;
|
||||
if (node.name === 'Image' || node.name === 'LinkReference') {
|
||||
ranges.push({ from: node.from, to: node.to });
|
||||
return false;
|
||||
}
|
||||
if (node.name !== 'HTMLTag' && node.name !== 'HTMLBlock') return;
|
||||
const html = markdown.slice(node.from, node.to);
|
||||
const pattern = /<!--[\s\S]*?(?:-->|$)|<(script|style|textarea|pre|code)\b[^>]*>[\s\S]*?(?:<\/\1\s*>|$)|<div\b[^>]*class=["'][^"']*\bpdf-embed\b[^"']*["'][^>]*>[\s\S]*?<\/div>|<img\b(?:"[^"]*"|'[^']*'|[^'">])*>/gi;
|
||||
for (const match of html.matchAll(pattern)) {
|
||||
if (match[0].startsWith('<!--') || match[1]) continue;
|
||||
ranges.push({ from: node.from + match.index!, to: node.from + match.index! + match[0].length });
|
||||
}
|
||||
} });
|
||||
ranges.sort((a, b) => a.from - b.from || b.to - a.to);
|
||||
const media = new Map<string, string>();
|
||||
let cursor = 0;
|
||||
let text = '';
|
||||
for (const range of ranges) {
|
||||
if (range.from < cursor) continue;
|
||||
const key = `__MEDIA_${nonce}_${media.size}__`;
|
||||
media.set(key, markdown.slice(range.from, range.to));
|
||||
text += markdown.slice(cursor, range.from) + key;
|
||||
cursor = range.to;
|
||||
}
|
||||
return { text: text + markdown.slice(cursor), media };
|
||||
}
|
||||
|
||||
/** Refuse to apply a response which lost/duplicated media; never silently drop attachments. */
|
||||
export function restoreAiMedia(result: string, media: ReadonlyMap<string, string>): string | null {
|
||||
for (const key of media.keys()) if (result.split(key).length !== 2) return null;
|
||||
for (const [key, original] of media) result = result.replace(key, () => original);
|
||||
return result;
|
||||
}
|
||||
@@ -9,6 +9,7 @@ export function buildNoteListRows(
|
||||
notes: NoteEntry[],
|
||||
groupBy: 'created' | 'modified' | null,
|
||||
now = new Date(),
|
||||
locale?: string,
|
||||
): NoteListRow[] {
|
||||
const rows: NoteListRow[] = [];
|
||||
let previousLabel: string | undefined;
|
||||
@@ -16,7 +17,7 @@ export function buildNoteListRows(
|
||||
for (let noteIndex = 0; noteIndex < notes.length; noteIndex++) {
|
||||
const note = notes[noteIndex];
|
||||
if (groupBy) {
|
||||
const label = note.meta.pinned ? 'Pinned' : dateBucketLabel(note.meta[groupBy], now);
|
||||
const label = note.meta.pinned ? 'Pinned' : dateBucketLabel(note.meta[groupBy], now, locale);
|
||||
if (label !== previousLabel) {
|
||||
rows.push({ kind: 'section', key: `section:${section++}:${label}`, label });
|
||||
previousLabel = label;
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
export interface SelectOption {
|
||||
value: string;
|
||||
label: string;
|
||||
lang?: string;
|
||||
}
|
||||
|
||||
/** Navigation changes the active option, not the saved value. */
|
||||
export function moveSelectIndex(index: number, count: number, key: string): number | null {
|
||||
if (!['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(key)) return null;
|
||||
if (count <= 0) return -1;
|
||||
if (key === 'Home') return 0;
|
||||
if (key === 'End') return count - 1;
|
||||
if (index < 0) return key === 'ArrowUp' ? count - 1 : 0;
|
||||
return Math.max(0, Math.min(count - 1, index + (key === 'ArrowDown' ? 1 : -1)));
|
||||
}
|
||||
|
||||
export const TYPEAHEAD_TIMEOUT = 700;
|
||||
|
||||
export function typeaheadQuery(previous: string, key: string, elapsed: number): string {
|
||||
const query = elapsed >= TYPEAHEAD_TIMEOUT ? key : previous + key;
|
||||
const letters = [...query.toLowerCase()];
|
||||
// Repeated letters cycle matches, e.g. P switches between the Portuguese variants.
|
||||
return letters.every(letter => letter === letters[0]) ? key : query;
|
||||
}
|
||||
|
||||
function fold(text: string): string {
|
||||
return text.normalize('NFD').replace(/\p{Mark}/gu, '').toLowerCase();
|
||||
}
|
||||
|
||||
export function findTypeaheadIndex(options: readonly SelectOption[], query: string, current: number): number {
|
||||
if (!query) return -1;
|
||||
const prefix = fold(query);
|
||||
for (let step = 1; step <= options.length; step++) {
|
||||
const index = (Math.max(-1, current) + step) % options.length;
|
||||
if (fold(options[index].label).startsWith(prefix)) return index;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
+33
-6
@@ -8,6 +8,24 @@ const fullDateFormatter = new Intl.DateTimeFormat(undefined, {
|
||||
});
|
||||
const monthFormatter = new Intl.DateTimeFormat(undefined, { month: 'long' });
|
||||
const monthYearFormatter = new Intl.DateTimeFormat(undefined, { month: 'long', year: 'numeric' });
|
||||
const localizedDates = new Map<string, {
|
||||
short: Intl.DateTimeFormat; full: Intl.DateTimeFormat; month: Intl.DateTimeFormat;
|
||||
monthYear: Intl.DateTimeFormat; relative: Intl.RelativeTimeFormat;
|
||||
}>();
|
||||
function displayDates(locale: string) {
|
||||
let value = localizedDates.get(locale);
|
||||
if (!value) {
|
||||
value = {
|
||||
short: new Intl.DateTimeFormat(locale, { month: 'short', day: 'numeric' }),
|
||||
full: new Intl.DateTimeFormat(locale, { year: 'numeric', month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit' }),
|
||||
month: new Intl.DateTimeFormat(locale, { month: 'long' }),
|
||||
monthYear: new Intl.DateTimeFormat(locale, { month: 'long', year: 'numeric' }),
|
||||
relative: new Intl.RelativeTimeFormat(locale, { numeric: 'auto', style: 'short' }),
|
||||
};
|
||||
localizedDates.set(locale, value);
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
export function formatLocalDate(date: Date): string {
|
||||
const month = String(date.getMonth() + 1).padStart(2, '0');
|
||||
@@ -25,7 +43,7 @@ export function formatClockTime(date: Date, timeFormat?: string): string {
|
||||
return `${String(hours).padStart(2, '0')}:${minutes}`;
|
||||
}
|
||||
|
||||
export function formatRelativeTime(dateStr: string): string {
|
||||
export function formatRelativeTime(dateStr: string, locale?: string): string {
|
||||
const date = new Date(dateStr);
|
||||
if (Number.isNaN(date.getTime())) return date.toString();
|
||||
const now = new Date();
|
||||
@@ -35,6 +53,14 @@ export function formatRelativeTime(dateStr: string): string {
|
||||
const hours = Math.floor(minutes / 60);
|
||||
const days = Math.floor(hours / 24);
|
||||
|
||||
if (locale) {
|
||||
const relative = displayDates(locale).relative;
|
||||
if (seconds < 60) return relative.format(0, 'second');
|
||||
if (minutes < 60) return relative.format(-minutes, 'minute');
|
||||
if (hours < 24) return relative.format(-hours, 'hour');
|
||||
if (days < 7) return relative.format(-days, 'day');
|
||||
return displayDates(locale).short.format(date);
|
||||
}
|
||||
if (seconds < 60) return 'just now';
|
||||
if (minutes < 60) return `${minutes}m ago`;
|
||||
if (hours < 24) return `${hours}h ago`;
|
||||
@@ -43,15 +69,16 @@ export function formatRelativeTime(dateStr: string): string {
|
||||
return shortDateFormatter.format(date);
|
||||
}
|
||||
|
||||
export function formatDate(dateStr: string): string {
|
||||
export function formatDate(dateStr: string, locale?: string): string {
|
||||
const date = new Date(dateStr);
|
||||
return Number.isNaN(date.getTime()) ? date.toString() : fullDateFormatter.format(date);
|
||||
const formatter = locale ? displayDates(locale).full : fullDateFormatter;
|
||||
return Number.isNaN(date.getTime()) ? date.toString() : formatter.format(date);
|
||||
}
|
||||
|
||||
// Relative-date bucket label for grouping the notes list:
|
||||
// Today / Yesterday / Previous 7 Days / Previous 30 Days / "June" (this year) / "June 2025".
|
||||
// Buckets are contiguous, so a list already sorted by date groups by consecutive label.
|
||||
export function dateBucketLabel(dateStr: string, now: Date = new Date()): string {
|
||||
export function dateBucketLabel(dateStr: string, now: Date = new Date(), locale?: string): string {
|
||||
const d = new Date(dateStr);
|
||||
if (Number.isNaN(d.getTime())) return d.toString();
|
||||
const dayMs = 86400000;
|
||||
@@ -62,6 +89,6 @@ export function dateBucketLabel(dateStr: string, now: Date = new Date()): string
|
||||
if (day >= today - dayMs) return 'Yesterday';
|
||||
if (day >= today - 7 * dayMs) return 'Previous 7 Days';
|
||||
if (day >= today - 30 * dayMs) return 'Previous 30 Days';
|
||||
if (d.getFullYear() === now.getFullYear()) return monthFormatter.format(d);
|
||||
return monthYearFormatter.format(d);
|
||||
if (d.getFullYear() === now.getFullYear()) return (locale ? displayDates(locale).month : monthFormatter).format(d);
|
||||
return (locale ? displayDates(locale).monthYear : monthYearFormatter).format(d);
|
||||
}
|
||||
@@ -1,5 +1,7 @@
|
||||
<script lang="ts">
|
||||
import { onMount } from 'svelte';
|
||||
import { listen } from '@tauri-apps/api/event';
|
||||
import { applyLanguage, locale, normalizeLanguage, type Language } from '$lib/i18n';
|
||||
import '../app.css';
|
||||
import { resolvedTheme, appConfig, activeNotePath, installType, platformIsMobile, checkForUpdate, checkForUpdateMobile, isManagedInstall, customThemes } from '$lib/stores/app';
|
||||
import { openFile, openUrl, getInstallType, isMobilePlatform } from '$lib/api';
|
||||
@@ -11,6 +13,22 @@
|
||||
|
||||
let { children } = $props();
|
||||
|
||||
let lastLanguageEvent = $state<Language | null>(null);
|
||||
// A config request started before another window changed language may finish afterward.
|
||||
$effect(() => { if ($appConfig) applyLanguage(lastLanguageEvent ?? $appConfig.language); });
|
||||
$effect(() => { document.documentElement.lang = $locale; });
|
||||
onMount(() => {
|
||||
let disposed = false;
|
||||
let unlisten: (() => void) | undefined;
|
||||
listen<string>('language-changed', ({ payload }) => {
|
||||
const next = normalizeLanguage(payload);
|
||||
lastLanguageEvent = next;
|
||||
applyLanguage(next);
|
||||
appConfig.update(config => config ? { ...config, language: next } : config);
|
||||
}).then(stop => { if (disposed) stop(); else unlisten = stop; });
|
||||
return () => { disposed = true; unlisten?.(); };
|
||||
});
|
||||
|
||||
// Reactively apply theme class to <html> whenever the resolved theme or custom themes change.
|
||||
// $resolvedTheme already maps "system" onto the configured light/dark pair, so flipping the OS
|
||||
// appearance re-runs this effect.
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<script lang="ts">
|
||||
import { onDestroy, onMount, tick } from 'svelte';
|
||||
import { tr } from '$lib/i18n';
|
||||
import { appConfig, vaultReady, theme } from '$lib/stores/app';
|
||||
import { getAppConfig, openVault, restoreExternalVault, setFontSize } from '$lib/api';
|
||||
import { darkThemes, isIOS, isMobile } from '$lib/platform';
|
||||
@@ -168,7 +169,7 @@
|
||||
} else {
|
||||
noteWindowPath = null;
|
||||
noteWindowVault = null;
|
||||
startupVaultError = 'This note window’s vault is no longer available. Choose a vault to continue.';
|
||||
startupVaultError = tr('startup.vaultUnavailable');
|
||||
}
|
||||
}
|
||||
$appConfig = config;
|
||||
@@ -285,7 +286,7 @@
|
||||
$vaultReady = true;
|
||||
} catch (e) {
|
||||
$vaultReady = false;
|
||||
startupVaultError = `Could not open the last vault: ${String(e)}`;
|
||||
startupVaultError = tr('startup.openFailed', { error: String(e) });
|
||||
// A saved path is not proof that the vault was initialized.
|
||||
// Do not let the picker navigate back into a failed startup.
|
||||
$appConfig = {
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { readFile } from 'node:fs/promises';
|
||||
import { aiImageCandidates, protectAiMedia, restoreAiMedia } from '../src/lib/utils/ai-media.ts';
|
||||
import { aiAsk, fetchAiModels } from '../src/lib/api.ts';
|
||||
|
||||
const vault = '/vault', note = '/vault/Work/Note.md';
|
||||
|
||||
test('AI image candidates resolve managed and note-relative files without fetching remote URLs', () => {
|
||||
const source = '\n\n\n\n[PDF](doc.pdf)\n';
|
||||
assert.deepEqual(aiImageCandidates(source, note, vault), [
|
||||
{ path: '/vault/.helixnotes/attachments/screen.png', name: 'screen.png' },
|
||||
{ path: '/vault/Work/photo one.webp', name: 'photo one.webp' },
|
||||
]);
|
||||
});
|
||||
|
||||
test('code, math and comments do not become AI image candidates', () => {
|
||||
const source = '```md\n\n```\n\n``\n\n<!-- <img src="comment.png"> -->\n\n$$\n\n$$\n';
|
||||
assert.deepEqual(aiImageCandidates(source, note, vault), []);
|
||||
});
|
||||
|
||||
test('complete Markdown images, reference definitions and HTML images round-trip byte-for-byte', () => {
|
||||
const source = '# План\n\n.png "hover") \n![ref][shot]\n\n[shot]: photo.png "title"\n\n<div class="image-grid"><img src="one.png" title="a > b"><img src="two.png"></div>\n';
|
||||
const protectedText = protectAiMedia(source, 'test');
|
||||
assert.ok(protectedText.media.size >= 4);
|
||||
assert.equal(restoreAiMedia(protectedText.text, protectedText.media), source);
|
||||
assert.equal(restoreAiMedia('Edited\n'+protectedText.text, protectedText.media), 'Edited\n'+source);
|
||||
});
|
||||
|
||||
test('encoded image data is protected in text-only requests, not silently sent as prompt text', () => {
|
||||
const source = '\n';
|
||||
const protectedText = protectAiMedia(source, 'test');
|
||||
assert.ok(!protectedText.text.includes('VERY_PRIVATE_PIXELS'));
|
||||
assert.equal(restoreAiMedia(protectedText.text, protectedText.media), source);
|
||||
});
|
||||
|
||||
test('missing and duplicated image markers refuse application; replacement metacharacters remain data', () => {
|
||||
const source = '\n';
|
||||
const { text, media } = protectAiMedia(source, 'test');
|
||||
assert.equal(restoreAiMedia(text, media), source);
|
||||
assert.equal(restoreAiMedia('No image', media), null);
|
||||
assert.equal(restoreAiMedia(text+text, media), null);
|
||||
assert.equal(restoreAiMedia('Plain result', new Map()), 'Plain result');
|
||||
});
|
||||
|
||||
test('media protection ignores literal image examples in fenced code and comments', () => {
|
||||
const source = '```html\n<img src="code.png">\n```\n<!-- <img src="comment.png"> -->\n';
|
||||
const { text, media } = protectAiMedia(source, 'test');
|
||||
assert.equal(text, source); assert.equal(media.size, 0);
|
||||
});
|
||||
|
||||
test('AI application rejects errored drafts even if a stale Apply handler is invoked', async () => {
|
||||
const source = await readFile(new URL('../src/lib/components/Editor.svelte', import.meta.url), 'utf8');
|
||||
const apply = source.slice(source.indexOf('async function aiApplyResult()'), source.indexOf('function aiDiscard()'));
|
||||
assert.match(apply, /if \(!origin \|\| !aiResult \|\| aiLoading \|\| aiError \|\| !canInsert\(origin\)\) return;/);
|
||||
assert.ok(apply.indexOf('|| aiError') < apply.indexOf('await forceSave()'));
|
||||
});
|
||||
|
||||
test('model discovery sends only provider/key, and AI requests are text-only unless explicitly supplied images', async () => {
|
||||
const previous = globalThis.window, calls = [];
|
||||
globalThis.window = { __TAURI_INTERNALS__: { invoke: async (command, args) => { calls.push({ command, args }); return []; } } };
|
||||
try {
|
||||
await fetchAiModels('openai','fake-key');
|
||||
await aiAsk('summarize','Note text',null,'request');
|
||||
const images = { vaultPath: vault, notePath: note, paths: ['/vault/screen.png'] };
|
||||
const expected = { provider: 'openai', model: 'gpt-future', baseUrl: null };
|
||||
await aiAsk('describe_images','Protected note',null,'vision',images,expected);
|
||||
assert.deepEqual(calls[0], { command:'fetch_ai_models', args:{provider:'openai',apiKey:'fake-key'} });
|
||||
assert.equal(calls[1].args.imageContext,null);
|
||||
assert.deepEqual(calls[2].args.imageContext,images);
|
||||
assert.deepEqual(calls[2].args.expectedConfig,expected);
|
||||
} finally { if (previous === undefined) delete globalThis.window; else globalThis.window=previous; }
|
||||
});
|
||||
@@ -0,0 +1,56 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { readFile } from 'node:fs/promises';
|
||||
import { getDailyNoteTemplate, setDailyNoteTemplate, importDailyNoteTemplate } from '../src/lib/api.ts';
|
||||
|
||||
const saved = { raw: '# {{title}}\n{{date}}\n', content: '# {{title}}\n{{date}}\n', enabled: true };
|
||||
|
||||
test('template API calls are vault-scoped, carry the exact revision and let native code own the picker', async () => {
|
||||
const previous = globalThis.window;
|
||||
const calls = [];
|
||||
globalThis.window = { __TAURI_INTERNALS__: { invoke: async (command, args) => { calls.push({ command, args }); return saved; } } };
|
||||
try {
|
||||
assert.equal(await getDailyNoteTemplate('/vault'), saved);
|
||||
assert.equal(await setDailyNoteTemplate('/vault', null, saved.raw), saved);
|
||||
assert.equal(await importDailyNoteTemplate('/vault', 'Import Markdown', saved.raw), saved);
|
||||
assert.deepEqual(calls, [
|
||||
{ command: 'get_daily_note_template', args: { vaultPath: '/vault' } },
|
||||
{ command: 'set_daily_note_template', args: { vaultPath: '/vault', template: null, expectedTemplate: saved.raw } },
|
||||
{ command: 'import_daily_note_template', args: { vaultPath: '/vault', title: 'Import Markdown', expectedTemplate: saved.raw } },
|
||||
]);
|
||||
assert.ok(calls.every(call => !('sourcePath' in call.args)), 'IPC callers cannot supply an arbitrary import source');
|
||||
} finally { if (previous === undefined) delete globalThis.window; else globalThis.window = previous; }
|
||||
});
|
||||
|
||||
test('template API failures propagate without retrying or silently rewriting a note', async () => {
|
||||
const previous = globalThis.window;
|
||||
const calls = [];
|
||||
globalThis.window = { __TAURI_INTERNALS__: { invoke: async (command) => { calls.push(command); throw new Error('disk full'); } } };
|
||||
try {
|
||||
await assert.rejects(setDailyNoteTemplate('/vault', 'draft', saved.raw), /disk full/);
|
||||
assert.deepEqual(calls, ['set_daily_note_template']);
|
||||
} finally { if (previous === undefined) delete globalThis.window; else globalThis.window = previous; }
|
||||
});
|
||||
|
||||
test('both daily-note entry points display creation errors instead of only logging them', async () => {
|
||||
for (const file of ['AppLayout.svelte', 'NoteList.svelte']) {
|
||||
const source = await readFile(new URL(`../src/lib/components/${file}`, import.meta.url), 'utf8');
|
||||
const handler = source.match(/console\.error\('Failed to (?:create\/open|open) daily note:'[\s\S]+?Could not display daily-note error:/)?.[0];
|
||||
assert.ok(handler, file);
|
||||
assert.match(handler, /navigationIsCurrent\(token\)/, file);
|
||||
assert.match(handler, /await showMessage\(/, file);
|
||||
assert.match(handler, /ui\.could_not_open_this_note/, file);
|
||||
assert.match(handler, /kind: 'error'/, file);
|
||||
}
|
||||
});
|
||||
|
||||
test('the template editor isolates vault identity from language updates and guards late responses', async () => {
|
||||
const source = await readFile(new URL('../src/lib/components/DailyNoteTemplate.svelte', import.meta.url), 'utf8');
|
||||
assert.match(source, /const currentVault = \$derived\(vaultPath\)/);
|
||||
assert.match(source, /const vault = currentVault/);
|
||||
assert.match(source, /return \(\) => \{ generation\+\+; \}/);
|
||||
assert.match(source, /if \(request !== generation\) return/);
|
||||
assert.match(source, /setDailyNoteTemplate\(vault, template, value.raw\)/);
|
||||
assert.match(source, /save\(value.enabled \? null : value.content\)/, 'reenabling uses the retained body');
|
||||
assert.doesNotMatch(source, /\b(?:saveNote|createDailyNote|activeNote|editorDirty)\b/);
|
||||
});
|
||||
@@ -0,0 +1,237 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { readFile, readdir } from 'node:fs/promises';
|
||||
import * as compiler from 'svelte/compiler';
|
||||
import { IntlMessageFormat } from 'intl-messageformat';
|
||||
import { get } from 'svelte/store';
|
||||
import { catalogs, languageOptions, formatLabel, formatMessage, normalizeLanguage, resolveLocale } from '../src/lib/i18n/core.ts';
|
||||
import { applyLanguage, language, locale, t, setUiText } from '../src/lib/i18n/index.ts';
|
||||
import { formatDate, formatRelativeTime, dateBucketLabel, formatLocalDate, formatClockTime } from '../src/lib/utils/time.ts';
|
||||
import { SourceController } from '../src/lib/editor/source/controller.ts';
|
||||
import { EditorView } from '@codemirror/view';
|
||||
|
||||
function argumentsIn(ast) {
|
||||
const result = new Set();
|
||||
function visit(nodes) {
|
||||
for (const node of nodes) {
|
||||
if (node.type >= 1 && node.type <= 6) result.add(node.value);
|
||||
if (node.options) for (const option of Object.values(node.options)) visit(option.value);
|
||||
if (node.children) visit(node.children);
|
||||
}
|
||||
}
|
||||
visit(ast);
|
||||
return [...result].sort();
|
||||
}
|
||||
|
||||
test('all bundled catalogs have matching keys, valid ICU messages and matching arguments', () => {
|
||||
assert.ok(Object.keys(catalogs.en).length > 1000);
|
||||
const reference = new Map(Object.entries(catalogs.en).map(([key, english]) => [
|
||||
key, argumentsIn(new IntlMessageFormat(english, 'en', undefined, { ignoreTag: true }).getAst()),
|
||||
]));
|
||||
for (const [code, catalog] of Object.entries(catalogs)) {
|
||||
assert.deepEqual(Object.keys(catalog).sort(), Object.keys(catalogs.en).sort(), code);
|
||||
for (const [key, text] of Object.entries(catalog)) {
|
||||
assert.ok(text.trim().length > 0, `${code}:${key} is empty`);
|
||||
const message = new IntlMessageFormat(text, code, undefined, { ignoreTag: true });
|
||||
assert.deepEqual(argumentsIn(message.getAst()), reference.get(key), `${code}:${key}`);
|
||||
for (const count of [0, 1, 2, 5, 11, 21, 22, 1.5]) {
|
||||
const values = Object.fromEntries(reference.get(key).map(name => [name, count]));
|
||||
assert.equal(typeof message.format(values), 'string', `${code}:${key}:${count}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
test('system locale matches all supported languages, Portuguese regions and ordered preferences', () => {
|
||||
for (const [tag, expected] of [
|
||||
['en-AU', 'en'], ['ru-RU', 'ru'], ['ru_BY', 'ru'], ['nl-BE', 'nl'],
|
||||
['de_AT.UTF-8', 'de'], ['es-MX', 'es'], ['fr-CA', 'fr'], ['it-CH', 'it'],
|
||||
['pt', 'pt-PT'], ['pt-PT', 'pt-PT'], ['pt-AO', 'pt-PT'], ['pt-MZ', 'pt-PT'],
|
||||
['pt_BR.UTF-8', 'pt-BR'], ['pt-Latn-BR', 'pt-BR'], ['pt-BR-u-ca-gregory', 'pt-BR'],
|
||||
]) assert.equal(resolveLocale('system', [tag]), expected, tag);
|
||||
assert.equal(resolveLocale('system', ['ja-JP', 'nl-NL', 'en-GB']), 'nl');
|
||||
assert.equal(resolveLocale('system', ['ja-JP']), 'en');
|
||||
assert.equal(resolveLocale('system', []), 'en');
|
||||
for (const code of Object.keys(catalogs)) {
|
||||
assert.equal(normalizeLanguage(code), code);
|
||||
assert.equal(resolveLocale(code, ['ru-RU']), code, 'explicit setting overrides OS');
|
||||
}
|
||||
assert.equal(normalizeLanguage('pt-br'), 'pt-BR');
|
||||
for (const invalid of [null, undefined, '', 'ja', 'constructor', '__proto__', 42, {}]) assert.equal(normalizeLanguage(invalid), 'system');
|
||||
});
|
||||
|
||||
test('language autonyms and native catalogs stay in sync with the shared registry', async () => {
|
||||
const codes = languageOptions.map(option => option.code);
|
||||
assert.deepEqual([...codes].sort(), Object.keys(catalogs).sort());
|
||||
assert.equal(new Set(codes).size, codes.length);
|
||||
assert.deepEqual(codes.slice(0, 2), ['en', 'ru']);
|
||||
for (const code of ['nl', 'de', 'es', 'fr', 'it', 'pt-PT', 'pt-BR']) assert.ok(codes.includes(code), code);
|
||||
assert.equal(languageOptions.find(option => option.code === 'pt-PT').name, 'Português (Portugal)');
|
||||
assert.equal(languageOptions.find(option => option.code === 'pt-BR').name, 'Português (Brasil)');
|
||||
const native = await readFile(new URL('../src-tauri/src/i18n.rs', import.meta.url), 'utf8');
|
||||
const nativeCodes = [...native.matchAll(/include_str!\("[^"\n]*\/locales\/([^/]+)\.json"\)/g)].map(match => match[1]);
|
||||
assert.deepEqual(nativeCodes.sort(), [...codes].sort());
|
||||
assert.match(native, /include_str!\("[^"\n]*languages\.json"\)/);
|
||||
});
|
||||
|
||||
test('Portuguese variants use their own vocabulary and preserve interpolation', () => {
|
||||
for (const [key, portugal, brazil] of [
|
||||
['ui.file', 'Ficheiro', 'Arquivo'], ['ui.save', 'Guardar', 'Salvar'],
|
||||
['ui.settings', 'Definições', 'Configurações'], ['ui.password', 'Palavra-passe', 'Senha'],
|
||||
['ui.download', 'Transferir', 'Baixar'],
|
||||
]) {
|
||||
assert.equal(formatMessage('pt-PT', key), portugal);
|
||||
assert.equal(formatMessage('pt-BR', key), brazil);
|
||||
}
|
||||
for (const code of ['pt-PT', 'pt-BR']) {
|
||||
assert.equal(formatMessage(code, 'count.notes', { count: 0 }), '0 notas');
|
||||
assert.equal(formatMessage(code, 'count.notes', { count: 1 }), '1 nota');
|
||||
assert.equal(formatMessage(code, 'count.notes', { count: 2 }), '2 notas');
|
||||
}
|
||||
});
|
||||
|
||||
test('French and Italian contractions and Dutch apostrophes survive ICU parsing', () => {
|
||||
assert.match(formatMessage('fr', 'ui.could_not_open_this_note'), /d'ouvrir/);
|
||||
assert.match(formatMessage('it', 'ui.you_are_on_the_latest_version'), /l'ultima/);
|
||||
assert.equal(formatMessage('nl', 'ui.photos'), "Foto's");
|
||||
for (const code of Object.keys(catalogs)) {
|
||||
const title = 'A {count} <tag> "quoted" note';
|
||||
assert.ok(formatMessage(code, 'ui.create_note', { value0: title }).includes(title), code);
|
||||
}
|
||||
});
|
||||
|
||||
test('Russian plurals handle one, few, many, teens and decimal counts', () => {
|
||||
for (const [count, noun] of [[0, 'заметок'], [1, 'заметка'], [2, 'заметки'], [5, 'заметок'], [11, 'заметок'], [21, 'заметка'], [22, 'заметки'], [25, 'заметок'], [1.5, 'заметки']]) {
|
||||
assert.ok(formatMessage('ru', 'count.notes', { count }).endsWith(noun), String(count));
|
||||
}
|
||||
assert.equal(formatMessage('en', 'count.notes', { count: 1 }), '1 note');
|
||||
assert.equal(formatMessage('en', 'count.notes', { count: 2 }), '2 notes');
|
||||
});
|
||||
|
||||
test('interpolation keeps user strings as data, not ICU syntax or executable HTML', () => {
|
||||
const title = '<img src=x onerror=alert(1)> {count, plural, other {injected}}';
|
||||
const result = formatMessage('ru', 'ui.create_note', { value0: title });
|
||||
assert.equal(result, `Создать заметку «${title}»`);
|
||||
assert.equal(formatMessage('en', 'language.saveFailed', { error: new Error('disk full') }), 'Could not save the language setting: Error: disk full');
|
||||
});
|
||||
|
||||
test('unknown and malformed translations fall back without breaking the interface', () => {
|
||||
catalogs.en['test.fallback'] = 'English {name}';
|
||||
try {
|
||||
for (const code of Object.keys(catalogs).filter(code => code !== 'en')) {
|
||||
assert.equal(formatMessage(code, 'test.fallback', { name: 'fallback' }), 'English fallback', `${code}: missing`);
|
||||
catalogs[code]['test.fallback'] = '{broken';
|
||||
assert.equal(formatMessage(code, 'test.fallback', { name: 'fallback' }), 'English fallback', `${code}: invalid`);
|
||||
assert.equal(formatMessage(code, 'test.missing'), 'test.missing', code);
|
||||
}
|
||||
} finally {
|
||||
for (const catalog of Object.values(catalogs)) delete catalog['test.fallback'];
|
||||
}
|
||||
});
|
||||
|
||||
test('language changes reactively update existing translator subscriptions and preserve IDs', () => {
|
||||
const results = [];
|
||||
const stop = t.subscribe(translate => results.push(translate('ui.settings')));
|
||||
applyLanguage('ru');
|
||||
assert.equal(get(language), 'ru');
|
||||
assert.equal(get(locale), 'ru');
|
||||
assert.equal(results.at(-1), 'Настройки');
|
||||
assert.equal(formatLabel('ru', 'Open Tasks'), 'Открыть задачи');
|
||||
assert.equal(formatLabel('ru', 'unregistered app label'), 'unregistered app label');
|
||||
applyLanguage('en');
|
||||
assert.equal(results.at(-1), 'Settings');
|
||||
stop();
|
||||
});
|
||||
|
||||
test('explicit node-view bindings update only UI controls, not adjacent note content', () => {
|
||||
const button = { textContent: '', attributes: {}, setAttribute(name, value) { this.attributes[name] = value; } };
|
||||
const note = { textContent: 'Settings' };
|
||||
applyLanguage('en');
|
||||
setUiText(button, 'ui.copy');
|
||||
setUiText(button, 'ui.passphrase', {}, 'placeholder');
|
||||
assert.equal(button.textContent, 'Copy');
|
||||
applyLanguage('ru');
|
||||
assert.equal(button.textContent, 'Копировать');
|
||||
assert.equal(button.attributes.placeholder, 'Парольная фраза');
|
||||
assert.equal(note.textContent, 'Settings');
|
||||
applyLanguage('en');
|
||||
});
|
||||
|
||||
test('display dates follow the UI locale without changing persisted dates or inserted times', () => {
|
||||
const date = new Date(2026, 5, 10, 14, 7);
|
||||
assert.notEqual(formatDate(date.toISOString(), 'en'), formatDate(date.toISOString(), 'ru'));
|
||||
assert.match(dateBucketLabel(new Date(2025, 5, 10).toISOString(), date, 'ru'), /июн/);
|
||||
assert.match(formatRelativeTime(new Date(Date.now() - 120000).toISOString(), 'ru'), /мин/);
|
||||
assert.equal(formatLocalDate(date), '2026-06-10');
|
||||
assert.equal(formatClockTime(date, '24h'), '14:07');
|
||||
});
|
||||
|
||||
test('source editor language changes preserve the draft, selection and undo history', () => {
|
||||
let edits = 0;
|
||||
const source = new SourceController(() => edits++);
|
||||
source.load('Existing note');
|
||||
source.replace(' draft', source.state.doc.length, source.state.doc.length);
|
||||
source.select(2, 5);
|
||||
const before = edits;
|
||||
source.setLabels('Начните писать...', 'Исходный текст Markdown');
|
||||
assert.equal(source.state.doc.toString(), 'Existing note draft');
|
||||
assert.equal(source.state.selection.main.anchor, 2);
|
||||
assert.equal(source.state.selection.main.head, 5);
|
||||
assert.equal(edits, before, 'language changes must not mark the note dirty');
|
||||
assert.equal(source.undo(), true);
|
||||
assert.equal(source.state.doc.toString(), 'Existing note');
|
||||
source.load('Another note');
|
||||
assert.ok(source.state.facet(EditorView.contentAttributes).some(attrs => attrs['aria-label'] === 'Исходный текст Markdown'));
|
||||
});
|
||||
|
||||
test('static interface text is translated rather than left hardcoded in templates', async () => {
|
||||
const directory = new URL('../src/lib/components/', import.meta.url);
|
||||
const allowed = new Set(['HelixNotes', 'WebDAV', 'English']); // brand, protocol, language autonym
|
||||
const failures = [];
|
||||
for (const file of (await readdir(directory)).filter(name => name.endsWith('.svelte'))) {
|
||||
const source = await readFile(new URL(file, directory), 'utf8');
|
||||
const ast = compiler.parse(source, { modern: true });
|
||||
function fragment(value, tag) { for (const node of value?.nodes ?? []) visit(node, tag); }
|
||||
function visit(node, tag = '') {
|
||||
if (!node || typeof node !== 'object') return;
|
||||
if (node.type === 'Text' && /[A-Za-z]{2}/.test(node.data.trim()) && !['code', 'pre', 'kbd', 'svg'].includes(tag) && !allowed.has(node.data.trim())) {
|
||||
failures.push(`${file}: ${node.data.trim()}`);
|
||||
}
|
||||
if (node.fragment) fragment(node.fragment, node.name || tag);
|
||||
for (const key of ['body', 'consequent', 'alternate', 'fallback', 'pending', 'then', 'catch']) {
|
||||
if (node[key]?.nodes) fragment(node[key], node.name || tag);
|
||||
else if (node[key]) visit(node[key], node.name || tag);
|
||||
}
|
||||
}
|
||||
fragment(ast.fragment, '');
|
||||
}
|
||||
assert.deepEqual(failures, []);
|
||||
});
|
||||
|
||||
test('the community translation example stays in sync with the English catalog', async () => {
|
||||
const example = JSON.parse(await readFile(new URL('../docs/translations/example.json', import.meta.url), 'utf8'));
|
||||
assert.ok(Object.keys(example).length > 0);
|
||||
for (const [key, text] of Object.entries(example)) assert.equal(text, catalogs.en[key], key);
|
||||
});
|
||||
|
||||
test('the language selector renders its popup in the app rather than delegating colors to the OS', async () => {
|
||||
const source = await readFile(new URL('../src/lib/components/SettingsPanel.svelte', import.meta.url), 'utf8');
|
||||
assert.match(source, /<ThemedSelect[^>]+id="interface-language"/);
|
||||
assert.doesNotMatch(source, /<select[^>]+id="interface-language"/);
|
||||
const select = await readFile(new URL('../src/lib/components/ThemedSelect.svelte', import.meta.url), 'utf8');
|
||||
for (const selector of ['select-trigger', 'select-menu', 'select-option']) {
|
||||
const rule = select.match(new RegExp(`\\.${selector}\\s*\\{([^}]+)\\}`))[1];
|
||||
assert.match(rule, /background:\s*var\(--bg-secondary\)/, selector);
|
||||
assert.match(rule, /color:\s*var\(--text-primary\)/, selector);
|
||||
}
|
||||
assert.match(select, /role="combobox"/);
|
||||
assert.match(select, /role="listbox"/);
|
||||
assert.match(select, /role="option" aria-selected/);
|
||||
assert.match(select, /aria-activedescendant/);
|
||||
assert.match(select, /\.select-trigger:focus-visible\s*\{\s*outline:\s*2px solid var\(--accent\)/);
|
||||
});
|
||||
|
||||
test('UI lookup is not applied to user-authored note titles', async () => {
|
||||
const editor = await readFile(new URL('../src/lib/components/Editor.svelte', import.meta.url), 'utf8');
|
||||
assert.doesNotMatch(editor, /\$uiLabel\((?:entry\.title|note\.meta\.title|\$activeNote\.meta\.title)\)/);
|
||||
});
|
||||
@@ -0,0 +1,63 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { findTypeaheadIndex, moveSelectIndex, typeaheadQuery } from '../src/lib/utils/select-navigation.ts';
|
||||
|
||||
const options = [
|
||||
{ value: 'system', label: 'System default' },
|
||||
{ value: 'en', label: 'English' },
|
||||
{ value: 'ru', label: 'Русский' },
|
||||
{ value: 'nl', label: 'Nederlands' },
|
||||
{ value: 'de', label: 'Deutsch' },
|
||||
{ value: 'es', label: 'Español' },
|
||||
{ value: 'fr', label: 'Français' },
|
||||
{ value: 'it', label: 'Italiano' },
|
||||
{ value: 'pt-PT', label: 'Português (Portugal)' },
|
||||
{ value: 'pt-BR', label: 'Português (Brasil)' },
|
||||
];
|
||||
|
||||
test('dropdown arrows move the active option without wrapping or committing a value', () => {
|
||||
const before = structuredClone(options);
|
||||
assert.equal(moveSelectIndex(1, 10, 'ArrowDown'), 2);
|
||||
assert.equal(moveSelectIndex(1, 10, 'ArrowUp'), 0);
|
||||
assert.equal(moveSelectIndex(0, 10, 'ArrowUp'), 0);
|
||||
assert.equal(moveSelectIndex(9, 10, 'ArrowDown'), 9);
|
||||
assert.equal(moveSelectIndex(-1, 10, 'ArrowDown'), 0);
|
||||
assert.equal(moveSelectIndex(-1, 10, 'ArrowUp'), 9);
|
||||
assert.deepEqual(options, before);
|
||||
});
|
||||
|
||||
test('Home and End reach both ends and empty menus have no active option', () => {
|
||||
assert.equal(moveSelectIndex(5, 10, 'Home'), 0);
|
||||
assert.equal(moveSelectIndex(5, 10, 'End'), 9);
|
||||
for (const key of ['Home', 'End', 'ArrowUp', 'ArrowDown']) assert.equal(moveSelectIndex(0, 0, key), -1);
|
||||
for (const key of ['Enter', 'Escape', 'Tab', ' ', 'D']) assert.equal(moveSelectIndex(1, 10, key), null);
|
||||
});
|
||||
|
||||
test('type-to-select matches accents, case and Russian autonyms without changing their spelling', () => {
|
||||
assert.equal(findTypeaheadIndex(options, 'francais', 0), 6);
|
||||
assert.equal(findTypeaheadIndex(options, 'ESPA', 0), 5);
|
||||
assert.equal(findTypeaheadIndex(options, 'рус', 0), 2);
|
||||
assert.equal(findTypeaheadIndex(options, 'portugues (br', 0), 9);
|
||||
assert.equal(options[6].label, 'Français');
|
||||
assert.equal(options[9].label, 'Português (Brasil)');
|
||||
});
|
||||
|
||||
test('repeated letters cycle through both Portuguese options, including across the menu boundary', () => {
|
||||
let query = typeaheadQuery('', 'p', 1000);
|
||||
let index = findTypeaheadIndex(options, query, 1);
|
||||
assert.equal(index, 8);
|
||||
query = typeaheadQuery(query, 'p', 50);
|
||||
index = findTypeaheadIndex(options, query, index);
|
||||
assert.equal(index, 9);
|
||||
query = typeaheadQuery(query, 'p', 50);
|
||||
assert.equal(findTypeaheadIndex(options, query, index), 8);
|
||||
});
|
||||
|
||||
test('typing builds a prefix until timeout; missing and empty matches are safe', () => {
|
||||
assert.equal(typeaheadQuery('de', 'u', 50), 'deu');
|
||||
assert.equal(typeaheadQuery('de', 'f', 700), 'f');
|
||||
assert.equal(findTypeaheadIndex(options, 'deu', 4), 4);
|
||||
assert.equal(findTypeaheadIndex(options, 'unavailable', 4), -1);
|
||||
assert.equal(findTypeaheadIndex(options, '', 4), -1);
|
||||
assert.equal(findTypeaheadIndex([], 'd', -1), -1);
|
||||
});
|
||||
@@ -4,6 +4,7 @@ import test from 'node:test';
|
||||
import { createContext, Script } from 'node:vm';
|
||||
import { parse } from 'svelte/compiler';
|
||||
import { transformWithEsbuild } from 'vite';
|
||||
import { formatMessage } from '../src/lib/i18n/core.ts';
|
||||
|
||||
const source = await readFile(new URL('../src/lib/components/Editor.svelte', import.meta.url), 'utf8');
|
||||
const declaration = parse(source, { modern: true }).instance.content.body.find(node =>
|
||||
@@ -26,6 +27,7 @@ function fixture(path = '/external/External.md') {
|
||||
const messages = [];
|
||||
const files = new Map([[path, original]]);
|
||||
const context = createContext({
|
||||
uiText: (key, values) => formatMessage('en', key, values),
|
||||
beginEditorNoteNavigation: () => () => current,
|
||||
$viewerNote: { path, content: original.content }, $activeNote: original,
|
||||
$appConfig: { active_vault: '/vault' }, $readOnly: true, $focusMode: true,
|
||||
|
||||
Reference in new issue
Block a user