Squashed commit of the following:

mattfengsh · mattfengsh · commit cd7e729fc4c5 · 2025-02-22T07:21:35.000+08:00
commit 76c4ec7 Author: Damien Elmes <gpg@ankiweb.net> Date: Fri Feb 21 18:29:41 2025 +0700 Add actions-processing based on qt-misc-processing commit a7c5376 Author: Damien Elmes <gpg@ankiweb.net> Date: Fri Feb 21 18:21:28 2025 +0700 Update translations commit 00cc1b4 Author: GithubAnon0000 <160563432+GithubAnon0000@users.noreply.github.com> Date: Fri Feb 21 10:14:15 2025 +0000 Increase font size for accessibility (ankitects#3832) Apparently no font size should be lower than 12px, see https://www.boia.org/blog/accessibility-tips-let-users-control-font-size. With the current 55%, I get a computed font size of 8.25px though. Considering the text shows the helpful message "Press ⁨Enter⁩ to accept, ⁨Shift+Enter⁩ for new line.", I think we should add a minimum font size. commit 8ec139f Author: llama <100429699+iamllama@users.noreply.github.com> Date: Fri Feb 21 17:39:11 2025 +0800 Debounce mathjax rendering to avoid stalling (ankitects#3827) * move change-timer to editable * debounce mathjax rendering commit e373b0e Author: mumtazrifai <78283743+mumtazrifai@users.noreply.github.com> Date: Fri Feb 21 04:38:04 2025 -0500 Use default flag name when flag is renamed to empty string (ankitects#3826) * Add function to restore the default name of a flag * Call function to restore default flag name if flag renamed to empty string * Update _load_flags to use the default_flag_names dict * Add name to contributors file * Add trailing comma to pass tests * Update to follow python style guide * Update about.py * Revert "Update _load_flags to use the default_flag_names dict" This reverts commit caa8fea. * Use require_refresh() instead of storing default flag names commit 2727cf3 Author: Damien Elmes <gpg@ankiweb.net> Date: Fri Feb 21 10:33:57 2025 +0700 Update to Rust 1.85 Edition update to follow later
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -213,6 +213,7 @@ wackbyte <wackbyte@protonmail.com>
 GithubAnon0000 <GithubAnon0000@users.noreply.github.com>
 Mike Hardy <github@mikehardy.net>
 Danika_Dakika <https://github.com/Danika-Dakika>
+Mumtaz Hajjo Alrifai <mumtazrifai@protonmail.com>
 
 ********************
 
diff --git a/ftl/core/actions.ftl b/ftl/core/actions.ftl
@@ -70,7 +70,6 @@ actions-previous-card-info = Previous Card Info
 # input is required before it can be performed. E.g. "Export..." vs. "Delete".
 actions-with-ellipsis = { $action }...
 actions-fullscreen-unsupported = Full screen mode is not supported for your video driver. Try switching to a different one from the preferences screen.
-
 actions-flag-number = Flag { $number }
 
 ## The same translation may used for two independent actions:
@@ -93,3 +92,4 @@ actions-nothing-to-redo = Nothing to redo
 actions-auto-advance = Auto Advance
 actions-auto-advance-activated = Auto Advance enabled
 actions-auto-advance-deactivated = Auto Advance disabled
+actions-processing = Processing...
diff --git a/ftl/src/string/mod.rs b/ftl/src/string/mod.rs
@@ -84,6 +84,7 @@ fn ftl_file_from_key(old_key: &str) -> String {
         "deck-config",
         "empty-cards",
         "media-check",
+        "qt-misc",
     ] {
         if old_key.starts_with(&format!("{prefix}-")) {
             return format!("{prefix}.ftl");
diff --git a/qt/aqt/about.py b/qt/aqt/about.py
@@ -214,6 +214,7 @@ def on_dialog_destroyed() -> None:
             "Gregory Abrasaldo",
             "Danika_Dakika",
             "Marcelo Vasconcelos",
+            "Mumtaz Hajjo Alrifai",
         )
     )
 
diff --git a/qt/aqt/browser/sidebar/tree.py b/qt/aqt/browser/sidebar/tree.py
@@ -453,7 +453,9 @@ def _on_search(self, index: QModelIndex) -> None:
 
     def _on_rename(self, item: SidebarItem, text: str) -> bool:
         new_name = text.replace('"', "")
-        if new_name and new_name != item.name:
+        if not new_name and item.item_type == SidebarItemType.FLAG:
+            self.restore_default_flag_name(item)
+        elif new_name and new_name != item.name:
             if item.item_type == SidebarItemType.DECK:
                 self.rename_deck(item, new_name)
             elif item.item_type == SidebarItemType.SAVED_SEARCH:
@@ -1089,6 +1091,10 @@ def rename_flag(self, item: SidebarItem, new_name: str) -> None:
         item.name = new_name
         self.mw.flags.rename_flag(item.id, new_name)
 
+    def restore_default_flag_name(self, item: SidebarItem) -> None:
+        self.mw.flags.restore_default_flag_name(item.id)
+        item.name = self.mw.flags.get_flag(item.id).label
+
     # Decks
     ###########################
 
diff --git a/qt/aqt/flags.py b/qt/aqt/flags.py
@@ -55,6 +55,15 @@ def rename_flag(self, flag_index: int, new_name: str) -> None:
         self.mw.col.set_config("flagLabels", labels)
         gui_hooks.flag_label_did_change()
 
+    def restore_default_flag_name(self, flag_index: int) -> None:
+        labels = self.mw.col.get_config("flagLabels", {})
+        if str(flag_index) not in labels:
+            return
+        del labels[str(flag_index)]
+        self.mw.col.set_config("flagLabels", labels)
+        self.require_refresh()
+        gui_hooks.flag_label_did_change()
+
     def require_refresh(self) -> None:
         "Discard cached labels."
         self._flags = []
diff --git a/rslib/src/backend/card_rendering.rs b/rslib/src/backend/card_rendering.rs
@@ -34,6 +34,5 @@ impl BackendCardRenderingService for Backend {
             request.speed,
             &request.text,
         )
-        .map(Into::into)
     }
 }
diff --git a/rslib/src/backend/config.rs b/rslib/src/backend/config.rs
@@ -77,7 +77,6 @@ impl crate::services::ConfigService for Collection {
     ) -> Result<()> {
         let val: Value = serde_json::from_slice(&input.value_json)?;
         self.transact_no_undo(|col| col.set_config(input.key.as_str(), &val).map(|_| ()))
-            .map(Into::into)
     }
 
     fn remove_config(
diff --git a/rslib/src/backend/import_export.rs b/rslib/src/backend/import_export.rs
@@ -18,9 +18,7 @@ impl BackendImportExportService for Backend {
         let mut guard = self.lock_open_collection()?;
 
         let col_inner = guard.take().unwrap();
-        col_inner
-            .export_colpkg(input.out_path, input.include_media, input.legacy)
-            .map(Into::into)
+        col_inner.export_colpkg(input.out_path, input.include_media, input.legacy)
     }
 
     fn import_collection_package(
@@ -36,6 +34,5 @@ impl BackendImportExportService for Backend {
             Path::new(&input.media_db),
             self.new_progress_handler(),
         )
-        .map(Into::into)
     }
 }
diff --git a/rslib/src/backend/sync.rs b/rslib/src/backend/sync.rs
@@ -99,7 +99,7 @@ impl TryFrom<anki_proto::sync::SyncAuth> for SyncAuth {
 impl crate::services::BackendSyncService for Backend {
     fn sync_media(&self, input: anki_proto::sync::SyncAuth) -> Result<()> {
         let auth = input.try_into()?;
-        self.sync_media_in_background(auth, None).map(Into::into)
+        self.sync_media_in_background(auth, None)
     }
 
     fn media_sync_status(&self) -> Result<MediaSyncStatusResponse> {
diff --git a/rslib/src/card/service.rs b/rslib/src/card/service.rs
@@ -131,7 +131,7 @@ impl From<Card> for anki_proto::cards::Card {
             original_due: c.original_due,
             original_deck_id: c.original_deck_id.0,
             flags: c.flags as u32,
-            original_position: c.original_position.map(Into::into),
+            original_position: c.original_position,
             memory_state: c.memory_state.map(Into::into),
             desired_retention: c.desired_retention,
             custom_data: c.custom_data,
diff --git a/rslib/src/deckconfig/service.rs b/rslib/src/deckconfig/service.rs
@@ -21,7 +21,6 @@ impl crate::services::DeckConfigService for Collection {
             col.add_or_update_deck_config_legacy(&mut conf)?;
             Ok(anki_proto::deck_config::DeckConfigId { dcid: conf.id.0 })
         })
-        .map(Into::into)
     }
 
     fn all_deck_config_legacy(&mut self) -> Result<generic::Json> {
@@ -62,7 +61,6 @@ impl crate::services::DeckConfigService for Collection {
 
     fn remove_deck_config(&mut self, input: anki_proto::deck_config::DeckConfigId) -> Result<()> {
         self.transact_no_undo(|col| col.remove_deck_config_inner(input.into()))
-            .map(Into::into)
     }
 
     fn get_deck_configs_for_update(
diff --git a/rslib/src/scheduler/service/mod.rs b/rslib/src/scheduler/service/mod.rs
@@ -55,7 +55,7 @@ impl crate::services::SchedulerService for Collection {
         self.transact_no_undo(|col| {
             let today = col.current_due_day(0)?;
             let usn = col.usn()?;
-            col.update_deck_stats(today, usn, input).map(Into::into)
+            col.update_deck_stats(today, usn, input)
         })
     }
 
@@ -70,7 +70,6 @@ impl crate::services::SchedulerService for Collection {
                 input.new_delta,
                 input.review_delta,
             )
-            .map(Into::into)
         })
     }
 
@@ -229,7 +228,6 @@ impl crate::services::SchedulerService for Collection {
 
     fn upgrade_scheduler(&mut self) -> Result<()> {
         self.transact_no_undo(|col| col.upgrade_to_v2_scheduler())
-            .map(Into::into)
     }
 
     fn get_queued_cards(
diff --git a/rslib/src/search/service/mod.rs b/rslib/src/search/service/mod.rs
@@ -129,7 +129,7 @@ impl crate::services::SearchService for Collection {
         &mut self,
         input: generic::Int64,
     ) -> Result<anki_proto::search::BrowserRow> {
-        self.browser_row_for_id(input.val).map(Into::into)
+        self.browser_row_for_id(input.val)
     }
 }
 
diff --git a/rslib/src/stats/service.rs b/rslib/src/stats/service.rs
@@ -34,7 +34,7 @@ impl crate::services::StatsService for Collection {
         &mut self,
         input: anki_proto::stats::GraphPreferences,
     ) -> error::Result<()> {
-        self.set_graph_preferences(input).map(Into::into)
+        self.set_graph_preferences(input)
     }
 }
 
diff --git a/rslib/src/storage/deck/mod.rs b/rslib/src/storage/deck/mod.rs
@@ -82,7 +82,6 @@ impl SqliteStorage {
             .query_and_then([machine_name], row_to_deck)?
             .next()
             .transpose()
-            .map_err(Into::into)
     }
 
     pub(crate) fn get_all_decks(&self) -> Result<Vec<Deck>> {
diff --git a/rslib/src/storage/deckconfig/mod.rs b/rslib/src/storage/deckconfig/mod.rs
@@ -68,7 +68,6 @@ impl SqliteStorage {
             .query_and_then([name], |row| Ok::<_, AnkiError>(DeckConfigId(row.get(0)?)))?
             .next()
             .transpose()
-            .map_err(Into::into)
     }
 
     pub(crate) fn add_deck_conf(&self, conf: &mut DeckConfig) -> Result<()> {
diff --git a/rslib/src/storage/note/mod.rs b/rslib/src/storage/note/mod.rs
@@ -280,7 +280,7 @@ impl super::SqliteStorage {
                 include_str!("get.sql"),
                 " WHERE id IN (SELECT nid FROM search_nids)"
             ))?
-            .query_and_then([], |r| row_to_note(r).map_err(Into::into))?
+            .query_and_then([], row_to_note)?
             .collect()
     }
 
diff --git a/rslib/src/storage/revlog/mod.rs b/rslib/src/storage/revlog/mod.rs
@@ -175,7 +175,7 @@ impl SqliteStorage {
     pub(crate) fn get_all_revlog_entries(&self, after: TimestampSecs) -> Result<Vec<RevlogEntry>> {
         self.db
             .prepare_cached(concat!(include_str!("get.sql"), " where id >= ?"))?
-            .query_and_then([after.0 * 1000], |r| row_to_revlog_entry(r).map(Into::into))?
+            .query_and_then([after.0 * 1000], row_to_revlog_entry)?
             .collect()
     }
 
diff --git a/rslib/src/storage/sqlite.rs b/rslib/src/storage/sqlite.rs
@@ -410,7 +410,7 @@ fn schema_version(db: &Connection) -> Result<(bool, u8)> {
 
     Ok((
         false,
-        db.query_row("select ver from col", [], |r| r.get(0).map_err(Into::into))?,
+        db.query_row("select ver from col", [], |r| r.get(0))?,
     ))
 }
 
diff --git a/rslib/src/sync/http_server/media_manager/upload.rs b/rslib/src/sync/http_server/media_manager/upload.rs
@@ -79,7 +79,7 @@ impl ServerMediaManager {
 }
 
 fn add_or_replace_file(path: &Path, data: Vec<u8>) -> error::Result<(), FileIoError> {
-    write_file(path, data).map_err(Into::into)
+    write_file(path, data)
 }
 
 fn remove_file(path: &Path) -> error::Result<(), FileIoError> {
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
 # older versions may fail to compile; newer versions may fail the clippy tests
-channel = "1.84.0"
+channel = "1.85.0"
diff --git a/ts/editable/Mathjax.svelte b/ts/editable/Mathjax.svelte
@@ -38,25 +38,31 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { pageTheme } from "$lib/sveltelib/theme";
 
     import { convertMathjax, unescapeSomeEntities } from "./mathjax";
+    import { ChangeTimer } from "./change-timer";
 
     export let mathjax: string;
     export let block: boolean;
     export let fontSize: number;
 
     let converted: string, title: string;
+
+    const debouncedMathjax = writable(mathjax);
+    const debouncer = new ChangeTimer();
+    $: debouncer.schedule(() => debouncedMathjax.set(mathjax), 500);
+
     $: {
         const cache = getCache($pageTheme.isDark, fontSize);
-        const entry = cache.get(mathjax);
+        const entry = cache.get($debouncedMathjax);
         if (entry) {
             [converted, title] = entry;
         } else {
             const entry = convertMathjax(
-                unescapeSomeEntities(mathjax),
+                unescapeSomeEntities($debouncedMathjax),
                 $pageTheme.isDark,
                 fontSize,
             );
             [converted, title] = entry;
-            cache.set(mathjax, entry);
+            cache.set($debouncedMathjax, entry);
         }
     }
     $: empty = title === "MathJax";
diff --git a/ts/editable/change-timer.ts b/ts/editable/change-timer.ts
diff --git a/ts/editor/NoteEditor.svelte b/ts/editor/NoteEditor.svelte
@@ -57,7 +57,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         type ImageLoadedEvent,
         resetIOImage,
     } from "../routes/image-occlusion/mask-editor";
-    import { ChangeTimer } from "./change-timer";
+    import { ChangeTimer } from "../editable/change-timer";
     import { clearableArray } from "./destroyable";
     import DuplicateLink from "./DuplicateLink.svelte";
     import EditorToolbar from "./editor-toolbar";
diff --git a/ts/editor/mathjax-overlay/MathjaxEditor.svelte b/ts/editor/mathjax-overlay/MathjaxEditor.svelte
@@ -144,7 +144,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
         :global(.CodeMirror-placeholder) {
             font-family: sans-serif;
-            font-size: 55%;
+            font-size: max(12px, 55%);
             text-align: center;
             color: var(--fg-subtle);
         }

-Original file line number
+Diff line change
 GithubAnon0000 <[email protected]>
 Mike Hardy <[email protected]>
 Danika_Dakika <https://github.com/Danika-Dakika>
 +Mumtaz Hajjo Alrifai <[email protected]>
 ********************
Original file line number	Diff line number	Diff line change
`@@ -214,6 +214,7 @@ def on_dialog_destroyed() -> None:`
`214`	`214`	`"Gregory Abrasaldo",`
`215`	`215`	`"Danika_Dakika",`
`216`	`216`	`"Marcelo Vasconcelos",`
	`217`	`+ "Mumtaz Hajjo Alrifai",`
`217`	`218`	`)`
`218`	`219`	`)`
`219`	`220`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,5 @@ impl BackendCardRenderingService for Backend {`
`34`	`34`	`request.speed,`
`35`	`35`	`&request.text,`
`36`	`36`	`)`
`37`		`- .map(Into::into)`
`38`	`37`	`}`
`39`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,6 @@ impl crate::services::ConfigService for Collection {`
`77`	`77`	`) -> Result<()> {`
`78`	`78`	`let val: Value = serde_json::from_slice(&input.value_json)?;`
`79`	`79`	`self.transact_no_undo(\|col\| col.set_config(input.key.as_str(), &val).map(\|_\| ()))`
`80`		`- .map(Into::into)`
`81`	`80`	`}`
`82`	`81`
`83`	`82`	`fn remove_config(`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,7 @@ impl BackendImportExportService for Backend {`
`18`	`18`	`let mut guard = self.lock_open_collection()?;`
`19`	`19`
`20`	`20`	`let col_inner = guard.take().unwrap();`
`21`		`- col_inner`
`22`		`- .export_colpkg(input.out_path, input.include_media, input.legacy)`
`23`		`- .map(Into::into)`
	`21`	`+ col_inner.export_colpkg(input.out_path, input.include_media, input.legacy)`
`24`	`22`	`}`
`25`	`23`
`26`	`24`	`fn import_collection_package(`
`@@ -36,6 +34,5 @@ impl BackendImportExportService for Backend {`
`36`	`34`	`Path::new(&input.media_db),`
`37`	`35`	`self.new_progress_handler(),`
`38`	`36`	`)`
`39`		`- .map(Into::into)`
`40`	`37`	`}`
`41`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ impl TryFrom<anki_proto::sync::SyncAuth> for SyncAuth {`
`99`	`99`	`impl crate::services::BackendSyncService for Backend {`
`100`	`100`	`fn sync_media(&self, input: anki_proto::sync::SyncAuth) -> Result<()> {`
`101`	`101`	`let auth = input.try_into()?;`
`102`		`- self.sync_media_in_background(auth, None).map(Into::into)`
	`102`	`+ self.sync_media_in_background(auth, None)`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`fn media_sync_status(&self) -> Result<MediaSyncStatusResponse> {`