Merge branch 'main' into accessibility-color-blind

.cargo/config.toml

@@ -10,3 +10,6 @@ PYTHONDONTWRITEBYTECODE = "1" # prevent junk files on Windows
 
 [term]
 color = "always"
+
+[target.'cfg(all(target_env = "msvc", target_os = "windows"))']
+rustflags = ["-C", "target-feature=+crt-static"]

.gitignore

@@ -19,4 +19,4 @@ yarn-error.log
 ts/.svelte-kit
 .yarn
 .claude/settings.local.json
-CLAUDE.local.md
+.claude/user.md

.isort.cfg

@@ -1,4 +0,0 @@
-[settings]
-py_version=39
-known_first_party=anki,aqt,tests
-profile=black

.pylintrc

@@ -1,48 +0,0 @@
-[MASTER]
-ignore-patterns=.*_pb2.*
-persistent = no
-extension-pkg-whitelist=orjson,PyQt6
-init-hook="import sys; sys.path.extend(['pylib/anki/_vendor', 'out/qt'])"
-
-[REPORTS]
-output-format=colorized
-
-[MESSAGES CONTROL]
-disable=
-  R,
-  line-too-long,
-  too-many-lines,
-  missing-function-docstring,
-  missing-module-docstring,
-  missing-class-docstring,
-  import-outside-toplevel,
-  wrong-import-position,
-  wrong-import-order,
-  fixme,
-  unused-wildcard-import,
-  attribute-defined-outside-init,
-  redefined-builtin,
-  wildcard-import,
-  broad-except,
-  bare-except,
-  unused-argument,
-  unused-variable,
-  redefined-outer-name,
-  global-statement,
-  protected-access,
-  arguments-differ,
-  arguments-renamed,
-  consider-using-f-string,
-  invalid-name,
-  broad-exception-raised
-
-[BASIC]
-good-names =
-  id,
-  tr,
-  db,
-  ok,
-  ip,
-
-[IMPORTS]
-ignored-modules = anki.*_pb2, anki.sync_pb2, win32file,pywintypes,socket,win32pipe,pyaudio,anki.scheduler_pb2,anki.notetypes_pb2

.ruff.toml

@@ -1,2 +1,91 @@
-target-version = "py39"
+lint.select = [
-extend-exclude = []
+  "E", # pycodestyle errors
+  "F", # Pyflakes errors
+  "PL", # Pylint rules
+  "I", # Isort rules
+  "ARG",
+  # "UP", # pyupgrade
+  # "B", # flake8-bugbear
+  # "SIM", # flake8-simplify
+]
+
+extend-exclude = ["*_pb2.py", "*_pb2.pyi"]
+
+lint.ignore = [
+  # Docstring rules (missing-*-docstring in pylint)
+  "D100", # Missing docstring in public module
+  "D101", # Missing docstring in public class
+  "D103", # Missing docstring in public function
+
+  # Import rules (wrong-import-* in pylint)
+  "E402", # Module level import not at top of file
+  "E501", # Line too long
+
+  # pycodestyle rules
+  "E741", # ambiguous-variable-name
+
+  # Comment rules (fixme in pylint)
+  "FIX002", # Line contains TODO
+
+  # Pyflakes rules
+  "F402", # import-shadowed-by-loop-var
+  "F403", # undefined-local-with-import-star
+  "F405", # undefined-local-with-import-star-usage
+
+  # Naming rules (invalid-name in pylint)
+  "N801", # Class name should use CapWords convention
+  "N802", # Function name should be lowercase
+  "N803", # Argument name should be lowercase
+  "N806", # Variable in function should be lowercase
+  "N811", # Constant imported as non-constant
+  "N812", # Lowercase imported as non-lowercase
+  "N813", # Camelcase imported as lowercase
+  "N814", # Camelcase imported as constant
+  "N815", # Variable in class scope should not be mixedCase
+  "N816", # Variable in global scope should not be mixedCase
+  "N817", # CamelCase imported as acronym
+  "N818", # Error suffix in exception names
+
+  # Pylint rules
+  "PLW0603", # global-statement
+  "PLW2901", # redefined-loop-name
+  "PLC0415", # import-outside-top-level
+  "PLR2004", # magic-value-comparison
+
+  # Exception handling (broad-except, bare-except in pylint)
+  "BLE001", # Do not catch blind exception
+
+  # Argument rules (unused-argument in pylint)
+  "ARG001", # Unused function argument
+  "ARG002", # Unused method argument
+  "ARG005", # Unused lambda argument
+
+  # Access rules (protected-access in pylint)
+  "SLF001", # Private member accessed
+
+  # String formatting (consider-using-f-string in pylint)
+  "UP032", # Use f-string instead of format call
+
+  # Exception rules (broad-exception-raised in pylint)
+  "TRY301", # Abstract raise to an inner function
+
+  # Builtin shadowing (redefined-builtin in pylint)
+  "A001", # Variable shadows a Python builtin
+  "A002", # Argument shadows a Python builtin
+  "A003", # Class attribute shadows a Python builtin
+]
+
+[lint.per-file-ignores]
+"**/anki/*_pb2.py" = ["ALL"]
+
+[lint.pep8-naming]
+ignore-names = ["id", "tr", "db", "ok", "ip"]
+
+[lint.pylint]
+max-args = 12
+max-returns = 10
+max-branches = 35
+max-statements = 125
+
+[lint.isort]
+known-first-party = ["anki", "aqt", "tests"]

.version

@@ -1 +1 @@
-25.06
+25.08b5

.vscode.dist/extensions.json

@@ -2,7 +2,7 @@
     "recommendations": [
         "dprint.dprint",
         "ms-python.python",
-        "ms-python.black-formatter",
+        "charliermarsh.ruff",
         "rust-lang.rust-analyzer",
         "svelte.svelte-vscode",
         "zxh404.vscode-proto3",

.vscode.dist/settings.json

@@ -18,7 +18,7 @@
         "out/qt",
         "qt"
     ],
-    "python.formatting.provider": "black",
+    "python.formatting.provider": "charliermarsh.ruff",
     "python.linting.mypyEnabled": false,
     "python.analysis.diagnosticSeverityOverrides": {
         "reportMissingModuleSource": "none"

CLAUDE.md

@@ -21,7 +21,7 @@ Please do this as a final step before marking a task as completed.
 During development, you can build/check subsections of our code:
 
 - Rust: 'cargo check'
-- Python: './tools/dmypy'
+- Python: './tools/dmypy', and if wheel-related, './ninja wheels'
 - TypeScript/Svelte: './ninja check:svelte'
 
 Be mindful that some changes (such as modifications to .proto files) may
@@ -80,3 +80,7 @@ when possible.
 
 in rslib, use error/mod.rs's AnkiError/Result and snafu. In our other Rust modules, prefer anyhow + additional context where appropriate. Unwrapping
 in build scripts/tests is fine.
+
+## Individual preferences
+
+See @.claude/user.md

CONTRIBUTORS

@@ -63,6 +63,7 @@ Jakub Kaczmarzyk <jakub.kaczmarzyk@gmail.com>
 Akshara Balachandra <akshara.bala.18@gmail.com>
 lukkea <github.com/lukkea/>
 David Allison <davidallisongithub@gmail.com>
+David Allison <62114487+david-allison@users.noreply.github.com>
 Tsung-Han Yu <johan456789@gmail.com>
 Piotr Kubowicz <piotr.kubowicz@gmail.com>
 RumovZ <gp5glkw78@relay.firefox.com>
@@ -236,6 +237,10 @@ David Brenn <davidbrenn@t-online.de>
 Felix Kühne <flxkhn0602@gmail.com>
 Matthis Ehrhardt <matthis-ehrhardt@gmx.de>
 Billy Julian Lesmana <hunter140797@gmail.com>
+Kevin Nakamura <grinkers@grinkers.net>
+Bradley Szoke <bradleyszoke@gmail.com>
+jcznk <https://github.com/jcznk>
+Thomas Rixen <thomas.rixen@student.uclouvain.be>
 
 ********************
 

Cargo.lock

@@ -94,6 +94,7 @@ dependencies = [
  "axum",
  "axum-client-ip",
  "axum-extra",
+ "bitflags 2.9.1",
  "blake3",
  "bytes",
  "chrono",
@@ -117,7 +118,7 @@ dependencies = [
  "id_tree",
  "inflections",
  "itertools 0.14.0",
- "nom",
+ "nom 8.0.0",
  "num_cpus",
  "num_enum",
  "once_cell",
@@ -129,7 +130,8 @@ dependencies = [
  "prost",
  "prost-reflect",
  "pulldown-cmark 0.13.0",
- "rand 0.9.1",
+ "rand 0.9.2",
+ "rayon",
  "regex",
  "reqwest 0.12.20",
  "rusqlite",
@@ -142,7 +144,7 @@ dependencies = [
  "serde_tuple",
  "sha1",
  "snafu",
- "strum 0.27.1",
+ "strum 0.27.2",
  "syn 2.0.103",
  "tempfile",
  "tokio",
@@ -218,7 +220,7 @@ dependencies = [
  "prost-types",
  "serde",
  "snafu",
- "strum 0.27.1",
+ "strum 0.27.2",
 ]
 
 [[package]]
@@ -704,7 +706,7 @@ dependencies = [
  "log",
  "num-traits",
  "portable-atomic-util",
- "rand 0.9.1",
+ "rand 0.9.2",
  "rmp-serde",
  "serde",
  "serde_json",
@@ -730,7 +732,7 @@ dependencies = [
  "hashbrown 0.15.4",
  "log",
  "num-traits",
- "rand 0.9.1",
+ "rand 0.9.2",
  "serde",
  "spin 0.10.0",
  "text_placeholder",
@@ -760,12 +762,12 @@ dependencies = [
  "csv",
  "derive-new 0.7.0",
  "dirs 6.0.0",
- "rand 0.9.1",
+ "rand 0.9.2",
  "rmp-serde",
  "sanitize-filename 0.6.0",
  "serde",
  "serde_json",
- "strum 0.27.1",
+ "strum 0.27.2",
  "tempfile",
  "thiserror 2.0.12",
 ]
@@ -815,7 +817,7 @@ dependencies = [
  "num-traits",
  "paste",
  "portable-atomic-util",
- "rand 0.9.1",
+ "rand 0.9.2",
  "seq-macro",
  "spin 0.10.0",
 ]
@@ -863,7 +865,7 @@ dependencies = [
  "half",
  "hashbrown 0.15.4",
  "num-traits",
- "rand 0.9.1",
+ "rand 0.9.2",
  "rand_distr",
  "serde",
  "serde_bytes",
@@ -957,7 +959,7 @@ dependencies = [
  "memmap2",
  "num-traits",
  "num_cpus",
- "rand 0.9.1",
+ "rand 0.9.2",
  "rand_distr",
  "rayon",
  "safetensors",
@@ -1401,7 +1403,7 @@ dependencies = [
  "log",
  "num-traits",
  "portable-atomic",
- "rand 0.9.1",
+ "rand 0.9.2",
  "sanitize-filename 0.5.0",
  "serde",
  "serde_json",
@@ -2212,20 +2214,20 @@ dependencies = [
 
 [[package]]
 name = "fsrs"
-version = "4.1.1"
+version = "5.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1f3a8c3df2c324ebab71461178fe8c1fe2d7373cf603f312b652befd026f06d"
+checksum = "04954cc67c3c11ee342a2ee1f5222bf76d73f7772df08d37dc9a6cdd73c467eb"
 dependencies = [
  "burn",
  "itertools 0.14.0",
  "log",
  "ndarray",
  "priority-queue",
- "rand 0.9.1",
+ "rand 0.9.2",
  "rayon",
  "serde",
  "snafu",
- "strum 0.27.1",
+ "strum 0.27.2",
 ]
 
 [[package]]
@@ -2802,7 +2804,7 @@ dependencies = [
  "cfg-if",
  "crunchy",
  "num-traits",
- "rand 0.9.1",
+ "rand 0.9.2",
  "rand_distr",
  "serde",
 ]
@@ -3543,11 +3545,14 @@ dependencies = [
  "anki_io",
  "anki_process",
  "anyhow",
+ "camino",
  "dirs 6.0.0",
  "embed-resource",
  "libc",
  "libc-stdhandle",
- "winapi",
+ "serde_json",
+ "widestring",
+ "windows 0.61.3",
 ]
 
 [[package]]
@@ -3653,7 +3658,7 @@ dependencies = [
  "linkcheck",
  "regex",
  "reqwest 0.12.20",
- "strum 0.27.1",
+ "strum 0.27.2",
  "tokio",
 ]
 
@@ -4117,6 +4122,15 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nom"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "normpath"
 version = "1.3.0"
@@ -5082,7 +5096,7 @@ dependencies = [
  "bytes",
  "getrandom 0.3.3",
  "lru-slab",
- "rand 0.9.1",
+ "rand 0.9.2",
  "ring",
  "rustc-hash 2.1.1",
  "rustls",
@@ -5136,9 +5150,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.3",
@@ -5189,7 +5203,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8615d50dcf34fa31f7ab52692afec947c4dd0ab803cc87cb3b0b4570ff7463"
 dependencies = [
  "num-traits",
- "rand 0.9.1",
+ "rand 0.9.2",
 ]
 
 [[package]]
@@ -6099,9 +6113,9 @@ dependencies = [
 
 [[package]]
 name = "strum"
-version = "0.27.1"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32"
+checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
 dependencies = [
  "strum_macros 0.27.1",
 ]
@@ -6258,7 +6272,7 @@ dependencies = [
  "bytesize",
  "lazy_static",
  "libc",
- "nom",
+ "nom 7.1.3",
  "time",
  "winapi",
 ]
@@ -7365,6 +7379,12 @@ dependencies = [
  "winsafe",
 ]
 
+[[package]]
+name = "widestring"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"

Cargo.toml

@@ -33,9 +33,8 @@ git = "https://github.com/ankitects/linkcheck.git"
 rev = "184b2ca50ed39ca43da13f0b830a463861adb9ca"
 
 [workspace.dependencies.fsrs]
-version = "4.1.1"
+version = "5.1.0"
 # git = "https://github.com/open-spaced-repetition/fsrs-rs.git"
-# rev = "a7f7efc10f0a26b14ee348cc7402155685f2a24f"
 # path = "../open-spaced-repetition/fsrs-rs"
 
 [workspace.dependencies]
@@ -60,6 +59,7 @@ async-trait = "0.1.88"
 axum = { version = "0.8.4", features = ["multipart", "macros"] }
 axum-client-ip = "1.1.3"
 axum-extra = { version = "0.10.1", features = ["typed-header"] }
+bitflags = "2.9.1"
 blake3 = "1.8.2"
 bytes = "1.10.1"
 camino = "1.1.10"
@@ -93,7 +93,7 @@ junction = "1.2.0"
 libc = "0.2"
 libc-stdhandle = "0.1"
 maplit = "1.0.2"
-nom = "7.1.3"
+nom = "8.0.0"
 num-format = "0.4.4"
 num_cpus = "1.17.0"
 num_enum = "0.7.3"
@@ -109,6 +109,7 @@ prost-types = "0.13"
 pulldown-cmark = "0.13.0"
 pyo3 = { version = "0.25.1", features = ["extension-module", "abi3", "abi3-py39"] }
 rand = "0.9.1"
+rayon = "1.10.0"
 regex = "1.11.1"
 reqwest = { version = "0.12.20", default-features = false, features = ["json", "socks", "stream", "multipart"] }
 rusqlite = { version = "0.36.0", features = ["trace", "functions", "collation", "bundled"] }
@@ -138,8 +139,9 @@ unic-ucd-category = "0.9.0"
 unicode-normalization = "0.1.24"
 walkdir = "2.5.0"
 which = "8.0.0"
-winapi = { version = "0.3", features = ["wincon"] }
+widestring = "1.1.0"
-windows = { version = "0.61.3", features = ["Media_SpeechSynthesis", "Media_Core", "Foundation_Collections", "Storage_Streams"] }
+winapi = { version = "0.3", features = ["wincon", "winreg"] }
+windows = { version = "0.61.3", features = ["Media_SpeechSynthesis", "Media_Core", "Foundation_Collections", "Storage_Streams", "Win32_System_Console", "Win32_System_Registry", "Win32_System_SystemInformation", "Win32_Foundation", "Win32_UI_Shell", "Wdk_System_SystemServices"] }
 wiremock = "0.6.3"
 xz2 = "0.1.7"
 zip = { version = "4.1.0", default-features = false, features = ["deflate", "time"] }

LICENSE

@@ -6,8 +6,6 @@ The following included source code items use a license other than AGPL3:
 
 In the pylib folder:
 
- * The SuperMemo importer: GPL3 and 0BSD.
- * The Pauker importer: BSD-3.
  * statsbg.py: CC BY 4.0.
 
 In the qt folder:

README.md

@@ -1,4 +1,4 @@
-# Anki
+# Anki®
 
 [![Build status](https://badge.buildkite.com/c9edf020a4aec976f9835e54751cc5409d843adbb66d043bd3.svg?branch=main)](https://buildkite.com/ankitects/anki-ci)
 

build/configure/src/aqt.rs

@@ -27,7 +27,6 @@ pub fn build_and_check_aqt(build: &mut Build) -> Result<()> {
     build_forms(build)?;
     build_generated_sources(build)?;
     build_data_folder(build)?;
-    build_macos_helper(build)?;
     build_wheel(build)?;
     check_python(build)?;
     Ok(())
@@ -39,7 +38,6 @@ fn build_forms(build: &mut Build) -> Result<()> {
     let mut py_files = vec![];
     for path in ui_files.resolve() {
         let outpath = outdir.join(path.file_name().unwrap()).into_string();
-        py_files.push(outpath.replace(".ui", "_qt5.py"));
         py_files.push(outpath.replace(".ui", "_qt6.py"));
     }
     build.add_action(
@@ -337,27 +335,6 @@ impl BuildAction for BuildThemedIcon<'_> {
     }
 }
 
-fn build_macos_helper(build: &mut Build) -> Result<()> {
-    if cfg!(target_os = "macos") {
-        build.add_action(
-            "qt:aqt:data:lib:libankihelper",
-            RunCommand {
-                command: ":pyenv:bin",
-                args: "$script $out $in",
-                inputs: hashmap! {
-                    "script" => inputs!["qt/mac/helper_build.py"],
-                    "in" => inputs![glob!["qt/mac/*.swift"]],
-                    "" => inputs!["out/env"],
-                },
-                outputs: hashmap! {
-                    "out" => vec!["qt/_aqt/data/lib/libankihelper.dylib"],
-                },
-            },
-        )?;
-    }
-    Ok(())
-}
-
 fn build_wheel(build: &mut Build) -> Result<()> {
     build.add_action(
         "wheels:aqt",
@@ -365,7 +342,12 @@ fn build_wheel(build: &mut Build) -> Result<()> {
             name: "aqt",
             version: anki_version(),
             platform: None,
-            deps: inputs![":qt:aqt", glob!("qt/aqt/**"), "qt/pyproject.toml"],
+            deps: inputs![
+                ":qt:aqt",
+                glob!("qt/aqt/**"),
+                "qt/pyproject.toml",
+                "qt/hatch_build.py"
+            ],
         },
     )
 }

build/configure/src/pylib.rs

@@ -68,7 +68,8 @@ pub fn build_pylib(build: &mut Build) -> Result<()> {
             deps: inputs![
                 ":pylib:anki",
                 glob!("pylib/anki/**"),
-                "pylib/pyproject.toml"
+                "pylib/pyproject.toml",
+                "pylib/hatch_build.py"
             ],
         },
     )?;

build/configure/src/python.rs

@@ -1,34 +1,61 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-use std::env;
-
 use anyhow::Result;
 use ninja_gen::action::BuildAction;
 use ninja_gen::archives::Platform;
 use ninja_gen::build::FilesHandle;
-use ninja_gen::command::RunCommand;
 use ninja_gen::copy::CopyFiles;
 use ninja_gen::glob;
-use ninja_gen::hashmap;
 use ninja_gen::input::BuildInput;
 use ninja_gen::inputs;
 use ninja_gen::python::python_format;
 use ninja_gen::python::PythonEnvironment;
-use ninja_gen::python::PythonLint;
 use ninja_gen::python::PythonTypecheck;
-use ninja_gen::rsync::RsyncFiles;
+use ninja_gen::python::RuffCheck;
 use ninja_gen::Build;
 
+/// Normalize version string by removing leading zeros from numeric parts
+/// while preserving pre-release markers (b1, rc2, a3, etc.)
+fn normalize_version(version: &str) -> String {
+    version
+        .split('.')
+        .map(|part| {
+            // Check if the part contains only digits
+            if part.chars().all(|c| c.is_ascii_digit()) {
+                // Numeric part: remove leading zeros
+                part.parse::<u32>().unwrap_or(0).to_string()
+            } else {
+                // Mixed part (contains both numbers and pre-release markers)
+                // Split on first non-digit character and normalize the numeric prefix
+                let chars = part.chars();
+                let mut numeric_prefix = String::new();
+                let mut rest = String::new();
+                let mut found_non_digit = false;
+
+                for ch in chars {
+                    if ch.is_ascii_digit() && !found_non_digit {
+                        numeric_prefix.push(ch);
+                    } else {
+                        found_non_digit = true;
+                        rest.push(ch);
+                    }
+                }
+
+                if numeric_prefix.is_empty() {
+                    part.to_string()
+                } else {
+                    let normalized_prefix = numeric_prefix.parse::<u32>().unwrap_or(0).to_string();
+                    format!("{normalized_prefix}{rest}")
+                }
+            }
+        })
+        .collect::<Vec<_>>()
+        .join(".")
+}
+
 pub fn setup_venv(build: &mut Build) -> Result<()> {
-    let extra_binary_exports = &[
+    let extra_binary_exports = &["mypy", "ruff", "pytest", "protoc-gen-mypy"];
-        "mypy",
-        "black",
-        "isort",
-        "pylint",
-        "pytest",
-        "protoc-gen-mypy",
-    ];
     build.add_action(
         "pyenv",
         PythonEnvironment {
@@ -96,7 +123,14 @@ impl BuildAction for BuildWheel {
     }
 
     fn files(&mut self, build: &mut impl FilesHandle) {
-        build.add_inputs("uv", inputs![":uv_binary"]);
+        if std::env::var("OFFLINE_BUILD").ok().as_deref() == Some("1") {
+            let uv_path =
+                std::env::var("UV_BINARY").expect("UV_BINARY must be set in OFFLINE_BUILD mode");
+            build.add_inputs("uv", inputs![uv_path]);
+        } else {
+            build.add_inputs("uv", inputs![":uv_binary"]);
+        }
+
         build.add_inputs("", &self.deps);
 
         // Set the project directory based on which package we're building
@@ -131,14 +165,7 @@ impl BuildAction for BuildWheel {
 
         let name = self.name;
 
-        // Normalize version like hatchling does: remove leading zeros from version
+        let normalized_version = normalize_version(&self.version);
-        // parts
-        let normalized_version = self
-            .version
-            .split('.')
-            .map(|part| part.parse::<u32>().unwrap_or(0).to_string())
-            .collect::<Vec<_>>()
-            .join(".");
 
         let wheel_path = format!("wheels/{name}-{normalized_version}-{tag}.whl");
         build.add_outputs("out", vec![wheel_path]);
@@ -168,60 +195,26 @@ pub fn check_python(build: &mut Build) -> Result<()> {
         },
     )?;
 
-    add_pylint(build)?;
+    let ruff_folders = &["qt/aqt", "ftl", "pylib/tools", "tools", "python"];
-
+    let ruff_deps = inputs![
-    Ok(())
+        glob!["{pylib,ftl,qt,python,tools}/**/*.py"],
-}
+        ":pylib:anki",
-
+        ":qt:aqt"
-fn add_pylint(build: &mut Build) -> Result<()> {
+    ];
-    // pylint does not support PEP420 implicit namespaces split across import paths,
-    // so we need to merge our pylib sources and generated files before invoking it,
-    // and add a top-level __init__.py
     build.add_action(
-        "check:pylint:copy_pylib",
+        "check:ruff",
-        RsyncFiles {
+        RuffCheck {
-            inputs: inputs![":pylib:anki"],
+            folders: ruff_folders,
-            target_folder: "pylint/anki",
+            deps: ruff_deps.clone(),
-            strip_prefix: "$builddir/pylib/anki",
+            check_only: true,
-            // avoid copying our large rsbridge binary
-            extra_args: "--links",
         },
     )?;
     build.add_action(
-        "check:pylint:copy_pylib",
+        "fix:ruff",
-        RsyncFiles {
+        RuffCheck {
-            inputs: inputs![glob!["pylib/anki/**"]],
+            folders: ruff_folders,
-            target_folder: "pylint/anki",
+            deps: ruff_deps,
-            strip_prefix: "pylib/anki",
+            check_only: false,
-            extra_args: "",
-        },
-    )?;
-    build.add_action(
-        "check:pylint:copy_pylib",
-        RunCommand {
-            command: ":pyenv:bin",
-            args: "$script $out",
-            inputs: hashmap! { "script" => inputs!["python/mkempty.py"] },
-            outputs: hashmap! { "out" => vec!["pylint/anki/__init__.py"] },
-        },
-    )?;
-    build.add_action(
-        "check:pylint",
-        PythonLint {
-            folders: &[
-                "$builddir/pylint/anki",
-                "qt/aqt",
-                "ftl",
-                "pylib/tools",
-                "tools",
-                "python",
-            ],
-            pylint_ini: inputs![".pylintrc"],
-            deps: inputs![
-                ":check:pylint:copy_pylib",
-                ":qt:aqt",
-                glob!("{pylib/tools,ftl,qt,python,tools}/**/*.py")
-            ],
         },
     )?;
 
@@ -234,15 +227,19 @@ struct Sphinx {
 
 impl BuildAction for Sphinx {
     fn command(&self) -> &str {
-        if env::var("OFFLINE_BUILD").is_err() {
+        if std::env::var("OFFLINE_BUILD").ok().as_deref() == Some("1") {
-            "$uv sync --extra sphinx && $python python/sphinx/build.py"
-        } else {
             "$python python/sphinx/build.py"
+        } else {
+            "$uv sync --extra sphinx && $python python/sphinx/build.py"
         }
     }
 
     fn files(&mut self, build: &mut impl FilesHandle) {
-        if env::var("OFFLINE_BUILD").is_err() {
+        if std::env::var("OFFLINE_BUILD").ok().as_deref() == Some("1") {
+            let uv_path =
+                std::env::var("UV_BINARY").expect("UV_BINARY must be set in OFFLINE_BUILD mode");
+            build.add_inputs("uv", inputs![uv_path]);
+        } else {
             build.add_inputs("uv", inputs![":uv_binary"]);
             // Set environment variable to use the existing pyenv
             build.add_variable("pyenv_path", "$builddir/pyenv");
@@ -279,3 +276,25 @@ pub(crate) fn setup_sphinx(build: &mut Build) -> Result<()> {
     )?;
     Ok(())
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_normalize_version_basic() {
+        assert_eq!(normalize_version("1.2.3"), "1.2.3");
+        assert_eq!(normalize_version("01.02.03"), "1.2.3");
+        assert_eq!(normalize_version("1.0.0"), "1.0.0");
+    }
+
+    #[test]
+    fn test_normalize_version_with_prerelease() {
+        assert_eq!(normalize_version("1.2.3b1"), "1.2.3b1");
+        assert_eq!(normalize_version("01.02.03b1"), "1.2.3b1");
+        assert_eq!(normalize_version("1.0.0rc2"), "1.0.0rc2");
+        assert_eq!(normalize_version("2.1.0a3"), "2.1.0a3");
+        assert_eq!(normalize_version("1.2.3beta1"), "1.2.3beta1");
+        assert_eq!(normalize_version("1.2.3alpha1"), "1.2.3alpha1");
+    }
+}

build/configure/src/rust.rs

@@ -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/**,tools/workspace-hack/**}"),
+        glob!("{rslib/**,pylib/rsbridge/**,ftl/**,build/**,qt/launcher/**}"),
         "Cargo.lock",
         "Cargo.toml",
         "rust-toolchain.toml",

build/ninja_gen/Cargo.toml

@@ -35,3 +35,7 @@ path = "src/bin/update_uv.rs"
 [[bin]]
 name = "update_protoc"
 path = "src/bin/update_protoc.rs"
+
+[[bin]]
+name = "update_node"
+path = "src/bin/update_node.rs"

build/ninja_gen/src/bin/update_node.rs

@@ -0,0 +1,268 @@
+// Copyright: Ankitects Pty Ltd and contributors
+// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+
+use std::error::Error;
+use std::fs;
+use std::path::Path;
+
+use regex::Regex;
+use reqwest::blocking::Client;
+use serde_json::Value;
+
+#[derive(Debug)]
+struct NodeRelease {
+    version: String,
+    files: Vec<NodeFile>,
+}
+
+#[derive(Debug)]
+struct NodeFile {
+    filename: String,
+    url: String,
+}
+
+fn main() -> Result<(), Box<dyn Error>> {
+    let release_info = fetch_node_release_info()?;
+    let new_text = generate_node_archive_function(&release_info)?;
+    update_node_text(&new_text)?;
+    println!("Node.js archive function updated successfully!");
+    Ok(())
+}
+
+fn fetch_node_release_info() -> Result<NodeRelease, Box<dyn Error>> {
+    let client = Client::new();
+
+    // Get the Node.js release info
+    let response = client
+        .get("https://nodejs.org/dist/index.json")
+        .header("User-Agent", "anki-build-updater")
+        .send()?;
+
+    let releases: Vec<Value> = response.json()?;
+
+    // Find the latest LTS release
+    let latest = releases
+        .iter()
+        .find(|release| {
+            // LTS releases have a non-false "lts" field
+            release["lts"].as_str().is_some() && release["lts"] != false
+        })
+        .ok_or("No LTS releases found")?;
+
+    let version = latest["version"]
+        .as_str()
+        .ok_or("Version not found")?
+        .to_string();
+
+    let files = latest["files"]
+        .as_array()
+        .ok_or("Files array not found")?
+        .iter()
+        .map(|f| f.as_str().unwrap_or(""))
+        .collect::<Vec<_>>();
+
+    let lts_name = latest["lts"].as_str().unwrap_or("unknown");
+    println!("Found Node.js LTS version: {version} ({lts_name})");
+
+    // Map platforms to their expected file keys and full filenames
+    let platform_mapping = vec![
+        (
+            "linux-x64",
+            "linux-x64",
+            format!("node-{version}-linux-x64.tar.xz"),
+        ),
+        (
+            "linux-arm64",
+            "linux-arm64",
+            format!("node-{version}-linux-arm64.tar.xz"),
+        ),
+        (
+            "darwin-x64",
+            "osx-x64-tar",
+            format!("node-{version}-darwin-x64.tar.xz"),
+        ),
+        (
+            "darwin-arm64",
+            "osx-arm64-tar",
+            format!("node-{version}-darwin-arm64.tar.xz"),
+        ),
+        (
+            "win-x64",
+            "win-x64-zip",
+            format!("node-{version}-win-x64.zip"),
+        ),
+        (
+            "win-arm64",
+            "win-arm64-zip",
+            format!("node-{version}-win-arm64.zip"),
+        ),
+    ];
+
+    let mut node_files = Vec::new();
+
+    for (platform, file_key, filename) in platform_mapping {
+        // Check if this file exists in the release
+        if files.contains(&file_key) {
+            let url = format!("https://nodejs.org/dist/{version}/{filename}");
+            node_files.push(NodeFile {
+                filename: filename.clone(),
+                url,
+            });
+            println!("Found file for {platform}: {filename} (key: {file_key})");
+        } else {
+            return Err(
+                format!("File not found for {platform} (key: {file_key}): {filename}").into(),
+            );
+        }
+    }
+
+    Ok(NodeRelease {
+        version,
+        files: node_files,
+    })
+}
+
+fn generate_node_archive_function(release: &NodeRelease) -> Result<String, Box<dyn Error>> {
+    let client = Client::new();
+
+    // Fetch the SHASUMS256.txt file once
+    println!("Fetching SHA256 checksums...");
+    let shasums_url = format!("https://nodejs.org/dist/{}/SHASUMS256.txt", release.version);
+    let shasums_response = client
+        .get(&shasums_url)
+        .header("User-Agent", "anki-build-updater")
+        .send()?;
+    let shasums_text = shasums_response.text()?;
+
+    // Create a mapping from filename patterns to platform names - using the exact
+    // patterns we stored in files
+    let platform_mapping = vec![
+        ("linux-x64.tar.xz", "LinuxX64"),
+        ("linux-arm64.tar.xz", "LinuxArm"),
+        ("darwin-x64.tar.xz", "MacX64"),
+        ("darwin-arm64.tar.xz", "MacArm"),
+        ("win-x64.zip", "WindowsX64"),
+        ("win-arm64.zip", "WindowsArm"),
+    ];
+
+    let mut platform_blocks = Vec::new();
+
+    for (file_pattern, platform_name) in platform_mapping {
+        // Find the file that ends with this pattern
+        if let Some(file) = release
+            .files
+            .iter()
+            .find(|f| f.filename.ends_with(file_pattern))
+        {
+            // Find the SHA256 for this file
+            let sha256 = shasums_text
+                .lines()
+                .find(|line| line.contains(&file.filename))
+                .and_then(|line| line.split_whitespace().next())
+                .ok_or_else(|| format!("SHA256 not found for {}", file.filename))?;
+
+            println!(
+                "Found SHA256 for {}: {} => {}",
+                platform_name, file.filename, sha256
+            );
+
+            let block = format!(
+                "        Platform::{} => OnlineArchive {{\n            url: \"{}\",\n            sha256: \"{}\",\n        }},",
+                platform_name, file.url, sha256
+            );
+            platform_blocks.push(block);
+        } else {
+            return Err(format!(
+                "File not found for platform {platform_name}: no file ending with {file_pattern}"
+            )
+            .into());
+        }
+    }
+
+    let function = format!(
+        "pub fn node_archive(platform: Platform) -> OnlineArchive {{\n    match platform {{\n{}\n    }}\n}}",
+        platform_blocks.join("\n")
+    );
+
+    Ok(function)
+}
+
+fn update_node_text(new_function: &str) -> Result<(), Box<dyn Error>> {
+    let node_rs_content = read_node_rs()?;
+
+    // Regex to match the entire node_archive function with proper multiline
+    // matching
+    let re = Regex::new(
+        r"(?s)pub fn node_archive\(platform: Platform\) -> OnlineArchive \{.*?\n\s*\}\s*\n\s*\}",
+    )?;
+
+    let updated_content = re.replace(&node_rs_content, new_function);
+
+    write_node_rs(&updated_content)?;
+    Ok(())
+}
+
+fn read_node_rs() -> Result<String, Box<dyn Error>> {
+    // Use CARGO_MANIFEST_DIR to get the crate root, then find src/node.rs
+    let manifest_dir =
+        std::env::var("CARGO_MANIFEST_DIR").map_err(|_| "CARGO_MANIFEST_DIR not set")?;
+    let path = Path::new(&manifest_dir).join("src").join("node.rs");
+    Ok(fs::read_to_string(path)?)
+}
+
+fn write_node_rs(content: &str) -> Result<(), Box<dyn Error>> {
+    // Use CARGO_MANIFEST_DIR to get the crate root, then find src/node.rs
+    let manifest_dir =
+        std::env::var("CARGO_MANIFEST_DIR").map_err(|_| "CARGO_MANIFEST_DIR not set")?;
+    let path = Path::new(&manifest_dir).join("src").join("node.rs");
+    fs::write(path, content)?;
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_regex_replacement() {
+        let sample_content = r#"Some other code
+pub fn node_archive(platform: Platform) -> OnlineArchive {
+    match platform {
+        Platform::LinuxX64 => OnlineArchive {
+            url: "https://nodejs.org/dist/v20.11.0/node-v20.11.0-linux-x64.tar.xz",
+            sha256: "old_hash",
+        },
+        Platform::MacX64 => OnlineArchive {
+            url: "https://nodejs.org/dist/v20.11.0/node-v20.11.0-darwin-x64.tar.xz",
+            sha256: "old_hash",
+        },
+    }
+}
+
+More code here"#;
+
+        let new_function = r#"pub fn node_archive(platform: Platform) -> OnlineArchive {
+    match platform {
+        Platform::LinuxX64 => OnlineArchive {
+            url: "https://nodejs.org/dist/v21.0.0/node-v21.0.0-linux-x64.tar.xz",
+            sha256: "new_hash",
+        },
+        Platform::MacX64 => OnlineArchive {
+            url: "https://nodejs.org/dist/v21.0.0/node-v21.0.0-darwin-x64.tar.xz",
+            sha256: "new_hash",
+        },
+    }
+}"#;
+
+        let re = Regex::new(
+            r"(?s)pub fn node_archive\(platform: Platform\) -> OnlineArchive \{.*?\n\s*\}\s*\n\s*\}"
+        ).unwrap();
+
+        let result = re.replace(sample_content, new_function);
+        assert!(result.contains("v21.0.0"));
+        assert!(result.contains("new_hash"));
+        assert!(!result.contains("old_hash"));
+        assert!(result.contains("Some other code"));
+        assert!(result.contains("More code here"));
+    }
+}

build/ninja_gen/src/bin/update_protoc.rs

@@ -72,12 +72,11 @@ fn fetch_protoc_release_info() -> Result<String, Box<dyn Error>> {
             "MacArm" => continue, // Skip MacArm since it's handled with MacX64
             "WindowsX64" => "Platform::WindowsX64 | Platform::WindowsArm",
             "WindowsArm" => continue, // Skip WindowsArm since it's handled with WindowsX64
-            _ => &format!("Platform::{}", platform),
+            _ => &format!("Platform::{platform}"),
         };
 
         match_blocks.push(format!(
-            "        {} => {{\n            OnlineArchive {{\n                url: \"{}\",\n                sha256: \"{}\",\n            }}\n        }}",
+            "        {match_pattern} => {{\n            OnlineArchive {{\n                url: \"{download_url}\",\n                sha256: \"{sha256}\",\n            }}\n        }}"
-            match_pattern, download_url, sha256
         ));
     }
 

build/ninja_gen/src/bin/update_uv.rs

@@ -53,7 +53,7 @@ fn fetch_uv_release_info() -> Result<String, Box<dyn Error>> {
         // Find the corresponding .sha256 or .sha256sum asset
         let sha_asset = assets.iter().find(|a| {
             let name = a["name"].as_str().unwrap_or("");
-            name == format!("{}.sha256", asset_name) || name == format!("{}.sha256sum", asset_name)
+            name == format!("{asset_name}.sha256") || name == format!("{asset_name}.sha256sum")
         });
         if sha_asset.is_none() {
             eprintln!("No sha256 asset found for {asset_name}");
@@ -71,8 +71,7 @@ fn fetch_uv_release_info() -> Result<String, Box<dyn Error>> {
         let sha256 = sha_text.split_whitespace().next().unwrap_or("");
 
         match_blocks.push(format!(
-            "        Platform::{} => {{\n            OnlineArchive {{\n                url: \"{}\",\n                sha256: \"{}\",\n            }}\n        }}",
+            "        Platform::{platform} => {{\n            OnlineArchive {{\n                url: \"{download_url}\",\n                sha256: \"{sha256}\",\n            }}\n        }}"
-            platform, download_url, sha256
         ));
     }
 
@@ -135,10 +134,7 @@ mod tests {
         assert_eq!(
             updated_lines,
             original_lines - EXPECTED_LINES_REMOVED,
-            "Expected line count to decrease by exactly {} lines (original: {}, updated: {})",
+            "Expected line count to decrease by exactly {EXPECTED_LINES_REMOVED} lines (original: {original_lines}, updated: {updated_lines})"
-            EXPECTED_LINES_REMOVED,
-            original_lines,
-            updated_lines
         );
     }
 }

build/ninja_gen/src/build.rs

@@ -300,7 +300,7 @@ impl BuildStatement<'_> {
 
         writeln!(buf, "build {outputs_str}: {action_name} {inputs_str}").unwrap();
         for (key, value) in self.variables.iter().sorted() {
-            writeln!(buf, "  {key} = {}", value).unwrap();
+            writeln!(buf, "  {key} = {value}").unwrap();
         }
         writeln!(buf).unwrap();
 
@@ -476,7 +476,7 @@ impl FilesHandle for BuildStatement<'_> {
         let outputs = outputs.into_iter().map(|v| {
             let v = v.as_ref();
             let v = if !v.starts_with("$builddir/") && !v.starts_with("$builddir\\") {
-                format!("$builddir/{}", v)
+                format!("$builddir/{v}")
             } else {
                 v.to_owned()
             };

build/ninja_gen/src/cargo.rs

@@ -162,7 +162,7 @@ impl BuildAction for CargoTest {
             "cargo-nextest",
             CargoInstall {
                 binary_name: "cargo-nextest",
-                args: "cargo-nextest --version 0.9.57 --locked",
+                args: "cargo-nextest --version 0.9.99 --locked --no-default-features --features default-no-update",
             },
         )?;
         setup_flags(build)

build/ninja_gen/src/node.rs

@@ -19,28 +19,28 @@ use crate::input::BuildInput;
 pub fn node_archive(platform: Platform) -> OnlineArchive {
     match platform {
         Platform::LinuxX64 => OnlineArchive {
-            url: "https://nodejs.org/dist/v20.11.0/node-v20.11.0-linux-x64.tar.xz",
+            url: "https://nodejs.org/dist/v22.17.0/node-v22.17.0-linux-x64.tar.xz",
-            sha256: "822780369d0ea309e7d218e41debbd1a03f8cdf354ebf8a4420e89f39cc2e612",
+            sha256: "325c0f1261e0c61bcae369a1274028e9cfb7ab7949c05512c5b1e630f7e80e12",
         },
         Platform::LinuxArm => OnlineArchive {
-            url: "https://nodejs.org/dist/v20.11.0/node-v20.11.0-linux-arm64.tar.xz",
+            url: "https://nodejs.org/dist/v22.17.0/node-v22.17.0-linux-arm64.tar.xz",
-            sha256: "f6df68c6793244071f69023a9b43a0cf0b13d65cbe86d55925c28e4134d9aafb",
+            sha256: "140aee84be6774f5fb3f404be72adbe8420b523f824de82daeb5ab218dab7b18",
         },
         Platform::MacX64 => OnlineArchive {
-            url: "https://nodejs.org/dist/v20.11.0/node-v20.11.0-darwin-x64.tar.xz",
+            url: "https://nodejs.org/dist/v22.17.0/node-v22.17.0-darwin-x64.tar.xz",
-            sha256: "d4b4ab81ebf1f7aab09714f834992f27270ad0079600da00c8110f8950ca6c5a",
+            sha256: "f79de1f64df4ac68493a344bb5ab7d289d0275271e87b543d1278392c9de778a",
         },
         Platform::MacArm => OnlineArchive {
-            url: "https://nodejs.org/dist/v20.11.0/node-v20.11.0-darwin-arm64.tar.xz",
+            url: "https://nodejs.org/dist/v22.17.0/node-v22.17.0-darwin-arm64.tar.xz",
-            sha256: "f18a7438723d48417f5e9be211a2f3c0520ffbf8e02703469e5153137ca0f328",
+            sha256: "cc9cc294eaf782dd93c8c51f460da610cc35753c6a9947411731524d16e97914",
         },
         Platform::WindowsX64 => OnlineArchive {
-            url: "https://nodejs.org/dist/v20.11.0/node-v20.11.0-win-x64.zip",
+            url: "https://nodejs.org/dist/v22.17.0/node-v22.17.0-win-x64.zip",
-            sha256: "893115cd92ad27bf178802f15247115e93c0ef0c753b93dca96439240d64feb5",
+            sha256: "721ab118a3aac8584348b132767eadf51379e0616f0db802cc1e66d7f0d98f85",
         },
         Platform::WindowsArm => OnlineArchive {
-            url: "https://nodejs.org/dist/v20.11.0/node-v20.11.0-win-arm64.zip",
+            url: "https://nodejs.org/dist/v22.17.0/node-v22.17.0-win-arm64.zip",
-            sha256: "89c1f7034dcd6ff5c17f2af61232a96162a1902f862078347dcf274a938b6142",
+            sha256: "78355dc9ca117bb71d3f081e4b1b281855e2b134f3939bb0ca314f7567b0e621",
         },
     }
 }

build/ninja_gen/src/python.rs

@@ -148,7 +148,7 @@ impl BuildAction for PythonEnvironment {
             // Add --python flag to extra_args if PYTHON_BINARY is set
             let mut args = self.extra_args.to_string();
             if let Ok(python_binary) = env::var("PYTHON_BINARY") {
-                args = format!("--python {} {}", python_binary, args);
+                args = format!("--python {python_binary} {args}");
             }
             build.add_variable("extra_args", args);
         }
@@ -159,6 +159,10 @@ impl BuildAction for PythonEnvironment {
         }
         build.add_output_stamp(format!("{}/.stamp", self.venv_folder));
     }
+
+    fn check_output_timestamps(&self) -> bool {
+        true
+    }
 }
 
 pub struct PythonTypecheck {
@@ -189,31 +193,19 @@ impl BuildAction for PythonTypecheck {
 struct PythonFormat<'a> {
     pub inputs: &'a BuildInput,
     pub check_only: bool,
-    pub isort_ini: &'a BuildInput,
 }
 
 impl BuildAction for PythonFormat<'_> {
     fn command(&self) -> &str {
-        "$black -t py39 -q $check --color $in && $
+        "$ruff format $mode $in && $ruff check --select I --fix $in"
-         $isort --color --settings-path $isort_ini $check $in"
     }
 
     fn files(&mut self, build: &mut impl crate::build::FilesHandle) {
         build.add_inputs("in", self.inputs);
-        build.add_inputs("black", inputs![":pyenv:black"]);
+        build.add_inputs("ruff", inputs![":pyenv:ruff"]);
-        build.add_inputs("isort", inputs![":pyenv:isort"]);
 
         let hash = simple_hash(self.inputs);
-        build.add_env_var("BLACK_CACHE_DIR", "out/python/black.cache.{hash}");
+        build.add_variable("mode", if self.check_only { "--check" } else { "" });
-        build.add_inputs("isort_ini", self.isort_ini);
-        build.add_variable(
-            "check",
-            if self.check_only {
-                "--diff --check"
-            } else {
-                ""
-            },
-        );
 
         build.add_output_stamp(format!(
             "tests/python_format.{}.{hash}",
@@ -223,13 +215,11 @@ impl BuildAction for PythonFormat<'_> {
 }
 
 pub fn python_format(build: &mut Build, group: &str, inputs: BuildInput) -> Result<()> {
-    let isort_ini = &inputs![".isort.cfg"];
     build.add_action(
         format!("check:format:python:{group}"),
         PythonFormat {
             inputs: &inputs,
             check_only: true,
-            isort_ini,
         },
     )?;
 
@@ -238,34 +228,39 @@ pub fn python_format(build: &mut Build, group: &str, inputs: BuildInput) -> Resu
         PythonFormat {
             inputs: &inputs,
             check_only: false,
-            isort_ini,
         },
     )?;
     Ok(())
 }
 
-pub struct PythonLint {
+pub struct RuffCheck {
     pub folders: &'static [&'static str],
-    pub pylint_ini: BuildInput,
     pub deps: BuildInput,
+    pub check_only: bool,
 }
 
-impl BuildAction for PythonLint {
+impl BuildAction for RuffCheck {
     fn command(&self) -> &str {
-        "$pylint --rcfile $pylint_ini -sn -j $cpus $folders"
+        "$ruff check $folders $mode"
     }
 
     fn files(&mut self, build: &mut impl crate::build::FilesHandle) {
         build.add_inputs("", &self.deps);
-        build.add_inputs("pylint", inputs![":pyenv:pylint"]);
+        build.add_inputs("", inputs![".ruff.toml"]);
-        build.add_inputs("pylint_ini", &self.pylint_ini);
+        build.add_inputs("ruff", inputs![":pyenv:ruff"]);
         build.add_variable("folders", self.folders.join(" "));
-        // On a 16 core system, values above 10 do not improve wall clock time,
+        build.add_variable(
-        // but waste extra cores that could be working on other tests.
+            "mode",
-        build.add_variable("cpus", num_cpus::get().min(10).to_string());
+            if self.check_only {
+                ""
+            } else {
+                "--fix --unsafe-fixes"
+            },
+        );
 
         let hash = simple_hash(&self.deps);
-        build.add_output_stamp(format!("tests/python_lint.{hash}"));
+        let kind = if self.check_only { "check" } else { "fix" };
+        build.add_output_stamp(format!("tests/python_ruff.{kind}.{hash}"));
     }
 }
 

build/ninja_gen/src/render.rs

@@ -30,12 +30,12 @@ impl Build {
         )
         .unwrap();
         for (key, value) in &self.variables {
-            writeln!(&mut buf, "{} = {}", key, value).unwrap();
+            writeln!(&mut buf, "{key} = {value}").unwrap();
         }
         buf.push('\n');
 
         for (key, value) in &self.pools {
-            writeln!(&mut buf, "pool {}\n  depth = {}", key, value).unwrap();
+            writeln!(&mut buf, "pool {key}\n  depth = {value}").unwrap();
         }
         buf.push('\n');
 

build/runner/src/archive.rs

@@ -65,7 +65,7 @@ fn sha2_data(data: &[u8]) -> String {
     let mut digest = sha2::Sha256::new();
     digest.update(data);
     let result = digest.finalize();
-    format!("{:x}", result)
+    format!("{result:x}")
 }
 
 enum CompressionKind {

build/runner/src/build.rs

@@ -67,7 +67,10 @@ pub fn run_build(args: BuildArgs) {
             "MYPY_CACHE_DIR",
             build_root.join("tests").join("mypy").into_string(),
         )
-        .env("PYTHONPYCACHEPREFIX", build_root.join("pycache"))
+        .env(
+            "PYTHONPYCACHEPREFIX",
+            std::path::absolute(build_root.join("pycache")).unwrap(),
+        )
         // commands will not show colors by default, as we do not provide a tty
         .env("FORCE_COLOR", "1")
         .env("MYPY_FORCE_COLOR", "1")
@@ -135,7 +138,7 @@ fn setup_build_root() -> Utf8PathBuf {
             true
         };
         if create {
-            println!("Switching build root to {}", new_target);
+            println!("Switching build root to {new_target}");
             std::os::unix::fs::symlink(new_target, build_root).unwrap();
         }
     }

build/runner/src/pyenv.rs

@@ -32,10 +32,19 @@ pub fn setup_pyenv(args: PyenvArgs) {
         }
     }
 
+    let mut command = Command::new(args.uv_bin);
+
+    // 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);
+        }
+    }
+
     run_command(
-        Command::new(args.uv_bin)
+        command
             .env("UV_PROJECT_ENVIRONMENT", args.pyenv_folder.clone())
-            .args(["sync", "--frozen"])
+            .args(["sync", "--locked", "--no-config"])
             .args(args.extra_args),
     );
 

build/runner/src/run.rs

@@ -83,7 +83,7 @@ fn split_args(args: Vec<String>) -> Vec<Vec<String>> {
 
 pub fn run_command(command: &mut Command) {
     if let Err(err) = command.ensure_success() {
-        println!("{}", err);
+        println!("{err}");
         std::process::exit(1);
     }
 }

cargo/licenses.json

@@ -1450,7 +1450,7 @@
   },
   {
     "name": "fsrs",
-    "version": "4.1.1",
+    "version": "5.1.0",
     "authors": "Open Spaced Repetition",
     "repository": "https://github.com/open-spaced-repetition/fsrs-rs",
     "license": "BSD-3-Clause",
@@ -2645,6 +2645,15 @@
     "license_file": null,
     "description": "A byte-oriented, zero-copy, parser combinators library"
   },
+  {
+    "name": "nom",
+    "version": "8.0.0",
+    "authors": "contact@geoffroycouprie.com",
+    "repository": "https://github.com/rust-bakery/nom",
+    "license": "MIT",
+    "license_file": null,
+    "description": "A byte-oriented, zero-copy, parser combinators library"
+  },
   {
     "name": "ntapi",
     "version": "0.4.1",
@@ -3313,7 +3322,7 @@
   },
   {
     "name": "rand",
-    "version": "0.9.1",
+    "version": "0.9.2",
     "authors": "The Rand Project Developers|The Rust Project Developers",
     "repository": "https://github.com/rust-random/rand",
     "license": "Apache-2.0 OR MIT",
@@ -4123,7 +4132,7 @@
   },
   {
     "name": "strum",
-    "version": "0.27.1",
+    "version": "0.27.2",
     "authors": "Peter Glotfelty <peter.glotfelty@microsoft.com>",
     "repository": "https://github.com/Peternator7/strum",
     "license": "MIT",

docs/development.md

@@ -85,7 +85,7 @@ When formatting issues are reported, they can be fixed with
 ./ninja format
 ```
 
-## Fixing eslint/copyright header issues
+## Fixing ruff/eslint/copyright header issues
 
 ```
 ./ninja fix

docs/linux.md

@@ -51,13 +51,8 @@ Anki requires a recent glibc.
 
 If you are using a distro that uses musl, Anki will not work.
 
-If your glibc version is 2.35+ on AMD64 or 2.39+ on ARM64, you can skip the rest of this section.
+You can use your system's Qt libraries if they are Qt 6.2 or later, if
-
+you wish. After installing the system libraries (eg:
-If your system has an older glibc, you won't be able to use the PyQt wheels that are
-available in pip/PyPy, and will need to use your system-installed PyQt instead.
-Your distro will also need to have Python 3.9 or later.
-
-After installing the system libraries (eg:
 'sudo apt install python3-pyqt6.qt{quick,webengine} python3-venv pyqt6-dev-tools'),
 find the place they are installed (eg '/usr/lib/python3/dist-packages'). On modern Ubuntu, you'll
 also need 'sudo apt remove python3-protobuf'. Then before running any commands like './run', tell Anki where
@@ -68,12 +63,6 @@ export PYTHONPATH=/usr/lib/python3/dist-packages
 export PYTHON_BINARY=/usr/bin/python3
 ```
 
-There are a few things to be aware of:
-
-- You should use ./run and not tools/run-qt5\*, even if your system libraries are Qt5.
-- If your system libraries are Qt5, when creating an aqt wheel, the wheel will not work
-  on Qt6 environments.
-
 ## Packaging considerations
 
 Python, node and protoc are downloaded as part of the build. You can optionally define

docs/protobuf.md

@@ -98,12 +98,6 @@ should preferably be assigned a number between 1 and 15. If a message contains
 
 Protobuf has an official Python implementation with an extensive [reference](https://developers.google.com/protocol-buffers/docs/reference/python-generated).
 
-- Every message used in aqt or pylib must be added to the respective `.pylintrc`
-  to avoid failing type checks. The unqualified protobuf message's name must be
-  used, not an alias from `collection.py` for example. This should be taken into
-  account when choosing a message name in order to prevent skipping typechecking
-  a Python class of the same name.
-
 ### Typescript
 
 Anki uses [protobuf-es](https://github.com/bufbuild/protobuf-es), which offers

ftl/core-repo

@@ -1 +1 @@
-Subproject commit 2f8c9d9566aef8b86e3326fe9ff007d594b7ec83
+Subproject commit a599715d3c27ff2eb895c749f3534ab73d83dad1

ftl/core/card-templates.ftl

@@ -60,7 +60,6 @@ card-templates-this-will-create-card-proceed =
     }
 card-templates-type-boxes-warning = Only one typing box per card template is supported.
 card-templates-restore-to-default = Restore to Default
-card-templates-restore-to-default-confirmation = This will reset all fields and templates in this note type to their default
+card-templates-restore-to-default-confirmation = This will reset all fields and templates in this note type to their default values, removing any extra fields/templates and their content, and any custom styling. Do you wish to proceed?
-    values, removing any extra fields/templates and their content, and any custom styling. Do you wish to proceed?
 card-templates-restored-to-default = Note type has been restored to its original state.
 

ftl/core/database-check.ftl

@@ -5,6 +5,11 @@ database-check-card-properties =
         [one] Fixed { $count } invalid card property.
        *[other] Fixed { $count } invalid card properties.
     }
+database-check-card-last-review-time-empty =
+    { $count ->
+        [one] Added last review time to { $count } card.
+       *[other] Added last review time to { $count } cards.
+    }
 database-check-missing-templates =
     { $count ->
         [one] Deleted { $count } card with missing template.

ftl/core/deck-config.ftl

@@ -425,6 +425,8 @@ deck-config-desired-retention-tooltip =
     less frequently, and you will forget more of them. Be conservative when adjusting this - higher
     values will greatly increase your workload, and lower values can be demoralizing when you forget
     a lot of material.
+deck-config-desired-retention-tooltip2 = 
+    The workload values provided by the info box are a rough approximation. For a greater level of accuracy, use the simulator.
 deck-config-historical-retention-tooltip =
     When some of your review history is missing, FSRS needs to fill in the gaps. By default, it will
     assume that when you did those old reviews, you remembered 90% of the material. If your old retention
@@ -503,7 +505,9 @@ deck-config-desired-retention-below-optimal = Your desired retention is below op
 # Description of the y axis in the FSRS simulation
 # diagram (Deck options -> FSRS) showing the total number of
 # cards that can be recalled or retrieved on a specific date.
-deck-config-fsrs-simulator-experimental = FSRS simulator (experimental)
+deck-config-fsrs-simulator-experimental = FSRS Simulator (Experimental)
+deck-config-fsrs-simulate-desired-retention-experimental = FSRS Desired Retention Simulator (Experimental)
+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
 deck-config-clear-last-simulate = Clear Last Simulation
@@ -512,10 +516,14 @@ deck-config-advanced-settings = Advanced Settings
 deck-config-smooth-graph = Smooth graph
 deck-config-suspend-leeches = Suspend leeches
 deck-config-save-options-to-preset = Save Changes to Preset
+deck-config-save-options-to-preset-confirm = Overwrite the options in your current preset with the options that are currently set in the simulator?
 # Radio button in the FSRS simulation diagram (Deck options -> FSRS) selecting
 # to show the total number of cards that can be recalled or retrieved on a
 # specific date.
 deck-config-fsrs-simulator-radio-memorized = Memorized
+deck-config-fsrs-simulator-radio-ratio = Time / Memorized Ratio
+# $time here is pre-formatted e.g. "10 Seconds" 
+deck-config-fsrs-simulator-ratio-tooltip = { $time } per memorized card
 
 ## Messages related to the FSRS scheduler’s health check. The health check determines whether the correlation between FSRS predictions and your memory is good or bad. It can be optionally triggered as part of the "Optimize" function.
 
@@ -536,6 +544,7 @@ 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-plotted-on-x-axis = (Plotted on the X-axis)
 deck-config-a-100-day-interval = 
     { $days ->
         [one] A 100 day interval will become { $days } day.

ftl/core/importing.ftl

@@ -48,6 +48,7 @@ importing-merge-notetypes-help =
     Warning: This will require a one-way sync, and may mark existing notes as modified.
 importing-mnemosyne-20-deck-db = Mnemosyne 2.0 Deck (*.db)
 importing-multicharacter-separators-are-not-supported-please = Multi-character separators are not supported. Please enter one character only.
+importing-new-deck-will-be-created = A new deck will be created: { $name }
 importing-notes-added-from-file = Notes added from file: { $val }
 importing-notes-found-in-file = Notes found in file: { $val }
 importing-notes-skipped-as-theyre-already-in = Notes skipped, as up-to-date copies are already in your collection: { $val }
@@ -65,7 +66,6 @@ importing-with-deck-configs-help =
     If enabled, any deck options that the deck sharer included will also be imported.
     Otherwise, all decks will be assigned the default preset.
 importing-packaged-anki-deckcollection-apkg-colpkg-zip = Packaged Anki Deck/Collection (*.apkg *.colpkg *.zip)
-importing-pauker-18-lesson-paugz = Pauker 1.8 Lesson (*.pau.gz)
 # the '|' character
 importing-pipe = Pipe
 # Warning displayed when the csv import preview table is clipped (some columns were hidden)
@@ -78,7 +78,6 @@ importing-rows-had-num1d-fields-expected-num2d = '{ $row }' had { $found } field
 importing-selected-file-was-not-in-utf8 = Selected file was not in UTF-8 format. Please see the importing section of the manual.
 importing-semicolon = Semicolon
 importing-skipped = Skipped
-importing-supermemo-xml-export-xml = Supermemo XML export (*.xml)
 importing-tab = Tab
 importing-tag-modified-notes = Tag modified notes:
 importing-text-separated-by-tabs-or-semicolons = Text separated by tabs or semicolons (*)
@@ -252,3 +251,5 @@ importing-importing-collection = Importing collection...
 importing-unable-to-import-filename = Unable to import { $filename }: file type not supported
 importing-notes-that-could-not-be-imported = Notes that could not be imported as note type has changed: { $val }
 importing-added = Added
+importing-pauker-18-lesson-paugz = Pauker 1.8 Lesson (*.pau.gz)
+importing-supermemo-xml-export-xml = Supermemo XML export (*.xml)

ftl/core/preferences.ftl

@@ -34,7 +34,7 @@ preferences-when-adding-default-to-current-deck = When adding, default to curren
 preferences-you-can-restore-backups-via-fileswitch = You can restore backups via File > Switch Profile.
 preferences-legacy-timezone-handling = Legacy timezone handling (buggy, but required for AnkiDroid <= 2.14)
 preferences-default-search-text = Default search text
-preferences-default-search-text-example = eg. 'deck:current '
+preferences-default-search-text-example = e.g. "deck:current"
 preferences-theme = Theme
 preferences-theme-follow-system = Follow System
 preferences-theme-light = Light

ftl/core/statistics.ftl

@@ -80,7 +80,7 @@ statistics-reviews =
 # This fragment of the tooltip in the FSRS simulation
 # diagram (Deck options -> FSRS) shows the total number of
 # cards that can be recalled or retrieved on a specific date.
-statistics-memorized = {$memorized} memorized
+statistics-memorized = {$memorized} cards memorized
 statistics-today-title = Today
 statistics-today-again-count = Again count:
 statistics-today-type-counts = Learn: { $learnCount }, Review: { $reviewCount }, Relearn: { $relearnCount }, Filtered: { $filteredCount }
@@ -99,9 +99,9 @@ statistics-counts-relearning-cards = Relearning
 statistics-counts-title = Card Counts
 statistics-counts-separate-suspended-buried-cards = Separate suspended/buried cards
 
-## True Retention represents your actual retention rate from past reviews, in
+## Retention represents your actual retention from past reviews, in
-## comparison to the "desired retention" parameter of FSRS, which forecasts
+## comparison to the "desired retention" setting of FSRS, which forecasts
-## future retention. True Retention is the percentage of all reviewed cards
+## future retention. Retention is the percentage of all reviewed cards
 ## that were marked as "Hard," "Good," or "Easy" within a specific time period.
 ##
 ## Most of these strings are used as column / row headings in a table.
@@ -112,9 +112,9 @@ statistics-counts-separate-suspended-buried-cards = Separate suspended/buried ca
 ## N.B. Stats cards may be very small on mobile devices and when the Stats
 ##      window is certain sizes.
 
-statistics-true-retention-title = True Retention
+statistics-true-retention-title = Retention
 statistics-true-retention-subtitle = Pass rate of cards with an interval ≥ 1 day.
-statistics-true-retention-tooltip = If you are using FSRS, your true retention is expected to be close to your desired retention. Please keep in mind that data for a single day is noisy, so it's better to look at monthly data.
+statistics-true-retention-tooltip = If you are using FSRS, your retention is expected to be close to your desired retention. Please keep in mind that data for a single day is noisy, so it's better to look at monthly data.
 statistics-true-retention-range = Range
 statistics-true-retention-pass = Pass
 statistics-true-retention-fail = Fail

ftl/qt-repo

@@ -1 +1 @@
-Subproject commit 69f2dbaeba6f72ac62da0b35881f320603da5124
+Subproject commit bb4207f3b8e9a7c428db282d12c75b850be532f3

ftl/qt/qt-accel.ftl

@@ -1,4 +1,5 @@
 qt-accel-about = &About
+qt-accel-about-mac = About Anki...
 qt-accel-cards = &Cards
 qt-accel-check-database = &Check Database
 qt-accel-check-media = Check &Media
@@ -45,3 +46,4 @@ qt-accel-zoom-editor-in = Zoom Editor &In
 qt-accel-zoom-editor-out = Zoom Editor &Out
 qt-accel-create-backup = Create &Backup
 qt-accel-load-backup = &Revert to Backup
+qt-accel-upgrade-downgrade = Upgrade/Downgrade

ftl/qt/qt-misc.ftl

@@ -73,6 +73,7 @@ qt-misc-second =
 qt-misc-layout-auto-enabled = Responsive layout enabled
 qt-misc-layout-vertical-enabled = Vertical layout enabled
 qt-misc-layout-horizontal-enabled = Horizontal layout enabled
+qt-misc-open-anki-launcher = Change to a different Anki version?
 
 ## deprecated- these strings will be removed in the future, and do not need
 ## to be translated

ftl/src/serialize.rs

@@ -435,7 +435,7 @@ impl TextWriter {
             item = item.trim_start_matches(' ');
         }
 
-        write!(self.buffer, "{}", item)
+        write!(self.buffer, "{item}")
     }
 
     fn write_char_into_indent(&mut self, ch: char) {

ftl/src/string/mod.rs

@@ -67,7 +67,7 @@ fn additional_template_folder(dst_folder: &Utf8Path) -> Option<Utf8PathBuf> {
 
 fn all_langs(lang_folder: &Utf8Path) -> Result<Vec<Utf8PathBuf>> {
     std::fs::read_dir(lang_folder)
-        .with_context(|| format!("reading {:?}", lang_folder))?
+        .with_context(|| format!("reading {lang_folder:?}"))?
         .filter_map(Result::ok)
         .map(|e| Ok(e.path().utf8()?))
         .collect()

package.json

@@ -19,8 +19,8 @@
         "@poppanator/sveltekit-svg": "^5.0.0",
         "@sqltools/formatter": "^1.2.2",
         "@sveltejs/adapter-static": "^3.0.0",
-        "@sveltejs/kit": "^2.20.7",
+        "@sveltejs/kit": "^2.22.2",
-        "@sveltejs/vite-plugin-svelte": "4.0.0",
+        "@sveltejs/vite-plugin-svelte": "5.1",
         "@types/bootstrap": "^5.0.12",
         "@types/codemirror": "^5.60.0",
         "@types/d3": "^7.0.0",
@@ -30,7 +30,7 @@
         "@types/jqueryui": "^1.12.13",
         "@types/lodash-es": "^4.17.4",
         "@types/marked": "^5.0.0",
-        "@types/node": "^20",
+        "@types/node": "^22",
         "@typescript-eslint/eslint-plugin": "^5.60.1",
         "@typescript-eslint/parser": "^5.60.1",
         "caniuse-lite": "^1.0.30001431",
@@ -48,16 +48,16 @@
         "prettier": "^3.4.2",
         "prettier-plugin-svelte": "^3.3.2",
         "sass": "<1.77",
-        "svelte": "^5.17.3",
+        "svelte": "^5.34.9",
-        "svelte-check": "^3.4.4",
+        "svelte-check": "^4.2.2",
-        "svelte-preprocess": "^5.0.4",
+        "svelte-preprocess": "^6.0.3",
         "svelte-preprocess-esbuild": "^3.0.1",
         "svgo": "^3.2.0",
         "tslib": "^2.0.3",
-        "tsx": "^3.12.0",
+        "tsx": "^4.8.1",
         "typescript": "^5.0.4",
-        "vite": "5.4.19",
+        "vite": "6",
-        "vitest": "^2"
+        "vitest": "^3"
     },
     "dependencies": {
         "@bufbuild/protobuf": "^1.2.1",
@@ -81,7 +81,8 @@
     },
     "resolutions": {
         "canvas": "npm:empty-npm-package@1.0.0",
-        "cookie": "0.7.0"
+        "cookie": "0.7.0",
+        "vite": "6"
     },
     "browserslist": [
         "defaults",

proto/anki/cards.proto

@@ -51,6 +51,7 @@ message Card {
   optional FsrsMemoryState memory_state = 20;
   optional float desired_retention = 21;
   optional float decay = 22;
+  optional int64 last_review_time_secs = 23;
   string custom_data = 19;
 }
 

proto/anki/config.proto

@@ -56,6 +56,7 @@ message ConfigKey {
     RENDER_LATEX = 25;
     LOAD_BALANCER_ENABLED = 26;
     FSRS_SHORT_TERM_WITH_STEPS_ENABLED = 27;
+    FSRS_LEGACY_EVALUATE = 28;
   }
   enum String {
     SET_DUE_BROWSER = 0;

proto/anki/deck_config.proto

@@ -40,12 +40,10 @@ message DeckConfigId {
 message GetRetentionWorkloadRequest {
   repeated float w = 1;
   string search = 2;
-  float before = 3;
-  float after = 4;
 }
 
 message GetRetentionWorkloadResponse {
-  float factor = 1;
+  map<uint32, float> costs = 1;
 }
 
 message GetIgnoredBeforeCountRequest {
@@ -219,6 +217,8 @@ message DeckConfigsForUpdate {
       bool review_today_active = 5;
       // Whether new_today applies to today or a past day.
       bool new_today_active = 6;
+      // Deck-specific desired retention override
+      optional float desired_retention = 7;
     }
     string name = 1;
     int64 config_id = 2;
@@ -236,6 +236,7 @@ message DeckConfigsForUpdate {
   bool new_cards_ignore_review_limit = 7;
   bool fsrs = 8;
   bool fsrs_health_check = 11;
+  bool fsrs_legacy_evaluate = 12;
   bool apply_all_parent_limits = 9;
   uint32 days_since_last_fsrs_optimize = 10;
 }

proto/anki/decks.proto

@@ -83,6 +83,8 @@ message Deck {
     optional uint32 new_limit = 7;
     DayLimit review_limit_today = 8;
     DayLimit new_limit_today = 9;
+    // Deck-specific desired retention override
+    optional float desired_retention = 10;
 
     reserved 12 to 15;
   }

proto/anki/import_export.proto

@@ -176,9 +176,12 @@ message CsvMetadata {
   // to determine the number of columns.
   repeated string column_labels = 5;
   oneof deck {
+    // id of an existing deck
     int64 deck_id = 6;
     // One-based. 0 means n/a.
     uint32 deck_column = 7;
+    // name of new deck to be created
+    string deck_name = 17;
   }
   oneof notetype {
     // One notetype for all rows with given column mapping.

proto/anki/scheduler.proto

@@ -55,7 +55,11 @@ service SchedulerService {
       returns (ComputeOptimalRetentionResponse);
   rpc SimulateFsrsReview(SimulateFsrsReviewRequest)
       returns (SimulateFsrsReviewResponse);
+  rpc SimulateFsrsWorkload(SimulateFsrsReviewRequest)
+      returns (SimulateFsrsWorkloadResponse);
   rpc EvaluateParams(EvaluateParamsRequest) returns (EvaluateParamsResponse);
+  rpc EvaluateParamsLegacy(EvaluateParamsLegacyRequest)
+      returns (EvaluateParamsResponse);
   rpc ComputeMemoryState(cards.CardId) returns (ComputeMemoryStateResponse);
   // The number of days the calculated interval was fuzzed by on the previous
   // review (if any). Utilized by the FSRS add-on.
@@ -402,6 +406,9 @@ message SimulateFsrsReviewRequest {
   repeated float easy_days_percentages = 10;
   deck_config.DeckConfig.Config.ReviewCardOrder review_order = 11;
   optional uint32 suspend_after_lapse_count = 12;
+  float historical_retention = 13;
+  uint32 learning_step_count = 14;
+  uint32 relearning_step_count = 15;
 }
 
 message SimulateFsrsReviewResponse {
@@ -411,6 +418,12 @@ message SimulateFsrsReviewResponse {
   repeated float daily_time_cost = 4;
 }
 
+message SimulateFsrsWorkloadResponse {
+  map<uint32, float> cost = 1;
+  map<uint32, float> memorized = 2;
+  map<uint32, uint32> review_count = 3;
+}
+
 message ComputeOptimalRetentionResponse {
   float optimal_retention = 1;
 }
@@ -442,6 +455,12 @@ message EvaluateParamsRequest {
   uint32 num_of_relearning_steps = 3;
 }
 
+message EvaluateParamsLegacyRequest {
+  repeated float params = 1;
+  string search = 2;
+  int64 ignore_revlogs_before_ms = 3;
+}
+
 message EvaluateParamsResponse {
   float log_loss = 1;
   float rmse_bins = 2;
@@ -450,6 +469,7 @@ message EvaluateParamsResponse {
 message ComputeMemoryStateResponse {
   optional cards.FsrsMemoryState state = 1;
   float desired_retention = 2;
+  float decay = 3;
 }
 
 message FuzzDeltaRequest {

pylib/anki/_backend.py

@@ -46,7 +46,6 @@ from .errors import (
 
 # the following comment is required to suppress a warning that only shows up
 # when there are other pylint failures
-# pylint: disable=c-extension-no-member
 if _rsbridge.buildhash() != anki.buildinfo.buildhash:
     raise Exception(
         f"""rsbridge and anki build hashes do not match:
@@ -164,7 +163,7 @@ class RustBackend(RustBackendGenerated):
         finally:
             elapsed = time.time() - start
             if current_thread() is main_thread() and elapsed > 0.2:
-                print(f"blocked main thread for {int(elapsed*1000)}ms:")
+                print(f"blocked main thread for {int(elapsed * 1000)}ms:")
                 print("".join(traceback.format_stack()))
 
         err = backend_pb2.BackendError()
@@ -247,7 +246,7 @@ def backend_exception_to_pylib(err: backend_pb2.BackendError) -> Exception:
         return BackendError(err.message, help_page, context, backtrace)
 
     elif val == kind.SEARCH_ERROR:
-        return SearchError(markdown(err.message), help_page, context, backtrace)
+        return SearchError(err.message, help_page, context, backtrace)
 
     elif val == kind.UNDO_EMPTY:
         return UndoEmpty(err.message, help_page, context, backtrace)

pylib/anki/cards.py

@@ -7,7 +7,7 @@ import pprint
 import time
 from typing import NewType
 
-import anki  # pylint: disable=unused-import
+import anki
 import anki.collection
 import anki.decks
 import anki.notes
@@ -49,6 +49,7 @@ class Card(DeprecatedNamesMixin):
     memory_state: FSRSMemoryState | None
     desired_retention: float | None
     decay: float | None
+    last_review_time: int | None
 
     def __init__(
         self,
@@ -103,6 +104,11 @@ class Card(DeprecatedNamesMixin):
             card.desired_retention if card.HasField("desired_retention") else None
         )
         self.decay = card.decay if card.HasField("decay") else None
+        self.last_review_time = (
+            card.last_review_time_secs
+            if card.HasField("last_review_time_secs")
+            else None
+        )
 
     def _to_backend_card(self) -> cards_pb2.Card:
         # mtime & usn are set by backend
@@ -127,6 +133,7 @@ class Card(DeprecatedNamesMixin):
             memory_state=self.memory_state,
             desired_retention=self.desired_retention,
             decay=self.decay,
+            last_review_time_secs=self.last_review_time,
         )
 
     @deprecated(info="please use col.update_card()")

pylib/anki/collection.py

@@ -122,6 +122,7 @@ class ComputedMemoryState:
     desired_retention: float
     stability: float | None = None
     difficulty: float | None = None
+    decay: float | None = None
 
 
 @dataclass
@@ -157,7 +158,7 @@ class Collection(DeprecatedNamesMixin):
         self.tags = TagManager(self)
         self.conf = ConfigManager(self)
         self._load_scheduler()
-        self._startReps = 0  # pylint: disable=invalid-name
+        self._startReps = 0
 
     def name(self) -> Any:
         return os.path.splitext(os.path.basename(self.path))[0]
@@ -510,9 +511,7 @@ class Collection(DeprecatedNamesMixin):
     # Utils
     ##########################################################################
 
-    def nextID(  # pylint: disable=invalid-name
+    def nextID(self, type: str, inc: bool = True) -> Any:
-        self, type: str, inc: bool = True
-    ) -> Any:
         type = f"next{type.capitalize()}"
         id = self.conf.get(type, 1)
         if inc:
@@ -848,7 +847,6 @@ class Collection(DeprecatedNamesMixin):
         )
 
     def _pb_search_separator(self, operator: SearchJoiner) -> SearchNode.Group.Joiner.V:
-        # pylint: disable=no-member
         if operator == "AND":
             return SearchNode.Group.Joiner.AND
         else:
@@ -866,7 +864,9 @@ class Collection(DeprecatedNamesMixin):
                 return column
         return None
 
-    def browser_row_for_id(self, id_: int) -> tuple[
+    def browser_row_for_id(
+        self, id_: int
+    ) -> tuple[
         Generator[tuple[str, bool, BrowserRow.Cell.TextElideMode.V], None, None],
         BrowserRow.Color.V,
         str,
@@ -1189,9 +1189,13 @@ class Collection(DeprecatedNamesMixin):
                 desired_retention=resp.desired_retention,
                 stability=resp.state.stability,
                 difficulty=resp.state.difficulty,
+                decay=resp.decay,
             )
         else:
-            return ComputedMemoryState(desired_retention=resp.desired_retention)
+            return ComputedMemoryState(
+                desired_retention=resp.desired_retention,
+                decay=resp.decay,
+            )
 
     def fuzz_delta(self, card_id: CardId, interval: int) -> int:
         "The delta days of fuzz applied if reviewing the card in v3."
@@ -1207,8 +1211,6 @@ class Collection(DeprecatedNamesMixin):
     # the count on things like edits, which we probably could do by checking
     # the previous state in moveToState.
 
-    # pylint: disable=invalid-name
-
     def startTimebox(self) -> None:
         self._startTime = time.time()
         self._startReps = self.sched.reps

pylib/anki/exporting.py

@@ -1,7 +1,6 @@
 # Copyright: Ankitects Pty Ltd and contributors
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-# pylint: disable=invalid-name
 
 from __future__ import annotations
 
@@ -351,7 +350,7 @@ class AnkiPackageExporter(AnkiExporter):
         colfile = path.replace(".apkg", ".anki2")
         AnkiExporter.exportInto(self, colfile)
         # prevent older clients from accessing
-        # pylint: disable=unreachable
+
         self._addDummyCollection(z)
         z.write(colfile, "collection.anki21")
 

pylib/anki/find.py

@@ -1,7 +1,6 @@
 # Copyright: Ankitects Pty Ltd and contributors
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-# pylint: disable=invalid-name
 
 from __future__ import annotations
 

pylib/anki/hooks.py

@@ -1,7 +1,6 @@
 # Copyright: Ankitects Pty Ltd and contributors
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-# pylint: disable=invalid-name
 
 """
 Tools for extending Anki.

pylib/anki/importing/__init__.py

@@ -11,8 +11,6 @@ from anki.importing.apkg import AnkiPackageImporter
 from anki.importing.base import Importer
 from anki.importing.csvfile import TextImporter
 from anki.importing.mnemo import MnemosyneImporter
-from anki.importing.pauker import PaukerImporter
-from anki.importing.supermemo_xml import SupermemoXmlImporter  # type: ignore
 from anki.lang import TR
 
 
@@ -24,8 +22,6 @@ def importers(col: Collection) -> Sequence[tuple[str, type[Importer]]]:
             AnkiPackageImporter,
         ),
         (col.tr.importing_mnemosyne_20_deck_db(), MnemosyneImporter),
-        (col.tr.importing_supermemo_xml_export_xml(), SupermemoXmlImporter),
-        (col.tr.importing_pauker_18_lesson_paugz(), PaukerImporter),
     ]
     anki.hooks.importing_importers(importers)
     return importers

pylib/anki/importing/anki2.py

@@ -1,7 +1,7 @@
 # Copyright: Ankitects Pty Ltd and contributors
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-# pylint: disable=invalid-name
+
 from __future__ import annotations
 
 import os

pylib/anki/importing/apkg.py

@@ -1,7 +1,7 @@
 # Copyright: Ankitects Pty Ltd and contributors
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-# pylint: disable=invalid-name
+
 from __future__ import annotations
 
 import json

pylib/anki/importing/base.py

@@ -1,7 +1,7 @@
 # Copyright: Ankitects Pty Ltd and contributors
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-# pylint: disable=invalid-name
+
 from __future__ import annotations
 
 from typing import Any

pylib/anki/importing/csvfile.py

@@ -1,7 +1,6 @@
 # Copyright: Ankitects Pty Ltd and contributors
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-# pylint: disable=invalid-name
 
 from __future__ import annotations
 
@@ -144,7 +143,6 @@ class TextImporter(NoteImporter):
         self.close()
         zuper = super()
         if hasattr(zuper, "__del__"):
-            # pylint: disable=no-member
             zuper.__del__(self)  # type: ignore
 
     def noteFromFields(self, fields: list[str]) -> ForeignNote:

pylib/anki/importing/mnemo.py

@@ -1,7 +1,6 @@
 # Copyright: Ankitects Pty Ltd and contributors
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-# pylint: disable=invalid-name
 
 import re
 import time
@@ -35,7 +34,6 @@ f._id=d._fact_id"""
         ):
             if id != curid:
                 if note:
-                    # pylint: disable=unsubscriptable-object
                     notes[note["_id"]] = note
                 note = {"_id": _id}
                 curid = id
@@ -185,7 +183,6 @@ acq_reps+ret_reps, lapses, card_type_id from cards"""
             state = dict(n=1)
 
             def repl(match):
-                # pylint: disable=cell-var-from-loop
                 # replace [...] with cloze refs
                 res = "{{c%d::%s}}" % (state["n"], match.group(1))
                 state["n"] += 1

pylib/anki/importing/noteimp.py

@@ -1,7 +1,6 @@
 # Copyright: Ankitects Pty Ltd and contributors
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-# pylint: disable=invalid-name
 
 from __future__ import annotations
 

pylib/anki/importing/pauker.py

@@ -1,94 +0,0 @@
-# Copyright: Andreas Klauer <Andreas.Klauer@metamorpher.de>
-# License: BSD-3
-
-# pylint: disable=invalid-name
-
-import gzip
-import html
-import math
-import random
-import time
-import xml.etree.ElementTree as ET
-
-from anki.importing.noteimp import ForeignCard, ForeignNote, NoteImporter
-from anki.stdmodels import _legacy_add_forward_reverse
-
-ONE_DAY = 60 * 60 * 24
-
-
-class PaukerImporter(NoteImporter):
-    """Import Pauker 1.8 Lesson (*.pau.gz)"""
-
-    needMapper = False
-    allowHTML = True
-
-    def run(self):
-        model = _legacy_add_forward_reverse(self.col)
-        model["name"] = "Pauker"
-        self.col.models.save(model, updateReqs=False)
-        self.col.models.set_current(model)
-        self.model = model
-        self.initMapping()
-        NoteImporter.run(self)
-
-    def fields(self):
-        """Pauker is Front/Back"""
-        return 2
-
-    def foreignNotes(self):
-        """Build and return a list of notes."""
-        notes = []
-
-        try:
-            f = gzip.open(self.file)
-            tree = ET.parse(f)  # type: ignore
-            lesson = tree.getroot()
-            assert lesson.tag == "Lesson"
-        finally:
-            f.close()
-
-        index = -4
-
-        for batch in lesson.findall("./Batch"):
-            index += 1
-
-            for card in batch.findall("./Card"):
-                # Create a note for this card.
-                front = card.findtext("./FrontSide/Text")
-                back = card.findtext("./ReverseSide/Text")
-                note = ForeignNote()
-                assert front and back
-                note.fields = [
-                    html.escape(x.strip())
-                    .replace("\n", "<br>")
-                    .replace("  ", " &nbsp;")
-                    for x in [front, back]
-                ]
-                notes.append(note)
-
-                # Determine due date for cards.
-                frontdue = card.find("./FrontSide[@LearnedTimestamp]")
-                backdue = card.find("./ReverseSide[@Batch][@LearnedTimestamp]")
-
-                if frontdue is not None:
-                    note.cards[0] = self._learnedCard(
-                        index, int(frontdue.attrib["LearnedTimestamp"])
-                    )
-
-                if backdue is not None:
-                    note.cards[1] = self._learnedCard(
-                        int(backdue.attrib["Batch"]),
-                        int(backdue.attrib["LearnedTimestamp"]),
-                    )
-
-        return notes
-
-    def _learnedCard(self, batch, timestamp):
-        ivl = math.exp(batch)
-        now = time.time()
-        due = ivl - (now - timestamp / 1000.0) / ONE_DAY
-        fc = ForeignCard()
-        fc.due = self.col.sched.today + int(due + 0.5)
-        fc.ivl = random.randint(int(ivl * 0.90), int(ivl + 0.5))
-        fc.factor = random.randint(1500, 2500)
-        return fc

pylib/anki/importing/supermemo_xml.py

@@ -1,484 +0,0 @@
-# Copyright: petr.michalec@gmail.com
-# License: GNU GPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
-# pytype: disable=attribute-error
-# type: ignore
-# pylint: disable=C
-from __future__ import annotations
-
-import re
-import sys
-import time
-import unicodedata
-from string import capwords
-from xml.dom import minidom
-from xml.dom.minidom import Element, Text
-
-from anki.collection import Collection
-from anki.importing.noteimp import ForeignCard, ForeignNote, NoteImporter
-from anki.stdmodels import _legacy_add_basic_model
-
-
-class SmartDict(dict):
-    """
-    See http://www.peterbe.com/plog/SmartDict
-    Copyright 2005, Peter Bengtsson, peter@fry-it.com
-    0BSD
-
-    A smart dict can be instantiated either from a pythonic dict
-    or an instance object (eg. SQL recordsets) but it ensures that you can
-    do all the convenient lookups such as x.first_name, x['first_name'] or
-    x.get('first_name').
-    """
-
-    def __init__(self, *a, **kw) -> None:
-        if a:
-            if isinstance(type(a[0]), dict):
-                kw.update(a[0])
-            elif isinstance(type(a[0]), object):
-                kw.update(a[0].__dict__)
-            elif hasattr(a[0], "__class__") and a[0].__class__.__name__ == "SmartDict":
-                kw.update(a[0].__dict__)
-
-        dict.__init__(self, **kw)
-        self.__dict__ = self
-
-
-class SuperMemoElement(SmartDict):
-    "SmartDict wrapper to store SM Element data"
-
-    def __init__(self, *a, **kw) -> None:
-        SmartDict.__init__(self, *a, **kw)
-        # default content
-        self.__dict__["lTitle"] = None
-        self.__dict__["Title"] = None
-        self.__dict__["Question"] = None
-        self.__dict__["Answer"] = None
-        self.__dict__["Count"] = None
-        self.__dict__["Type"] = None
-        self.__dict__["ID"] = None
-        self.__dict__["Interval"] = None
-        self.__dict__["Lapses"] = None
-        self.__dict__["Repetitions"] = None
-        self.__dict__["LastRepetiton"] = None
-        self.__dict__["AFactor"] = None
-        self.__dict__["UFactor"] = None
-
-
-# This is an AnkiImporter
-class SupermemoXmlImporter(NoteImporter):
-    needMapper = False
-    allowHTML = True
-
-    """
-    Supermemo XML export's to Anki parser.
-    Goes through a SM collection and fetch all elements.
-
-    My SM collection was a big mess where topics and items were mixed.
-    I was unable to parse my content in a regular way like for loop on
-    minidom.getElementsByTagName() etc. My collection had also an
-    limitation, topics were splited into branches with max 100 items
-    on each. Learning themes were in deep structure. I wanted to have
-    full title on each element to be stored in tags.
-
-    Code should be upgrade to support importing of SM2006 exports.
-    """
-
-    def __init__(self, col: Collection, file: str) -> None:
-        """Initialize internal variables.
-        Pameters to be exposed to GUI are stored in self.META"""
-        NoteImporter.__init__(self, col, file)
-        m = _legacy_add_basic_model(self.col)
-        m["name"] = "Supermemo"
-        self.col.models.save(m)
-        self.initMapping()
-
-        self.lines = None
-        self.numFields = int(2)
-
-        # SmXmlParse VARIABLES
-        self.xmldoc = None
-        self.pieces = []
-        self.cntBuf = []  # to store last parsed data
-        self.cntElm = []  # to store SM Elements data
-        self.cntCol = []  # to store SM Colections data
-
-        # store some meta info related to parse algorithm
-        # SmartDict works like dict / class wrapper
-        self.cntMeta = SmartDict()
-        self.cntMeta.popTitles = False
-        self.cntMeta.title = []
-
-        # META stores controls of import script, should be
-        # exposed to import dialog. These are default values.
-        self.META = SmartDict()
-        self.META.resetLearningData = False  # implemented
-        self.META.onlyMemorizedItems = False  # implemented
-        self.META.loggerLevel = 2  # implemented 0no,1info,2error,3debug
-        self.META.tagAllTopics = True
-        self.META.pathsToBeTagged = [
-            "English for beginners",
-            "Advanced English 97",
-            "Phrasal Verbs",
-        ]  # path patterns to be tagged - in gui entered like 'Advanced English 97|My Vocablary'
-        self.META.tagMemorizedItems = True  # implemented
-        self.META.logToStdOutput = False  # implemented
-
-        self.notes = []
-
-    ## TOOLS
-
-    def _fudgeText(self, text: str) -> str:
-        "Replace sm syntax to Anki syntax"
-        text = text.replace("\n\r", "<br>")
-        text = text.replace("\n", "<br>")
-        return text
-
-    def _unicode2ascii(self, str: str) -> str:
-        "Remove diacritic punctuation from strings (titles)"
-        return "".join(
-            [
-                c
-                for c in unicodedata.normalize("NFKD", str)
-                if not unicodedata.combining(c)
-            ]
-        )
-
-    def _decode_htmlescapes(self, html: str) -> str:
-        """Unescape HTML code."""
-        # In case of bad formatted html you can import MinimalSoup etc.. see BeautifulSoup source code
-        from bs4 import BeautifulSoup
-
-        # my sm2004 also ecaped & char in escaped sequences.
-        html = re.sub("&amp;", "&", html)
-
-        # https://anki.tenderapp.com/discussions/ankidesktop/39543-anki-is-replacing-the-character-by-when-i-exit-the-html-edit-mode-ctrlshiftx
-        if html.find(">") < 0:
-            return html
-
-        # unescaped solitary chars < or > that were ok for minidom confuse btfl soup
-        # html = re.sub(u'>',u'&gt;',html)
-        # html = re.sub(u'<',u'&lt;',html)
-
-        return str(BeautifulSoup(html, "html.parser"))
-
-    def _afactor2efactor(self, af: float) -> float:
-        # Adapted from <http://www.supermemo.com/beta/xml/xml-core.htm>
-
-        # Ranges for A-factors and E-factors
-        af_min = 1.2
-        af_max = 6.9
-        ef_min = 1.3
-        ef_max = 3.3
-
-        # Sanity checks for the A-factor
-        if af < af_min:
-            af = af_min
-        elif af > af_max:
-            af = af_max
-
-        # Scale af to the range 0..1
-        af_scaled = (af - af_min) / (af_max - af_min)
-        # Rescale to the interval ef_min..ef_max
-        ef = ef_min + af_scaled * (ef_max - ef_min)
-
-        return ef
-
-    ## DEFAULT IMPORTER METHODS
-
-    def foreignNotes(self) -> list[ForeignNote]:
-        # Load file and parse it by minidom
-        self.loadSource(self.file)
-
-        # Migrating content / time consuming part
-        # addItemToCards is called for each sm element
-        self.logger("Parsing started.")
-        self.parse()
-        self.logger("Parsing done.")
-
-        # Return imported cards
-        self.total = len(self.notes)
-        self.log.append("%d cards imported." % self.total)
-        return self.notes
-
-    def fields(self) -> int:
-        return 2
-
-    ## PARSER METHODS
-
-    def addItemToCards(self, item: SuperMemoElement) -> None:
-        "This method actually do conversion"
-
-        # new anki card
-        note = ForeignNote()
-
-        # clean Q and A
-        note.fields.append(self._fudgeText(self._decode_htmlescapes(item.Question)))
-        note.fields.append(self._fudgeText(self._decode_htmlescapes(item.Answer)))
-        note.tags = []
-
-        # pre-process scheduling data
-        # convert learning data
-        if (
-            not self.META.resetLearningData
-            and int(item.Interval) >= 1
-            and getattr(item, "LastRepetition", None)
-        ):
-            # migration of LearningData algorithm
-            tLastrep = time.mktime(time.strptime(item.LastRepetition, "%d.%m.%Y"))
-            tToday = time.time()
-            card = ForeignCard()
-            card.ivl = int(item.Interval)
-            card.lapses = int(item.Lapses)
-            card.reps = int(item.Repetitions) + int(item.Lapses)
-            nextDue = tLastrep + (float(item.Interval) * 86400.0)
-            remDays = int((nextDue - time.time()) / 86400)
-            card.due = self.col.sched.today + remDays
-            card.factor = int(
-                self._afactor2efactor(float(item.AFactor.replace(",", "."))) * 1000
-            )
-            note.cards[0] = card
-
-        # categories & tags
-        # it's worth to have every theme (tree structure of sm collection) stored in tags, but sometimes not
-        # you can deceide if you are going to tag all toppics or just that containing some pattern
-        tTaggTitle = False
-        for pattern in self.META.pathsToBeTagged:
-            if (
-                item.lTitle is not None
-                and pattern.lower() in " ".join(item.lTitle).lower()
-            ):
-                tTaggTitle = True
-                break
-        if tTaggTitle or self.META.tagAllTopics:
-            # normalize - remove diacritic punctuation from unicode chars to ascii
-            item.lTitle = [self._unicode2ascii(topic) for topic in item.lTitle]
-
-            # Transform xyz / aaa / bbb / ccc on Title path to Tag  xyzAaaBbbCcc
-            #  clean things like [999] or [111-2222] from title path, example: xyz / [1000-1200] zyx / xyz
-            #  clean whitespaces
-            #  set Capital letters for first char of the word
-            tmp = list(
-                {re.sub(r"(\[[0-9]+\])", " ", i).replace("_", " ") for i in item.lTitle}
-            )
-            tmp = list({re.sub(r"(\W)", " ", i) for i in tmp})
-            tmp = list({re.sub("^[0-9 ]+$", "", i) for i in tmp})
-            tmp = list({capwords(i).replace(" ", "") for i in tmp})
-            tags = [j[0].lower() + j[1:] for j in tmp if j.strip() != ""]
-
-            note.tags += tags
-
-            if self.META.tagMemorizedItems and int(item.Interval) > 0:
-                note.tags.append("Memorized")
-
-            self.logger("Element tags\t- " + repr(note.tags), level=3)
-
-        self.notes.append(note)
-
-    def logger(self, text: str, level: int = 1) -> None:
-        "Wrapper for Anki logger"
-
-        dLevels = {0: "", 1: "Info", 2: "Verbose", 3: "Debug"}
-        if level <= self.META.loggerLevel:
-            # self.deck.updateProgress(_(text))
-
-            if self.META.logToStdOutput:
-                print(
-                    self.__class__.__name__
-                    + " - "
-                    + dLevels[level].ljust(9)
-                    + " -\t"
-                    + text
-                )
-
-    # OPEN AND LOAD
-    def openAnything(self, source):
-        """Open any source / actually only opening of files is used
-        @return an open handle which must be closed after use, i.e., handle.close()"""
-
-        if source == "-":
-            return sys.stdin
-
-        # try to open with urllib (if source is http, ftp, or file URL)
-        import urllib.error
-        import urllib.parse
-        import urllib.request
-
-        try:
-            return urllib.request.urlopen(source)
-        except OSError:
-            pass
-
-        # try to open with native open function (if source is pathname)
-        try:
-            return open(source, encoding="utf8")
-        except OSError:
-            pass
-
-        # treat source as string
-        import io
-
-        return io.StringIO(str(source))
-
-    def loadSource(self, source: str) -> None:
-        """Load source file and parse with xml.dom.minidom"""
-        self.source = source
-        self.logger("Load started...")
-        sock = open(self.source, encoding="utf8")
-        self.xmldoc = minidom.parse(sock).documentElement
-        sock.close()
-        self.logger("Load done.")
-
-    # PARSE
-    def parse(self, node: Text | Element | None = None) -> None:
-        "Parse method - parses document elements"
-
-        if node is None and self.xmldoc is not None:
-            node = self.xmldoc
-
-        _method = "parse_%s" % node.__class__.__name__
-        if hasattr(self, _method):
-            parseMethod = getattr(self, _method)
-            parseMethod(node)
-        else:
-            self.logger("No handler for method %s" % _method, level=3)
-
-    def parse_Document(self, node):
-        "Parse XML document"
-
-        self.parse(node.documentElement)
-
-    def parse_Element(self, node: Element) -> None:
-        "Parse XML element"
-
-        _method = "do_%s" % node.tagName
-        if hasattr(self, _method):
-            handlerMethod = getattr(self, _method)
-            handlerMethod(node)
-        else:
-            self.logger("No handler for method %s" % _method, level=3)
-            # print traceback.print_exc()
-
-    def parse_Text(self, node: Text) -> None:
-        "Parse text inside elements. Text is stored into local buffer."
-
-        text = node.data
-        self.cntBuf.append(text)
-
-    # def parse_Comment(self, node):
-    #    """
-    #    Source can contain XML comments, but we ignore them
-    #    """
-    #    pass
-
-    # DO
-    def do_SuperMemoCollection(self, node: Element) -> None:
-        "Process SM Collection"
-
-        for child in node.childNodes:
-            self.parse(child)
-
-    def do_SuperMemoElement(self, node: Element) -> None:
-        "Process SM Element (Type - Title,Topics)"
-
-        self.logger("=" * 45, level=3)
-
-        self.cntElm.append(SuperMemoElement())
-        self.cntElm[-1]["lTitle"] = self.cntMeta["title"]
-
-        # parse all child elements
-        for child in node.childNodes:
-            self.parse(child)
-
-        # strip all saved strings, just for sure
-        for key in list(self.cntElm[-1].keys()):
-            if hasattr(self.cntElm[-1][key], "strip"):
-                self.cntElm[-1][key] = self.cntElm[-1][key].strip()
-
-        # pop current element
-        smel = self.cntElm.pop()
-
-        # Process cntElm if is valid Item (and not an Topic etc..)
-        # if smel.Lapses != None and smel.Interval != None and smel.Question != None and smel.Answer != None:
-        if smel.Title is None and smel.Question is not None and smel.Answer is not None:
-            if smel.Answer.strip() != "" and smel.Question.strip() != "":
-                # migrate only memorized otherway skip/continue
-                if self.META.onlyMemorizedItems and not (int(smel.Interval) > 0):
-                    self.logger("Element skipped  \t- not memorized ...", level=3)
-                else:
-                    # import sm element data to Anki
-                    self.addItemToCards(smel)
-                    self.logger("Import element \t- " + smel["Question"], level=3)
-
-                    # print element
-                    self.logger("-" * 45, level=3)
-                    for key in list(smel.keys()):
-                        self.logger(
-                            "\t{} {}".format((key + ":").ljust(15), smel[key]), level=3
-                        )
-            else:
-                self.logger("Element skipped  \t- no valid Q and A ...", level=3)
-
-        else:
-            # now we know that item was topic
-            # parsing of whole node is now finished
-
-            # test if it's really topic
-            if smel.Title is not None:
-                # remove topic from title list
-                t = self.cntMeta["title"].pop()
-                self.logger("End of topic \t- %s" % (t), level=2)
-
-    def do_Content(self, node: Element) -> None:
-        "Process SM element Content"
-
-        for child in node.childNodes:
-            if hasattr(child, "tagName") and child.firstChild is not None:
-                self.cntElm[-1][child.tagName] = child.firstChild.data
-
-    def do_LearningData(self, node: Element) -> None:
-        "Process SM element LearningData"
-
-        for child in node.childNodes:
-            if hasattr(child, "tagName") and child.firstChild is not None:
-                self.cntElm[-1][child.tagName] = child.firstChild.data
-
-    # It's being processed in do_Content now
-    # def do_Question(self, node):
-    #    for child in node.childNodes: self.parse(child)
-    #    self.cntElm[-1][node.tagName]=self.cntBuf.pop()
-
-    # It's being processed in do_Content now
-    # def do_Answer(self, node):
-    #    for child in node.childNodes: self.parse(child)
-    #    self.cntElm[-1][node.tagName]=self.cntBuf.pop()
-
-    def do_Title(self, node: Element) -> None:
-        "Process SM element Title"
-
-        t = self._decode_htmlescapes(node.firstChild.data)
-        self.cntElm[-1][node.tagName] = t
-        self.cntMeta["title"].append(t)
-        self.cntElm[-1]["lTitle"] = self.cntMeta["title"]
-        self.logger("Start of topic \t- " + " / ".join(self.cntMeta["title"]), level=2)
-
-    def do_Type(self, node: Element) -> None:
-        "Process SM element Type"
-
-        if len(self.cntBuf) >= 1:
-            self.cntElm[-1][node.tagName] = self.cntBuf.pop()
-
-
-# if __name__ == '__main__':
-
-# for testing you can start it standalone
-
-# file = u'/home/epcim/hg2g/dev/python/sm2anki/ADVENG2EXP.xxe.esc.zaloha_FINAL.xml'
-# file = u'/home/epcim/hg2g/dev/python/anki/libanki/tests/importing/supermemo/original_ENGLISHFORBEGGINERS_noOEM.xml'
-# file = u'/home/epcim/hg2g/dev/python/anki/libanki/tests/importing/supermemo/original_ENGLISHFORBEGGINERS_oem_1250.xml'
-# file = str(sys.argv[1])
-# impo = SupermemoXmlImporter(Deck(),file)
-# impo.foreignCards()
-
-# sys.exit(1)
-
-# vim: ts=4 sts=2 ft=python

pylib/anki/lang.py

@@ -73,6 +73,7 @@ langs = sorted(
         ("ଓଡ଼ିଆ", "or_OR"),
         ("Filipino", "tl"),
         ("ئۇيغۇر", "ug"),
+        ("Oʻzbekcha", "uz_UZ"),
     ]
 )
 
@@ -123,6 +124,7 @@ compatMap = {
     "th": "th_TH",
     "tr": "tr_TR",
     "uk": "uk_UA",
+    "uz": "uz_UZ",
     "vi": "vi_VN",
 }
 
@@ -157,13 +159,13 @@ def lang_to_disk_lang(lang: str) -> str:
 
 
 # the currently set interface language
-current_lang = "en"  # pylint: disable=invalid-name
+current_lang = "en"
 
 # the current Fluent translation instance. Code in pylib/ should
 # not reference this, and should use col.tr instead. The global
 # instance exists for legacy reasons, and as a convenience for the
 # Qt code.
-current_i18n: anki._backend.RustBackend | None = None  # pylint: disable=invalid-name
+current_i18n: anki._backend.RustBackend | None = None
 tr_legacyglobal = anki._backend.Translations(None)
 
 
@@ -178,7 +180,7 @@ def ngettext(single: str, plural: str, num: int) -> str:
 
 
 def set_lang(lang: str) -> None:
-    global current_lang, current_i18n  # pylint: disable=invalid-name
+    global current_lang, current_i18n
     current_lang = lang
     current_i18n = anki._backend.RustBackend(langs=[lang])
     tr_legacyglobal.backend = weakref.ref(current_i18n)
@@ -198,9 +200,7 @@ def get_def_lang(user_lang: str | None = None) -> tuple[int, str]:
         # getdefaultlocale() is deprecated since Python 3.11, but we need to keep using it as getlocale() behaves differently: https://bugs.python.org/issue38805
         with warnings.catch_warnings():
             warnings.simplefilter("ignore", DeprecationWarning)
-            (sys_lang, enc) = (
+            (sys_lang, enc) = locale.getdefaultlocale()
-                locale.getdefaultlocale()  # pylint: disable=deprecated-method
-            )
     except AttributeError:
         # this will return a different format on Windows (e.g. Italian_Italy), resulting in us falling back to en_US
         # further below

pylib/anki/models.py

@@ -10,7 +10,7 @@ import time
 from collections.abc import Sequence
 from typing import Any, NewType, Union
 
-import anki  # pylint: disable=unused-import
+import anki
 import anki.collection
 import anki.notes
 from anki import notetypes_pb2
@@ -419,7 +419,7 @@ and notes.mid = ? and cards.ord = ?""",
 
     # legacy API - used by unit tests and add-ons
 
-    def change(  # pylint: disable=invalid-name
+    def change(
         self,
         notetype: NotetypeDict,
         nids: list[anki.notes.NoteId],
@@ -478,8 +478,6 @@ and notes.mid = ? and cards.ord = ?""",
     # Legacy
     ##########################################################################
 
-    # pylint: disable=invalid-name
-
     @deprecated(info="use note.cloze_numbers_in_fields()")
     def _availClozeOrds(
         self, notetype: NotetypeDict, flds: str, allow_empty: bool = True

pylib/anki/notes.py

@@ -7,7 +7,7 @@ import copy
 from collections.abc import Sequence
 from typing import NewType
 
-import anki  # pylint: disable=unused-import
+import anki
 import anki.cards
 import anki.collection
 import anki.decks

pylib/anki/rsbackend.py

@@ -4,10 +4,8 @@
 # The backend code has moved into _backend; this file exists only to avoid breaking
 # some add-ons. They should be updated to point to the correct location in the
 # future.
-#
-# pylint: disable=unused-import
-# pylint: enable=invalid-name
 
+# ruff: noqa: F401
 from anki.decks import DeckTreeNode
 from anki.errors import InvalidInput, NotFoundError
 from anki.lang import TR

pylib/anki/scheduler/dummy.py

@@ -1,7 +1,6 @@
 # Copyright: Ankitects Pty Ltd and contributors
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-# pylint: disable=invalid-name
 
 from __future__ import annotations
 

pylib/anki/scheduler/legacy.py

@@ -1,7 +1,6 @@
 # Copyright: Ankitects Pty Ltd and contributors
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-# pylint: disable=invalid-name
 
 from __future__ import annotations
 

pylib/anki/scheduler/v3.py

@@ -1,7 +1,6 @@
 # Copyright: Ankitects Pty Ltd and contributors
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-# pylint: disable=invalid-name
 
 """
 The V3/2021 scheduler.
@@ -184,7 +183,7 @@ class Scheduler(SchedulerBaseWithLegacy):
             return self._interval_for_filtered_state(state.filtered)
         else:
             assert_exhaustive(kind)
-            return 0  # pylint: disable=unreachable
+            return 0
 
     def _interval_for_normal_state(
         self, normal: scheduler_pb2.SchedulingState.Normal
@@ -200,7 +199,7 @@ class Scheduler(SchedulerBaseWithLegacy):
             return normal.relearning.learning.scheduled_secs
         else:
             assert_exhaustive(kind)
-            return 0  # pylint: disable=unreachable
+            return 0
 
     def _interval_for_filtered_state(
         self, filtered: scheduler_pb2.SchedulingState.Filtered
@@ -212,7 +211,7 @@ class Scheduler(SchedulerBaseWithLegacy):
             return self._interval_for_normal_state(filtered.rescheduling.original_state)
         else:
             assert_exhaustive(kind)
-            return 0  # pylint: disable=unreachable
+            return 0
 
     def nextIvl(self, card: Card, ease: int) -> Any:
         "Don't use this - it is only required by tests, and will be moved in the future."

pylib/anki/stats.py

@@ -1,7 +1,6 @@
 # Copyright: Ankitects Pty Ltd and contributors
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-# pylint: disable=C
 
 from __future__ import annotations
 
@@ -27,7 +26,7 @@ def _legacy_card_stats(
     col: anki.collection.Collection, card_id: anki.cards.CardId, include_revlog: bool
 ) -> str:
     "A quick hack to preserve compatibility with the old HTML string API."
-    random_id = f"cardinfo-{base62(random.randint(0, 2 ** 64 - 1))}"
+    random_id = f"cardinfo-{base62(random.randint(0, 2**64 - 1))}"
     varName = random_id.replace("-", "")
     return f"""
 <div id="{random_id}"></div>
@@ -324,7 +323,6 @@ group by day order by day"""
             yaxes=[dict(min=0), dict(position="right", min=0)],
         )
         if days is not None:
-            # pylint: disable=invalid-unary-operand-type
             conf["xaxis"]["min"] = -days + 0.5
 
         def plot(id: str, data: Any, ylabel: str, ylabel2: str) -> str:
@@ -359,7 +357,6 @@ group by day order by day"""
             yaxes=[dict(min=0), dict(position="right", min=0)],
         )
         if days is not None:
-            # pylint: disable=invalid-unary-operand-type
             conf["xaxis"]["min"] = -days + 0.5
 
         def plot(id: str, data: Any, ylabel: str, ylabel2: str) -> str:

pylib/anki/statsbg.py

@@ -1,5 +1,3 @@
-# pylint: disable=invalid-name
-
 # from subtlepatterns.com; CC BY 4.0.
 # by Daniel Beaton
 # https://www.toptal.com/designers/subtlepatterns/fancy-deboss/

pylib/anki/stdmodels.py

@@ -12,7 +12,6 @@ from anki import notetypes_pb2
 from anki._legacy import DeprecatedNamesMixinForModule
 from anki.utils import from_json_bytes
 
-# pylint: disable=no-member
 StockNotetypeKind = notetypes_pb2.StockNotetype.Kind
 
 # add-on authors can add ("note type name", function)

pylib/anki/tags.py

@@ -16,7 +16,7 @@ import re
 from collections.abc import Collection, Sequence
 from typing import Match
 
-import anki  # pylint: disable=unused-import
+import anki
 import anki.collection
 from anki import tags_pb2
 from anki._legacy import DeprecatedNamesMixin, deprecated

pylib/anki/utils.py

@@ -24,7 +24,6 @@ from anki.dbproxy import DBProxy
 _tmpdir: str | None
 
 try:
-    # pylint: disable=c-extension-no-member
     import orjson
 
     to_json_bytes: Callable[[Any], bytes] = orjson.dumps
@@ -156,12 +155,12 @@ def field_checksum(data: str) -> int:
 # Temp files
 ##############################################################################
 
-_tmpdir = None  # pylint: disable=invalid-name
+_tmpdir = None
 
 
 def tmpdir() -> str:
     "A reusable temp folder which we clean out on each program invocation."
-    global _tmpdir  # pylint: disable=invalid-name
+    global _tmpdir
     if not _tmpdir:
 
         def cleanup() -> None:
@@ -216,7 +215,6 @@ def call(argv: list[str], wait: bool = True, **kwargs: Any) -> int:
         try:
             info.dwFlags |= subprocess.STARTF_USESHOWWINDOW  # type: ignore
         except Exception:
-            # pylint: disable=no-member
             info.dwFlags |= subprocess._subprocess.STARTF_USESHOWWINDOW  # type: ignore
     else:
         info = None
@@ -282,7 +280,7 @@ def plat_desc() -> str:
             elif is_win:
                 theos = f"win:{platform.win32_ver()[0]}"
             elif system == "Linux":
-                import distro  # pytype: disable=import-error # pylint: disable=import-error
+                import distro  # pytype: disable=import-error
 
                 dist_id = distro.id()
                 dist_version = distro.version()
@@ -309,12 +307,17 @@ def int_version() -> int:
     """Anki's version as an integer in the form YYMMPP, e.g. 230900.
     (year, month, patch).
     In 2.1.x releases, this was just the last number."""
+    import re
+
     from anki.buildinfo import version
 
+    # Strip non-numeric characters (handles beta/rc suffixes like '25.02b1' or 'rc3')
+    numeric_version = re.sub(r"[^0-9.]", "", version)
+
     try:
-        [year, month, patch] = version.split(".")
+        [year, month, patch] = numeric_version.split(".")
     except ValueError:
-        [year, month] = version.split(".")
+        [year, month] = numeric_version.split(".")
         patch = "0"
 
     year_num = int(year)

pylib/hatch_build.py

@@ -35,8 +35,16 @@ class CustomBuildHook(BuildHookInterface):
 
         assert generated_root.exists(), "you should build with --wheel"
         for path in generated_root.rglob("*"):
-            if path.is_file():
+            if path.is_file() and not self._should_exclude(path):
                 relative_path = path.relative_to(generated_root)
                 # Place files under anki/ in the distribution
                 dist_path = "anki" / relative_path
                 force_include[str(path)] = str(dist_path)
+
+    def _should_exclude(self, path: Path) -> bool:
+        """Check if a file should be excluded from the wheel."""
+        # Exclude __pycache__
+        path_str = str(path)
+        if "/__pycache__/" in path_str:
+            return True
+        return False

pylib/pyproject.toml

@@ -1,23 +1,18 @@
 [project]
 name = "anki"
-# dynamic = ["version"]
+dynamic = ["version"]
-version = "0.1.2"
 requires-python = ">=3.9"
 license = "AGPL-3.0-or-later"
 dependencies = [
-  "beautifulsoup4",
   "decorator",
   "markdown",
   "orjson",
-  "protobuf>=4.21",
+  "protobuf>=6.0,<8.0",
   "requests[socks]",
+  # remove after we update to min python 3.11+
   "typing_extensions",
-  "types-protobuf",
-  "types-requests",
-  "types-orjson",
   # platform-specific dependencies
   "distro; sys_platform != 'darwin' and sys_platform != 'win32'",
-  "psutil; sys_platform == 'win32'",
 ]
 
 [build-system]

pylib/rsbridge/Cargo.toml

@@ -12,6 +12,7 @@ description = "Anki's Rust library code Python bindings"
 name = "rsbridge"
 crate-type = ["cdylib"]
 path = "lib.rs"
+test = false
 
 [dependencies]
 anki.workspace = true

pylib/rsbridge/build.rs

@@ -28,6 +28,6 @@ fn main() {
             .to_string();
 
         let libs_path = stdlib_path + "s";
-        println!("cargo:rustc-link-search={}", libs_path);
+        println!("cargo:rustc-link-search={libs_path}");
     }
 }

pylib/tests/test_find.py

@@ -169,8 +169,7 @@ def test_find_cards():
     # properties
     id = col.db.scalar("select id from cards limit 1")
     col.db.execute(
-        "update cards set queue=2, ivl=10, reps=20, due=30, factor=2200 "
+        "update cards set queue=2, ivl=10, reps=20, due=30, factor=2200 where id = ?",
-        "where id = ?",
         id,
     )
     assert len(col.find_cards("prop:ivl>5")) == 1

pylib/tests/test_importing.py

@@ -13,7 +13,6 @@ from anki.importing import (
     Anki2Importer,
     AnkiPackageImporter,
     MnemosyneImporter,
-    SupermemoXmlImporter,
     TextImporter,
 )
 from tests.shared import getEmptyCol, getUpgradeDeckPath
@@ -306,22 +305,6 @@ def test_csv_tag_only_if_modified():
     col.close()
 
 
-@pytest.mark.filterwarnings("ignore:Using or importing the ABCs")
-def test_supermemo_xml_01_unicode():
-    col = getEmptyCol()
-    file = str(os.path.join(testDir, "support", "supermemo1.xml"))
-    i = SupermemoXmlImporter(col, file)
-    # i.META.logToStdOutput = True
-    i.run()
-    assert i.total == 1
-    cid = col.db.scalar("select id from cards")
-    c = col.get_card(cid)
-    # Applies A Factor-to-E Factor conversion
-    assert c.factor == 2879
-    assert c.reps == 7
-    col.close()
-
-
 def test_mnemo():
     col = getEmptyCol()
     file = str(os.path.join(testDir, "support", "mnemo.db"))

pylib/tests/test_schedv3.py

@@ -551,12 +551,10 @@ def test_bury():
     col.addNote(note)
     c2 = note.cards()[0]
     # burying
-    col.sched.bury_cards([c.id], manual=True)  # pylint: disable=unexpected-keyword-arg
+    col.sched.bury_cards([c.id], manual=True)
     c.load()
     assert c.queue == QUEUE_TYPE_MANUALLY_BURIED
-    col.sched.bury_cards(
+    col.sched.bury_cards([c2.id], manual=False)
-        [c2.id], manual=False
-    )  # pylint: disable=unexpected-keyword-arg
     c2.load()
     assert c2.queue == QUEUE_TYPE_SIBLING_BURIED
 

pylib/tools/genbuildinfo.py

@@ -15,6 +15,5 @@ with open(buildhash_file, "r", encoding="utf8") as f:
 
 with open(outpath, "w", encoding="utf8") as f:
     # if we switch to uppercase we'll need to add legacy aliases
-    f.write("# pylint: disable=invalid-name\n")
     f.write(f"version = '{version}'\n")
     f.write(f"buildhash = '{buildhash}'\n")

pylib/tools/genhooks.py

@@ -133,7 +133,7 @@ prefix = """\
 # This file is automatically generated; edit tools/genhooks.py instead.
 # Please import from anki.hooks instead of this file.
 
-# pylint: disable=unused-import
+# ruff: noqa: F401
 
 from __future__ import annotations
 

pylib/tools/hookslib.py

@@ -7,7 +7,6 @@ Code for generating hooks.
 
 from __future__ import annotations
 
-import os
 import subprocess
 import sys
 from dataclasses import dataclass
@@ -204,9 +203,6 @@ def write_file(path: str, hooks: list[Hook], prefix: str, suffix: str):
 
     code += f"\n{suffix}"
 
-    # work around issue with latest black
-    if sys.platform == "win32" and "HOME" in os.environ:
-        os.environ["USERPROFILE"] = os.environ["HOME"]
     with open(path, "wb") as file:
         file.write(code.encode("utf8"))
-    subprocess.run([sys.executable, "-m", "black", "-q", path], check=True)
+    subprocess.run([sys.executable, "-m", "ruff", "format", "-q", path], check=True)

pyproject.toml

@@ -7,16 +7,23 @@ classifiers = ["Private :: Do Not Upload"]
 
 [dependency-groups]
 dev = [
-  "black",
-  "isort",
   "mypy",
   "mypy-protobuf",
-  "pylint",
+  "ruff",
   "pytest",
   "PyChromeDevTools",
-  "colorama", # for isort --color
   "wheel",
   "hatchling", # for type checking hatch_build.py files
+  "mock",
+  "types-protobuf",
+  "types-requests",
+  "types-orjson",
+  "types-decorator",
+  "types-flask",
+  "types-flask-cors",
+  "types-markdown",
+  "types-waitress",
+  "types-pywin32",
 ]
 
 [project.optional-dependencies]

python/sphinx/build.py

@@ -2,6 +2,7 @@
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 import os
 import subprocess
+
 os.environ["REPO_ROOT"] = os.path.abspath(".")
 subprocess.run(["out/pyenv/bin/sphinx-apidoc", "-o", "out/python/sphinx", "pylib", "qt"], check=True)
 subprocess.run(["out/pyenv/bin/sphinx-build", "out/python/sphinx", "out/python/sphinx/html"], check=True)

qt/.isort.cfg

@@ -1,5 +0,0 @@
-[settings]
-py_version=39
-profile=black
-known_first_party=anki,aqt
-extend_skip=aqt/forms,hooks_gen.py

qt/aqt/__init__.py

@@ -3,6 +3,7 @@
 
 from __future__ import annotations
 
+# ruff: noqa: F401
 import atexit
 import logging
 import os
@@ -28,7 +29,7 @@ if sys.version_info[0] < 3 or sys.version_info[1] < 9:
 # ensure unicode filenames are supported
 try:
     "テスト".encode(sys.getfilesystemencoding())
-except UnicodeEncodeError as exc:
+except UnicodeEncodeError:
     print("Anki requires a UTF-8 locale.")
     print("Please Google 'how to change locale on [your Linux distro]'")
     sys.exit(1)
@@ -41,6 +42,11 @@ if "--syncserver" in sys.argv:
     # does not return
     run_sync_server()
 
+if sys.platform == "win32":
+    from win32com.shell import shell
+
+    shell.SetCurrentProcessExplicitAppUserModelID("Ankitects.Anki")
+
 import argparse
 import builtins
 import cProfile
@@ -284,8 +290,7 @@ def setupLangAndBackend(
 class NativeEventFilter(QAbstractNativeEventFilter):
     def nativeEventFilter(
         self, eventType: Any, message: Any
-    ) -> tuple[bool, sip.voidptr | None]:
+    ) -> tuple[bool, Any | None]:
-
         if eventType == "windows_generic_MSG":
             import ctypes.wintypes
 
@@ -376,6 +381,8 @@ class AnkiApp(QApplication):
 
     def onRecv(self) -> None:
         sock = self._srv.nextPendingConnection()
+        if sock is None:
+            return
         if not sock.waitForReadyRead(self.TMOUT):
             sys.stderr.write(sock.errorString())
             return
@@ -406,14 +413,12 @@ class AnkiApp(QApplication):
             QRadioButton,
             QMenu,
             QSlider,
-            # classes with PyQt5 compatibility proxy
+            QToolButton,
-            without_qt5_compat_wrapper(QToolButton),
+            QTabBar,
-            without_qt5_compat_wrapper(QTabBar),
         )
         if evt.type() in [QEvent.Type.Enter, QEvent.Type.HoverEnter]:
             if (isinstance(src, pointer_classes) and src.isEnabled()) or (
-                isinstance(src, without_qt5_compat_wrapper(QComboBox))
+                isinstance(src, QComboBox) and not src.isEditable()
-                and not src.isEditable()
             ):
                 self.setOverrideCursor(QCursor(Qt.CursorShape.PointingHandCursor))
             else:
@@ -525,15 +530,12 @@ def setupGL(pm: aqt.profiles.ProfileManager) -> None:
             QQuickWindow.setGraphicsApi(QSGRendererInterface.GraphicsApi.OpenGL)
     elif driver in (VideoDriver.Software, VideoDriver.ANGLE):
         if is_win:
-            # on Windows, this appears to be sufficient on Qt5/Qt6.
+            # on Windows, this appears to be sufficient
             # On Qt6, ANGLE is excluded by the enum.
             os.environ["QT_OPENGL"] = driver.value
         elif is_mac:
             QCoreApplication.setAttribute(Qt.ApplicationAttribute.AA_UseSoftwareOpenGL)
         elif is_lin:
-            # Qt5 only
-            os.environ["QT_XCB_FORCE_SOFTWARE_OPENGL"] = "1"
-            # Required on Qt6
             if "QTWEBENGINE_CHROMIUM_FLAGS" not in os.environ:
                 os.environ["QTWEBENGINE_CHROMIUM_FLAGS"] = "--disable-gpu"
         if qtmajor > 5:
@@ -561,7 +563,7 @@ def run() -> None:
     print(f"Starting Anki {_version}...")
     try:
         _run()
-    except Exception as e:
+    except Exception:
         traceback.print_exc()
         QMessageBox.critical(
             None,
@@ -663,12 +665,6 @@ def _run(argv: list[str] | None = None, exec: bool = True) -> AnkiApp | None:
     if is_win and "QT_QPA_PLATFORM" not in os.environ:
         os.environ["QT_QPA_PLATFORM"] = "windows:altgr"
 
-    # Disable sandbox on Qt5 PyPi/packaged builds, as it causes blank screens on modern
-    # glibc versions. We check for specific patch versions, because distros may have
-    # fixed the issue in their own Qt builds.
-    if is_lin and qtfullversion in ([5, 15, 2], [5, 14, 1]):
-        os.environ["QTWEBENGINE_DISABLE_SANDBOX"] = "1"
-
     # create the app
     QCoreApplication.setApplicationName("Anki")
     QGuiApplication.setDesktopFileName("anki")

qt/aqt/_macos_helper.py

@@ -3,50 +3,9 @@
 
 from __future__ import annotations
 
-import os
 import sys
-from collections.abc import Callable
-from ctypes import CDLL, CFUNCTYPE, c_bool, c_char_p
 
-import aqt
-import aqt.utils
-
-
-class _MacOSHelper:
-    def __init__(self) -> None:
-        path = os.path.join(aqt.utils.aqt_data_folder(), "lib", "libankihelper.dylib")
-
-        self._dll = CDLL(path)
-        self._dll.system_is_dark.restype = c_bool
-
-    def system_is_dark(self) -> bool:
-        return self._dll.system_is_dark()
-
-    def set_darkmode_enabled(self, enabled: bool) -> bool:
-        return self._dll.set_darkmode_enabled(enabled)
-
-    def start_wav_record(self, path: str, on_error: Callable[[str], None]) -> None:
-        global _on_audio_error
-        _on_audio_error = on_error
-        self._dll.start_wav_record(path.encode("utf8"), _audio_error_callback)
-
-    def end_wav_record(self) -> None:
-        "On completion, file should be saved if no error has arrived."
-        self._dll.end_wav_record()
-
-
-# this must not be overwritten or deallocated
-@CFUNCTYPE(None, c_char_p)  # type: ignore
-def _audio_error_callback(msg: str) -> None:
-    if handler := _on_audio_error:
-        handler(msg)
-
-
-_on_audio_error: Callable[[str], None] | None = None
-
-macos_helper: _MacOSHelper | None = None
 if sys.platform == "darwin":
-    try:
+    from anki_mac_helper import macos_helper
-        macos_helper = _MacOSHelper()
+else:
-    except Exception as e:
+    macos_helper = None
-        print("macos_helper:", e)

qt/aqt/about.py

@@ -66,13 +66,14 @@ def show(mw: aqt.AnkiQt) -> QDialog:
     # WebView contents
     ######################################################################
     abouttext = "<center><img src='/_anki/imgs/anki-logo-thin.png'></center>"
-    abouttext += f"<p>{tr.about_anki_is_a_friendly_intelligent_spaced()}"
+    lede = tr.about_anki_is_a_friendly_intelligent_spaced().replace("Anki", "Anki®")
+    abouttext += f"<p>{lede}"
     abouttext += f"<p>{tr.about_anki_is_licensed_under_the_agpl3()}"
     abouttext += f"<p>{tr.about_version(val=version_with_build())}<br>"
-    abouttext += ("Python %s Qt %s PyQt %s<br>") % (
+    abouttext += ("Python %s Qt %s Chromium %s<br>") % (
         platform.python_version(),
         qVersion(),
-        PYQT_VERSION_STR,
+        (qWebEngineChromiumVersion() or "").split(".")[0],
     )
     abouttext += (
         without_unicode_isolation(tr.about_visit_website(val=aqt.appWebsite))
@@ -223,6 +224,8 @@ def show(mw: aqt.AnkiQt) -> QDialog:
             "Mukunda Madhav Dey",
             "Adnane Taghi",
             "Anon_0000",
+            "Bilolbek Normuminov",
+            "Sagiv Marzini",
         )
     )
 

qt/aqt/addons.py

@@ -927,7 +927,6 @@ class AddonsDialog(QDialog):
                     or self.mgr.configAction(addon.dir_name)
                 )
             )
-        return
 
     def _onAddonItemSelected(self, row_int: int) -> None:
         try:
@@ -1457,7 +1456,9 @@ class ChooseAddonsToUpdateDialog(QDialog):
         layout.addWidget(addons_list_widget)
         self.addons_list_widget = addons_list_widget
 
-        button_box = QDialogButtonBox(QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel)  # type: ignore
+        button_box = QDialogButtonBox(
+            QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel
+        )  # type: ignore
         qconnect(
             button_box.button(QDialogButtonBox.StandardButton.Ok).clicked, self.accept
         )

qt/aqt/ankihub.py

@@ -36,7 +36,6 @@ def ankihub_login(
     username: str = "",
     password: str = "",
 ) -> None:
-
     def on_future_done(fut: Future[str], username: str, password: str) -> None:
         try:
             token = fut.result()
@@ -73,7 +72,6 @@ def ankihub_logout(
     on_success: Callable[[], None],
     token: str,
 ) -> None:
-
     def logout() -> None:
         mw.pm.set_ankihub_username(None)
         mw.pm.set_ankihub_token(None)

qt/aqt/browser/__init__.py

@@ -2,6 +2,7 @@
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 from __future__ import annotations
 
+# ruff: noqa: F401
 import sys
 
 import aqt