From f6ae0b73beadd2950647a840d9b1208a15b7a81c Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Fri, 20 Aug 2021 10:47:41 +1000 Subject: [PATCH] show v3 scheduler in error info --- pylib/anki/collection.py | 6 ++++-- qt/aqt/utils.py | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pylib/anki/collection.py b/pylib/anki/collection.py index 2afea59bc..349734036 100644 --- a/pylib/anki/collection.py +++ b/pylib/anki/collection.py @@ -150,10 +150,12 @@ class Collection(DeprecatedNamesMixin): # Scheduler ########################################################################## - # for backwards compatibility, v3 is represented as 2 _supported_scheduler_versions = (1, 2) def sched_ver(self) -> Literal[1, 2]: + """For backwards compatibility, the v3 scheduler currently returns 2. + Use the separate v3_scheduler() method to check if it is active.""" + # for backwards compatibility, v3 is represented as 2 ver = self.conf.get("schedVer", 1) if ver in self._supported_scheduler_versions: return ver @@ -176,7 +178,7 @@ class Collection(DeprecatedNamesMixin): self._load_scheduler() def v3_scheduler(self) -> bool: - return self.get_config_bool(Config.Bool.SCHED_2021) + return self.sched_ver() == 2 and self.get_config_bool(Config.Bool.SCHED_2021) def set_v3_scheduler(self, enabled: bool) -> None: if self.v3_scheduler() != enabled: diff --git a/qt/aqt/utils.py b/qt/aqt/utils.py index 263ab4523..99c486b2b 100644 --- a/qt/aqt/utils.py +++ b/qt/aqt/utils.py @@ -863,7 +863,10 @@ def supportText() -> str: def schedVer() -> str: try: - return str(mw.col.sched_ver()) + if mw.col.v3_scheduler(): + return "3" + else: + return str(mw.col.sched_ver()) except: return "?"