GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 14:02:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Serialize modal popups at startup (#2000)

Browse source 
* call_add-on_update_after_initial_sync

* Add safeMode restriction

* check for anki update after other modal dialogs

* fix failing test

* make changes suggested in review
This commit is contained in:
Sam Penny 2022-08-09 05:40:52 +02:00 committed by GitHub
parent bd2f866c68
commit 21812556a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
qt/aqt/main.py
View file

@ -214,7 +214,6 @@ class AnkiQt(QMainWindow):
self.setupMenus()
self.setupErrorHandler()
self.setupSignals()
self.setupAutoUpdate()
self.setupHooks()
self.setup_timers()
self.updateTitleBar()
@ -893,20 +892,28 @@ title="{}" {}>{}</button>""".format(
if not self.safeMode:
self.addonManager.loadAddons()
self.maybe_check_for_addon_updates()
def maybe_check_for_addon_updates(self) -> None:
def maybe_check_for_addon_updates(
self, on_done: Callable[[], None] | None = None
) -> None:
last_check = self.pm.last_addon_update_check()
elap = int_time() - last_check
def wrap_on_updates_installed(log: list[DownloadLogEntry]) -> None:
self.on_updates_installed(log)
if on_done:
on_done()
if elap > 86_400 or self.pm.last_run_version() != point_version():
check_and_prompt_for_updates(
self,
self.addonManager,
self.on_updates_installed,
wrap_on_updates_installed,
requested_by_user=False,
)
self.pm.set_last_addon_update_check(int_time())
elif on_done:
on_done()
def on_updates_installed(self, log: list[DownloadLogEntry]) -> None:
if log:
@ -978,10 +985,16 @@ title="{}" {}>{}</button>""".format(
def maybe_auto_sync_on_open_close(self, after_sync: Callable[[], None]) -> None:
"If disabled, after_sync() is called immediately."
if self.can_auto_sync():
self._sync_collection_and_media(after_sync)
else:
def after_sync_and_call_addon_update() -> None:
after_sync()
if not self.safeMode:
self.maybe_check_for_addon_updates(self.setupAutoUpdate)
if self.can_auto_sync():
self._sync_collection_and_media(after_sync_and_call_addon_update)
else:
after_sync_and_call_addon_update()
def maybe_auto_sync_media(self) -> None:
if self.can_auto_sync():