langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
cfb309e6b3
anki/rslib/Cargo.toml

105 lines
2.7 KiB
TOML
Raw Normal View History

split the rust code into a workspace
2019-12-23 05:42:14 +01:00
[package]
move the separate components back into this monorepo Earlier today I pushed a change that split this code up into multiple repos, but that has proved to complicate things too much. So we're back to a single repo, except the individual submodules are better separated than they were before. The README files need updating again; I will push them out soon. Aside from splitting out the different modules, the sound code has moved from from anki to aqt.
2020-01-02 10:43:19 +01:00
name = "anki"
update cargo deps; add script to copy them from rslib/
2020-11-02 09:17:26 +01:00
version = "0.0.0"
update to edition 2021
2021-11-18 11:51:10 +01:00
edition = "2021"
use support URL and point to source repo
2020-04-03 00:44:59 +02:00
authors = ["Ankitects Pty Ltd and contributors"]
move the separate components back into this monorepo Earlier today I pushed a change that split this code up into multiple repos, but that has proved to complicate things too much. So we're back to a single repo, except the individual submodules are better separated than they were before. The README files need updating again; I will push them out soon. Aside from splitting out the different modules, the sound code has moved from from anki to aqt.
2020-01-02 10:43:19 +01:00
license = "AGPL-3.0-or-later"
Created the GitHub Actions step Upload to PyPi to run only on tagged releases of anki: https://anki.tenderapp.com/discussions/ankidesktop/40025-anki-in-python-package-index
2020-04-02 04:01:48 +02:00
description = "Anki's Rust library code"
initial Bazel conversion Running and testing should be working on the three platforms, but there's still a fair bit that needs to be done: - Wheel building + testing in a venv still needs to be implemented. - Python requirements still need to be compiled with piptool and pinned; need to compile on all platforms then merge - Cargo deps in cargo/ and rslib/ need to be cleaned up, and ideally unified into one place - Currently using rustls to work around openssl compilation issues on Linux, but this will break corporate proxies with custom SSL authorities; need to conditionally use openssl or use https://github.com/seanmonstar/reqwest/pull/1058 - Makefiles and docs still need cleaning up - It may make sense to reparent ts/* to the top level, as we don't nest the other modules under a specific language. - rspy and pylib must always be updated in lock-step, so merging rspy into pylib as a private module would simplify things. - Merging desktop-ftl and mobile-ftl into the core ftl would make managing and updating translations easier. - Obsolete scripts need removing. - And probably more.
2020-11-01 05:26:58 +01:00
build = "build/main.rs"
[lib]
name = "anki"
path = "src/lib.rs"
use protobuf for python/rust bridge If we go ahead with betterproto on the Python side, it will mean bumping the minimum Python dependency to 3.7.
2019-12-24 04:33:44 +01:00
New TTS/AV tag handling (#1559) * Add new `card_rendering` mod Parses a text with av/tts tags and strips or extracts tags. * Replace old `extract_av_tags` and `strip_av_tags` ... with new `card_rendering` mod * ressource -> resource * Add AV prettifier for use in browser table * Accept String in av tag routines ... and avoid redundant writes if no changes need to be made. * add benchmarking with criterion; make links test optional (dae) cargo install cargo-criterion, then run ./bench.sh * performance comparison: creating HashMap up front (dae) the previous solution: anki_tag_parse time: [1.8401 us 1.8437 us 1.8476 us] this solution: anki_tag_parse time: [2.2420 us 2.2447 us 2.2477 us] change: [+21.477% +21.770% +22.066%] (p = 0.00 < 0.05) Performance has regressed. * Revert "performance comparison: creating HashMap up front" (dae) This reverts commit f19126a2f15b729b825825a49283f63ab13474d0. * add missing header * Write error message if tts lang is missing * `Tag` -> `Directive`
2021-12-17 10:04:42 +01:00
[features]
bench = ["criterion"]
[[bench]]
name = "benchmark"
harness = false
required-features = ["bench"]
update cargo deps; add script to copy them from rslib/
2020-11-02 09:17:26 +01:00
# After updating anything below, run ../cargo/update.py
[build-dependencies]
Update Rust deps
2022-09-24 04:39:21 +02:00
prost-build = "0.11.1"
update cargo deps; add script to copy them from rslib/
2020-11-02 09:17:26 +01:00
[dev-dependencies]
Update Rust deps
2022-09-24 04:39:21 +02:00
env_logger = "0.9.1"
tokio = { version = "1.21", features = ["macros"] }
update cargo deps; add script to copy them from rslib/
2020-11-02 09:17:26 +01:00
use protobuf for python/rust bridge If we go ahead with betterproto on the Python side, it will mean bumping the minimum Python dependency to 3.7.
2019-12-24 04:33:44 +01:00
[dependencies]
vendor coarsetime so we can get the use after free fix
2020-07-13 05:34:37 +02:00
# pinned as any changes could invalidate sqlite indexes
unicase = "=2.6.0"
report pinned package issues upstream
2021-04-27 15:11:22 +02:00
Update Rust deps
2022-09-24 04:39:21 +02:00
tokio = { version = "1.21", features = ["fs", "rt-multi-thread"] }
Update Rust deps; pin Tokio Tokio has had to be pinned, because the 1.17 release introduces a dependency on windows_sys, which fails to build on Windows on Bazel. The issue appears to be the build script of a subcrate - it is using CARGO_MANIFEST_DIR to update the linking path so windows.lib can be found (it's contained in that crate), but the path is set incorrectly. https://github.com/microsoft/windows-rs/blob/dfc25285a289847ad88cbd206d169f7697be0dd4/crates/targets/x86_64_msvc/build.rs One way we might be able to work around it is to add to the link path in our own build script.
2022-02-25 07:30:59 +01:00
update most rust deps; skip rusqlite
2021-06-25 07:35:25 +02:00
anki_i18n = { path="i18n" }
rework translation handling Instead of generating a fluent.proto file with a giant enum, create a .json file representing the translations that downstream consumers can use for code generation. This enables the generation of a separate method for each translation, with a docstring that shows the actual text, and any required arguments listed in the function signature. The codebase is still using the old enum for now; updating it will need to come in future commits, and the old enum will need to be kept around, as add-ons are referencing it. Other changes: - move translation code into a separate crate - store the translations on a per-file/module basis, which will allow us to avoid sending 1000+ strings on each JS page load in the future - drop the undocumented support for external .ftl files, that we weren't using - duplicate strings in translation files are now checked for at build time - fix i18n test failing when run outside Bazel - drop slog dependency in i18n module
2021-03-26 00:40:41 +01:00
Update Rust deps
2022-09-24 04:39:21 +02:00
criterion = { version = "0.4.0", optional = true }
New TTS/AV tag handling (#1559) * Add new `card_rendering` mod Parses a text with av/tts tags and strips or extracts tags. * Replace old `extract_av_tags` and `strip_av_tags` ... with new `card_rendering` mod * ressource -> resource * Add AV prettifier for use in browser table * Accept String in av tag routines ... and avoid redundant writes if no changes need to be made. * add benchmarking with criterion; make links test optional (dae) cargo install cargo-criterion, then run ./bench.sh * performance comparison: creating HashMap up front (dae) the previous solution: anki_tag_parse time: [1.8401 us 1.8437 us 1.8476 us] this solution: anki_tag_parse time: [2.2420 us 2.2447 us 2.2477 us] change: [+21.477% +21.770% +22.066%] (p = 0.00 < 0.05) Performance has regressed. * Revert "performance comparison: creating HashMap up front" (dae) This reverts commit f19126a2f15b729b825825a49283f63ab13474d0. * add missing header * Write error message if tts lang is missing * `Tag` -> `Directive`
2021-12-17 10:04:42 +01:00
Update Rust deps
2022-09-24 04:39:21 +02:00
nom = "7.1.1"
update Rust deps
2021-10-02 12:42:03 +02:00
proc-macro-nested = "0.1.7"
Update Rust deps
2022-09-24 04:39:21 +02:00
slog-term = "2.9.0"
blake3 = "1.3.1"
bytes = "1.2.1"
chrono = "0.4.22"
coarsetime = "0.1.22"
flate2 = "1.0.24"
update Rust deps
2021-10-02 12:42:03 +02:00
fluent = "0.16.0"
Update Rust deps
2022-09-24 04:39:21 +02:00
fluent-bundle = "0.15.2"
futures = "0.3.24"
update most rust deps; skip rusqlite
2021-06-25 07:35:25 +02:00
hex = "0.4.3"
add a simple TTS field filter This simply wraps the field in extra text that the frontend will deal with. Also added some helpers for extracting and stripping audio and TTS tags from the rendered text.
2020-01-20 10:12:34 +01:00
htmlescape = "0.3.1"
update most rust deps; skip rusqlite
2021-06-25 07:35:25 +02:00
intl-memoizer = "0.5.1"
Update Rust deps
2022-09-24 04:39:21 +02:00
itertools = "0.10.5"
update cargo deps; add script to copy them from rslib/
2020-11-02 09:17:26 +01:00
lazy_static = "1.4.0"
Update Rust deps
2022-09-24 04:39:21 +02:00
num_enum = "0.5.7"
num-integer = "0.1.45"
once_cell = "1.15.0"
pin-project = "1.0.12"
prost = "0.11.0"
rand = "0.8.5"
regex = "1.6.0"
update most rust deps; skip rusqlite
2021-06-25 07:35:25 +02:00
reqwest = { git="https://github.com/ankitects/reqwest.git", rev="7591444614de02b658ddab125efba7b2bb4e2335", default-features=false, features=[
update prost to new 0.7 release+auto stage changes Allows us to drop slow git repo.
2020-12-28 01:12:10 +01:00
"json",
"socks",
"stream",
update Rust deps - tokio 1.0 - updated reqwest, thanks to Rumo - other minor dep updates the reqwest build file has been split into two, as it was awkward to manually update the combined file, and the platform gate is now on the target in rslib/
2021-04-27 14:18:12 +02:00
"multipart",
# the Bazel build scripts separate these out by platform
update prost to new 0.7 release+auto stage changes Allows us to drop slow git repo.
2020-12-28 01:12:10 +01:00
"native-tls",
update Rust deps - tokio 1.0 - updated reqwest, thanks to Rumo - other minor dep updates the reqwest build file has been split into two, as it was awkward to manually update the combined file, and the platform gate is now on the target in rslib/
2021-04-27 14:18:12 +02:00
"rustls-tls",
"rustls-tls-webpki-roots",
add rustls-native-certs closes #1241
2021-06-18 10:15:41 +02:00
"rustls-tls-native-roots",
update prost to new 0.7 release+auto stage changes Allows us to drop slow git repo.
2020-12-28 01:12:10 +01:00
] }
Update Rust deps
2022-09-24 04:39:21 +02:00
rusqlite = { version = "0.28.0", features = ["trace", "functions", "collation", "bundled"] }
update cargo deps; add script to copy them from rslib/
2020-11-02 09:17:26 +01:00
scopeguard = "1.1.0"
Update Rust deps
2022-09-24 04:39:21 +02:00
serde = "1.0.145"
serde_derive = "1.0.145"
serde_json = "1.0.85"
serde_repr = "0.1.9"
update rslib/rspy deps
2020-07-12 03:38:25 +02:00
serde_tuple = "0.5.0"
Update Rust deps
2022-09-24 04:39:21 +02:00
serde-aux = "4.0.0"
update cargo deps; add script to copy them from rslib/
2020-11-02 09:17:26 +01:00
sha1 = "0.6.0"
update to latest rusqlite
2021-06-25 08:22:21 +02:00
slog = { version = "2.7.0", features = ["max_level_trace", "release_max_level_debug"] }
update Rust deps
2021-10-02 12:42:03 +02:00
slog-async = "2.7.0"
make logging explicit, and support logging to a file
2020-02-29 10:50:15 +01:00
slog-envlogger = "2.2.0"
Update Rust deps
2022-09-24 04:39:21 +02:00
tempfile = "3.3.0"
update to latest rusqlite
2021-06-25 08:22:21 +02:00
unic-langid = { version = "0.9.0", features = ["macros"] }
Update Rust deps
2022-09-24 04:39:21 +02:00
unicode-normalization = "0.1.22"
update cargo deps; add script to copy them from rslib/
2020-11-02 09:17:26 +01:00
utime = "0.3.1"
Update Rust deps
2022-09-24 04:39:21 +02:00
zip = { version = "0.6.2", default-features = false, features = ["deflate", "time"] }
async-trait = "0.1.57"
ammonia = "3.2.1"
pulldown-cmark = "0.9.2"
experimental queue building Still a work in progress, and hidden behind a feature flag.
2021-03-01 01:34:04 +01:00
fnv = "1.0.7"
Update Rust deps
2022-09-24 04:39:21 +02:00
strum = { version = "0.24.1", features = ["derive"] }
tokio-util = { version = "0.7.4", features = ["io"] }
move from Python's URI escaping to IRI escaping in Rust Should make non-Latin text readable in the HTML editor, without the breakages reverted in the previous change.
2021-07-16 02:35:09 +02:00
pct-str = { git="https://github.com/timothee-haudebourg/pct-str.git", rev="4adccd8d4a222ab2672350a102f06ae832a0572d" }
strip invalid Unicode chars in media check
2021-07-17 07:36:43 +02:00
unic-ucd-category = "0.9.0"
V3 parent limits (#1638) * avoid repinning Rust deps by default * add id_tree dependency * Respect intermediate child limits in v3 * Test new behaviour of v3 counts * Rework v3 queue building to respect parent limits * Add missing did field to SQL query * Fix `LimitTreeMap::is_exhausted()` * Rework tree building logic https://github.com/ankitects/anki/pull/1638#discussion_r798328734 * Add timer for build_queues() * `is_exhausted()` -> `limit_reached()` * Move context and limits into `QueueBuilder` This allows for moving more logic into QueueBuilder, so less passing around of arguments. Unfortunately, some tests will require additional work to set up. * Fix stop condition in new_cards_by_position * Fix order gather order of new cards by deck * Add scheduler/queue/builder/burying.rs * Fix bad tree due to unsorted child decks * Fix comment * Fix `cap_new_to_review_rec()` * Add test for new card gathering * Always sort `child_decks()` * Fix deck removal in `cap_new_to_review_rec()` * Fix sibling ordering in new card gathering * Remove limits for deck total count with children * Add random gather order * Remove bad sibling order handling All routines ensure ascending order now. Also do some other minor refactoring. * Remove queue truncating All routines stop now as soon as the root limit is reached. * Move deck fetching into `QueueBuilder::new()` * Rework new card gather and sort options https://github.com/ankitects/anki/pull/1638#issuecomment-1032173013 * Disable new sort order choices ... depending on set gather order. * Use enum instead of numbers * Ensure valid sort order setting * Update new gather and sort order tooltips * Warn about random insertion order with v3 * Revert "Add timer for build_queues()" This reverts commit c9f5fc6ebe87953c17a0c842990b009b5596c69c. * Update rslib/src/storage/card/mod.rs (dae) * minor wording tweaks to the tooltips (dae) + move legacy strings to bottom + consistent capitalization (our leech action still needs fixing, but that will require introducing a new 'suspend card' string as the existing one is used elsewhere as well)
2022-02-10 00:55:43 +01:00
id_tree = "1.8.0"
Update Rust deps
2022-09-24 04:39:21 +02:00
zstd = { version="0.11.2", features=["zstdmt"] }
Backups (#1685) * Add zstd dep * Implement backend backup with zstd * Implement backup thinning * Write backup meta * Use new file ending anki21b * Asynchronously backup on collection close in Rust * Revert "Add zstd dep" This reverts commit 3fcb2141d2be15f907269d13275c41971431385c. * Add zstd again * Take backup col path from col struct * Fix formatting * Implement backup restoring on backend * Normalize restored media file names * Refactor `extract_legacy_data()` A bit cumbersome due to borrowing rules. * Refactor * Make thinning calendar-based and gradual * Consider last kept backups of previous stages * Import full apkgs and colpkgs with backend * Expose new backup settings * Test `BackupThinner` and make it deterministic * Mark backup_path when closing optional * Delete leaky timer * Add progress updates for restoring media * Write restored collection to tempfile first * Do collection compression in the background thread This has us currently storing an uncompressed and compressed copy of the collection in memory (not ideal), but means the collection can be closed without waiting for compression to complete. On a large collection, this takes a close and reopen from about 0.55s to about 0.07s. The old backup code for comparison: about 0.35s for compression off, about 8.5s for zip compression. * Use multithreading in zstd compression On my system, this reduces the compression time of a large collection from about 0.55s to 0.08s. * Stream compressed collection data into zip file * Tweak backup explanation + Fix incorrect tab order for ignore accents option * Decouple restoring backup and full import In the first case, no profile is opened, unless the new collection succeeds to load. In the second case, either the old collection is reloaded or the new one is loaded. * Fix number gap in Progress message * Don't revert backup when media fails but report it * Tweak error flow * Remove native BackupLimits enum * Fix type annotation * Add thinning test for whole year * Satisfy linter * Await async backup to finish * Move restart disclaimer out of backup tab Should be visible regardless of the current tab. * Write restored collection in chunks * Refactor * Write media in chunks and refactor * Log error if removing file fails * join_backup_task -> await_backup_completion * Refactor backup.rs * Refactor backup meta and collection extraction * Fix wrong error being returned * Call sync_all() on new collection * Add ImportError * Store logger in Backend, instead of creating one on demand init_backend() accepts a Logger rather than a log file, to allow other callers to customize the logger if they wish. In the future we may want to explore using the tracing crate as an alternative; it's a bit more ergonomic, as a logger doesn't need to be passed around, and it plays more nicely with async code. * Sync file contents prior to rename; sync folder after rename. * Limit backup creation to once per 30 min * Use zstd::stream::copy_decode * Make importing abortable * Don't revert if backup media is aborted * Set throttle implicitly * Change force flag to minimum_backup_interval * Don't attempt to open folders on Windows * Join last backup thread before starting new one Also refactor. * Disable auto sync and backup when restoring again * Force backup on full download * Include the reason why a media file import failed, and the file path - Introduce a FileIoError that contains a string representation of the underlying I/O error, and an associated path. There are a few places in the code where we're currently manually including the filename in a custom error message, and this is a step towards a more consistent approach (but we may be better served with a more general approach in the future similar to Anyhow's .context()) - Move the error message into importing.ftl, as it's a bit neater when error messages live in the same file as the rest of the messages associated with some functionality. * Fix importing of media files * Minor wording tweaks * Save an allocation I18n strings with replacements are already strings, so we can skip the extra allocation. Not that it matters here at all. * Terminate import if file missing from archive If a third-party tool is creating invalid archives, the user should know about it. This should be rare, so I did not attempt to make it translatable. * Skip multithreaded compression on small collections Co-authored-by: Damien Elmes <gpg@ankiweb.net>
2022-03-07 06:11:31 +01:00
num_cpus = "1.13.1"
CSV import/export fixes and features (#1898) * Fix footer moving upwards * Fix column detection Was broken because escaped line breaks were not considered. Also removes delimiter detection on `#columns:` line. User must use tabs or set delimiter beforehand. * Add CSV preview * Parse `#tags column:` * Optionally export deck and notetype with CSV * Avoid clones in CSV export * Prevent bottom of page appearing under footer (dae) * Increase padding to 1em (dae) With 0.5em, when a vertical scrollbar is shown, it sits right next to the right edge of the content, making it look like there's no right margin. * Experimental changes to make table fit+scroll (dae) - limit individual cells to 15em, and show ellipses when truncated - limit total table width to body width, so that inner table is shown with scrollbar - use class rather than id - ids are bad practice in Svelte components, as more than one may be displayed on a single page * Skip importing foreign notes with filtered decks Were implicitly imported into the default deck before. Also some refactoring to fetch deck ids and names beforehand. * Hide spacer below hidden field mapping * Fix guid being replaced when updating note * Fix dupe identity check Canonify tags before checking if dupe is identical, but only add update tags later if appropriate. * Fix deck export for notes with missing card 1 * Fix note lines starting with `#` csv crate doesn't support escaping a leading comment char. :( * Support import/export of guids * Strip HTML from preview rows * Fix initially set deck if current is filtered * Make isHtml toggle reactive * Fix `html_to_text_line()` stripping sound names * Tweak export option labels * Switch to patched rust-csv fork Fixes writing lines starting with `#`, so revert 5ece10ad05f331. * List column options with first column field * Fix flag for exports with HTML stripped
2022-06-09 02:28:01 +02:00
csv = { git="https://github.com/ankitects/rust-csv.git", rev="1c9d3aab6f79a7d815c69f925a46a4590c115f90" }
Partially migrate type answer to backend Partially completes #1068, and will allow mobile clients to drop their separate diff-match-patch imports. Does not yet try to handle case folding or combining-char stripping, and leaves some of the outer HTML wrapping up to the frontend for now. The logic for rendering the provided string has changed: missing chars are now only inserted if they follow a correct section, and the original text is shown instead of hyphens. This is an experiment, and can be changed if it's not well received.
2022-07-22 11:20:04 +02:00
dissimilar = "1.0.4"
Reference in New Issue Copy Permalink