mirror of
https://github.com/ankitects/anki.git
synced 2025-09-25 09:16:38 -04:00
Compare commits
No commits in common. "main" and "25.08b5" have entirely different histories.
116 changed files with 5019 additions and 5134 deletions
2
.version
2
.version
|
|
@ -1 +1 @@
|
|||
25.09.2
|
||||
25.08b5
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
nodeLinker: node-modules
|
||||
enableScripts: false
|
||||
|
|
|
|||
|
|
@ -49,7 +49,6 @@ Sander Santema <github.com/sandersantema/>
|
|||
Thomas Brownback <https://github.com/brownbat/>
|
||||
Andrew Gaul <andrew@gaul.org>
|
||||
kenden
|
||||
Emil Hamrin <github.com/e-hamrin>
|
||||
Nickolay Yudin <kelciour@gmail.com>
|
||||
neitrinoweb <github.com/neitrinoweb/>
|
||||
Andreas Reis <github.com/nwwt>
|
||||
|
|
@ -238,11 +237,6 @@ Kevin Nakamura <grinkers@grinkers.net>
|
|||
Bradley Szoke <bradleyszoke@gmail.com>
|
||||
jcznk <https://github.com/jcznk>
|
||||
Thomas Rixen <thomas.rixen@student.uclouvain.be>
|
||||
Siyuan Mattuwu Yan <syan4@ualberta.ca>
|
||||
Lee Doughty <32392044+leedoughty@users.noreply.github.com>
|
||||
memchr <memchr@proton.me>
|
||||
Max Romanowski <maxr777@proton.me>
|
||||
Aldlss <ayaldlss@gmail.com>
|
||||
|
||||
********************
|
||||
|
||||
|
|
|
|||
1067
Cargo.lock
generated
1067
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -51,7 +51,7 @@ ninja_gen = { "path" = "build/ninja_gen" }
|
|||
unicase = "=2.6.0" # any changes could invalidate sqlite indexes
|
||||
|
||||
# normal
|
||||
ammonia = "4.1.2"
|
||||
ammonia = "4.1.0"
|
||||
anyhow = "1.0.98"
|
||||
async-compression = { version = "0.4.24", features = ["zstd", "tokio"] }
|
||||
async-stream = "0.3.6"
|
||||
|
|
@ -133,7 +133,7 @@ tokio-util = { version = "0.7.15", features = ["io"] }
|
|||
tower-http = { version = "0.6.6", features = ["trace"] }
|
||||
tracing = { version = "0.1.41", features = ["max_level_trace", "release_max_level_debug"] }
|
||||
tracing-appender = "0.2.3"
|
||||
tracing-subscriber = { version = "0.3.20", features = ["fmt", "env-filter"] }
|
||||
tracing-subscriber = { version = "0.3.19", features = ["fmt", "env-filter"] }
|
||||
unic-langid = { version = "0.9.6", features = ["macros"] }
|
||||
unic-ucd-category = "0.9.0"
|
||||
unicode-normalization = "0.1.24"
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ fn build_rsbridge(build: &mut Build) -> Result<()> {
|
|||
|
||||
pub fn check_rust(build: &mut Build) -> Result<()> {
|
||||
let inputs = inputs![
|
||||
glob!("{rslib/**,pylib/rsbridge/**,ftl/**,build/**,qt/launcher/**,tools/minilints/**}"),
|
||||
glob!("{rslib/**,pylib/rsbridge/**,ftl/**,build/**,qt/launcher/**}"),
|
||||
"Cargo.lock",
|
||||
"Cargo.toml",
|
||||
"rust-toolchain.toml",
|
||||
|
|
|
|||
|
|
@ -49,46 +49,6 @@ pub trait BuildAction {
|
|||
}
|
||||
|
||||
fn name(&self) -> &'static str {
|
||||
std::any::type_name::<Self>()
|
||||
.split("::")
|
||||
.last()
|
||||
.unwrap()
|
||||
.split('<')
|
||||
.next()
|
||||
.unwrap()
|
||||
std::any::type_name::<Self>().split("::").last().unwrap()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
trait TestBuildAction {}
|
||||
|
||||
#[cfg(test)]
|
||||
impl<T: TestBuildAction + ?Sized> BuildAction for T {
|
||||
fn command(&self) -> &str {
|
||||
"test"
|
||||
}
|
||||
fn files(&mut self, _build: &mut impl FilesHandle) {}
|
||||
}
|
||||
|
||||
#[allow(dead_code, unused_variables)]
|
||||
#[test]
|
||||
fn should_strip_regions_in_type_name() {
|
||||
struct Bare;
|
||||
impl TestBuildAction for Bare {}
|
||||
assert_eq!(Bare {}.name(), "Bare");
|
||||
|
||||
struct WithLifeTime<'a>(&'a str);
|
||||
impl TestBuildAction for WithLifeTime<'_> {}
|
||||
assert_eq!(WithLifeTime("test").name(), "WithLifeTime");
|
||||
|
||||
struct WithMultiLifeTime<'a, 'b>(&'a str, &'b str);
|
||||
impl TestBuildAction for WithMultiLifeTime<'_, '_> {}
|
||||
assert_eq!(
|
||||
WithMultiLifeTime("test", "test").name(),
|
||||
"WithMultiLifeTime"
|
||||
);
|
||||
|
||||
struct WithGeneric<T>(T);
|
||||
impl<T> TestBuildAction for WithGeneric<T> {}
|
||||
assert_eq!(WithGeneric(3).name(), "WithGeneric");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ impl Platform {
|
|||
}
|
||||
|
||||
/// Append .exe to path if on Windows.
|
||||
pub fn with_exe(path: &str) -> Cow<'_, str> {
|
||||
pub fn with_exe(path: &str) -> Cow<str> {
|
||||
if cfg!(windows) {
|
||||
format!("{path}.exe").into()
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ impl BuildAction for YarnInstall<'_> {
|
|||
}
|
||||
}
|
||||
|
||||
fn with_cmd_ext(bin: &str) -> Cow<'_, str> {
|
||||
fn with_cmd_ext(bin: &str) -> Cow<str> {
|
||||
if cfg!(windows) {
|
||||
format!("{bin}.cmd").into()
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -28,11 +28,7 @@ pub fn setup_yarn(args: YarnArgs) {
|
|||
.arg("--ignore-scripts"),
|
||||
);
|
||||
} else {
|
||||
run_command(
|
||||
Command::new(&args.yarn_bin)
|
||||
.arg("install")
|
||||
.arg("--immutable"),
|
||||
);
|
||||
run_command(Command::new(&args.yarn_bin).arg("install"));
|
||||
}
|
||||
|
||||
std::fs::write(args.stamp, b"").unwrap();
|
||||
|
|
|
|||
7532
cargo/licenses.json
7532
cargo/licenses.json
File diff suppressed because it is too large
Load diff
|
|
@ -1,78 +1,35 @@
|
|||
# This is a user-contributed Dockerfile. No official support is available.
|
||||
# This Dockerfile uses three stages.
|
||||
# 1. Compile anki (and dependencies) and build python wheels.
|
||||
# 2. Create a virtual environment containing anki and its dependencies.
|
||||
# 3. Create a final image that only includes anki's virtual environment and required
|
||||
# system packages.
|
||||
|
||||
ARG PYTHON_VERSION="3.9"
|
||||
ARG DEBIAN_FRONTEND="noninteractive"
|
||||
|
||||
FROM ubuntu:24.04 AS build
|
||||
# Build anki.
|
||||
FROM python:$PYTHON_VERSION AS build
|
||||
RUN curl -fsSL https://github.com/bazelbuild/bazelisk/releases/download/v1.7.4/bazelisk-linux-amd64 \
|
||||
> /usr/local/bin/bazel \
|
||||
&& chmod +x /usr/local/bin/bazel \
|
||||
# Bazel expects /usr/bin/python
|
||||
&& ln -s /usr/local/bin/python /usr/bin/python
|
||||
WORKDIR /opt/anki
|
||||
ENV PYTHON_VERSION="3.13"
|
||||
|
||||
|
||||
# System deps
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
curl \
|
||||
git \
|
||||
build-essential \
|
||||
pkg-config \
|
||||
libssl-dev \
|
||||
libbz2-dev \
|
||||
libreadline-dev \
|
||||
libsqlite3-dev \
|
||||
libffi-dev \
|
||||
zlib1g-dev \
|
||||
liblzma-dev \
|
||||
ca-certificates \
|
||||
ninja-build \
|
||||
rsync \
|
||||
libglib2.0-0 \
|
||||
libgl1 \
|
||||
libx11-6 \
|
||||
libxext6 \
|
||||
libxrender1 \
|
||||
libxkbcommon0 \
|
||||
libxkbcommon-x11-0 \
|
||||
libxcb1 \
|
||||
libxcb-render0 \
|
||||
libxcb-shm0 \
|
||||
libxcb-icccm4 \
|
||||
libxcb-image0 \
|
||||
libxcb-keysyms1 \
|
||||
libxcb-randr0 \
|
||||
libxcb-shape0 \
|
||||
libxcb-xfixes0 \
|
||||
libxcb-xinerama0 \
|
||||
libxcb-xinput0 \
|
||||
libsm6 \
|
||||
libice6 \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# install rust with rustup
|
||||
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
|
||||
ENV PATH="/root/.cargo/bin:${PATH}"
|
||||
|
||||
# Install uv and Python 3.13 with uv
|
||||
RUN curl -LsSf https://astral.sh/uv/install.sh | sh \
|
||||
&& ln -s /root/.local/bin/uv /usr/local/bin/uv
|
||||
ENV PATH="/root/.local/bin:${PATH}"
|
||||
|
||||
RUN uv python install ${PYTHON_VERSION} --default
|
||||
|
||||
COPY . .
|
||||
|
||||
COPY . .
|
||||
# Build python wheels.
|
||||
RUN ./tools/build
|
||||
|
||||
|
||||
# Install pre-compiled Anki.
|
||||
FROM python:3.13-slim AS installer
|
||||
FROM python:${PYTHON_VERSION}-slim as installer
|
||||
WORKDIR /opt/anki/
|
||||
COPY --from=build /opt/anki/out/wheels/ wheels/
|
||||
COPY --from=build /opt/anki/wheels/ wheels/
|
||||
# Use virtual environment.
|
||||
RUN python -m venv venv \
|
||||
&& ./venv/bin/python -m pip install --no-cache-dir setuptools wheel \
|
||||
&& ./venv/bin/python -m pip install --no-cache-dir /opt/anki/wheels/*.whl
|
||||
|
||||
|
||||
# We use another build stage here so we don't include the wheels in the final image.
|
||||
FROM python:3.13-slim AS final
|
||||
FROM python:${PYTHON_VERSION}-slim as final
|
||||
COPY --from=installer /opt/anki/venv /opt/anki/venv
|
||||
ENV PATH=/opt/anki/venv/bin:$PATH
|
||||
# Install run-time dependencies.
|
||||
|
|
@ -102,9 +59,9 @@ RUN apt-get update \
|
|||
libxrender1 \
|
||||
libxtst6 \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Add non-root user.
|
||||
RUN useradd --create-home anki
|
||||
USER anki
|
||||
WORKDIR /work
|
||||
ENTRYPOINT ["/opt/anki/venv/bin/anki"]
|
||||
ENTRYPOINT ["/opt/anki/venv/bin/anki"]
|
||||
LABEL maintainer="Jakub Kaczmarzyk <jakub.kaczmarzyk@gmail.com>"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 480ef0da728c7ea3485c58529ae7ee02be3e5dba
|
||||
Subproject commit a599715d3c27ff2eb895c749f3534ab73d83dad1
|
||||
|
|
@ -384,6 +384,8 @@ deck-config-which-deck = Which deck would you like to display options for?
|
|||
deck-config-updating-cards = Updating cards: { $current_cards_count }/{ $total_cards_count }...
|
||||
deck-config-invalid-parameters = The provided FSRS parameters are invalid. Leave them blank to use the default parameters.
|
||||
deck-config-not-enough-history = Insufficient review history to perform this operation.
|
||||
deck-config-unable-to-determine-desired-retention =
|
||||
Unable to determine a minimum recommended retention.
|
||||
deck-config-must-have-400-reviews =
|
||||
{ $count ->
|
||||
[one] Only { $count } review was found.
|
||||
|
|
@ -392,6 +394,7 @@ deck-config-must-have-400-reviews =
|
|||
# Numbers that control how aggressively the FSRS algorithm schedules cards
|
||||
deck-config-weights = FSRS parameters
|
||||
deck-config-compute-optimal-weights = Optimize FSRS parameters
|
||||
deck-config-compute-minimum-recommended-retention = Minimum recommended retention
|
||||
deck-config-optimize-button = Optimize Current Preset
|
||||
# Indicates that a given function or label, provided via the "text" variable, operates slowly.
|
||||
deck-config-slow-suffix = { $text } (slow)
|
||||
|
|
@ -404,6 +407,7 @@ deck-config-historical-retention = Historical retention
|
|||
deck-config-smaller-is-better = Smaller numbers indicate a better fit to your review history.
|
||||
deck-config-steps-too-large-for-fsrs = When FSRS is enabled, steps of 1 day or more are not recommended.
|
||||
deck-config-get-params = Get Params
|
||||
deck-config-predicted-minimum-recommended-retention = Minimum recommended retention: { $num }
|
||||
deck-config-complete = { $num }% complete.
|
||||
deck-config-iterations = Iteration: { $count }...
|
||||
deck-config-reschedule-cards-on-change = Reschedule cards on change
|
||||
|
|
@ -464,7 +468,12 @@ deck-config-compute-optimal-weights-tooltip2 =
|
|||
By default, parameters will be calculated from the review history of all decks using the current preset. You can
|
||||
optionally adjust the search before calculating the parameters, if you'd like to alter which cards are used for
|
||||
optimizing the parameters.
|
||||
|
||||
deck-config-compute-optimal-retention-tooltip4 =
|
||||
This tool will attempt to find the desired retention value
|
||||
that will lead to the most material learnt, in the least amount of time. The calculated number can serve as a reference
|
||||
when deciding what to set your desired retention to. You may wish to choose a higher desired retention if you’re
|
||||
willing to invest more study time to achieve it. Setting your desired retention lower than the minimum
|
||||
is not recommended, as it will lead to a higher workload, because of the high forgetting rate.
|
||||
deck-config-please-save-your-changes-first = Please save your changes first.
|
||||
deck-config-workload-factor-change = Approximate workload: {$factor}x
|
||||
(compared to {$previousDR}% desired retention)
|
||||
|
|
@ -498,7 +507,6 @@ deck-config-desired-retention-below-optimal = Your desired retention is below op
|
|||
# cards that can be recalled or retrieved on a specific date.
|
||||
deck-config-fsrs-simulator-experimental = FSRS Simulator (Experimental)
|
||||
deck-config-fsrs-simulate-desired-retention-experimental = FSRS Desired Retention Simulator (Experimental)
|
||||
deck-config-fsrs-simulate-save-preset = After optimizing, please save your deck preset before running the simulator.
|
||||
deck-config-fsrs-desired-retention-help-me-decide-experimental = Help Me Decide (Experimental)
|
||||
deck-config-additional-new-cards-to-simulate = Additional new cards to simulate
|
||||
deck-config-simulate = Simulate
|
||||
|
|
@ -525,7 +533,7 @@ deck-config-health-check = Check health when optimizing
|
|||
deck-config-fsrs-bad-fit-warning = Health Check:
|
||||
Your memory is difficult for FSRS to predict. Recommendations:
|
||||
|
||||
- Suspend or reformulate any cards you constantly forget.
|
||||
- Suspend or reformulate leeches.
|
||||
- Use the answer buttons consistently. Keep in mind that "Hard" is a passing grade, not a failing grade.
|
||||
- Understand before you memorize.
|
||||
|
||||
|
|
@ -536,16 +544,6 @@ deck-config-fsrs-good-fit = Health Check:
|
|||
|
||||
## NO NEED TO TRANSLATE. This text is no longer used by Anki, and will be removed in the future.
|
||||
|
||||
deck-config-unable-to-determine-desired-retention =
|
||||
Unable to determine a minimum recommended retention.
|
||||
deck-config-predicted-minimum-recommended-retention = Minimum recommended retention: { $num }
|
||||
deck-config-compute-minimum-recommended-retention = Minimum recommended retention
|
||||
deck-config-compute-optimal-retention-tooltip4 =
|
||||
This tool will attempt to find the desired retention value
|
||||
that will lead to the most material learnt, in the least amount of time. The calculated number can serve as a reference
|
||||
when deciding what to set your desired retention to. You may wish to choose a higher desired retention if you’re
|
||||
willing to invest more study time to achieve it. Setting your desired retention lower than the minimum
|
||||
is not recommended, as it will lead to a higher workload, because of the high forgetting rate.
|
||||
deck-config-plotted-on-x-axis = (Plotted on the X-axis)
|
||||
deck-config-a-100-day-interval =
|
||||
{ $days ->
|
||||
|
|
|
|||
|
|
@ -46,20 +46,6 @@ studying-type-answer-unknown-field = Type answer: unknown field { $val }
|
|||
studying-unbury = Unbury
|
||||
studying-what-would-you-like-to-unbury = What would you like to unbury?
|
||||
studying-you-havent-recorded-your-voice-yet = You haven't recorded your voice yet.
|
||||
studying-card-studied-in-minute =
|
||||
{ $cards ->
|
||||
[one] { $cards } card
|
||||
*[other] { $cards } cards
|
||||
} studied in
|
||||
{ $minutes ->
|
||||
[one] { $minutes } minute.
|
||||
*[other] { $minutes } minutes.
|
||||
}
|
||||
studying-question-time-elapsed = Question time elapsed
|
||||
studying-answer-time-elapsed = Answer time elapsed
|
||||
|
||||
## OBSOLETE; you do not need to translate this
|
||||
|
||||
studying-card-studied-in =
|
||||
{ $count ->
|
||||
[one] { $count } card studied in
|
||||
|
|
@ -70,3 +56,5 @@ studying-minute =
|
|||
[one] { $count } minute.
|
||||
*[other] { $count } minutes.
|
||||
}
|
||||
studying-question-time-elapsed = Question time elapsed
|
||||
studying-answer-time-elapsed = Answer time elapsed
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit fd5f984785ad07a0d3dbd893ee3d7e3671eaebd6
|
||||
Subproject commit bb4207f3b8e9a7c428db282d12c75b850be532f3
|
||||
|
|
@ -82,7 +82,6 @@
|
|||
"resolutions": {
|
||||
"canvas": "npm:empty-npm-package@1.0.0",
|
||||
"cookie": "0.7.0",
|
||||
"devalue": "^5.3.2",
|
||||
"vite": "6"
|
||||
},
|
||||
"browserslist": [
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ service CollectionService {
|
|||
rpc LatestProgress(generic.Empty) returns (Progress);
|
||||
rpc SetWantsAbort(generic.Empty) returns (generic.Empty);
|
||||
rpc SetLoadBalancerEnabled(generic.Bool) returns (OpChanges);
|
||||
rpc GetCustomColours(generic.Empty) returns (GetCustomColoursResponse);
|
||||
}
|
||||
|
||||
// Implicitly includes any of the above methods that are not listed in the
|
||||
|
|
@ -164,7 +163,3 @@ message CreateBackupRequest {
|
|||
bool force = 2;
|
||||
bool wait_for_completion = 3;
|
||||
}
|
||||
|
||||
message GetCustomColoursResponse {
|
||||
repeated string colours = 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,9 +27,6 @@ service FrontendService {
|
|||
rpc deckOptionsRequireClose(generic.Empty) returns (generic.Empty);
|
||||
// Warns python that the deck option web view is ready to receive requests.
|
||||
rpc deckOptionsReady(generic.Empty) returns (generic.Empty);
|
||||
|
||||
// Save colour picker's custom colour palette
|
||||
rpc SaveCustomColours(generic.Empty) returns (generic.Empty);
|
||||
}
|
||||
|
||||
service BackendFrontendService {}
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ message AddNoteRequest {
|
|||
}
|
||||
|
||||
message AddNoteResponse {
|
||||
collection.OpChangesWithCount changes = 1;
|
||||
collection.OpChanges changes = 1;
|
||||
int64 note_id = 2;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -74,15 +74,10 @@ message SearchNode {
|
|||
repeated SearchNode nodes = 1;
|
||||
Joiner joiner = 2;
|
||||
}
|
||||
enum FieldSearchMode {
|
||||
FIELD_SEARCH_MODE_NORMAL = 0;
|
||||
FIELD_SEARCH_MODE_REGEX = 1;
|
||||
FIELD_SEARCH_MODE_NOCOMBINING = 2;
|
||||
}
|
||||
message Field {
|
||||
string field_name = 1;
|
||||
string text = 2;
|
||||
FieldSearchMode mode = 3;
|
||||
bool is_re = 3;
|
||||
}
|
||||
|
||||
oneof filter {
|
||||
|
|
|
|||
|
|
@ -528,7 +528,7 @@ class Collection(DeprecatedNamesMixin):
|
|||
def new_note(self, notetype: NotetypeDict) -> Note:
|
||||
return Note(self, notetype)
|
||||
|
||||
def add_note(self, note: Note, deck_id: DeckId) -> OpChangesWithCount:
|
||||
def add_note(self, note: Note, deck_id: DeckId) -> OpChanges:
|
||||
hooks.note_will_be_added(self, note, deck_id)
|
||||
out = self._backend.add_note(note=note._to_backend_note(), deck_id=deck_id)
|
||||
note.id = NoteId(out.note_id)
|
||||
|
|
|
|||
|
|
@ -175,8 +175,8 @@ class MnemoFact:
|
|||
def fact_view(self) -> type[MnemoFactView]:
|
||||
try:
|
||||
fact_view = self.cards[0].fact_view_id
|
||||
except IndexError:
|
||||
return FrontOnly
|
||||
except IndexError as err:
|
||||
raise Exception(f"Fact {id} has no cards") from err
|
||||
|
||||
if fact_view.startswith("1.") or fact_view.startswith("1::"):
|
||||
return FrontOnly
|
||||
|
|
@ -187,7 +187,7 @@ class MnemoFact:
|
|||
elif fact_view.startswith("5.1"):
|
||||
return Cloze
|
||||
|
||||
raise Exception(f"Fact {self.id} has unknown fact view: {fact_view}")
|
||||
raise Exception(f"Fact {id} has unknown fact view: {fact_view}")
|
||||
|
||||
def anki_fields(self, fact_view: type[MnemoFactView]) -> list[str]:
|
||||
return [munge_field(self.fields.get(k, "")) for k in fact_view.field_keys]
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ from anki._legacy import DeprecatedNamesMixinForModule
|
|||
TR = anki._fluent.LegacyTranslationEnum
|
||||
FormatTimeSpan = _pb.FormatTimespanRequest
|
||||
|
||||
# When adding new languages here, check lang_to_disk_lang() below
|
||||
|
||||
langs = sorted(
|
||||
[
|
||||
("Afrikaans", "af_ZA"),
|
||||
|
|
@ -38,7 +38,6 @@ langs = sorted(
|
|||
("Italiano", "it_IT"),
|
||||
("lo jbobau", "jbo_EN"),
|
||||
("Lenga d'òc", "oc_FR"),
|
||||
("Қазақша", "kk_KZ"),
|
||||
("Magyar", "hu_HU"),
|
||||
("Nederlands", "nl_NL"),
|
||||
("Norsk", "nb_NO"),
|
||||
|
|
@ -65,7 +64,6 @@ langs = sorted(
|
|||
("Українська мова", "uk_UA"),
|
||||
("Հայերեն", "hy_AM"),
|
||||
("עִבְרִית", "he_IL"),
|
||||
("ייִדיש", "yi"),
|
||||
("العربية", "ar_SA"),
|
||||
("فارسی", "fa_IR"),
|
||||
("ภาษาไทย", "th_TH"),
|
||||
|
|
@ -106,7 +104,6 @@ compatMap = {
|
|||
"it": "it_IT",
|
||||
"ja": "ja_JP",
|
||||
"jbo": "jbo_EN",
|
||||
"kk": "kk_KZ",
|
||||
"ko": "ko_KR",
|
||||
"la": "la_LA",
|
||||
"mn": "mn_MN",
|
||||
|
|
@ -129,7 +126,6 @@ compatMap = {
|
|||
"uk": "uk_UA",
|
||||
"uz": "uz_UZ",
|
||||
"vi": "vi_VN",
|
||||
"yi": "yi",
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -237,7 +233,7 @@ def get_def_lang(user_lang: str | None = None) -> tuple[int, str]:
|
|||
|
||||
|
||||
def is_rtl(lang: str) -> bool:
|
||||
return lang in ("he", "ar", "fa", "ug", "yi")
|
||||
return lang in ("he", "ar", "fa", "ug")
|
||||
|
||||
|
||||
# strip off unicode isolation markers from a translated string
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ def test_find_cards():
|
|||
note = col.newNote()
|
||||
note["Front"] = "cat"
|
||||
note["Back"] = "sheep"
|
||||
note.tags.append("conjunção größte")
|
||||
col.addNote(note)
|
||||
catCard = note.cards()[0]
|
||||
m = col.models.current()
|
||||
|
|
@ -69,8 +68,6 @@ def test_find_cards():
|
|||
col.tags.bulk_remove(col.db.list("select id from notes"), "foo")
|
||||
assert len(col.find_cards("tag:foo")) == 0
|
||||
assert len(col.find_cards("tag:bar")) == 5
|
||||
assert len(col.find_cards("tag:conjuncao tag:groste")) == 0
|
||||
assert len(col.find_cards("tag:nc:conjuncao tag:nc:groste")) == 1
|
||||
# text searches
|
||||
assert len(col.find_cards("cat")) == 2
|
||||
assert len(col.find_cards("cat -dog")) == 1
|
||||
|
|
|
|||
|
|
@ -226,7 +226,6 @@ def show(mw: aqt.AnkiQt) -> QDialog:
|
|||
"Anon_0000",
|
||||
"Bilolbek Normuminov",
|
||||
"Sagiv Marzini",
|
||||
"Zhanibek Rassululy",
|
||||
)
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ from collections.abc import Callable
|
|||
import aqt.editor
|
||||
import aqt.forms
|
||||
from anki._legacy import deprecated
|
||||
from anki.collection import OpChanges, OpChangesWithCount, SearchNode
|
||||
from anki.collection import OpChanges, SearchNode
|
||||
from anki.decks import DeckId
|
||||
from anki.models import NotetypeId
|
||||
from anki.notes import Note, NoteFieldsCheckResult, NoteId
|
||||
|
|
@ -294,13 +294,13 @@ class AddCards(QMainWindow):
|
|||
|
||||
target_deck_id = self.deck_chooser.selected_deck_id
|
||||
|
||||
def on_success(changes: OpChangesWithCount) -> None:
|
||||
def on_success(changes: OpChanges) -> None:
|
||||
# only used for detecting changed sticky fields on close
|
||||
self._last_added_note = note
|
||||
|
||||
self.addHistory(note)
|
||||
|
||||
tooltip(tr.importing_cards_added(count=changes.count), period=500)
|
||||
tooltip(tr.adding_added(), period=500)
|
||||
av_player.stop_and_clear_queue()
|
||||
self._load_new_note(sticky_fields_from=note)
|
||||
gui_hooks.add_cards_did_add_note(note)
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ import aqt.browser
|
|||
from anki.cards import Card
|
||||
from anki.collection import Config
|
||||
from anki.tags import MARKED_TAG
|
||||
from aqt import AnkiQt, gui_hooks, is_mac
|
||||
from aqt import AnkiQt, gui_hooks
|
||||
from aqt.qt import (
|
||||
QCheckBox,
|
||||
QDialog,
|
||||
|
|
@ -81,15 +81,10 @@ class Previewer(QDialog):
|
|||
qconnect(self.finished, self._on_finished)
|
||||
self.silentlyClose = True
|
||||
self.vbox = QVBoxLayout()
|
||||
spacing = 6
|
||||
self.vbox.setContentsMargins(0, 0, 0, 0)
|
||||
self.vbox.setSpacing(spacing)
|
||||
self._web: AnkiWebView | None = AnkiWebView(kind=AnkiWebViewKind.PREVIEWER)
|
||||
self.vbox.addWidget(self._web)
|
||||
self.bbox = QDialogButtonBox()
|
||||
self.bbox.setContentsMargins(
|
||||
spacing, spacing if is_mac else 0, spacing, spacing
|
||||
)
|
||||
self.bbox.setLayoutDirection(Qt.LayoutDirection.LeftToRight)
|
||||
|
||||
gui_hooks.card_review_webview_did_init(self._web, AnkiWebViewKind.PREVIEWER)
|
||||
|
|
|
|||
BIN
qt/aqt/data/qt/icons/media-record.png
Normal file
BIN
qt/aqt/data/qt/icons/media-record.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 727 B |
|
|
@ -1,27 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="21" height="21" viewBox="0 0 21 21" version="1.1"
|
||||
xmlns="http://www.w3.org/2000/svg">
|
||||
<g id="Layer-1" transform="translate(0.5,0.5)">
|
||||
<rect x="0" y="0" width="20" height="20" fill="none"/>
|
||||
<g transform="translate(14.8974,6.3648)">
|
||||
<path d="M0,0C0,3.403 -2.042,6.161 -4.56,6.161C-7.078,6.161 -9.12,3.403 -9.12,0C-9.12,-3.403 -7.078,-6.161 -4.56,-6.161C-2.042,-6.161 0,-3.403 0,0"
|
||||
fill="black" fill-rule="nonzero"/>
|
||||
</g>
|
||||
<g transform="matrix(0,-1,-1,0,10.3374,1.8048)">
|
||||
<ellipse cx="-4.56" cy="0" rx="6.161" ry="4.56"
|
||||
fill="none" stroke="black" stroke-width="0.25"/>
|
||||
</g>
|
||||
<g transform="translate(3.1987,14.4958)">
|
||||
<path d="M0,-9.484C-0.76,-4.212 3.287,0 7.12,-0.046C10.864,-0.09 14.742,-4.199 14.076,-9.343"
|
||||
fill="none" stroke="black" stroke-width="2" fill-rule="nonzero"/>
|
||||
</g>
|
||||
<g transform="matrix(-1,0,0,1,20.573,18.613)">
|
||||
<rect x="5.387" y="0.601" width="9.799" height="0.185"
|
||||
fill="none" stroke="black" stroke-width="2"/>
|
||||
</g>
|
||||
<g transform="matrix(-1,0,0,1,20.741,13.51)">
|
||||
<rect x="9.899" y="1.163" width="0.943" height="4.164"
|
||||
fill="none" stroke="black" stroke-width="2"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.3 KiB |
|
|
@ -151,7 +151,6 @@ class Editor:
|
|||
self.add_webview()
|
||||
self.setupWeb()
|
||||
self.setupShortcuts()
|
||||
self.setupColourPalette()
|
||||
gui_hooks.editor_did_init(self)
|
||||
|
||||
# Initial setup
|
||||
|
|
@ -350,14 +349,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
|
|||
keys, fn, _ = row
|
||||
QShortcut(QKeySequence(keys), self.widget, activated=fn) # type: ignore
|
||||
|
||||
def setupColourPalette(self) -> None:
|
||||
if not (colors := self.mw.col.get_config("customColorPickerPalette")):
|
||||
return
|
||||
for i, colour in enumerate(colors[: QColorDialog.customCount()]):
|
||||
if not QColor.isValidColorName(colour):
|
||||
continue
|
||||
QColorDialog.setCustomColor(i, QColor.fromString(colour))
|
||||
|
||||
def _addFocusCheck(self, fn: Callable) -> Callable:
|
||||
def checkFocus() -> None:
|
||||
if self.currentField is None:
|
||||
|
|
|
|||
|
|
@ -170,42 +170,13 @@ def favicon() -> Response:
|
|||
|
||||
def _mime_for_path(path: str) -> str:
|
||||
"Mime type for provided path/filename."
|
||||
|
||||
_, ext = os.path.splitext(path)
|
||||
ext = ext.lower()
|
||||
|
||||
# Badly-behaved apps on Windows can alter the standard mime types in the registry, which can completely
|
||||
# break Anki's UI. So we hard-code the most common extensions.
|
||||
mime_types = {
|
||||
".css": "text/css",
|
||||
".js": "application/javascript",
|
||||
".mjs": "application/javascript",
|
||||
".html": "text/html",
|
||||
".htm": "text/html",
|
||||
".svg": "image/svg+xml",
|
||||
".png": "image/png",
|
||||
".jpg": "image/jpeg",
|
||||
".jpeg": "image/jpeg",
|
||||
".gif": "image/gif",
|
||||
".webp": "image/webp",
|
||||
".ico": "image/x-icon",
|
||||
".json": "application/json",
|
||||
".woff": "font/woff",
|
||||
".woff2": "font/woff2",
|
||||
".ttf": "font/ttf",
|
||||
".otf": "font/otf",
|
||||
".mp3": "audio/mpeg",
|
||||
".mp4": "video/mp4",
|
||||
".webm": "video/webm",
|
||||
".ogg": "audio/ogg",
|
||||
".pdf": "application/pdf",
|
||||
".txt": "text/plain",
|
||||
}
|
||||
|
||||
if mime := mime_types.get(ext):
|
||||
return mime
|
||||
if path.endswith(".css"):
|
||||
# some users may have invalid mime type in the Windows registry
|
||||
return "text/css"
|
||||
elif path.endswith(".js") or path.endswith(".mjs"):
|
||||
return "application/javascript"
|
||||
else:
|
||||
# fallback to mimetypes, which may consult the registry
|
||||
# autodetect
|
||||
mime, _encoding = mimetypes.guess_type(path)
|
||||
return mime or "application/octet-stream"
|
||||
|
||||
|
|
@ -512,7 +483,7 @@ def update_deck_configs() -> bytes:
|
|||
update.abort = True
|
||||
|
||||
def on_success(changes: OpChanges) -> None:
|
||||
if isinstance(window := aqt.mw.app.activeModalWidget(), DeckOptionsDialog):
|
||||
if isinstance(window := aqt.mw.app.activeWindow(), DeckOptionsDialog):
|
||||
window.reject()
|
||||
|
||||
def handle_on_main() -> None:
|
||||
|
|
@ -540,7 +511,7 @@ def set_scheduling_states() -> bytes:
|
|||
|
||||
def import_done() -> bytes:
|
||||
def update_window_modality() -> None:
|
||||
if window := aqt.mw.app.activeModalWidget():
|
||||
if window := aqt.mw.app.activeWindow():
|
||||
from aqt.import_export.import_dialog import ImportDialog
|
||||
|
||||
if isinstance(window, ImportDialog):
|
||||
|
|
@ -558,7 +529,7 @@ def import_request(endpoint: str) -> bytes:
|
|||
response.ParseFromString(output)
|
||||
|
||||
def handle_on_main() -> None:
|
||||
window = aqt.mw.app.activeModalWidget()
|
||||
window = aqt.mw.app.activeWindow()
|
||||
on_op_finished(aqt.mw, response, window)
|
||||
|
||||
aqt.mw.taskman.run_on_main(handle_on_main)
|
||||
|
|
@ -598,7 +569,7 @@ def change_notetype() -> bytes:
|
|||
data = request.data
|
||||
|
||||
def handle_on_main() -> None:
|
||||
window = aqt.mw.app.activeModalWidget()
|
||||
window = aqt.mw.app.activeWindow()
|
||||
if isinstance(window, ChangeNotetypeDialog):
|
||||
window.save(data)
|
||||
|
||||
|
|
@ -608,7 +579,7 @@ def change_notetype() -> bytes:
|
|||
|
||||
def deck_options_require_close() -> bytes:
|
||||
def handle_on_main() -> None:
|
||||
window = aqt.mw.app.activeModalWidget()
|
||||
window = aqt.mw.app.activeWindow()
|
||||
if isinstance(window, DeckOptionsDialog):
|
||||
window.require_close()
|
||||
|
||||
|
|
@ -620,7 +591,7 @@ def deck_options_require_close() -> bytes:
|
|||
|
||||
def deck_options_ready() -> bytes:
|
||||
def handle_on_main() -> None:
|
||||
window = aqt.mw.app.activeModalWidget()
|
||||
window = aqt.mw.app.activeWindow()
|
||||
if isinstance(window, DeckOptionsDialog):
|
||||
window.set_ready()
|
||||
|
||||
|
|
@ -628,15 +599,6 @@ def deck_options_ready() -> bytes:
|
|||
return b""
|
||||
|
||||
|
||||
def save_custom_colours() -> bytes:
|
||||
colors = [
|
||||
QColorDialog.customColor(i).name(QColor.NameFormat.HexRgb)
|
||||
for i in range(QColorDialog.customCount())
|
||||
]
|
||||
aqt.mw.col.set_config("customColorPickerPalette", colors)
|
||||
return b""
|
||||
|
||||
|
||||
post_handler_list = [
|
||||
congrats_info,
|
||||
get_deck_configs_for_update,
|
||||
|
|
@ -652,14 +614,12 @@ post_handler_list = [
|
|||
search_in_browser,
|
||||
deck_options_require_close,
|
||||
deck_options_ready,
|
||||
save_custom_colours,
|
||||
]
|
||||
|
||||
|
||||
exposed_backend_list = [
|
||||
# CollectionService
|
||||
"latest_progress",
|
||||
"get_custom_colours",
|
||||
# DeckService
|
||||
"get_deck_names",
|
||||
# I18nService
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ def add_note(
|
|||
parent: QWidget,
|
||||
note: Note,
|
||||
target_deck_id: DeckId,
|
||||
) -> CollectionOp[OpChangesWithCount]:
|
||||
) -> CollectionOp[OpChanges]:
|
||||
return CollectionOp(parent, lambda col: col.add_note(note, target_deck_id))
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ import aqt.browser
|
|||
import aqt.operations
|
||||
from anki.cards import Card, CardId
|
||||
from anki.collection import Config, OpChanges, OpChangesWithCount
|
||||
from anki.lang import with_collapsed_whitespace
|
||||
from anki.scheduler.base import ScheduleCardsAsNew
|
||||
from anki.scheduler.v3 import (
|
||||
CardAnswer,
|
||||
|
|
@ -967,15 +966,11 @@ timerStopped = false;
|
|||
elapsed = self.mw.col.timeboxReached()
|
||||
if elapsed:
|
||||
assert not isinstance(elapsed, bool)
|
||||
cards_val = elapsed[1]
|
||||
minutes_val = int(round(elapsed[0] / 60))
|
||||
message = with_collapsed_whitespace(
|
||||
tr.studying_card_studied_in_minute(
|
||||
cards=cards_val, minutes=str(minutes_val)
|
||||
)
|
||||
)
|
||||
part1 = tr.studying_card_studied_in(count=elapsed[1])
|
||||
mins = int(round(elapsed[0] / 60))
|
||||
part2 = tr.studying_minute(count=mins)
|
||||
fin = tr.studying_finish()
|
||||
diag = askUserDialog(message, [tr.studying_continue(), fin])
|
||||
diag = askUserDialog(f"{part1} {part2}", [tr.studying_continue(), fin])
|
||||
diag.setIcon(QMessageBox.Icon.Information)
|
||||
if diag.run() == fin:
|
||||
self.mw.moveToState("deckBrowser")
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ from aqt._macos_helper import macos_helper
|
|||
from aqt.mpv import MPV, MPVBase, MPVCommandError
|
||||
from aqt.qt import *
|
||||
from aqt.taskman import TaskManager
|
||||
from aqt.theme import theme_manager
|
||||
from aqt.utils import (
|
||||
disable_help_button,
|
||||
restoreGeom,
|
||||
|
|
@ -631,44 +630,18 @@ class QtAudioInputRecorder(Recorder):
|
|||
self.mw = mw
|
||||
self._parent = parent
|
||||
|
||||
from PyQt6.QtMultimedia import QAudioSource, QMediaDevices # type: ignore
|
||||
from PyQt6.QtMultimedia import QAudioFormat, QAudioSource # type: ignore
|
||||
|
||||
# Get the default audio input device
|
||||
device = QMediaDevices.defaultAudioInput()
|
||||
format = QAudioFormat()
|
||||
format.setChannelCount(2)
|
||||
format.setSampleRate(44100)
|
||||
format.setSampleFormat(QAudioFormat.SampleFormat.Int16)
|
||||
|
||||
# Try to use Int16 format first (avoids conversion)
|
||||
preferred_format = device.preferredFormat()
|
||||
int16_format = preferred_format
|
||||
int16_format.setSampleFormat(preferred_format.SampleFormat.Int16)
|
||||
source = QAudioSource(format, parent)
|
||||
|
||||
if device.isFormatSupported(int16_format):
|
||||
# Use Int16 if supported
|
||||
format = int16_format
|
||||
else:
|
||||
# Fall back to device's preferred format
|
||||
format = preferred_format
|
||||
|
||||
# Create the audio source with the chosen format
|
||||
source = QAudioSource(device, format, parent)
|
||||
|
||||
# Store the actual format being used
|
||||
self._format = source.format()
|
||||
self._audio_input = source
|
||||
|
||||
def _convert_float_to_int16(self, float_buffer: bytearray) -> bytes:
|
||||
"""Convert float32 audio samples to int16 format for WAV output."""
|
||||
import struct
|
||||
|
||||
float_count = len(float_buffer) // 4 # 4 bytes per float32
|
||||
floats = struct.unpack(f"{float_count}f", float_buffer)
|
||||
|
||||
# Convert to int16 range, clipping and scaling in one step
|
||||
int16_samples = [
|
||||
max(-32768, min(32767, int(max(-1.0, min(1.0, f)) * 32767))) for f in floats
|
||||
]
|
||||
|
||||
return struct.pack(f"{len(int16_samples)}h", *int16_samples)
|
||||
|
||||
def start(self, on_done: Callable[[], None]) -> None:
|
||||
self._iodevice = self._audio_input.start()
|
||||
self._buffer = bytearray()
|
||||
|
|
@ -691,32 +664,18 @@ class QtAudioInputRecorder(Recorder):
|
|||
return
|
||||
|
||||
def write_file() -> None:
|
||||
from PyQt6.QtMultimedia import QAudioFormat
|
||||
|
||||
# swallow the first 300ms to allow audio device to quiesce
|
||||
bytes_per_frame = self._format.bytesPerFrame()
|
||||
frames_to_skip = int(self._format.sampleRate() * self.STARTUP_DELAY)
|
||||
bytes_to_skip = frames_to_skip * bytes_per_frame
|
||||
|
||||
if len(self._buffer) <= bytes_to_skip:
|
||||
wait = int(44100 * self.STARTUP_DELAY)
|
||||
if len(self._buffer) <= wait:
|
||||
return
|
||||
self._buffer = self._buffer[bytes_to_skip:]
|
||||
self._buffer = self._buffer[wait:]
|
||||
|
||||
# Check if we need to convert float samples to int16
|
||||
if self._format.sampleFormat() == QAudioFormat.SampleFormat.Float:
|
||||
audio_data = self._convert_float_to_int16(self._buffer)
|
||||
sample_width = 2 # int16 is 2 bytes
|
||||
else:
|
||||
# For integer formats, use the data as-is
|
||||
audio_data = bytes(self._buffer)
|
||||
sample_width = self._format.bytesPerSample()
|
||||
|
||||
# write out the wave file with the correct format parameters
|
||||
# write out the wave file
|
||||
wf = wave.open(self.output_path, "wb")
|
||||
wf.setnchannels(self._format.channelCount())
|
||||
wf.setsampwidth(sample_width)
|
||||
wf.setsampwidth(2)
|
||||
wf.setframerate(self._format.sampleRate())
|
||||
wf.writeframes(audio_data)
|
||||
wf.writeframes(self._buffer)
|
||||
wf.close()
|
||||
|
||||
def and_then(fut: Future) -> None:
|
||||
|
|
@ -784,8 +743,7 @@ class RecordDialog(QDialog):
|
|||
def _setup_dialog(self) -> None:
|
||||
self.setWindowTitle("Anki")
|
||||
icon = QLabel()
|
||||
qicon = theme_manager.icon_from_resources("icons:media-record.svg")
|
||||
icon.setPixmap(qicon.pixmap(60, 60))
|
||||
icon.setPixmap(QPixmap("icons:media-record.png"))
|
||||
self.label = QLabel("...")
|
||||
hbox = QHBoxLayout()
|
||||
hbox.addWidget(icon)
|
||||
|
|
|
|||
|
|
@ -180,7 +180,7 @@ class CustomStyles:
|
|||
QPushButton {{
|
||||
margin: 1px;
|
||||
}}
|
||||
QPushButton:focus, QPushButton:default:hover {{
|
||||
QPushButton:focus {{
|
||||
border: 2px solid {tm.var(colors.BORDER_FOCUS)};
|
||||
outline: none;
|
||||
margin: 0px;
|
||||
|
|
@ -199,6 +199,9 @@ class CustomStyles:
|
|||
)
|
||||
};
|
||||
}}
|
||||
QPushButton:default:hover {{
|
||||
border-width: 2px;
|
||||
}}
|
||||
QPushButton:pressed,
|
||||
QPushButton:checked,
|
||||
QSpinBox::up-button:pressed,
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ def handle_sync_error(mw: aqt.main.AnkiQt, err: Exception) -> None:
|
|||
elif isinstance(err, Interrupted):
|
||||
# no message to show
|
||||
return
|
||||
show_warning(str(err), parent=mw)
|
||||
show_warning(str(err))
|
||||
|
||||
|
||||
def on_normal_sync_timer(mw: aqt.main.AnkiQt) -> None:
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ class ThemeManager:
|
|||
# Workaround for Qt bug. First attempt was percent-escaping the chars,
|
||||
# but Qt can't handle that.
|
||||
# https://forum.qt.io/topic/55274/solved-qss-with-special-characters/11
|
||||
path = re.sub(r"(['\u00A1-\u00FF])", r"\\\1", path)
|
||||
path = re.sub(r"([\u00A1-\u00FF])", r"\\\1", path)
|
||||
return path
|
||||
|
||||
def icon_from_resources(self, path: str | ColoredIcon) -> QIcon:
|
||||
|
|
|
|||
|
|
@ -226,45 +226,29 @@ def ask_user_dialog(
|
|||
)
|
||||
|
||||
|
||||
def show_info(
|
||||
text: str,
|
||||
callback: Callable | None = None,
|
||||
parent: QWidget | None = None,
|
||||
**kwargs: Any,
|
||||
) -> MessageBox:
|
||||
def show_info(text: str, callback: Callable | None = None, **kwargs: Any) -> MessageBox:
|
||||
"Show a small info window with an OK button."
|
||||
if "icon" not in kwargs:
|
||||
kwargs["icon"] = QMessageBox.Icon.Information
|
||||
return MessageBox(
|
||||
text,
|
||||
callback=(lambda _: callback()) if callback is not None else None,
|
||||
parent=parent,
|
||||
**kwargs,
|
||||
)
|
||||
|
||||
|
||||
def show_warning(
|
||||
text: str,
|
||||
callback: Callable | None = None,
|
||||
parent: QWidget | None = None,
|
||||
**kwargs: Any,
|
||||
text: str, callback: Callable | None = None, **kwargs: Any
|
||||
) -> MessageBox:
|
||||
"Show a small warning window with an OK button."
|
||||
return show_info(
|
||||
text, icon=QMessageBox.Icon.Warning, callback=callback, parent=parent, **kwargs
|
||||
)
|
||||
return show_info(text, icon=QMessageBox.Icon.Warning, callback=callback, **kwargs)
|
||||
|
||||
|
||||
def show_critical(
|
||||
text: str,
|
||||
callback: Callable | None = None,
|
||||
parent: QWidget | None = None,
|
||||
**kwargs: Any,
|
||||
text: str, callback: Callable | None = None, **kwargs: Any
|
||||
) -> MessageBox:
|
||||
"Show a small critical error window with an OK button."
|
||||
return show_info(
|
||||
text, icon=QMessageBox.Icon.Critical, callback=callback, parent=parent, **kwargs
|
||||
)
|
||||
return show_info(text, icon=QMessageBox.Icon.Critical, callback=callback, **kwargs)
|
||||
|
||||
|
||||
def showWarning(
|
||||
|
|
|
|||
|
|
@ -30,12 +30,6 @@ lipo -create \
|
|||
-output "$APP_LAUNCHER/Contents/MacOS/launcher"
|
||||
cp "$OUTPUT_DIR/uv" "$APP_LAUNCHER/Contents/MacOS/"
|
||||
|
||||
# Build install_name_tool stub
|
||||
clang -arch arm64 -o "$OUTPUT_DIR/stub_arm64" stub.c
|
||||
clang -arch x86_64 -o "$OUTPUT_DIR/stub_x86_64" stub.c
|
||||
lipo -create "$OUTPUT_DIR/stub_arm64" "$OUTPUT_DIR/stub_x86_64" -output "$APP_LAUNCHER/Contents/MacOS/install_name_tool"
|
||||
rm "$OUTPUT_DIR/stub_arm64" "$OUTPUT_DIR/stub_x86_64"
|
||||
|
||||
# Copy support files
|
||||
ANKI_VERSION=$(cat ../../../.version | tr -d '\n')
|
||||
sed "s/ANKI_VERSION/$ANKI_VERSION/g" Info.plist > "$APP_LAUNCHER/Contents/Info.plist"
|
||||
|
|
@ -46,7 +40,7 @@ cp ../versions.py "$APP_LAUNCHER/Contents/Resources/"
|
|||
|
||||
# Codesign/bundle
|
||||
if [ -z "$NODMG" ]; then
|
||||
for i in "$APP_LAUNCHER/Contents/MacOS/uv" "$APP_LAUNCHER/Contents/MacOS/install_name_tool" "$APP_LAUNCHER/Contents/MacOS/launcher" "$APP_LAUNCHER"; do
|
||||
for i in "$APP_LAUNCHER/Contents/MacOS/uv" "$APP_LAUNCHER/Contents/MacOS/launcher" "$APP_LAUNCHER"; do
|
||||
codesign --force -vvvv -o runtime -s "Developer ID Application:" \
|
||||
--entitlements entitlements.python.xml \
|
||||
"$i"
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
// Copyright: Ankitects Pty Ltd and contributors
|
||||
// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
||||
|
||||
int main(void) {
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -51,8 +51,6 @@ struct State {
|
|||
previous_version: Option<String>,
|
||||
resources_dir: std::path::PathBuf,
|
||||
venv_folder: std::path::PathBuf,
|
||||
/// system Python + PyQt6 library mode
|
||||
system_qt: bool,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
|
|
@ -90,13 +88,9 @@ fn main() {
|
|||
}
|
||||
|
||||
fn run() -> Result<()> {
|
||||
let uv_install_root = if let Ok(custom_root) = std::env::var("ANKI_LAUNCHER_VENV_ROOT") {
|
||||
std::path::PathBuf::from(custom_root)
|
||||
} else {
|
||||
dirs::data_local_dir()
|
||||
.context("Unable to determine data_dir")?
|
||||
.join("AnkiProgramFiles")
|
||||
};
|
||||
let uv_install_root = dirs::data_local_dir()
|
||||
.context("Unable to determine data_dir")?
|
||||
.join("AnkiProgramFiles");
|
||||
|
||||
let (exe_dir, resources_dir) = get_exe_and_resources_dirs()?;
|
||||
|
||||
|
|
@ -119,8 +113,6 @@ fn run() -> Result<()> {
|
|||
mirror_path: uv_install_root.join("mirror"),
|
||||
pyproject_modified_by_user: false, // calculated later
|
||||
previous_version: None,
|
||||
system_qt: (cfg!(unix) && !cfg!(target_os = "macos"))
|
||||
&& resources_dir.join("system_qt").exists(),
|
||||
resources_dir,
|
||||
venv_folder: uv_install_root.join(".venv"),
|
||||
};
|
||||
|
|
@ -201,8 +193,8 @@ fn extract_aqt_version(state: &State) -> Option<String> {
|
|||
return None;
|
||||
}
|
||||
|
||||
let output = uv_command(state)
|
||||
.ok()?
|
||||
let output = Command::new(&state.uv_path)
|
||||
.current_dir(&state.uv_install_root)
|
||||
.env("VIRTUAL_ENV", &state.venv_folder)
|
||||
.args(["pip", "show", "aqt"])
|
||||
.output()
|
||||
|
|
@ -269,45 +261,34 @@ fn handle_version_install_or_update(state: &State, choice: MainMenuChoice) -> Re
|
|||
None
|
||||
};
|
||||
|
||||
// Prepare to sync the venv
|
||||
let mut command = uv_command(state)?;
|
||||
let have_venv = state.venv_folder.exists();
|
||||
if cfg!(target_os = "macos") && !have_developer_tools() && !have_venv {
|
||||
println!("If you see a pop-up about 'install_name_tool', you can cancel it, and ignore the warning below.\n");
|
||||
}
|
||||
|
||||
if cfg!(target_os = "macos") {
|
||||
// remove CONDA_PREFIX/bin from PATH to avoid conda interference
|
||||
if let Ok(conda_prefix) = std::env::var("CONDA_PREFIX") {
|
||||
if let Ok(current_path) = std::env::var("PATH") {
|
||||
let conda_bin = format!("{conda_prefix}/bin");
|
||||
let filtered_paths: Vec<&str> = current_path
|
||||
.split(':')
|
||||
.filter(|&path| path != conda_bin)
|
||||
.collect();
|
||||
let new_path = filtered_paths.join(":");
|
||||
command.env("PATH", new_path);
|
||||
}
|
||||
}
|
||||
// put our fake install_name_tool at the top of the path to override
|
||||
// potential conflicts
|
||||
if let Ok(current_path) = std::env::var("PATH") {
|
||||
let exe_dir = std::env::current_exe()
|
||||
.ok()
|
||||
.and_then(|exe| exe.parent().map(|p| p.to_path_buf()));
|
||||
if let Some(exe_dir) = exe_dir {
|
||||
let new_path = format!("{}:{}", exe_dir.display(), current_path);
|
||||
command.env("PATH", new_path);
|
||||
}
|
||||
// Prepare to sync the venv
|
||||
let mut command = Command::new(&state.uv_path);
|
||||
command.current_dir(&state.uv_install_root);
|
||||
|
||||
// remove UV_* environment variables to avoid interference
|
||||
for (key, _) in std::env::vars() {
|
||||
if key.starts_with("UV_") || key == "VIRTUAL_ENV" {
|
||||
command.env_remove(key);
|
||||
}
|
||||
}
|
||||
|
||||
// Create venv with system site packages if system Qt is enabled
|
||||
if state.system_qt {
|
||||
let mut venv_command = uv_command(state)?;
|
||||
venv_command.args([
|
||||
"venv",
|
||||
"--no-managed-python",
|
||||
"--system-site-packages",
|
||||
"--no-config",
|
||||
]);
|
||||
venv_command.ensure_success()?;
|
||||
// remove CONDA_PREFIX/bin from PATH to avoid conda interference
|
||||
#[cfg(target_os = "macos")]
|
||||
if let Ok(conda_prefix) = std::env::var("CONDA_PREFIX") {
|
||||
if let Ok(current_path) = std::env::var("PATH") {
|
||||
let conda_bin = format!("{conda_prefix}/bin");
|
||||
let filtered_paths: Vec<&str> = current_path
|
||||
.split(':')
|
||||
.filter(|&path| path != conda_bin)
|
||||
.collect();
|
||||
let new_path = filtered_paths.join(":");
|
||||
command.env("PATH", new_path);
|
||||
}
|
||||
}
|
||||
|
||||
command
|
||||
|
|
@ -316,18 +297,12 @@ fn handle_version_install_or_update(state: &State, choice: MainMenuChoice) -> Re
|
|||
.env(
|
||||
"UV_HTTP_TIMEOUT",
|
||||
std::env::var("UV_HTTP_TIMEOUT").unwrap_or_else(|_| "180".to_string()),
|
||||
);
|
||||
)
|
||||
.args(["sync", "--upgrade", "--managed-python", "--no-config"]);
|
||||
|
||||
command.args(["sync", "--upgrade", "--no-config"]);
|
||||
if !state.system_qt {
|
||||
command.arg("--managed-python");
|
||||
}
|
||||
|
||||
// Add python version if .python-version file exists (but not for system Qt)
|
||||
// Add python version if .python-version file exists
|
||||
if let Some(version) = &python_version_trimmed {
|
||||
if !state.system_qt {
|
||||
command.args(["--python", version]);
|
||||
}
|
||||
command.args(["--python", version]);
|
||||
}
|
||||
|
||||
if state.no_cache_marker.exists() {
|
||||
|
|
@ -683,8 +658,9 @@ fn filter_and_normalize_versions(
|
|||
fn fetch_versions(state: &State) -> Result<Vec<String>> {
|
||||
let versions_script = state.resources_dir.join("versions.py");
|
||||
|
||||
let mut cmd = uv_command(state)?;
|
||||
cmd.args(["run", "--no-project", "--no-config", "--managed-python"])
|
||||
let mut cmd = Command::new(&state.uv_path);
|
||||
cmd.current_dir(&state.uv_install_root)
|
||||
.args(["run", "--no-project", "--no-config", "--managed-python"])
|
||||
.args(["--with", "pip-system-certs,requests[socks]"]);
|
||||
|
||||
let python_version = read_file(&state.dist_python_version_path)?;
|
||||
|
|
@ -750,20 +726,9 @@ fn apply_version_kind(version_kind: &VersionKind, state: &State) -> Result<()> {
|
|||
),
|
||||
};
|
||||
|
||||
let final_content = if state.system_qt {
|
||||
format!(
|
||||
concat!(
|
||||
"{}\n\n[tool.uv]\n",
|
||||
"override-dependencies = [\n",
|
||||
" \"pyqt6; sys_platform=='never'\",\n",
|
||||
" \"pyqt6-qt6; sys_platform=='never'\",\n",
|
||||
" \"pyqt6-webengine; sys_platform=='never'\",\n",
|
||||
" \"pyqt6-webengine-qt6; sys_platform=='never'\",\n",
|
||||
" \"pyqt6_sip; sys_platform=='never'\"\n",
|
||||
"]\n"
|
||||
),
|
||||
updated_content
|
||||
)
|
||||
// Add mirror configuration if enabled
|
||||
let final_content = if let Some((python_mirror, pypi_mirror)) = get_mirror_urls(state)? {
|
||||
format!("{updated_content}\n\n[[tool.uv.index]]\nname = \"mirror\"\nurl = \"{pypi_mirror}\"\ndefault = true\n\n[tool.uv]\npython-install-mirror = \"{python_mirror}\"\n")
|
||||
} else {
|
||||
updated_content
|
||||
};
|
||||
|
|
@ -960,28 +925,12 @@ fn handle_uninstall(state: &State) -> Result<bool> {
|
|||
Ok(true)
|
||||
}
|
||||
|
||||
fn uv_command(state: &State) -> Result<Command> {
|
||||
let mut command = Command::new(&state.uv_path);
|
||||
command.current_dir(&state.uv_install_root);
|
||||
|
||||
// remove UV_* environment variables to avoid interference
|
||||
for (key, _) in std::env::vars() {
|
||||
if key.starts_with("UV_") {
|
||||
command.env_remove(key);
|
||||
}
|
||||
}
|
||||
command
|
||||
.env_remove("VIRTUAL_ENV")
|
||||
.env_remove("SSLKEYLOGFILE");
|
||||
|
||||
// Add mirror environment variable if enabled
|
||||
if let Some((python_mirror, pypi_mirror)) = get_mirror_urls(state)? {
|
||||
command
|
||||
.env("UV_PYTHON_INSTALL_MIRROR", &python_mirror)
|
||||
.env("UV_DEFAULT_INDEX", &pypi_mirror);
|
||||
}
|
||||
|
||||
Ok(command)
|
||||
fn have_developer_tools() -> bool {
|
||||
Command::new("xcode-select")
|
||||
.args(["-p"])
|
||||
.output()
|
||||
.map(|output| output.status.success())
|
||||
.unwrap_or(false)
|
||||
}
|
||||
|
||||
fn build_python_command(state: &State, args: &[String]) -> Result<Command> {
|
||||
|
|
@ -1006,7 +955,6 @@ fn build_python_command(state: &State, args: &[String]) -> Result<Command> {
|
|||
// Set UV and Python paths for the Python code
|
||||
cmd.env("ANKI_LAUNCHER_UV", state.uv_path.utf8()?.as_str());
|
||||
cmd.env("UV_PROJECT", state.uv_install_root.utf8()?.as_str());
|
||||
cmd.env_remove("SSLKEYLOGFILE");
|
||||
|
||||
Ok(cmd)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,9 +62,8 @@ pub fn prepare_for_launch_after_update(mut cmd: Command, root: &Path) -> Result<
|
|||
pub fn relaunch_in_terminal() -> Result<()> {
|
||||
let current_exe = std::env::current_exe().context("Failed to get current executable path")?;
|
||||
Command::new("open")
|
||||
.args(["-na", "Terminal"])
|
||||
.args(["-a", "Terminal"])
|
||||
.arg(current_exe)
|
||||
.env_remove("ANKI_LAUNCHER_WANT_TERMINAL")
|
||||
.ensure_spawn()?;
|
||||
std::process::exit(0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -134,8 +134,5 @@ pub fn ensure_os_supported() -> Result<()> {
|
|||
#[cfg(all(unix, not(target_os = "macos")))]
|
||||
unix::ensure_glibc_supported()?;
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
windows::ensure_windows_version_supported()?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,26 +38,6 @@ fn is_windows_10() -> bool {
|
|||
}
|
||||
}
|
||||
|
||||
/// Ensures Windows 10 version 1809 or later
|
||||
pub fn ensure_windows_version_supported() -> Result<()> {
|
||||
unsafe {
|
||||
let mut info = OSVERSIONINFOW {
|
||||
dwOSVersionInfoSize: std::mem::size_of::<OSVERSIONINFOW>() as u32,
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
if RtlGetVersion(&mut info).is_err() {
|
||||
anyhow::bail!("Failed to get Windows version information");
|
||||
}
|
||||
|
||||
if info.dwBuildNumber >= 17763 {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
anyhow::bail!("Windows 10 version 1809 or later is required.")
|
||||
}
|
||||
}
|
||||
|
||||
pub fn ensure_terminal_shown() -> Result<()> {
|
||||
unsafe {
|
||||
if !GetConsoleWindow().is_invalid() {
|
||||
|
|
|
|||
|
|
@ -33,12 +33,6 @@ class _MacOSHelper:
|
|||
"On completion, file should be saved if no error has arrived."
|
||||
self._dll.end_wav_record()
|
||||
|
||||
def disable_appnap(self) -> None:
|
||||
self._dll.disable_appnap()
|
||||
|
||||
def enable_appnap(self) -> None:
|
||||
self._dll.enable_appnap()
|
||||
|
||||
|
||||
# this must not be overwritten or deallocated
|
||||
@CFUNCTYPE(None, c_char_p) # type: ignore
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
// Copyright: Ankitects Pty Ltd and contributors
|
||||
// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
||||
|
||||
import Foundation
|
||||
|
||||
private var currentActivity: NSObjectProtocol?
|
||||
|
||||
@_cdecl("disable_appnap")
|
||||
public func disableAppNap() {
|
||||
// No-op if already assigned
|
||||
guard currentActivity == nil else { return }
|
||||
|
||||
currentActivity = ProcessInfo.processInfo.beginActivity(
|
||||
options: .userInitiatedAllowingIdleSystemSleep,
|
||||
reason: "AppNap is disabled"
|
||||
)
|
||||
}
|
||||
|
||||
@_cdecl("enable_appnap")
|
||||
public func enableAppNap() {
|
||||
guard let activity = currentActivity else { return }
|
||||
|
||||
ProcessInfo.processInfo.endActivity(activity)
|
||||
currentActivity = nil
|
||||
}
|
||||
|
|
@ -15,7 +15,6 @@ echo "Building macOS helper dylib..."
|
|||
# Create the wheel using uv
|
||||
echo "Creating wheel..."
|
||||
cd "$SCRIPT_DIR"
|
||||
rm -rf dist
|
||||
"$PROJ_ROOT/out/extracted/uv/uv" build --wheel
|
||||
|
||||
echo "Build complete!"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
# Copyright: Ankitects Pty Ltd and contributors
|
||||
# License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
||||
|
||||
import os
|
||||
import platform
|
||||
import subprocess
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ build-backend = "hatchling.build"
|
|||
|
||||
[project]
|
||||
name = "anki-mac-helper"
|
||||
version = "0.1.1"
|
||||
version = "0.1.0"
|
||||
description = "Small support library for Anki on Macs"
|
||||
requires-python = ">=3.9"
|
||||
license = { text = "AGPL-3.0-or-later" }
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Build and install into the launcher venv
|
||||
|
||||
set -e
|
||||
|
||||
./build.sh
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
export VIRTUAL_ENV=$HOME/Library/Application\ Support/AnkiProgramFiles/.venv
|
||||
else
|
||||
export VIRTUAL_ENV=$HOME/.local/share/AnkiProgramFiles/.venv
|
||||
fi
|
||||
../../out/extracted/uv/uv pip install dist/*.whl
|
||||
|
||||
|
|
@ -12,7 +12,7 @@ dependencies = [
|
|||
"send2trash",
|
||||
"waitress>=2.0.0",
|
||||
"pywin32; sys.platform == 'win32'",
|
||||
"anki-mac-helper>=0.1.1; sys.platform == 'darwin'",
|
||||
"anki-mac-helper; sys.platform == 'darwin'",
|
||||
"pip-system-certs!=5.1",
|
||||
"pyqt6>=6.2",
|
||||
"pyqt6-webengine>=6.2",
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ inflections.workspace = true
|
|||
anki_io.workspace = true
|
||||
anyhow.workspace = true
|
||||
itertools.workspace = true
|
||||
regex.workspace = true
|
||||
|
||||
[dependencies]
|
||||
fluent.workspace = true
|
||||
|
|
|
|||
|
|
@ -4,5 +4,6 @@
|
|||
// Include auto-generated content
|
||||
|
||||
#![allow(clippy::all)]
|
||||
#![allow(text_direction_codepoint_in_literal)]
|
||||
|
||||
include!(concat!(env!("OUT_DIR"), "/strings.rs"));
|
||||
|
|
|
|||
|
|
@ -195,30 +195,12 @@ pub(crate) const {lang_name}: phf::Map<&str, &str> = phf::phf_map! {{",
|
|||
.unwrap();
|
||||
|
||||
for (module, contents) in modules {
|
||||
let escaped_contents = escape_unicode_control_chars(contents);
|
||||
writeln!(
|
||||
buf,
|
||||
r###" "{module}" => r##"{escaped_contents}"##,"###
|
||||
)
|
||||
.unwrap();
|
||||
writeln!(buf, r###" "{module}" => r##"{contents}"##,"###).unwrap();
|
||||
}
|
||||
|
||||
buf.push_str("};\n");
|
||||
}
|
||||
|
||||
fn escape_unicode_control_chars(input: &str) -> String {
|
||||
use regex::Regex;
|
||||
|
||||
static RE: std::sync::OnceLock<Regex> = std::sync::OnceLock::new();
|
||||
let re = RE.get_or_init(|| Regex::new(r"[\u{202a}-\u{202e}\u{2066}-\u{2069}]").unwrap());
|
||||
|
||||
re.replace_all(input, |caps: ®ex::Captures| {
|
||||
let c = caps.get(0).unwrap().as_str().chars().next().unwrap();
|
||||
format!("\\u{{{:04x}}}", c as u32)
|
||||
})
|
||||
.into_owned()
|
||||
}
|
||||
|
||||
fn lang_constant_name(lang: &str) -> String {
|
||||
lang.to_ascii_uppercase().replace('-', "_")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,14 +42,14 @@ enum CheckableUrl {
|
|||
}
|
||||
|
||||
impl CheckableUrl {
|
||||
fn url(&self) -> Cow<'_, str> {
|
||||
fn url(&self) -> Cow<str> {
|
||||
match *self {
|
||||
Self::HelpPage(page) => help_page_to_link(page).into(),
|
||||
Self::String(s) => s.into(),
|
||||
}
|
||||
}
|
||||
|
||||
fn anchor(&self) -> Cow<'_, str> {
|
||||
fn anchor(&self) -> Cow<str> {
|
||||
match *self {
|
||||
Self::HelpPage(page) => help_page_link_suffix(page).into(),
|
||||
Self::String(s) => s.split('#').next_back().unwrap_or_default().into(),
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ impl BackendCollectionService for Backend {
|
|||
}
|
||||
|
||||
impl Backend {
|
||||
pub(super) fn lock_open_collection(&self) -> Result<MutexGuard<'_, Option<Collection>>> {
|
||||
pub(super) fn lock_open_collection(&self) -> Result<MutexGuard<Option<Collection>>> {
|
||||
let guard = self.col.lock().unwrap();
|
||||
guard
|
||||
.is_some()
|
||||
|
|
@ -102,7 +102,7 @@ impl Backend {
|
|||
.ok_or(AnkiError::CollectionNotOpen)
|
||||
}
|
||||
|
||||
pub(super) fn lock_closed_collection(&self) -> Result<MutexGuard<'_, Option<Collection>>> {
|
||||
pub(super) fn lock_closed_collection(&self) -> Result<MutexGuard<Option<Collection>>> {
|
||||
let guard = self.col.lock().unwrap();
|
||||
guard
|
||||
.is_none()
|
||||
|
|
|
|||
|
|
@ -132,14 +132,15 @@ impl Card {
|
|||
pub(crate) fn seconds_since_last_review(&self, timing: &SchedTimingToday) -> Option<u32> {
|
||||
if let Some(last_review_time) = self.last_review_time {
|
||||
Some(timing.now.elapsed_secs_since(last_review_time) as u32)
|
||||
} else if self.is_due_in_days() {
|
||||
} else if !self.is_due_in_days() {
|
||||
let last_review_time =
|
||||
TimestampSecs(self.original_or_current_due() as i64 - self.interval as i64);
|
||||
Some(timing.now.elapsed_secs_since(last_review_time) as u32)
|
||||
} else {
|
||||
self.due_time(timing).map(|due| {
|
||||
(due.adding_secs(-86_400 * self.interval as i64)
|
||||
.elapsed_secs()) as u32
|
||||
})
|
||||
} else {
|
||||
let last_review_time = TimestampSecs(self.original_or_current_due() as i64);
|
||||
Some(timing.now.elapsed_secs_since(last_review_time) as u32)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ pub fn prettify_av_tags<S: Into<String> + AsRef<str>>(txt: S) -> String {
|
|||
|
||||
/// Parse `txt` into [CardNodes] and return the result,
|
||||
/// or [None] if it only contains text nodes.
|
||||
fn nodes_or_text_only(txt: &str) -> Option<CardNodes<'_>> {
|
||||
fn nodes_or_text_only(txt: &str) -> Option<CardNodes> {
|
||||
let nodes = CardNodes::parse(txt);
|
||||
(!nodes.text_only).then_some(nodes)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,13 +103,13 @@ fn is_not0<'parser, 'arr: 'parser, 's: 'parser>(
|
|||
move |s| alt((is_not(arr), success(""))).parse(s)
|
||||
}
|
||||
|
||||
fn node(s: &str) -> IResult<'_, Node<'_>> {
|
||||
fn node(s: &str) -> IResult<Node> {
|
||||
alt((sound_node, tag_node, text_node)).parse(s)
|
||||
}
|
||||
|
||||
/// A sound tag `[sound:resource]`, where `resource` is pointing to a sound or
|
||||
/// video file.
|
||||
fn sound_node(s: &str) -> IResult<'_, Node<'_>> {
|
||||
fn sound_node(s: &str) -> IResult<Node> {
|
||||
map(
|
||||
delimited(tag("[sound:"), is_not("]"), tag("]")),
|
||||
Node::SoundOrVideo,
|
||||
|
|
@ -117,7 +117,7 @@ fn sound_node(s: &str) -> IResult<'_, Node<'_>> {
|
|||
.parse(s)
|
||||
}
|
||||
|
||||
fn take_till_potential_tag_start(s: &str) -> IResult<'_, &str> {
|
||||
fn take_till_potential_tag_start(s: &str) -> IResult<&str> {
|
||||
// first char could be '[', but wasn't part of a node, so skip (eof ends parse)
|
||||
let (after, offset) = anychar(s).map(|(s, c)| (s, c.len_utf8()))?;
|
||||
Ok(match after.find('[') {
|
||||
|
|
@ -127,9 +127,9 @@ fn take_till_potential_tag_start(s: &str) -> IResult<'_, &str> {
|
|||
}
|
||||
|
||||
/// An Anki tag `[anki:tag...]...[/anki:tag]`.
|
||||
fn tag_node(s: &str) -> IResult<'_, Node<'_>> {
|
||||
fn tag_node(s: &str) -> IResult<Node> {
|
||||
/// Match the start of an opening tag and return its name.
|
||||
fn name(s: &str) -> IResult<'_, &str> {
|
||||
fn name(s: &str) -> IResult<&str> {
|
||||
preceded(tag("[anki:"), is_not("] \t\r\n")).parse(s)
|
||||
}
|
||||
|
||||
|
|
@ -139,12 +139,12 @@ fn tag_node(s: &str) -> IResult<'_, Node<'_>> {
|
|||
) -> impl FnMut(&'s str) -> IResult<'s, Vec<(&'s str, &'s str)>> + 'name {
|
||||
/// List of whitespace-separated `key=val` tuples, where `val` may be
|
||||
/// empty.
|
||||
fn options(s: &str) -> IResult<'_, Vec<(&str, &str)>> {
|
||||
fn key(s: &str) -> IResult<'_, &str> {
|
||||
fn options(s: &str) -> IResult<Vec<(&str, &str)>> {
|
||||
fn key(s: &str) -> IResult<&str> {
|
||||
is_not("] \t\r\n=").parse(s)
|
||||
}
|
||||
|
||||
fn val(s: &str) -> IResult<'_, &str> {
|
||||
fn val(s: &str) -> IResult<&str> {
|
||||
alt((
|
||||
delimited(tag("\""), is_not0("\""), tag("\"")),
|
||||
is_not0("] \t\r\n\""),
|
||||
|
|
@ -197,7 +197,7 @@ fn tag_node(s: &str) -> IResult<'_, Node<'_>> {
|
|||
.parse(s)
|
||||
}
|
||||
|
||||
fn text_node(s: &str) -> IResult<'_, Node<'_>> {
|
||||
fn text_node(s: &str) -> IResult<Node> {
|
||||
map(take_till_potential_tag_start, Node::Text).parse(s)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -54,8 +54,8 @@ enum Token<'a> {
|
|||
}
|
||||
|
||||
/// Tokenize string
|
||||
fn tokenize(mut text: &str) -> impl Iterator<Item = Token<'_>> {
|
||||
fn open_cloze(text: &str) -> IResult<&str, Token<'_>> {
|
||||
fn tokenize(mut text: &str) -> impl Iterator<Item = Token> {
|
||||
fn open_cloze(text: &str) -> IResult<&str, Token> {
|
||||
// opening brackets and 'c'
|
||||
let (text, _opening_brackets_and_c) = tag("{{c")(text)?;
|
||||
// following number
|
||||
|
|
@ -75,12 +75,12 @@ fn tokenize(mut text: &str) -> impl Iterator<Item = Token<'_>> {
|
|||
Ok((text, Token::OpenCloze(digits)))
|
||||
}
|
||||
|
||||
fn close_cloze(text: &str) -> IResult<&str, Token<'_>> {
|
||||
fn close_cloze(text: &str) -> IResult<&str, Token> {
|
||||
map(tag("}}"), |_| Token::CloseCloze).parse(text)
|
||||
}
|
||||
|
||||
/// Match a run of text until an open/close marker is encountered.
|
||||
fn normal_text(text: &str) -> IResult<&str, Token<'_>> {
|
||||
fn normal_text(text: &str) -> IResult<&str, Token> {
|
||||
if text.is_empty() {
|
||||
return Err(nom::Err::Error(nom::error::make_error(
|
||||
text,
|
||||
|
|
@ -132,7 +132,7 @@ impl ExtractedCloze<'_> {
|
|||
self.hint.unwrap_or("...")
|
||||
}
|
||||
|
||||
fn clozed_text(&self) -> Cow<'_, str> {
|
||||
fn clozed_text(&self) -> Cow<str> {
|
||||
// happy efficient path?
|
||||
if self.nodes.len() == 1 {
|
||||
if let TextOrCloze::Text(text) = self.nodes.last().unwrap() {
|
||||
|
|
@ -353,7 +353,7 @@ pub fn parse_image_occlusions(text: &str) -> Vec<ImageOcclusion> {
|
|||
.collect()
|
||||
}
|
||||
|
||||
pub fn reveal_cloze_text(text: &str, cloze_ord: u16, question: bool) -> Cow<'_, str> {
|
||||
pub fn reveal_cloze_text(text: &str, cloze_ord: u16, question: bool) -> Cow<str> {
|
||||
let mut buf = String::new();
|
||||
let mut active_cloze_found_in_text = false;
|
||||
for node in &parse_text_with_clozes(text) {
|
||||
|
|
@ -376,7 +376,7 @@ pub fn reveal_cloze_text(text: &str, cloze_ord: u16, question: bool) -> Cow<'_,
|
|||
}
|
||||
}
|
||||
|
||||
pub fn reveal_cloze_text_only(text: &str, cloze_ord: u16, question: bool) -> Cow<'_, str> {
|
||||
pub fn reveal_cloze_text_only(text: &str, cloze_ord: u16, question: bool) -> Cow<str> {
|
||||
let mut output = Vec::new();
|
||||
for node in &parse_text_with_clozes(text) {
|
||||
reveal_cloze_text_in_nodes(node, cloze_ord, question, &mut output);
|
||||
|
|
@ -384,7 +384,7 @@ pub fn reveal_cloze_text_only(text: &str, cloze_ord: u16, question: bool) -> Cow
|
|||
output.join(", ").into()
|
||||
}
|
||||
|
||||
pub fn extract_cloze_for_typing(text: &str, cloze_ord: u16) -> Cow<'_, str> {
|
||||
pub fn extract_cloze_for_typing(text: &str, cloze_ord: u16) -> Cow<str> {
|
||||
let mut output = Vec::new();
|
||||
for node in &parse_text_with_clozes(text) {
|
||||
reveal_cloze_text_in_nodes(node, cloze_ord, false, &mut output);
|
||||
|
|
@ -460,7 +460,7 @@ pub(crate) fn strip_clozes(text: &str) -> Cow<'_, str> {
|
|||
CLOZE.replace_all(text, "$1")
|
||||
}
|
||||
|
||||
fn strip_html_inside_mathjax(text: &str) -> Cow<'_, str> {
|
||||
fn strip_html_inside_mathjax(text: &str) -> Cow<str> {
|
||||
MATHJAX.replace_all(text, |caps: &Captures| -> String {
|
||||
format!(
|
||||
"{}{}{}",
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
// Copyright: Ankitects Pty Ltd and contributors
|
||||
// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
||||
use anki_proto::collection::GetCustomColoursResponse;
|
||||
use anki_proto::generic;
|
||||
|
||||
use crate::collection::Collection;
|
||||
use crate::config::ConfigKey;
|
||||
use crate::error;
|
||||
use crate::prelude::BoolKey;
|
||||
use crate::prelude::Op;
|
||||
|
|
@ -64,13 +62,4 @@ impl crate::services::CollectionService for Collection {
|
|||
})
|
||||
.map(Into::into)
|
||||
}
|
||||
|
||||
fn get_custom_colours(
|
||||
&mut self,
|
||||
) -> error::Result<anki_proto::collection::GetCustomColoursResponse> {
|
||||
let colours = self
|
||||
.get_config_optional(ConfigKey::CustomColorPickerPalette)
|
||||
.unwrap_or_default();
|
||||
Ok(GetCustomColoursResponse { colours })
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,7 +71,6 @@ pub(crate) enum ConfigKey {
|
|||
NextNewCardPosition,
|
||||
#[strum(to_string = "schedVer")]
|
||||
SchedulerVersion,
|
||||
CustomColorPickerPalette,
|
||||
}
|
||||
|
||||
#[derive(PartialEq, Eq, Serialize_repr, Deserialize_repr, Clone, Copy, Debug)]
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ impl crate::services::DeckConfigService for Collection {
|
|||
.storage
|
||||
.get_revlog_entries_for_searched_cards_in_card_order()?;
|
||||
|
||||
let mut config = guard.col.get_optimal_retention_parameters(revlogs)?;
|
||||
let config = guard.col.get_optimal_retention_parameters(revlogs)?;
|
||||
let cards = guard
|
||||
.col
|
||||
.storage
|
||||
|
|
@ -125,8 +125,6 @@ impl crate::services::DeckConfigService for Collection {
|
|||
.filter_map(|c| crate::card::Card::convert(c.clone(), days_elapsed, c.memory_state?))
|
||||
.collect::<Vec<fsrs::Card>>();
|
||||
|
||||
config.deck_size = guard.cards;
|
||||
|
||||
let costs = (70u32..=99u32)
|
||||
.into_par_iter()
|
||||
.map(|dr| {
|
||||
|
|
|
|||
|
|
@ -216,6 +216,9 @@ impl Collection {
|
|||
for deck in self.storage.get_all_decks()? {
|
||||
if let Ok(normal) = deck.normal() {
|
||||
let deck_id = deck.id;
|
||||
if let Some(desired_retention) = normal.desired_retention {
|
||||
deck_desired_retention.insert(deck_id, desired_retention);
|
||||
}
|
||||
// previous order & params
|
||||
let previous_config_id = DeckConfigId(normal.config_id);
|
||||
let previous_config = configs_before_update.get(&previous_config_id);
|
||||
|
|
@ -223,23 +226,21 @@ impl Collection {
|
|||
.map(|c| c.inner.new_card_insert_order())
|
||||
.unwrap_or_default();
|
||||
let previous_params = previous_config.map(|c| c.fsrs_params());
|
||||
let previous_preset_dr = previous_config.map(|c| c.inner.desired_retention);
|
||||
let previous_deck_dr = normal.desired_retention;
|
||||
let previous_dr = previous_deck_dr.or(previous_preset_dr);
|
||||
let previous_retention = previous_config.map(|c| c.inner.desired_retention);
|
||||
let previous_easy_days = previous_config.map(|c| &c.inner.easy_days_percentages);
|
||||
|
||||
// if a selected (sub)deck, or its old config was removed, update deck to point
|
||||
// to new config
|
||||
let (current_config_id, current_deck_dr) = if selected_deck_ids.contains(&deck.id)
|
||||
let current_config_id = if selected_deck_ids.contains(&deck.id)
|
||||
|| !configs_after_update.contains_key(&previous_config_id)
|
||||
{
|
||||
let mut updated = deck.clone();
|
||||
updated.normal_mut()?.config_id = selected_config.id.0;
|
||||
update_deck_limits(updated.normal_mut()?, &req.limits, today);
|
||||
self.update_deck_inner(&mut updated, deck, usn)?;
|
||||
(selected_config.id, updated.normal()?.desired_retention)
|
||||
selected_config.id
|
||||
} else {
|
||||
(previous_config_id, previous_deck_dr)
|
||||
previous_config_id
|
||||
};
|
||||
|
||||
// if new order differs, deck needs re-sorting
|
||||
|
|
@ -253,12 +254,11 @@ impl Collection {
|
|||
|
||||
// if params differ, memory state needs to be recomputed
|
||||
let current_params = current_config.map(|c| c.fsrs_params());
|
||||
let current_preset_dr = current_config.map(|c| c.inner.desired_retention);
|
||||
let current_dr = current_deck_dr.or(current_preset_dr);
|
||||
let current_retention = current_config.map(|c| c.inner.desired_retention);
|
||||
let current_easy_days = current_config.map(|c| &c.inner.easy_days_percentages);
|
||||
if fsrs_toggled
|
||||
|| previous_params != current_params
|
||||
|| previous_dr != current_dr
|
||||
|| previous_retention != current_retention
|
||||
|| (req.fsrs_reschedule && previous_easy_days != current_easy_days)
|
||||
{
|
||||
decks_needing_memory_recompute
|
||||
|
|
@ -266,9 +266,7 @@ impl Collection {
|
|||
.or_default()
|
||||
.push(deck_id);
|
||||
}
|
||||
if let Some(desired_retention) = current_deck_dr {
|
||||
deck_desired_retention.insert(deck_id, desired_retention);
|
||||
}
|
||||
|
||||
self.adjust_remaining_steps_in_deck(deck_id, previous_config, current_config, usn)?;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -191,7 +191,7 @@ fn invalid_char_for_deck_component(c: char) -> bool {
|
|||
c.is_ascii_control()
|
||||
}
|
||||
|
||||
fn normalized_deck_name_component(comp: &str) -> Cow<'_, str> {
|
||||
fn normalized_deck_name_component(comp: &str) -> Cow<str> {
|
||||
let mut out = normalize_to_nfc(comp);
|
||||
if out.contains(invalid_char_for_deck_component) {
|
||||
out = out.replace(invalid_char_for_deck_component, "").into();
|
||||
|
|
|
|||
|
|
@ -135,8 +135,6 @@ pub struct NormalDeckSchema11 {
|
|||
review_limit_today: Option<DayLimit>,
|
||||
#[serde(default, deserialize_with = "default_on_invalid")]
|
||||
new_limit_today: Option<DayLimit>,
|
||||
#[serde(default, deserialize_with = "default_on_invalid")]
|
||||
desired_retention: Option<u32>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, PartialEq, Debug, Clone)]
|
||||
|
|
@ -251,7 +249,6 @@ impl Default for NormalDeckSchema11 {
|
|||
new_limit: None,
|
||||
review_limit_today: None,
|
||||
new_limit_today: None,
|
||||
desired_retention: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -328,7 +325,7 @@ impl From<NormalDeckSchema11> for NormalDeck {
|
|||
new_limit: deck.new_limit,
|
||||
review_limit_today: deck.review_limit_today,
|
||||
new_limit_today: deck.new_limit_today,
|
||||
desired_retention: deck.desired_retention.map(|v| v as f32 / 100.0),
|
||||
desired_retention: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -370,7 +367,6 @@ impl From<Deck> for DeckSchema11 {
|
|||
new_limit: norm.new_limit,
|
||||
review_limit_today: norm.review_limit_today,
|
||||
new_limit_today: norm.new_limit_today,
|
||||
desired_retention: norm.desired_retention.map(|v| (v * 100.0) as u32),
|
||||
common: deck.into(),
|
||||
}),
|
||||
DeckKind::Filtered(ref filt) => DeckSchema11::Filtered(FilteredDeckSchema11 {
|
||||
|
|
@ -435,8 +431,7 @@ static RESERVED_DECK_KEYS: Set<&'static str> = phf_set! {
|
|||
"browserCollapsed",
|
||||
"extendRev",
|
||||
"id",
|
||||
"collapsed",
|
||||
"desiredRetention",
|
||||
"collapsed"
|
||||
};
|
||||
|
||||
impl From<&Deck> for DeckTodaySchema11 {
|
||||
|
|
|
|||
|
|
@ -231,10 +231,7 @@ fn svg_getter(notetypes: &[Notetype]) -> impl Fn(NotetypeId) -> bool {
|
|||
}
|
||||
|
||||
impl Collection {
|
||||
fn gather_notes(
|
||||
&mut self,
|
||||
search: impl TryIntoSearch,
|
||||
) -> Result<(Vec<Note>, NoteTableGuard<'_>)> {
|
||||
fn gather_notes(&mut self, search: impl TryIntoSearch) -> Result<(Vec<Note>, NoteTableGuard)> {
|
||||
let guard = self.search_notes_into_table(search)?;
|
||||
guard
|
||||
.col
|
||||
|
|
@ -243,7 +240,7 @@ impl Collection {
|
|||
.map(|notes| (notes, guard))
|
||||
}
|
||||
|
||||
fn gather_cards(&mut self) -> Result<(Vec<Card>, CardTableGuard<'_>)> {
|
||||
fn gather_cards(&mut self) -> Result<(Vec<Card>, CardTableGuard)> {
|
||||
let guard = self.search_cards_of_notes_into_table()?;
|
||||
guard
|
||||
.col
|
||||
|
|
|
|||
|
|
@ -664,7 +664,7 @@ mod test {
|
|||
self
|
||||
}
|
||||
|
||||
fn import(self, col: &mut Collection) -> NoteContext<'_> {
|
||||
fn import(self, col: &mut Collection) -> NoteContext {
|
||||
let mut progress_handler = col.new_progress_handler();
|
||||
let media_map = Box::leak(Box::new(self.media_map));
|
||||
let mut ctx = NoteContext::new(
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ pub(super) fn extract_media_entries(
|
|||
}
|
||||
}
|
||||
|
||||
pub(super) fn safe_normalized_file_name(name: &str) -> Result<Cow<'_, str>> {
|
||||
pub(super) fn safe_normalized_file_name(name: &str) -> Result<Cow<str>> {
|
||||
if !filename_is_safe(name) {
|
||||
Err(AnkiError::ImportError {
|
||||
source: ImportError::Corrupt,
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ fn rendered_nodes_to_str(nodes: &[RenderedNode]) -> String {
|
|||
.join("")
|
||||
}
|
||||
|
||||
fn field_to_record_field(field: &str, with_html: bool) -> Cow<'_, str> {
|
||||
fn field_to_record_field(field: &str, with_html: bool) -> Cow<str> {
|
||||
let mut text = strip_redundant_sections(field);
|
||||
if !with_html {
|
||||
text = text.map_cow(|t| html_to_text_line(t, false));
|
||||
|
|
@ -155,7 +155,7 @@ fn field_to_record_field(field: &str, with_html: bool) -> Cow<'_, str> {
|
|||
text
|
||||
}
|
||||
|
||||
fn strip_redundant_sections(text: &str) -> Cow<'_, str> {
|
||||
fn strip_redundant_sections(text: &str) -> Cow<str> {
|
||||
static RE: LazyLock<Regex> = LazyLock::new(|| {
|
||||
Regex::new(
|
||||
r"(?isx)
|
||||
|
|
@ -169,7 +169,7 @@ fn strip_redundant_sections(text: &str) -> Cow<'_, str> {
|
|||
RE.replace_all(text.as_ref(), "")
|
||||
}
|
||||
|
||||
fn strip_answer_side_question(text: &str) -> Cow<'_, str> {
|
||||
fn strip_answer_side_question(text: &str) -> Cow<str> {
|
||||
static RE: LazyLock<Regex> =
|
||||
LazyLock::new(|| Regex::new(r"(?is)^.*<hr id=answer>\n*").unwrap());
|
||||
RE.replace_all(text.as_ref(), "")
|
||||
|
|
@ -251,7 +251,7 @@ impl NoteContext {
|
|||
.chain(self.tags(note))
|
||||
}
|
||||
|
||||
fn notetype_name(&self, note: &Note) -> Option<Cow<'_, [u8]>> {
|
||||
fn notetype_name(&self, note: &Note) -> Option<Cow<[u8]>> {
|
||||
self.with_notetype.then(|| {
|
||||
self.notetypes
|
||||
.get(¬e.notetype_id)
|
||||
|
|
@ -259,7 +259,7 @@ impl NoteContext {
|
|||
})
|
||||
}
|
||||
|
||||
fn deck_name(&self, note: &Note) -> Option<Cow<'_, [u8]>> {
|
||||
fn deck_name(&self, note: &Note) -> Option<Cow<[u8]>> {
|
||||
self.with_deck.then(|| {
|
||||
self.deck_ids
|
||||
.get(¬e.id)
|
||||
|
|
@ -268,7 +268,7 @@ impl NoteContext {
|
|||
})
|
||||
}
|
||||
|
||||
fn tags(&self, note: &Note) -> Option<Cow<'_, [u8]>> {
|
||||
fn tags(&self, note: &Note) -> Option<Cow<[u8]>> {
|
||||
self.with_tags
|
||||
.then(|| Cow::from(note.tags.join(" ").into_bytes()))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -511,7 +511,7 @@ impl NoteContext<'_> {
|
|||
}
|
||||
|
||||
impl Note {
|
||||
fn first_field_stripped(&self) -> Cow<'_, str> {
|
||||
fn first_field_stripped(&self) -> Cow<str> {
|
||||
strip_html_preserving_media_filenames(&self.fields()[0])
|
||||
}
|
||||
}
|
||||
|
|
@ -623,7 +623,7 @@ impl ForeignNote {
|
|||
.all(|(opt, field)| opt.as_ref().map(|s| s == field).unwrap_or(true))
|
||||
}
|
||||
|
||||
fn first_field_stripped(&self) -> Option<Cow<'_, str>> {
|
||||
fn first_field_stripped(&self) -> Option<Cow<str>> {
|
||||
self.fields
|
||||
.first()
|
||||
.and_then(|s| s.as_ref())
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ pub struct ExtractedLatex {
|
|||
pub(crate) fn extract_latex_expanding_clozes(
|
||||
text: &str,
|
||||
svg: bool,
|
||||
) -> (Cow<'_, str>, Vec<ExtractedLatex>) {
|
||||
) -> (Cow<str>, Vec<ExtractedLatex>) {
|
||||
if text.contains("{{c") {
|
||||
let expanded = expand_clozes_to_reveal_latex(text);
|
||||
let (text, extracts) = extract_latex(&expanded, svg);
|
||||
|
|
@ -60,7 +60,7 @@ pub(crate) fn extract_latex_expanding_clozes(
|
|||
|
||||
/// Extract LaTeX from the provided text.
|
||||
/// Expects cloze deletions to already be expanded.
|
||||
pub fn extract_latex(text: &str, svg: bool) -> (Cow<'_, str>, Vec<ExtractedLatex>) {
|
||||
pub fn extract_latex(text: &str, svg: bool) -> (Cow<str>, Vec<ExtractedLatex>) {
|
||||
let mut extracted = vec![];
|
||||
|
||||
let new_text = LATEX.replace_all(text, |caps: &Captures| {
|
||||
|
|
@ -84,7 +84,7 @@ pub fn extract_latex(text: &str, svg: bool) -> (Cow<'_, str>, Vec<ExtractedLatex
|
|||
(new_text, extracted)
|
||||
}
|
||||
|
||||
fn strip_html_for_latex(html: &str) -> Cow<'_, str> {
|
||||
fn strip_html_for_latex(html: &str) -> Cow<str> {
|
||||
let mut out: Cow<str> = html.into();
|
||||
if let Cow::Owned(o) = LATEX_NEWLINES.replace_all(html, "\n") {
|
||||
out = o.into();
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ fn nonbreaking_space(char: char) -> bool {
|
|||
/// - Any problem characters are removed.
|
||||
/// - Windows device names like CON and PRN have '_' appended
|
||||
/// - The filename is limited to 120 bytes.
|
||||
pub(crate) fn normalize_filename(fname: &str) -> Cow<'_, str> {
|
||||
pub(crate) fn normalize_filename(fname: &str) -> Cow<str> {
|
||||
let mut output = Cow::Borrowed(fname);
|
||||
|
||||
if !is_nfc(output.as_ref()) {
|
||||
|
|
@ -102,7 +102,7 @@ pub(crate) fn normalize_filename(fname: &str) -> Cow<'_, str> {
|
|||
}
|
||||
|
||||
/// See normalize_filename(). This function expects NFC-normalized input.
|
||||
pub(crate) fn normalize_nfc_filename(mut fname: Cow<'_, str>) -> Cow<'_, str> {
|
||||
pub(crate) fn normalize_nfc_filename(mut fname: Cow<str>) -> Cow<str> {
|
||||
if fname.contains(disallowed_char) {
|
||||
fname = fname.replace(disallowed_char, "").into()
|
||||
}
|
||||
|
|
@ -137,7 +137,7 @@ pub(crate) fn normalize_nfc_filename(mut fname: Cow<'_, str>) -> Cow<'_, str> {
|
|||
/// but can be accessed as NFC. On these devices, if the filename
|
||||
/// is otherwise valid, the filename is returned as NFC.
|
||||
#[allow(clippy::collapsible_else_if)]
|
||||
pub(crate) fn filename_if_normalized(fname: &str) -> Option<Cow<'_, str>> {
|
||||
pub(crate) fn filename_if_normalized(fname: &str) -> Option<Cow<str>> {
|
||||
if cfg!(target_vendor = "apple") {
|
||||
if !is_nfc(fname) {
|
||||
let as_nfc = fname.chars().nfc().collect::<String>();
|
||||
|
|
@ -208,7 +208,7 @@ pub(crate) fn add_hash_suffix_to_file_stem(fname: &str, hash: &Sha1Hash) -> Stri
|
|||
}
|
||||
|
||||
/// If filename is longer than max_bytes, truncate it.
|
||||
fn truncate_filename(fname: &str, max_bytes: usize) -> Cow<'_, str> {
|
||||
fn truncate_filename(fname: &str, max_bytes: usize) -> Cow<str> {
|
||||
if fname.len() <= max_bytes {
|
||||
return Cow::Borrowed(fname);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ impl TryFrom<anki_proto::notes::AddNoteRequest> for AddNoteRequest {
|
|||
}
|
||||
|
||||
impl Collection {
|
||||
pub fn add_note(&mut self, note: &mut Note, did: DeckId) -> Result<OpOutput<usize>> {
|
||||
pub fn add_note(&mut self, note: &mut Note, did: DeckId) -> Result<OpOutput<()>> {
|
||||
self.transact(Op::AddNote, |col| col.add_note_inner(note, did))
|
||||
}
|
||||
|
||||
|
|
@ -372,7 +372,7 @@ impl Collection {
|
|||
Ok(())
|
||||
}
|
||||
|
||||
pub(crate) fn add_note_inner(&mut self, note: &mut Note, did: DeckId) -> Result<usize> {
|
||||
pub(crate) fn add_note_inner(&mut self, note: &mut Note, did: DeckId) -> Result<()> {
|
||||
let nt = self
|
||||
.get_notetype(note.notetype_id)?
|
||||
.or_invalid("missing note type")?;
|
||||
|
|
@ -383,11 +383,10 @@ impl Collection {
|
|||
note.prepare_for_update(ctx.notetype, normalize_text)?;
|
||||
note.set_modified(ctx.usn);
|
||||
self.add_note_only_undoable(note)?;
|
||||
let count = self.generate_cards_for_new_note(&ctx, note, did)?;
|
||||
self.generate_cards_for_new_note(&ctx, note, did)?;
|
||||
self.set_last_deck_for_notetype(note.notetype_id, did)?;
|
||||
self.set_last_notetype_for_deck(did, note.notetype_id)?;
|
||||
self.set_current_notetype_id(note.notetype_id)?;
|
||||
Ok(count)
|
||||
self.set_current_notetype_id(note.notetype_id)
|
||||
}
|
||||
|
||||
pub fn update_note(&mut self, note: &mut Note) -> Result<OpOutput<()>> {
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ impl Collection {
|
|||
ctx: &CardGenContext<impl Deref<Target = Notetype>>,
|
||||
note: &Note,
|
||||
target_deck_id: DeckId,
|
||||
) -> Result<usize> {
|
||||
) -> Result<()> {
|
||||
self.generate_cards_for_note(
|
||||
ctx,
|
||||
note,
|
||||
|
|
@ -231,8 +231,7 @@ impl Collection {
|
|||
note: &Note,
|
||||
) -> Result<()> {
|
||||
let existing = self.storage.existing_cards_for_note(note.id)?;
|
||||
self.generate_cards_for_note(ctx, note, &existing, ctx.last_deck, &mut Default::default())?;
|
||||
Ok(())
|
||||
self.generate_cards_for_note(ctx, note, &existing, ctx.last_deck, &mut Default::default())
|
||||
}
|
||||
|
||||
fn generate_cards_for_note(
|
||||
|
|
@ -242,13 +241,12 @@ impl Collection {
|
|||
existing: &[AlreadyGeneratedCardInfo],
|
||||
target_deck_id: Option<DeckId>,
|
||||
cache: &mut CardGenCache,
|
||||
) -> Result<usize> {
|
||||
) -> Result<()> {
|
||||
let cards = ctx.new_cards_required(note, existing, true);
|
||||
if cards.is_empty() {
|
||||
return Ok(0);
|
||||
return Ok(());
|
||||
}
|
||||
self.add_generated_cards(note.id, &cards, target_deck_id, cache)?;
|
||||
Ok(cards.len())
|
||||
self.add_generated_cards(note.id, &cards, target_deck_id, cache)
|
||||
}
|
||||
|
||||
pub(crate) fn generate_cards_for_notetype(
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ pub struct RenderCardOutput {
|
|||
|
||||
impl RenderCardOutput {
|
||||
/// The question text. This is only valid to call when partial_render=false.
|
||||
pub fn question(&self) -> Cow<'_, str> {
|
||||
pub fn question(&self) -> Cow<str> {
|
||||
match self.qnodes.as_slice() {
|
||||
[RenderedNode::Text { text }] => text.into(),
|
||||
_ => "not fully rendered".into(),
|
||||
|
|
@ -33,7 +33,7 @@ impl RenderCardOutput {
|
|||
}
|
||||
|
||||
/// The answer text. This is only valid to call when partial_render=false.
|
||||
pub fn answer(&self) -> Cow<'_, str> {
|
||||
pub fn answer(&self) -> Cow<str> {
|
||||
match self.anodes.as_slice() {
|
||||
[RenderedNode::Text { text }] => text.into(),
|
||||
_ => "not fully rendered".into(),
|
||||
|
|
|
|||
|
|
@ -99,6 +99,8 @@ impl Collection {
|
|||
historical_retention.unwrap_or(0.9),
|
||||
ignore_before,
|
||||
)?;
|
||||
let preset_desired_retention =
|
||||
req.as_ref().map(|w| w.preset_desired_retention).unwrap();
|
||||
let mut progress = self.new_progress_handler::<ComputeMemoryProgress>();
|
||||
progress.update(false, |s| s.total_cards = items.len() as u32)?;
|
||||
for (idx, (card_id, item)) in items.into_iter().enumerate() {
|
||||
|
|
@ -106,7 +108,6 @@ impl Collection {
|
|||
let mut card = self.storage.get_card(card_id)?.or_not_found(card_id)?;
|
||||
let original = card.clone();
|
||||
if let Some(req) = &req {
|
||||
let preset_desired_retention = req.preset_desired_retention;
|
||||
// Store decay and desired retention in the card so that add-ons, card info,
|
||||
// stats and browser search/sorts don't need to access the deck config.
|
||||
// Unlike memory states, scheduler doesn't use decay and dr stored in the card.
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ impl Collection {
|
|||
}
|
||||
}
|
||||
|
||||
let health_check_passed = if health_check && input.train_set.len() > 300 {
|
||||
let health_check_passed = if health_check {
|
||||
let fsrs = FSRS::new(None)?;
|
||||
fsrs.evaluate_with_time_series_splits(input, |_| true)
|
||||
.ok()
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ fn create_review_priority_fn(
|
|||
|
||||
// Interval-based ordering
|
||||
IntervalsAscending => wrap!(|c, _w| c.interval as i32),
|
||||
IntervalsDescending => wrap!(|c, _w| (c.interval as i32).saturating_neg()),
|
||||
IntervalsDescending => wrap!(|c, _w| -(c.interval as i32)),
|
||||
// Retrievability-based ordering
|
||||
RetrievabilityAscending => {
|
||||
wrap!(move |c, w| (c.retrievability(w) * 1000.0) as i32)
|
||||
|
|
@ -142,11 +142,10 @@ impl Collection {
|
|||
// calculate any missing memory state
|
||||
for c in &mut cards {
|
||||
if is_included_card(c) && c.memory_state.is_none() {
|
||||
let fsrs_data = self.compute_memory_state(c.id)?;
|
||||
c.memory_state = fsrs_data.state.map(Into::into);
|
||||
c.desired_retention = Some(fsrs_data.desired_retention);
|
||||
c.decay = Some(fsrs_data.decay);
|
||||
self.storage.update_card(c)?;
|
||||
let original = c.clone();
|
||||
let new_state = self.compute_memory_state(c.id)?.state;
|
||||
c.memory_state = new_state.map(Into::into);
|
||||
self.update_card_inner(c, original, self.usn()?)?;
|
||||
}
|
||||
}
|
||||
let days_elapsed = self.timing_today().unwrap().days_elapsed as i32;
|
||||
|
|
@ -294,8 +293,7 @@ impl Collection {
|
|||
(
|
||||
*result.memorized_cnt_per_day.last().unwrap_or(&0.),
|
||||
result.cost_per_day.iter().sum::<f32>(),
|
||||
result.review_cnt_per_day.iter().sum::<usize>() as u32
|
||||
+ result.learn_cnt_per_day.iter().sum::<usize>() as u32,
|
||||
result.review_cnt_per_day.iter().sum::<usize>() as u32,
|
||||
),
|
||||
))
|
||||
})
|
||||
|
|
|
|||
|
|
@ -61,26 +61,28 @@ impl QueueBuilder {
|
|||
}
|
||||
|
||||
fn gather_new_cards(&mut self, col: &mut Collection) -> Result<()> {
|
||||
let salt = Self::knuth_salt(self.context.timing.days_elapsed);
|
||||
match self.context.sort_options.new_gather_priority {
|
||||
NewCardGatherPriority::Deck => {
|
||||
self.gather_new_cards_by_deck(col, NewCardSorting::LowestPosition)
|
||||
}
|
||||
NewCardGatherPriority::DeckThenRandomNotes => {
|
||||
self.gather_new_cards_by_deck(col, NewCardSorting::RandomNotes(salt))
|
||||
}
|
||||
NewCardGatherPriority::DeckThenRandomNotes => self.gather_new_cards_by_deck(
|
||||
col,
|
||||
NewCardSorting::RandomNotes(self.context.timing.days_elapsed),
|
||||
),
|
||||
NewCardGatherPriority::LowestPosition => {
|
||||
self.gather_new_cards_sorted(col, NewCardSorting::LowestPosition)
|
||||
}
|
||||
NewCardGatherPriority::HighestPosition => {
|
||||
self.gather_new_cards_sorted(col, NewCardSorting::HighestPosition)
|
||||
}
|
||||
NewCardGatherPriority::RandomNotes => {
|
||||
self.gather_new_cards_sorted(col, NewCardSorting::RandomNotes(salt))
|
||||
}
|
||||
NewCardGatherPriority::RandomCards => {
|
||||
self.gather_new_cards_sorted(col, NewCardSorting::RandomCards(salt))
|
||||
}
|
||||
NewCardGatherPriority::RandomNotes => self.gather_new_cards_sorted(
|
||||
col,
|
||||
NewCardSorting::RandomNotes(self.context.timing.days_elapsed),
|
||||
),
|
||||
NewCardGatherPriority::RandomCards => self.gather_new_cards_sorted(
|
||||
col,
|
||||
NewCardSorting::RandomCards(self.context.timing.days_elapsed),
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -167,10 +169,4 @@ impl QueueBuilder {
|
|||
true
|
||||
}
|
||||
}
|
||||
|
||||
// Generates a salt for use with fnvhash. Useful to increase randomness
|
||||
// when the base salt is a small integer.
|
||||
fn knuth_salt(base_salt: u32) -> u32 {
|
||||
base_salt.wrapping_mul(2654435761)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ impl LoadBalancer {
|
|||
&self,
|
||||
note_id: Option<NoteId>,
|
||||
deckconfig_id: DeckConfigId,
|
||||
) -> LoadBalancerContext<'_> {
|
||||
) -> LoadBalancerContext {
|
||||
LoadBalancerContext {
|
||||
load_balancer: self,
|
||||
note_id,
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ use std::mem;
|
|||
use itertools::Itertools;
|
||||
|
||||
use super::writer::write_nodes;
|
||||
use super::FieldSearchMode;
|
||||
use super::Node;
|
||||
use super::SearchNode;
|
||||
use super::StateKind;
|
||||
|
|
@ -175,7 +174,7 @@ impl SearchNode {
|
|||
pub fn from_tag_name(name: &str) -> Self {
|
||||
Self::Tag {
|
||||
tag: escape_anki_wildcards_for_search_node(name),
|
||||
mode: FieldSearchMode::Normal,
|
||||
is_re: false,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ pub use builder::JoinSearches;
|
|||
pub use builder::Negated;
|
||||
pub use builder::SearchBuilder;
|
||||
pub use parser::parse as parse_search;
|
||||
pub use parser::FieldSearchMode;
|
||||
pub use parser::Node;
|
||||
pub use parser::PropertyKind;
|
||||
pub use parser::RatingKind;
|
||||
|
|
@ -227,7 +226,7 @@ impl Collection {
|
|||
&mut self,
|
||||
search: impl TryIntoSearch,
|
||||
mode: SortMode,
|
||||
) -> Result<CardTableGuard<'_>> {
|
||||
) -> Result<CardTableGuard> {
|
||||
let top_node = search.try_into_search()?;
|
||||
let writer = SqlWriter::new(self, ReturnItemType::Cards);
|
||||
let want_order = mode != SortMode::NoOrder;
|
||||
|
|
@ -300,7 +299,7 @@ impl Collection {
|
|||
pub(crate) fn search_notes_into_table(
|
||||
&mut self,
|
||||
search: impl TryIntoSearch,
|
||||
) -> Result<NoteTableGuard<'_>> {
|
||||
) -> Result<NoteTableGuard> {
|
||||
let top_node = search.try_into_search()?;
|
||||
let writer = SqlWriter::new(self, ReturnItemType::Notes);
|
||||
let mode = SortMode::NoOrder;
|
||||
|
|
@ -321,7 +320,7 @@ impl Collection {
|
|||
|
||||
/// Place the ids of cards with notes in 'search_nids' into 'search_cids'.
|
||||
/// Returns number of added cards.
|
||||
pub(crate) fn search_cards_of_notes_into_table(&mut self) -> Result<CardTableGuard<'_>> {
|
||||
pub(crate) fn search_cards_of_notes_into_table(&mut self) -> Result<CardTableGuard> {
|
||||
self.storage.setup_searched_cards_table()?;
|
||||
let cards = self.storage.search_cards_of_notes_into_table()?;
|
||||
Ok(CardTableGuard { cards, col: self })
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
use std::sync::LazyLock;
|
||||
|
||||
use anki_proto::search::search_node::FieldSearchMode as FieldSearchModeProto;
|
||||
use nom::branch::alt;
|
||||
use nom::bytes::complete::escaped;
|
||||
use nom::bytes::complete::is_not;
|
||||
|
|
@ -28,6 +27,7 @@ use crate::error::ParseError;
|
|||
use crate::error::Result;
|
||||
use crate::error::SearchErrorKind as FailKind;
|
||||
use crate::prelude::*;
|
||||
|
||||
type IResult<'a, O> = std::result::Result<(&'a str, O), nom::Err<ParseError<'a>>>;
|
||||
type ParseResult<'a, O> = std::result::Result<O, nom::Err<ParseError<'a>>>;
|
||||
|
||||
|
|
@ -48,23 +48,6 @@ pub enum Node {
|
|||
Search(SearchNode),
|
||||
}
|
||||
|
||||
#[derive(Copy, Debug, PartialEq, Eq, Clone)]
|
||||
pub enum FieldSearchMode {
|
||||
Normal,
|
||||
Regex,
|
||||
NoCombining,
|
||||
}
|
||||
|
||||
impl From<FieldSearchModeProto> for FieldSearchMode {
|
||||
fn from(mode: FieldSearchModeProto) -> Self {
|
||||
match mode {
|
||||
FieldSearchModeProto::Normal => Self::Normal,
|
||||
FieldSearchModeProto::Regex => Self::Regex,
|
||||
FieldSearchModeProto::Nocombining => Self::NoCombining,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq, Clone)]
|
||||
pub enum SearchNode {
|
||||
// text without a colon
|
||||
|
|
@ -73,7 +56,7 @@ pub enum SearchNode {
|
|||
SingleField {
|
||||
field: String,
|
||||
text: String,
|
||||
mode: FieldSearchMode,
|
||||
is_re: bool,
|
||||
},
|
||||
AddedInDays(u32),
|
||||
EditedInDays(u32),
|
||||
|
|
@ -94,7 +77,7 @@ pub enum SearchNode {
|
|||
},
|
||||
Tag {
|
||||
tag: String,
|
||||
mode: FieldSearchMode,
|
||||
is_re: bool,
|
||||
},
|
||||
Duplicates {
|
||||
notetype_id: NotetypeId,
|
||||
|
|
@ -175,7 +158,7 @@ pub fn parse(input: &str) -> Result<Vec<Node>> {
|
|||
|
||||
/// Zero or more nodes inside brackets, eg 'one OR two -three'.
|
||||
/// Empty vec must be handled by caller.
|
||||
fn group_inner(input: &str) -> IResult<'_, Vec<Node>> {
|
||||
fn group_inner(input: &str) -> IResult<Vec<Node>> {
|
||||
let mut remaining = input;
|
||||
let mut nodes = vec![];
|
||||
|
||||
|
|
@ -220,16 +203,16 @@ fn group_inner(input: &str) -> IResult<'_, Vec<Node>> {
|
|||
Ok((remaining, nodes))
|
||||
}
|
||||
|
||||
fn whitespace0(s: &str) -> IResult<'_, Vec<char>> {
|
||||
fn whitespace0(s: &str) -> IResult<Vec<char>> {
|
||||
many0(one_of(" \u{3000}")).parse(s)
|
||||
}
|
||||
|
||||
/// Optional leading space, then a (negated) group or text
|
||||
fn node(s: &str) -> IResult<'_, Node> {
|
||||
fn node(s: &str) -> IResult<Node> {
|
||||
preceded(whitespace0, alt((negated_node, group, text))).parse(s)
|
||||
}
|
||||
|
||||
fn negated_node(s: &str) -> IResult<'_, Node> {
|
||||
fn negated_node(s: &str) -> IResult<Node> {
|
||||
map(preceded(char('-'), alt((group, text))), |node| {
|
||||
Node::Not(Box::new(node))
|
||||
})
|
||||
|
|
@ -237,7 +220,7 @@ fn negated_node(s: &str) -> IResult<'_, Node> {
|
|||
}
|
||||
|
||||
/// One or more nodes surrounded by brackets, eg (one OR two)
|
||||
fn group(s: &str) -> IResult<'_, Node> {
|
||||
fn group(s: &str) -> IResult<Node> {
|
||||
let (opened, _) = char('(')(s)?;
|
||||
let (tail, inner) = group_inner(opened)?;
|
||||
if let Some(remaining) = tail.strip_prefix(')') {
|
||||
|
|
@ -252,18 +235,18 @@ fn group(s: &str) -> IResult<'_, Node> {
|
|||
}
|
||||
|
||||
/// Either quoted or unquoted text
|
||||
fn text(s: &str) -> IResult<'_, Node> {
|
||||
fn text(s: &str) -> IResult<Node> {
|
||||
alt((quoted_term, partially_quoted_term, unquoted_term)).parse(s)
|
||||
}
|
||||
|
||||
/// Quoted text, including the outer double quotes.
|
||||
fn quoted_term(s: &str) -> IResult<'_, Node> {
|
||||
fn quoted_term(s: &str) -> IResult<Node> {
|
||||
let (remaining, term) = quoted_term_str(s)?;
|
||||
Ok((remaining, Node::Search(search_node_for_text(term)?)))
|
||||
}
|
||||
|
||||
/// eg deck:"foo bar" - quotes must come after the :
|
||||
fn partially_quoted_term(s: &str) -> IResult<'_, Node> {
|
||||
fn partially_quoted_term(s: &str) -> IResult<Node> {
|
||||
let (remaining, (key, val)) = separated_pair(
|
||||
escaped(is_not("\"(): \u{3000}\\"), '\\', none_of(" \u{3000}")),
|
||||
char(':'),
|
||||
|
|
@ -277,7 +260,7 @@ fn partially_quoted_term(s: &str) -> IResult<'_, Node> {
|
|||
}
|
||||
|
||||
/// Unquoted text, terminated by whitespace or unescaped ", ( or )
|
||||
fn unquoted_term(s: &str) -> IResult<'_, Node> {
|
||||
fn unquoted_term(s: &str) -> IResult<Node> {
|
||||
match escaped(is_not("\"() \u{3000}\\"), '\\', none_of(" \u{3000}"))(s) {
|
||||
Ok((tail, term)) => {
|
||||
if term.is_empty() {
|
||||
|
|
@ -314,7 +297,7 @@ fn unquoted_term(s: &str) -> IResult<'_, Node> {
|
|||
}
|
||||
|
||||
/// Non-empty string delimited by unescaped double quotes.
|
||||
fn quoted_term_str(s: &str) -> IResult<'_, &str> {
|
||||
fn quoted_term_str(s: &str) -> IResult<&str> {
|
||||
let (opened, _) = char('"')(s)?;
|
||||
if let Ok((tail, inner)) =
|
||||
escaped::<_, ParseError, _, _>(is_not(r#""\"#), '\\', anychar).parse(opened)
|
||||
|
|
@ -338,7 +321,7 @@ fn quoted_term_str(s: &str) -> IResult<'_, &str> {
|
|||
|
||||
/// Determine if text is a qualified search, and handle escaped chars.
|
||||
/// Expect well-formed input: unempty and no trailing \.
|
||||
fn search_node_for_text(s: &str) -> ParseResult<'_, SearchNode> {
|
||||
fn search_node_for_text(s: &str) -> ParseResult<SearchNode> {
|
||||
// leading : is only possible error for well-formed input
|
||||
let (tail, head) = verify(escaped(is_not(r":\"), '\\', anychar), |t: &str| {
|
||||
!t.is_empty()
|
||||
|
|
@ -386,26 +369,21 @@ fn search_node_for_text_with_argument<'a>(
|
|||
})
|
||||
}
|
||||
|
||||
fn parse_tag(s: &str) -> ParseResult<'_, SearchNode> {
|
||||
fn parse_tag(s: &str) -> ParseResult<SearchNode> {
|
||||
Ok(if let Some(re) = s.strip_prefix("re:") {
|
||||
SearchNode::Tag {
|
||||
tag: unescape_quotes(re),
|
||||
mode: FieldSearchMode::Regex,
|
||||
}
|
||||
} else if let Some(nc) = s.strip_prefix("nc:") {
|
||||
SearchNode::Tag {
|
||||
tag: unescape(nc)?,
|
||||
mode: FieldSearchMode::NoCombining,
|
||||
is_re: true,
|
||||
}
|
||||
} else {
|
||||
SearchNode::Tag {
|
||||
tag: unescape(s)?,
|
||||
mode: FieldSearchMode::Normal,
|
||||
is_re: false,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
fn parse_template(s: &str) -> ParseResult<'_, SearchNode> {
|
||||
fn parse_template(s: &str) -> ParseResult<SearchNode> {
|
||||
Ok(SearchNode::CardTemplate(match s.parse::<u16>() {
|
||||
Ok(n) => TemplateKind::Ordinal(n.max(1) - 1),
|
||||
Err(_) => TemplateKind::Name(unescape(s)?),
|
||||
|
|
@ -413,7 +391,7 @@ fn parse_template(s: &str) -> ParseResult<'_, SearchNode> {
|
|||
}
|
||||
|
||||
/// flag:0-7
|
||||
fn parse_flag(s: &str) -> ParseResult<'_, SearchNode> {
|
||||
fn parse_flag(s: &str) -> ParseResult<SearchNode> {
|
||||
if let Ok(flag) = s.parse::<u8>() {
|
||||
if flag > 7 {
|
||||
Err(parse_failure(s, FailKind::InvalidFlag))
|
||||
|
|
@ -426,7 +404,7 @@ fn parse_flag(s: &str) -> ParseResult<'_, SearchNode> {
|
|||
}
|
||||
|
||||
/// eg resched:3
|
||||
fn parse_resched(s: &str) -> ParseResult<'_, SearchNode> {
|
||||
fn parse_resched(s: &str) -> ParseResult<SearchNode> {
|
||||
parse_u32(s, "resched:").map(|days| SearchNode::Rated {
|
||||
days,
|
||||
ease: RatingKind::ManualReschedule,
|
||||
|
|
@ -434,7 +412,7 @@ fn parse_resched(s: &str) -> ParseResult<'_, SearchNode> {
|
|||
}
|
||||
|
||||
/// eg prop:ivl>3, prop:ease!=2.5
|
||||
fn parse_prop(prop_clause: &str) -> ParseResult<'_, SearchNode> {
|
||||
fn parse_prop(prop_clause: &str) -> ParseResult<SearchNode> {
|
||||
let (tail, prop) = alt((
|
||||
tag("ivl"),
|
||||
tag("due"),
|
||||
|
|
@ -602,23 +580,23 @@ fn parse_prop_rated<'a>(num: &str, context: &'a str) -> ParseResult<'a, Property
|
|||
}
|
||||
|
||||
/// eg added:1
|
||||
fn parse_added(s: &str) -> ParseResult<'_, SearchNode> {
|
||||
fn parse_added(s: &str) -> ParseResult<SearchNode> {
|
||||
parse_u32(s, "added:").map(|n| SearchNode::AddedInDays(n.max(1)))
|
||||
}
|
||||
|
||||
/// eg edited:1
|
||||
fn parse_edited(s: &str) -> ParseResult<'_, SearchNode> {
|
||||
fn parse_edited(s: &str) -> ParseResult<SearchNode> {
|
||||
parse_u32(s, "edited:").map(|n| SearchNode::EditedInDays(n.max(1)))
|
||||
}
|
||||
|
||||
/// eg introduced:1
|
||||
fn parse_introduced(s: &str) -> ParseResult<'_, SearchNode> {
|
||||
fn parse_introduced(s: &str) -> ParseResult<SearchNode> {
|
||||
parse_u32(s, "introduced:").map(|n| SearchNode::IntroducedInDays(n.max(1)))
|
||||
}
|
||||
|
||||
/// eg rated:3 or rated:10:2
|
||||
/// second arg must be between 1-4
|
||||
fn parse_rated(s: &str) -> ParseResult<'_, SearchNode> {
|
||||
fn parse_rated(s: &str) -> ParseResult<SearchNode> {
|
||||
let mut it = s.splitn(2, ':');
|
||||
let days = parse_u32(it.next().unwrap(), "rated:")?.max(1);
|
||||
let button = parse_answer_button(it.next(), s)?;
|
||||
|
|
@ -626,7 +604,7 @@ fn parse_rated(s: &str) -> ParseResult<'_, SearchNode> {
|
|||
}
|
||||
|
||||
/// eg is:due
|
||||
fn parse_state(s: &str) -> ParseResult<'_, SearchNode> {
|
||||
fn parse_state(s: &str) -> ParseResult<SearchNode> {
|
||||
use StateKind::*;
|
||||
Ok(SearchNode::State(match s {
|
||||
"new" => New,
|
||||
|
|
@ -646,7 +624,7 @@ fn parse_state(s: &str) -> ParseResult<'_, SearchNode> {
|
|||
}))
|
||||
}
|
||||
|
||||
fn parse_mid(s: &str) -> ParseResult<'_, SearchNode> {
|
||||
fn parse_mid(s: &str) -> ParseResult<SearchNode> {
|
||||
parse_i64(s, "mid:").map(|n| SearchNode::NotetypeId(n.into()))
|
||||
}
|
||||
|
||||
|
|
@ -668,7 +646,7 @@ fn check_id_list<'a>(s: &'a str, context: &str) -> ParseResult<'a, &'a str> {
|
|||
}
|
||||
|
||||
/// eg dupe:1231,hello
|
||||
fn parse_dupe(s: &str) -> ParseResult<'_, SearchNode> {
|
||||
fn parse_dupe(s: &str) -> ParseResult<SearchNode> {
|
||||
let mut it = s.splitn(2, ',');
|
||||
let ntid = parse_i64(it.next().unwrap(), s)?;
|
||||
if let Some(text) = it.next() {
|
||||
|
|
@ -692,19 +670,13 @@ fn parse_single_field<'a>(key: &'a str, val: &'a str) -> ParseResult<'a, SearchN
|
|||
SearchNode::SingleField {
|
||||
field: unescape(key)?,
|
||||
text: unescape_quotes(stripped),
|
||||
mode: FieldSearchMode::Regex,
|
||||
}
|
||||
} else if let Some(stripped) = val.strip_prefix("nc:") {
|
||||
SearchNode::SingleField {
|
||||
field: unescape(key)?,
|
||||
text: unescape_quotes(stripped),
|
||||
mode: FieldSearchMode::NoCombining,
|
||||
is_re: true,
|
||||
}
|
||||
} else {
|
||||
SearchNode::SingleField {
|
||||
field: unescape(key)?,
|
||||
text: unescape(val)?,
|
||||
mode: FieldSearchMode::Normal,
|
||||
is_re: false,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
@ -728,7 +700,7 @@ fn unescape_quotes_and_backslashes(s: &str) -> String {
|
|||
}
|
||||
|
||||
/// Unescape chars with special meaning to the parser.
|
||||
fn unescape(txt: &str) -> ParseResult<'_, String> {
|
||||
fn unescape(txt: &str) -> ParseResult<String> {
|
||||
if let Some(seq) = invalid_escape_sequence(txt) {
|
||||
Err(parse_failure(
|
||||
txt,
|
||||
|
|
@ -834,7 +806,7 @@ mod test {
|
|||
Search(SingleField {
|
||||
field: "foo".into(),
|
||||
text: "bar baz".into(),
|
||||
mode: FieldSearchMode::Normal,
|
||||
is_re: false,
|
||||
})
|
||||
]))),
|
||||
Or,
|
||||
|
|
@ -847,16 +819,7 @@ mod test {
|
|||
vec![Search(SingleField {
|
||||
field: "foo".into(),
|
||||
text: "bar".into(),
|
||||
mode: FieldSearchMode::Regex,
|
||||
})]
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
parse("foo:nc:bar")?,
|
||||
vec![Search(SingleField {
|
||||
field: "foo".into(),
|
||||
text: "bar".into(),
|
||||
mode: FieldSearchMode::NoCombining,
|
||||
is_re: true
|
||||
})]
|
||||
);
|
||||
|
||||
|
|
@ -866,7 +829,7 @@ mod test {
|
|||
vec![Search(SingleField {
|
||||
field: "field".into(),
|
||||
text: "va\"lue".into(),
|
||||
mode: FieldSearchMode::Normal,
|
||||
is_re: false
|
||||
})]
|
||||
);
|
||||
assert_eq!(parse(r#""field:va\"lue""#)?, parse(r#"field:"va\"lue""#)?,);
|
||||
|
|
@ -943,14 +906,14 @@ mod test {
|
|||
parse("tag:hard")?,
|
||||
vec![Search(Tag {
|
||||
tag: "hard".into(),
|
||||
mode: FieldSearchMode::Normal
|
||||
is_re: false
|
||||
})]
|
||||
);
|
||||
assert_eq!(
|
||||
parse(r"tag:re:\\")?,
|
||||
vec![Search(Tag {
|
||||
tag: r"\\".into(),
|
||||
mode: FieldSearchMode::Regex
|
||||
is_re: true
|
||||
})]
|
||||
);
|
||||
assert_eq!(
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ use itertools::Itertools;
|
|||
|
||||
use crate::prelude::*;
|
||||
use crate::search::parse_search;
|
||||
use crate::search::FieldSearchMode;
|
||||
use crate::search::Negated;
|
||||
use crate::search::Node;
|
||||
use crate::search::PropertyKind;
|
||||
|
|
@ -41,7 +40,7 @@ impl TryFrom<anki_proto::search::SearchNode> for Node {
|
|||
Filter::FieldName(s) => Node::Search(SearchNode::SingleField {
|
||||
field: escape_anki_wildcards_for_search_node(&s),
|
||||
text: "_*".to_string(),
|
||||
mode: FieldSearchMode::Normal,
|
||||
is_re: false,
|
||||
}),
|
||||
Filter::Rated(rated) => Node::Search(SearchNode::Rated {
|
||||
days: rated.days,
|
||||
|
|
@ -108,7 +107,7 @@ impl TryFrom<anki_proto::search::SearchNode> for Node {
|
|||
Filter::Field(field) => Node::Search(SearchNode::SingleField {
|
||||
field: escape_anki_wildcards(&field.field_name),
|
||||
text: escape_anki_wildcards(&field.text),
|
||||
mode: field.mode().into(),
|
||||
is_re: field.is_re,
|
||||
}),
|
||||
Filter::LiteralText(text) => {
|
||||
let text = escape_anki_wildcards(&text);
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ use std::ops::Range;
|
|||
|
||||
use itertools::Itertools;
|
||||
|
||||
use super::parser::FieldSearchMode;
|
||||
use super::parser::Node;
|
||||
use super::parser::PropertyKind;
|
||||
use super::parser::RatingKind;
|
||||
|
|
@ -139,8 +138,8 @@ impl SqlWriter<'_> {
|
|||
false,
|
||||
)?
|
||||
}
|
||||
SearchNode::SingleField { field, text, mode } => {
|
||||
self.write_field(&norm(field), &self.norm_note(text), *mode)?
|
||||
SearchNode::SingleField { field, text, is_re } => {
|
||||
self.write_field(&norm(field), &self.norm_note(text), *is_re)?
|
||||
}
|
||||
SearchNode::Duplicates { notetype_id, text } => {
|
||||
self.write_dupe(*notetype_id, &self.norm_note(text))?
|
||||
|
|
@ -181,7 +180,7 @@ impl SqlWriter<'_> {
|
|||
SearchNode::Notetype(notetype) => self.write_notetype(&norm(notetype)),
|
||||
SearchNode::Rated { days, ease } => self.write_rated(">", -i64::from(*days), ease)?,
|
||||
|
||||
SearchNode::Tag { tag, mode } => self.write_tag(&norm(tag), *mode),
|
||||
SearchNode::Tag { tag, is_re } => self.write_tag(&norm(tag), *is_re),
|
||||
SearchNode::State(state) => self.write_state(state)?,
|
||||
SearchNode::Flag(flag) => {
|
||||
write!(self.sql, "(c.flags & 7) == {flag}").unwrap();
|
||||
|
|
@ -297,8 +296,8 @@ impl SqlWriter<'_> {
|
|||
Ok(())
|
||||
}
|
||||
|
||||
fn write_tag(&mut self, tag: &str, mode: FieldSearchMode) {
|
||||
if mode == FieldSearchMode::Regex {
|
||||
fn write_tag(&mut self, tag: &str, is_re: bool) {
|
||||
if is_re {
|
||||
self.args.push(format!("(?i){tag}"));
|
||||
write!(self.sql, "regexp_tags(?{}, n.tags)", self.args.len()).unwrap();
|
||||
} else {
|
||||
|
|
@ -311,19 +310,8 @@ impl SqlWriter<'_> {
|
|||
}
|
||||
s if s.contains(' ') => write!(self.sql, "false").unwrap(),
|
||||
text => {
|
||||
let text = if mode == FieldSearchMode::Normal {
|
||||
write!(self.sql, "n.tags regexp ?").unwrap();
|
||||
Cow::from(text)
|
||||
} else {
|
||||
write!(
|
||||
self.sql,
|
||||
"coalesce(process_text(n.tags, {}), n.tags) regexp ?",
|
||||
ProcessTextFlags::NoCombining.bits()
|
||||
)
|
||||
.unwrap();
|
||||
without_combining(text)
|
||||
};
|
||||
let re = &to_custom_re(&text, r"\S");
|
||||
write!(self.sql, "n.tags regexp ?").unwrap();
|
||||
let re = &to_custom_re(text, r"\S");
|
||||
self.args.push(format!("(?i).* {re}(::| ).*"));
|
||||
}
|
||||
}
|
||||
|
|
@ -579,18 +567,16 @@ impl SqlWriter<'_> {
|
|||
}
|
||||
}
|
||||
|
||||
fn write_field(&mut self, field_name: &str, val: &str, mode: FieldSearchMode) -> Result<()> {
|
||||
fn write_field(&mut self, field_name: &str, val: &str, is_re: bool) -> Result<()> {
|
||||
if matches!(field_name, "*" | "_*" | "*_") {
|
||||
if mode == FieldSearchMode::Regex {
|
||||
if is_re {
|
||||
self.write_all_fields_regexp(val);
|
||||
} else {
|
||||
self.write_all_fields(val);
|
||||
}
|
||||
Ok(())
|
||||
} else if mode == FieldSearchMode::Regex {
|
||||
} else if is_re {
|
||||
self.write_single_field_regexp(field_name, val)
|
||||
} else if mode == FieldSearchMode::NoCombining {
|
||||
self.write_single_field_nc(field_name, val)
|
||||
} else {
|
||||
self.write_single_field(field_name, val)
|
||||
}
|
||||
|
|
@ -606,58 +592,6 @@ impl SqlWriter<'_> {
|
|||
write!(self.sql, "regexp_fields(?{}, n.flds)", self.args.len()).unwrap();
|
||||
}
|
||||
|
||||
fn write_single_field_nc(&mut self, field_name: &str, val: &str) -> Result<()> {
|
||||
let field_indicies_by_notetype = self.num_fields_and_fields_indices_by_notetype(
|
||||
field_name,
|
||||
matches!(val, "*" | "_*" | "*_"),
|
||||
)?;
|
||||
if field_indicies_by_notetype.is_empty() {
|
||||
write!(self.sql, "false").unwrap();
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
let val = to_sql(val);
|
||||
let val = without_combining(&val);
|
||||
self.args.push(val.into());
|
||||
let arg_idx = self.args.len();
|
||||
let field_idx_str = format!("' || ?{arg_idx} || '");
|
||||
let other_idx_str = "%".to_string();
|
||||
|
||||
let notetype_clause = |ctx: &FieldQualifiedSearchContext| -> String {
|
||||
let field_index_clause = |range: &Range<u32>| {
|
||||
let f = (0..ctx.total_fields_in_note)
|
||||
.filter_map(|i| {
|
||||
if i as u32 == range.start {
|
||||
Some(&field_idx_str)
|
||||
} else if range.contains(&(i as u32)) {
|
||||
None
|
||||
} else {
|
||||
Some(&other_idx_str)
|
||||
}
|
||||
})
|
||||
.join("\x1f");
|
||||
format!(
|
||||
"coalesce(process_text(n.flds, {}), n.flds) like '{f}' escape '\\'",
|
||||
ProcessTextFlags::NoCombining.bits()
|
||||
)
|
||||
};
|
||||
|
||||
let all_field_clauses = ctx
|
||||
.field_ranges_to_search
|
||||
.iter()
|
||||
.map(field_index_clause)
|
||||
.join(" or ");
|
||||
format!("(n.mid = {mid} and ({all_field_clauses}))", mid = ctx.ntid)
|
||||
};
|
||||
let all_notetype_clauses = field_indicies_by_notetype
|
||||
.iter()
|
||||
.map(notetype_clause)
|
||||
.join(" or ");
|
||||
write!(self.sql, "({all_notetype_clauses})").unwrap();
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn write_single_field_regexp(&mut self, field_name: &str, val: &str) -> Result<()> {
|
||||
let field_indicies_by_notetype = self.fields_indices_by_notetype(field_name)?;
|
||||
if field_indicies_by_notetype.is_empty() {
|
||||
|
|
@ -1182,20 +1116,6 @@ mod test {
|
|||
vec!["(?i)te.*st".into()]
|
||||
)
|
||||
);
|
||||
// field search with no-combine
|
||||
assert_eq!(
|
||||
s(ctx, "front:nc:frânçais"),
|
||||
(
|
||||
concat!(
|
||||
"(((n.mid = 1581236385344 and (coalesce(process_text(n.flds, 1), n.flds) like '' || ?1 || '\u{1f}%' escape '\\')) or ",
|
||||
"(n.mid = 1581236385345 and (coalesce(process_text(n.flds, 1), n.flds) like '' || ?1 || '\u{1f}%\u{1f}%' escape '\\')) or ",
|
||||
"(n.mid = 1581236385346 and (coalesce(process_text(n.flds, 1), n.flds) like '' || ?1 || '\u{1f}%' escape '\\')) or ",
|
||||
"(n.mid = 1581236385347 and (coalesce(process_text(n.flds, 1), n.flds) like '' || ?1 || '\u{1f}%' escape '\\'))))"
|
||||
)
|
||||
.into(),
|
||||
vec!["francais".into()]
|
||||
)
|
||||
);
|
||||
// all field search
|
||||
assert_eq!(
|
||||
s(ctx, "*:te*st"),
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ use regex::Regex;
|
|||
use crate::notetype::NotetypeId as NotetypeIdType;
|
||||
use crate::prelude::*;
|
||||
use crate::search::parser::parse;
|
||||
use crate::search::parser::FieldSearchMode;
|
||||
use crate::search::parser::Node;
|
||||
use crate::search::parser::PropertyKind;
|
||||
use crate::search::parser::RatingKind;
|
||||
|
|
@ -70,7 +69,7 @@ fn write_search_node(node: &SearchNode) -> String {
|
|||
use SearchNode::*;
|
||||
match node {
|
||||
UnqualifiedText(s) => maybe_quote(&s.replace(':', "\\:")),
|
||||
SingleField { field, text, mode } => write_single_field(field, text, *mode),
|
||||
SingleField { field, text, is_re } => write_single_field(field, text, *is_re),
|
||||
AddedInDays(u) => format!("added:{u}"),
|
||||
EditedInDays(u) => format!("edited:{u}"),
|
||||
IntroducedInDays(u) => format!("introduced:{u}"),
|
||||
|
|
@ -82,7 +81,7 @@ fn write_search_node(node: &SearchNode) -> String {
|
|||
NotetypeId(NotetypeIdType(i)) => format!("mid:{i}"),
|
||||
Notetype(s) => maybe_quote(&format!("note:{s}")),
|
||||
Rated { days, ease } => write_rated(days, ease),
|
||||
Tag { tag, mode } => write_single_field("tag", tag, *mode),
|
||||
Tag { tag, is_re } => write_single_field("tag", tag, *is_re),
|
||||
Duplicates { notetype_id, text } => write_dupe(notetype_id, text),
|
||||
State(k) => write_state(k),
|
||||
Flag(u) => format!("flag:{u}"),
|
||||
|
|
@ -117,25 +116,14 @@ fn needs_quotation(txt: &str) -> bool {
|
|||
}
|
||||
|
||||
/// Also used by tag search, which has the same syntax.
|
||||
fn write_single_field(field: &str, text: &str, mode: FieldSearchMode) -> String {
|
||||
let prefix = match mode {
|
||||
FieldSearchMode::Normal => "",
|
||||
FieldSearchMode::Regex => "re:",
|
||||
FieldSearchMode::NoCombining => "nc:",
|
||||
};
|
||||
let text = if mode == FieldSearchMode::Normal
|
||||
&& (text.starts_with("re:") || text.starts_with("nc:"))
|
||||
{
|
||||
fn write_single_field(field: &str, text: &str, is_re: bool) -> String {
|
||||
let re = if is_re { "re:" } else { "" };
|
||||
let text = if !is_re && text.starts_with("re:") {
|
||||
text.replacen(':', "\\:", 1)
|
||||
} else {
|
||||
text.to_string()
|
||||
};
|
||||
maybe_quote(&format!(
|
||||
"{}:{}{}",
|
||||
field.replace(':', "\\:"),
|
||||
prefix,
|
||||
&text
|
||||
))
|
||||
maybe_quote(&format!("{}:{}{}", field.replace(':', "\\:"), re, &text))
|
||||
}
|
||||
|
||||
fn write_template(template: &TemplateKind) -> String {
|
||||
|
|
|
|||
|
|
@ -403,9 +403,7 @@ impl super::SqliteStorage {
|
|||
let last_revlog_info = get_last_revlog_info(&revlog);
|
||||
for (card_id, last_revlog_info) in last_revlog_info {
|
||||
let card = self.get_card(card_id)?;
|
||||
if last_revlog_info.last_reviewed_at.is_none() {
|
||||
continue;
|
||||
} else if let Some(mut card) = card {
|
||||
if let Some(mut card) = card {
|
||||
if card.ctype != CardType::New && card.last_review_time.is_none() {
|
||||
card.last_review_time = last_revlog_info.last_reviewed_at;
|
||||
self.update_card(&card)?;
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ fn invalid_char_for_tag(c: char) -> bool {
|
|||
c.is_ascii_control() || is_tag_separator(c)
|
||||
}
|
||||
|
||||
fn normalized_tag_name_component(comp: &str) -> Cow<'_, str> {
|
||||
fn normalized_tag_name_component(comp: &str) -> Cow<str> {
|
||||
let mut out = normalize_to_nfc(comp);
|
||||
if out.contains(invalid_char_for_tag) {
|
||||
out = out.replace(invalid_char_for_tag, "").into();
|
||||
|
|
@ -170,7 +170,7 @@ fn normalized_tag_name_component(comp: &str) -> Cow<'_, str> {
|
|||
}
|
||||
}
|
||||
|
||||
pub(super) fn normalize_tag_name(name: &str) -> Result<Cow<'_, str>> {
|
||||
pub(super) fn normalize_tag_name(name: &str) -> Result<Cow<str>> {
|
||||
let normalized_name: Cow<str> = if name
|
||||
.split("::")
|
||||
.any(|comp| matches!(normalized_tag_name_component(comp), Cow::Owned(_)))
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ pub enum Token<'a> {
|
|||
CloseConditional(&'a str),
|
||||
}
|
||||
|
||||
fn comment_token(s: &str) -> nom::IResult<&str, Token<'_>> {
|
||||
fn comment_token(s: &str) -> nom::IResult<&str, Token> {
|
||||
map(
|
||||
delimited(
|
||||
tag(COMMENT_START),
|
||||
|
|
@ -151,7 +151,7 @@ fn tokens(mut template: &str) -> impl Iterator<Item = TemplateResult<Token<'_>>>
|
|||
}
|
||||
|
||||
/// classify handle based on leading character
|
||||
fn classify_handle(s: &str) -> Token<'_> {
|
||||
fn classify_handle(s: &str) -> Token {
|
||||
let start = s.trim_start_matches('{').trim();
|
||||
if start.len() < 2 {
|
||||
return Token::Replacement(start);
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ fn captured_sound(caps: &Captures) -> bool {
|
|||
caps.get(2).unwrap().as_str().starts_with("sound:")
|
||||
}
|
||||
|
||||
fn kana_filter(text: &str) -> Cow<'_, str> {
|
||||
fn kana_filter(text: &str) -> Cow<str> {
|
||||
FURIGANA
|
||||
.replace_all(&text.replace(" ", " "), |caps: &Captures| {
|
||||
if captured_sound(caps) {
|
||||
|
|
@ -130,7 +130,7 @@ fn kana_filter(text: &str) -> Cow<'_, str> {
|
|||
.into()
|
||||
}
|
||||
|
||||
fn kanji_filter(text: &str) -> Cow<'_, str> {
|
||||
fn kanji_filter(text: &str) -> Cow<str> {
|
||||
FURIGANA
|
||||
.replace_all(&text.replace(" ", " "), |caps: &Captures| {
|
||||
if captured_sound(caps) {
|
||||
|
|
@ -143,7 +143,7 @@ fn kanji_filter(text: &str) -> Cow<'_, str> {
|
|||
.into()
|
||||
}
|
||||
|
||||
fn furigana_filter(text: &str) -> Cow<'_, str> {
|
||||
fn furigana_filter(text: &str) -> Cow<str> {
|
||||
FURIGANA
|
||||
.replace_all(&text.replace(" ", " "), |caps: &Captures| {
|
||||
if captured_sound(caps) {
|
||||
|
|
|
|||
|
|
@ -215,8 +215,8 @@ pub fn is_html(text: impl AsRef<str>) -> bool {
|
|||
HTML.is_match(text.as_ref())
|
||||
}
|
||||
|
||||
pub fn html_to_text_line(html: &str, preserve_media_filenames: bool) -> Cow<'_, str> {
|
||||
let (html_stripper, sound_rep): (fn(&str) -> Cow<'_, str>, _) = if preserve_media_filenames {
|
||||
pub fn html_to_text_line(html: &str, preserve_media_filenames: bool) -> Cow<str> {
|
||||
let (html_stripper, sound_rep): (fn(&str) -> Cow<str>, _) = if preserve_media_filenames {
|
||||
(strip_html_preserving_media_filenames, "$1")
|
||||
} else {
|
||||
(strip_html, "")
|
||||
|
|
@ -229,15 +229,15 @@ pub fn html_to_text_line(html: &str, preserve_media_filenames: bool) -> Cow<'_,
|
|||
.trim()
|
||||
}
|
||||
|
||||
pub fn strip_html(html: &str) -> Cow<'_, str> {
|
||||
pub fn strip_html(html: &str) -> Cow<str> {
|
||||
strip_html_preserving_entities(html).map_cow(decode_entities)
|
||||
}
|
||||
|
||||
pub fn strip_html_preserving_entities(html: &str) -> Cow<'_, str> {
|
||||
pub fn strip_html_preserving_entities(html: &str) -> Cow<str> {
|
||||
HTML.replace_all(html, "")
|
||||
}
|
||||
|
||||
pub fn decode_entities(html: &str) -> Cow<'_, str> {
|
||||
pub fn decode_entities(html: &str) -> Cow<str> {
|
||||
if html.contains('&') {
|
||||
match htmlescape::decode_html(html) {
|
||||
Ok(text) => text.replace('\u{a0}', " ").into(),
|
||||
|
|
@ -249,7 +249,7 @@ pub fn decode_entities(html: &str) -> Cow<'_, str> {
|
|||
}
|
||||
}
|
||||
|
||||
pub(crate) fn newlines_to_spaces(text: &str) -> Cow<'_, str> {
|
||||
pub(crate) fn newlines_to_spaces(text: &str) -> Cow<str> {
|
||||
if text.contains('\n') {
|
||||
text.replace('\n', " ").into()
|
||||
} else {
|
||||
|
|
@ -257,7 +257,7 @@ pub(crate) fn newlines_to_spaces(text: &str) -> Cow<'_, str> {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn strip_html_for_tts(html: &str) -> Cow<'_, str> {
|
||||
pub fn strip_html_for_tts(html: &str) -> Cow<str> {
|
||||
HTML_LINEBREAK_TAGS
|
||||
.replace_all(html, " ")
|
||||
.map_cow(strip_html)
|
||||
|
|
@ -282,7 +282,7 @@ pub(crate) struct MediaRef<'a> {
|
|||
pub fname_decoded: Cow<'a, str>,
|
||||
}
|
||||
|
||||
pub(crate) fn extract_media_refs(text: &str) -> Vec<MediaRef<'_>> {
|
||||
pub(crate) fn extract_media_refs(text: &str) -> Vec<MediaRef> {
|
||||
let mut out = vec![];
|
||||
|
||||
for caps in HTML_MEDIA_TAGS.captures_iter(text) {
|
||||
|
|
@ -359,11 +359,11 @@ pub(crate) fn extract_underscored_references(text: &str) -> Vec<&str> {
|
|||
/// Returns the first matching group as a str. This is intended for regexes
|
||||
/// where exactly one group matches, and will panic for matches without matching
|
||||
/// groups.
|
||||
fn extract_match(caps: Captures<'_>) -> &str {
|
||||
fn extract_match(caps: Captures) -> &str {
|
||||
caps.iter().skip(1).find_map(|g| g).unwrap().as_str()
|
||||
}
|
||||
|
||||
pub fn strip_html_preserving_media_filenames(html: &str) -> Cow<'_, str> {
|
||||
pub fn strip_html_preserving_media_filenames(html: &str) -> Cow<str> {
|
||||
HTML_MEDIA_TAGS
|
||||
.replace_all(html, r" ${1}${2}${3} ")
|
||||
.map_cow(strip_html)
|
||||
|
|
@ -385,7 +385,7 @@ pub(crate) fn sanitize_html_no_images(html: &str) -> String {
|
|||
.to_string()
|
||||
}
|
||||
|
||||
pub(crate) fn normalize_to_nfc(s: &str) -> Cow<'_, str> {
|
||||
pub(crate) fn normalize_to_nfc(s: &str) -> Cow<str> {
|
||||
match is_nfc(s) {
|
||||
false => s.chars().nfc().collect::<String>().into(),
|
||||
true => s.into(),
|
||||
|
|
@ -429,7 +429,7 @@ static EXTRA_NO_COMBINING_REPLACEMENTS: phf::Map<char, &str> = phf::phf_map! {
|
|||
};
|
||||
|
||||
/// Convert provided string to NFKD form and strip combining characters.
|
||||
pub(crate) fn without_combining(s: &str) -> Cow<'_, str> {
|
||||
pub(crate) fn without_combining(s: &str) -> Cow<str> {
|
||||
// if the string is already normalized
|
||||
if matches!(is_nfkd_quick(s.chars()), IsNormalized::Yes) {
|
||||
// and no combining characters found, return unchanged
|
||||
|
|
@ -472,7 +472,7 @@ pub(crate) fn is_glob(txt: &str) -> bool {
|
|||
}
|
||||
|
||||
/// Convert to a RegEx respecting Anki wildcards.
|
||||
pub(crate) fn to_re(txt: &str) -> Cow<'_, str> {
|
||||
pub(crate) fn to_re(txt: &str) -> Cow<str> {
|
||||
to_custom_re(txt, ".")
|
||||
}
|
||||
|
||||
|
|
@ -492,7 +492,7 @@ pub(crate) fn to_custom_re<'a>(txt: &'a str, wildcard: &str) -> Cow<'a, str> {
|
|||
}
|
||||
|
||||
/// Convert to SQL respecting Anki wildcards.
|
||||
pub(crate) fn to_sql(txt: &str) -> Cow<'_, str> {
|
||||
pub(crate) fn to_sql(txt: &str) -> Cow<str> {
|
||||
// escape sequences and unescaped special characters which need conversion
|
||||
static RE: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\\[\\*]|[*%]").unwrap());
|
||||
RE.replace_all(txt, |caps: &Captures| {
|
||||
|
|
@ -508,7 +508,7 @@ pub(crate) fn to_sql(txt: &str) -> Cow<'_, str> {
|
|||
}
|
||||
|
||||
/// Unescape everything.
|
||||
pub(crate) fn to_text(txt: &str) -> Cow<'_, str> {
|
||||
pub(crate) fn to_text(txt: &str) -> Cow<str> {
|
||||
static RE: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\\(.)").unwrap());
|
||||
RE.replace_all(txt, "$1")
|
||||
}
|
||||
|
|
@ -561,14 +561,14 @@ const FRAGMENT_QUERY_UNION: &AsciiSet = &CONTROLS
|
|||
.add(b'#');
|
||||
|
||||
/// IRI-encode unescaped local paths in HTML fragment.
|
||||
pub(crate) fn encode_iri_paths(unescaped_html: &str) -> Cow<'_, str> {
|
||||
pub(crate) fn encode_iri_paths(unescaped_html: &str) -> Cow<str> {
|
||||
transform_html_paths(unescaped_html, |fname| {
|
||||
utf8_percent_encode(fname, FRAGMENT_QUERY_UNION).into()
|
||||
})
|
||||
}
|
||||
|
||||
/// URI-decode escaped local paths in HTML fragment.
|
||||
pub(crate) fn decode_iri_paths(escaped_html: &str) -> Cow<'_, str> {
|
||||
pub(crate) fn decode_iri_paths(escaped_html: &str) -> Cow<str> {
|
||||
transform_html_paths(escaped_html, |fname| {
|
||||
percent_decode_str(fname).decode_utf8_lossy()
|
||||
})
|
||||
|
|
@ -577,9 +577,9 @@ pub(crate) fn decode_iri_paths(escaped_html: &str) -> Cow<'_, str> {
|
|||
/// Apply a transform to local filename references in tags like IMG.
|
||||
/// Required at display time, as Anki unfortunately stores the references
|
||||
/// in unencoded form in the database.
|
||||
fn transform_html_paths<F>(html: &str, transform: F) -> Cow<'_, str>
|
||||
fn transform_html_paths<F>(html: &str, transform: F) -> Cow<str>
|
||||
where
|
||||
F: Fn(&str) -> Cow<'_, str>,
|
||||
F: Fn(&str) -> Cow<str>,
|
||||
{
|
||||
HTML_MEDIA_TAGS.replace_all(html, |caps: &Captures| {
|
||||
let fname = caps
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ pub fn compare_answer(expected: &str, typed: &str, combining: bool) -> String {
|
|||
trait DiffTrait {
|
||||
fn get_typed(&self) -> &[char];
|
||||
fn get_expected(&self) -> &[char];
|
||||
fn get_expected_original(&self) -> Cow<'_, str>;
|
||||
fn get_expected_original(&self) -> Cow<str>;
|
||||
|
||||
fn new(expected: &str, typed: &str) -> Self;
|
||||
|
||||
|
|
@ -136,7 +136,7 @@ fn render_tokens(tokens: &[DiffToken]) -> String {
|
|||
|
||||
/// Prefixes a leading mark character with a non-breaking space to prevent
|
||||
/// it from joining the previous token.
|
||||
fn isolate_leading_mark(text: &str) -> Cow<'_, str> {
|
||||
fn isolate_leading_mark(text: &str) -> Cow<str> {
|
||||
if text
|
||||
.chars()
|
||||
.next()
|
||||
|
|
@ -161,7 +161,7 @@ impl DiffTrait for Diff {
|
|||
fn get_expected(&self) -> &[char] {
|
||||
&self.expected
|
||||
}
|
||||
fn get_expected_original(&self) -> Cow<'_, str> {
|
||||
fn get_expected_original(&self) -> Cow<str> {
|
||||
Cow::Owned(self.get_expected().iter().collect::<String>())
|
||||
}
|
||||
|
||||
|
|
@ -191,7 +191,7 @@ impl DiffTrait for DiffNonCombining {
|
|||
fn get_expected(&self) -> &[char] {
|
||||
&self.base.expected
|
||||
}
|
||||
fn get_expected_original(&self) -> Cow<'_, str> {
|
||||
fn get_expected_original(&self) -> Cow<str> {
|
||||
Cow::Borrowed(&self.expected_original)
|
||||
}
|
||||
|
||||
|
|
|
|||
4
run.bat
4
run.bat
|
|
@ -9,8 +9,6 @@ set QTWEBENGINE_CHROMIUM_FLAGS=--remote-allow-origins=http://localhost:8080
|
|||
set ANKI_API_PORT=40000
|
||||
set ANKI_API_HOST=127.0.0.1
|
||||
|
||||
@if not defined PYENV set PYENV=out\pyenv
|
||||
|
||||
call tools\ninja pylib qt || exit /b 1
|
||||
%PYENV%\Scripts\python tools\run.py %* || exit /b 1
|
||||
.\out\pyenv\scripts\python tools\run.py %* || exit /b 1
|
||||
popd
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
[toolchain]
|
||||
# older versions may fail to compile; newer versions may fail the clippy tests
|
||||
channel = "1.89.0"
|
||||
channel = "1.88.0"
|
||||
|
|
|
|||
|
|
@ -12,6 +12,5 @@ anki_io.workspace = true
|
|||
anki_process.workspace = true
|
||||
anyhow.workspace = true
|
||||
camino.workspace = true
|
||||
serde_json.workspace = true
|
||||
walkdir.workspace = true
|
||||
which.workspace = true
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
||||
|
||||
use std::cell::LazyCell;
|
||||
use std::collections::BTreeMap;
|
||||
use std::collections::HashSet;
|
||||
use std::env;
|
||||
use std::fs;
|
||||
|
|
@ -149,7 +148,7 @@ impl LintContext {
|
|||
|
||||
if last_author == "49699333+dependabot[bot]@users.noreply.github.com" {
|
||||
println!("Dependabot whitelisted.");
|
||||
std::process::exit(0);
|
||||
return Ok(());
|
||||
} else if all_contributors.contains(last_author.as_str()) {
|
||||
return Ok(());
|
||||
}
|
||||
|
|
@ -268,16 +267,5 @@ fn generate_licences() -> Result<String> {
|
|||
"--manifest-path",
|
||||
"rslib/Cargo.toml",
|
||||
])?;
|
||||
|
||||
let licenses: Vec<BTreeMap<String, serde_json::Value>> = serde_json::from_str(&output.stdout)?;
|
||||
|
||||
let filtered: Vec<BTreeMap<String, serde_json::Value>> = licenses
|
||||
.into_iter()
|
||||
.map(|mut entry| {
|
||||
entry.remove("version");
|
||||
entry
|
||||
})
|
||||
.collect();
|
||||
|
||||
Ok(serde_json::to_string_pretty(&filtered)?)
|
||||
Ok(output.stdout)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
|||
-->
|
||||
<script lang="ts">
|
||||
import Shortcut from "$lib/components/Shortcut.svelte";
|
||||
import { saveCustomColours } from "@generated/backend";
|
||||
|
||||
export let keyCombination: string | null = null;
|
||||
export let value: string;
|
||||
|
|
@ -12,15 +11,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
|||
let inputRef: HTMLInputElement;
|
||||
</script>
|
||||
|
||||
<input
|
||||
bind:this={inputRef}
|
||||
tabindex="-1"
|
||||
type="color"
|
||||
bind:value
|
||||
on:input
|
||||
on:change
|
||||
on:click={() => saveCustomColours({})}
|
||||
/>
|
||||
<input bind:this={inputRef} tabindex="-1" type="color" bind:value on:input on:change />
|
||||
|
||||
{#if keyCombination}
|
||||
<Shortcut {keyCombination} on:action={() => inputRef.click()} />
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
|||
import ColorPicker from "./ColorPicker.svelte";
|
||||
import { context as editorToolbarContext } from "./EditorToolbar.svelte";
|
||||
import WithColorHelper from "./WithColorHelper.svelte";
|
||||
import { saveCustomColours } from "@generated/backend";
|
||||
|
||||
export let color: string;
|
||||
|
||||
|
|
@ -135,10 +134,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
|||
color = setColor(event);
|
||||
bridgeCommand(`lastHighlightColor:${color}`);
|
||||
}}
|
||||
on:change={() => {
|
||||
setTextColor();
|
||||
saveCustomColours({});
|
||||
}}
|
||||
on:change={() => setTextColor()}
|
||||
/>
|
||||
</IconButton>
|
||||
</WithColorHelper>
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue