kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Addon Manager: Improve stability when cache update interrupted

Browse Source
This commit is contained in:
Chris Hennes
2022-01-08 19:47:57 -06:00
parent 9a933a6015
commit efa08946f2
4 changed files with 109 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Mod/AddonManager/addonmanager_workers.py
View File

@@ -1485,13 +1485,18 @@ class UpdateMetadataCacheWorker(QtCore.QThread):
self.num_downloads_completed = UpdateMetadataCacheWorker.AtomicCounter()
aborted = False
while True:
if current_thread.isInterruptionRequested() and not aborted:
if current_thread.isInterruptionRequested():
download_queue.finished.disconnect(self.on_finished)
for downloader in self.downloaders:
downloader.updated.disconnect(self.on_updated)
downloader.abort()
aborted = True
QtCore.QCoreApplication.processEvents(QtCore.QEventLoop.AllEvents)
if self.num_downloads_completed.get() >= self.num_downloads_required:
if (
aborted
or self.num_downloads_completed.get() >= self.num_downloads_required
):
break
QtCore.QCoreApplication.processEvents(QtCore.QEventLoop.AllEvents, 50)
if aborted:
FreeCAD.Console.PrintLog("Metadata update cancelled\n")
@@ -1522,6 +1527,15 @@ class UpdateMetadataCacheWorker(QtCore.QThread):
self.num_downloads_completed.get(), self.num_downloads_required
)
def terminate_all(self):
got = self.num_downloads_completed.get()
wanted = self.num_downloads_required
if wanted < got:
FreeCAD.Console.PrintWarning(
f"During cache interruption, wanted {wanted}, got {got}, forcibly terminating now...\n"
)
self.num_downloads_completed.set(wanted)
if have_git and not NOGIT: