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

wait for media sync to complete before unloading collection

Browse source
This commit is contained in:
Damien Elmes 2020-03-14 12:09:11 +10:00
parent 72bcef917e
commit 55c9f5dbeb
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
qt/aqt/main.py
View file

@ -397,7 +397,7 @@ close the profile or restart Anki."""
# at this point there should be no windows left # at this point there should be no windows left
self._checkForUnclosedWidgets() self._checkForUnclosedWidgets()
self.maybeAutoSync(True) self.maybeAutoSync()
def _checkForUnclosedWidgets(self) -> None: def _checkForUnclosedWidgets(self) -> None:
for w in self.app.topLevelWidgets(): for w in self.app.topLevelWidgets():
@ -476,6 +476,7 @@ close the profile or restart Anki."""
def unloadCollection(self, onsuccess: Callable) -> None: def unloadCollection(self, onsuccess: Callable) -> None:
def callback(): def callback():
self.setEnabled(False) self.setEnabled(False)
self.media_syncer.show_diag_until_finished()
self._unloadCollection() self._unloadCollection()
onsuccess() onsuccess()
@ -845,7 +846,7 @@ title="%s" %s>%s</button>""" % (
self.media_syncer.start() self.media_syncer.start()
# expects a current profile, but no collection loaded # expects a current profile, but no collection loaded
def maybeAutoSync(self, closing=False) -> None: def maybeAutoSync(self) -> None:
if ( if (
not self.pm.profile["syncKey"] not self.pm.profile["syncKey"]
or not self.pm.profile["autoSync"] or not self.pm.profile["autoSync"]
@ -857,10 +858,6 @@ title="%s" %s>%s</button>""" % (
# ok to sync # ok to sync
self._sync() self._sync()
# if media still syncing at this point, pop up progress diag
if closing:
self.media_syncer.show_diag_until_finished()
def maybe_auto_sync_media(self) -> None: def maybe_auto_sync_media(self) -> None:
if not self.pm.profile["autoSync"] or self.safeMode or self.restoringBackup: if not self.pm.profile["autoSync"] or self.safeMode or self.restoringBackup:
return return