show v3 scheduler in error info

This commit is contained in:
Damien Elmes 2021-08-20 10:47:41 +10:00
parent 53fe7e574e
commit f6ae0b73be
2 changed files with 8 additions and 3 deletions

View File

@ -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:

View File

@ -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 "?"