From be630adab9d3accb81a94950a0ba7e27b2fef078 Mon Sep 17 00:00:00 2001 From: Arthur Milchior Date: Tue, 23 Mar 2021 13:15:16 +0100 Subject: [PATCH] NF: CardType type --- pylib/anki/cards.py | 3 ++- pylib/anki/consts.py | 9 +++++---- pylib/anki/decks.py | 1 - pylib/anki/scheduler/v2.py | 3 ++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pylib/anki/cards.py b/pylib/anki/cards.py index 3ccfa49a0..8bd3464fc 100644 --- a/pylib/anki/cards.py +++ b/pylib/anki/cards.py @@ -40,6 +40,7 @@ class Card: did: anki.decks.DeckID odid: anki.decks.DeckID queue: CardQueue + type: CardType def __init__( self, col: anki.collection.Collection, id: Optional[CardID] = None @@ -69,7 +70,7 @@ class Card: self.ord = c.template_idx self.mod = c.mtime_secs self.usn = c.usn - self.type = c.ctype + self.type = CardType(c.ctype) self.queue = CardQueue(c.queue) self.due = c.due self.ivl = c.interval diff --git a/pylib/anki/consts.py b/pylib/anki/consts.py index 92818889f..18cb2aa59 100644 --- a/pylib/anki/consts.py +++ b/pylib/anki/consts.py @@ -29,10 +29,11 @@ QUEUE_TYPE_DAY_LEARN_RELEARN = CardQueue(3) QUEUE_TYPE_PREVIEW = CardQueue(4) # Card types -CARD_TYPE_NEW = 0 -CARD_TYPE_LRN = 1 -CARD_TYPE_REV = 2 -CARD_TYPE_RELEARNING = 3 +CardType = NewType("CardType", int) +CARD_TYPE_NEW = CardType(0) +CARD_TYPE_LRN = CardType(1) +CARD_TYPE_REV = CardType(2) +CARD_TYPE_RELEARNING = CardType(3) # removal types REM_CARD = 0 diff --git a/pylib/anki/decks.py b/pylib/anki/decks.py index 261cb1da3..1d877ad54 100644 --- a/pylib/anki/decks.py +++ b/pylib/anki/decks.py @@ -37,7 +37,6 @@ default_deck_id = DeckID(1) default_deck_conf_id = DeckConfID(1) - class DecksDictProxy: def __init__(self, col: anki.collection.Collection): self._col = col.weakref() diff --git a/pylib/anki/scheduler/v2.py b/pylib/anki/scheduler/v2.py index ae24aa1f9..2b644b5da 100644 --- a/pylib/anki/scheduler/v2.py +++ b/pylib/anki/scheduler/v2.py @@ -722,7 +722,8 @@ limit ?""" card.ivl = self._graduatingIvl(card, conf, early) card.due = self.today + card.ivl card.factor = conf["initialFactor"] - card.type = card.queue = QUEUE_TYPE_REV + card.type = CARD_TYPE_REV + card.queue = QUEUE_TYPE_REV def _logLrn( self,