fixed cards with known morphs not being skipped (#207)

Author: mortii

ankimorphs/reviewing_utils.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 from functools import partial
-from typing import Any, Callable, Optional, Union
+from typing import Any, Callable
 
 from anki.cards import Card
 from anki.collection import Collection, UndoStatus
@@ -16,7 +18,6 @@
 from .ankimorphs_db import AnkiMorphsDB
 from .browser_utils import browse_same_morphs
 from .exceptions import CancelledOperationException, CardQueueEmptyException
-from .skipped_cards import SkippedCards
 
 SET_KNOWN_AND_SKIP_UNDO = "Set known and skip"
 ANKIMORPHS_UNDO = "AnkiMorphs custom undo"
@@ -28,7 +29,7 @@
     "Set Due Date",
     "Delete Note",
 }
-set_known_and_skip_undo: Optional[UndoStatus] = None
+set_known_and_skip_undo: UndoStatus | None = None
 
 
 def am_next_card() -> None:
@@ -119,15 +120,8 @@ def _get_next_card_background(
         if am_config_filter is None:
             break  # card did not match any (note type and tags) set in the settings GUI
 
-        card_unknown_morphs: Optional[set[tuple[str, str]]] = am_db.get_morphs_of_card(
-            reviewer.card.id, search_unknowns=True
-        )
-
-        if card_unknown_morphs is None:
-            break
-
         skipped_cards.process_skip_conditions_of_card(
-            am_config, am_db, note, card_unknown_morphs
+            am_config, am_db, note=note, card_id=reviewer.card.id
         )
 
         if not skipped_cards.did_skip_card:
@@ -294,9 +288,9 @@ def am_reviewer_shortcut_keys(
     self: Reviewer,
     _old: Callable[
         [Reviewer],
-        list[Union[tuple[str, Callable[[], None]], tuple[Qt.Key, Callable[[], None]]]],
+        list[tuple[str, Callable[[], None]] | tuple[Qt.Key, Callable[[], None]]],
     ],
-) -> list[Union[tuple[str, Callable[[], None]], tuple[Qt.Key, Callable[[], None]]]]:
+) -> list[tuple[str, Callable[[], None]] | tuple[Qt.Key, Callable[[], None]]]:
     am_config = AnkiMorphsConfig()
 
     key_browse_ready: QKeySequence = am_config.shortcut_browse_ready_same_unknown
@@ -353,7 +347,7 @@ def _show_scheduler_version_error() -> None:
 
 
 def _on_failure(
-    error: Union[Exception, CardQueueEmptyException, CancelledOperationException]
+    error: Exception | CardQueueEmptyException | CancelledOperationException,
 ) -> None:
     # This function runs on the main thread.
     assert mw is not None
@@ -367,3 +361,69 @@ def _on_failure(
         mw.moveToState("overview")
     else:
         raise error
+
+
+class SkippedCards:
+    __slots__ = (
+        "skipped_known_cards",
+        "skipped_already_seen_morphs_cards",
+        "total_skipped_cards",
+        "did_skip_card",
+    )
+
+    def __init__(self) -> None:
+        self.skipped_known_cards = 0
+        self.skipped_already_seen_morphs_cards = 0
+        self.total_skipped_cards = 0
+        self.did_skip_card = False
+
+    def process_skip_conditions_of_card(
+        self,
+        am_config: AnkiMorphsConfig,
+        am_db: AnkiMorphsDB,
+        note: Note,
+        card_id: int,
+    ) -> None:
+        self.did_skip_card = False
+
+        learn_now_tag: bool = note.has_tag(am_config.tag_learn_card_now)
+        known_automatically: bool = note.has_tag(am_config.tag_known_automatically)
+        known_manually: bool = note.has_tag(am_config.tag_known_manually)
+        known_tag: bool = known_automatically or known_manually
+
+        if learn_now_tag:
+            self.did_skip_card = False
+        elif known_tag:
+            if am_config.skip_only_known_morphs_cards:
+                self.skipped_known_cards += 1
+                self.did_skip_card = True
+        elif am_config.skip_unknown_morph_seen_today_cards:
+            morphs_already_seen_morphs_today: set[str] = (
+                am_db.get_all_morphs_seen_today()
+            )
+            card_unknown_morphs_raw: set[tuple[str, str]] | None = (
+                am_db.get_morphs_of_card(card_id, search_unknowns=True)
+            )
+            if card_unknown_morphs_raw is not None:
+                card_unknown_morphs: set[str] = {
+                    morph_raw[0] + morph_raw[1] for morph_raw in card_unknown_morphs_raw
+                }
+                if card_unknown_morphs.issubset(morphs_already_seen_morphs_today):
+                    self.skipped_already_seen_morphs_cards += 1
+                    self.did_skip_card = True
+
+        self.total_skipped_cards = (
+            self.skipped_known_cards + self.skipped_already_seen_morphs_cards
+        )
+
+    def show_tooltip_of_skipped_cards(self) -> None:
+        skipped_string = ""
+
+        if self.skipped_known_cards > 0:
+            skipped_string += f"Skipped <b>{self.skipped_known_cards}</b> cards with only known morphs"
+        if self.skipped_already_seen_morphs_cards > 0:
+            if skipped_string != "":
+                skipped_string += "<br>"
+            skipped_string += f"Skipped <b>{self.skipped_already_seen_morphs_cards}</b> cards with morphs already seen today"
+
+        tooltip(skipped_string, parent=mw)

ankimorphs/settings_dialog.py

@@ -105,7 +105,7 @@ def __init__(self) -> None:
         )
 
         # Semantic Versioning https://semver.org/
-        self.ui.ankimorphs_version_label.setText("AnkiMorphs version: 2.2.0")
+        self.ui.ankimorphs_version_label.setText("AnkiMorphs version: 2.2.1")
 
         self.show()
 

ankimorphs/skipped_cards.py

@@ -19,7 +19,7 @@
     ankimorphs_db,
     reviewing_utils,
 )
-from ankimorphs.skipped_cards import SkippedCards
+from ankimorphs.reviewing_utils import SkippedCards
 
 
 class MockDB(AnkiMorphsDB):