Skip to content

Commit 514e5bf

Browse files
committed
Ensure all threads are named for debugging
1 parent ad24ece commit 514e5bf

9 files changed

+23
-2
lines changed

addonmanager_installer_gui.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ def _run_dependency_installer(self, addons, python_requires, python_optional):
329329
self.dependency_installer.finished.connect(self._dependencies_finished)
330330

331331
self.dependency_worker_thread = QtCore.QThread(self)
332+
self.dependency_worker_thread.setObjectName("Dependency Installer Thread")
332333
self.dependency_installer.moveToThread(self.dependency_worker_thread)
333334
self.dependency_worker_thread.started.connect(self.dependency_installer.run)
334335

@@ -445,6 +446,7 @@ def _cancel_dependency_installation(self) -> None:
445446
def install(self) -> None:
446447
"""Installs or updates a workbench, macro, or package"""
447448
self.worker_thread = QtCore.QThread()
449+
self.worker_thread.setObjectName("AddonInstallerGUI worker thread")
448450
self.installer.moveToThread(self.worker_thread)
449451
self.installer.finished.connect(self.worker_thread.quit)
450452
self.worker_thread.started.connect(self.installer.run)
@@ -551,6 +553,7 @@ def run(self):
551553
boxes. If installation proceeds successfully to completion, emits the success() signal."""
552554

553555
self.worker_thread = QtCore.QThread()
556+
self.worker_thread.setObjectName("MacroInstallerGUI worker thread")
554557
self.installer.moveToThread(self.worker_thread)
555558
self.installer.finished.connect(self.worker_thread.quit)
556559
self.installer.success.connect(self._base_installation_success)

addonmanager_package_details_controller.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,9 @@ def show_repo(self, repo: Addon) -> None:
133133
self.ui.button_bar.check_for_update.setEnabled(True)
134134
if not self.update_check_thread:
135135
self.update_check_thread = QtCore.QThread()
136+
self.update_check_thread.setObjectName(
137+
"PackageDetailsController update check thread"
138+
)
136139
self.check_for_update_worker = CheckSingleUpdateWorker(repo)
137140
self.check_for_update_worker.moveToThread(self.update_check_thread)
138141
self.update_check_thread.finished.connect(self.check_for_update_worker.deleteLater)

addonmanager_python_deps_gui.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ class CheckForPythonPackageUpdatesWorker(QtCore.QThread):
9191

9292
def __init__(self):
9393
QtCore.QThread.__init__(self)
94+
self.setObjectName("CheckForPythonPackageUpdatesWorker")
9495

9596
def run(self):
9697
"""Usually not called directly: instead, instantiate this class and call its start()
@@ -263,6 +264,7 @@ def _create_list_from_pip(self):
263264
showing in most cases."""
264265

265266
self.worker_thread = QtCore.QThread()
267+
self.worker_thread.setObjectName("CreateListFromPip worker thread")
266268
self.worker_object = PythonPackageManager.PipRunner(self.vendor_path)
267269
self.worker_object.moveToThread(self.worker_thread)
268270
self.worker_object.finished.connect(self._worker_finished)

addonmanager_uninstaller_gui.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ def __init__(self, addon_to_remove):
5757
self.uninstaller.success.connect(self._succeeded)
5858
self.uninstaller.failure.connect(self._failed)
5959
self.worker_thread = QtCore.QThread()
60+
self.worker_thread.setObjectName("AddonUninstallerGUI worker thread")
6061
self.uninstaller.moveToThread(self.worker_thread)
6162
self.uninstaller.finished.connect(self.worker_thread.quit)
6263
self.worker_thread.started.connect(self.uninstaller.run)

addonmanager_update_all_gui.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ def _launch_active_installer(self):
195195
self.active_installer.finished.connect(self._update_finished)
196196

197197
self.worker_thread = QtCore.QThread()
198+
self.worker_thread.setObjectName("UpdateAllGUI worker thread")
198199
self.active_installer.moveToThread(self.worker_thread)
199200
self.worker_thread.started.connect(self.active_installer.run)
200201
self.worker_thread.start()

addonmanager_workers_installation.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ class RequestType(Enum):
6666
def __init__(self, repos):
6767

6868
QtCore.QThread.__init__(self)
69+
self.setObjectName("UpdateMetadataCacheWorker")
6970
self.repos = repos
7071
self.requests: Dict[int, (Addon, UpdateMetadataCacheWorker.RequestType)] = {}
7172
NetworkManager.AM_NETWORK_MANAGER.completed.connect(self.download_completed)

addonmanager_workers_startup.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ class CreateAddonListWorker(QtCore.QThread):
6767

6868
def __init__(self):
6969
QtCore.QThread.__init__(self)
70+
self.setObjectName("CreateAddonListWorker")
7071

7172
# reject_listed addons
7273
self.macros_reject_list = []
@@ -440,6 +441,7 @@ class LoadPackagesFromCacheWorker(QtCore.QThread):
440441

441442
def __init__(self, cache_file: str):
442443
QtCore.QThread.__init__(self)
444+
self.setObjectName("LoadPackagesFromCacheWorker")
443445
self.cache_file = cache_file
444446
self.metadata_cache_path = os.path.join(
445447
fci.DataPaths().cache_dir, "AddonManager", "PackageMetadata"
@@ -479,6 +481,7 @@ class LoadMacrosFromCacheWorker(QtCore.QThread):
479481

480482
def __init__(self, cache_file: str):
481483
QtCore.QThread.__init__(self)
484+
self.setObjectName("LoadMacrosFromCacheWorker")
482485
self.cache_file = cache_file
483486

484487
def run(self):
@@ -531,6 +534,7 @@ class CheckWorkbenchesForUpdatesWorker(QtCore.QThread):
531534
def __init__(self, repos: List[Addon]):
532535

533536
QtCore.QThread.__init__(self)
537+
self.setObjectName("CheckWorkbenchesForUpdatesWorker")
534538
self.repos = repos
535539
self.current_thread = None
536540
self.moddir = fci.DataPaths().mod_dir
@@ -746,6 +750,7 @@ class CacheMacroCodeWorker(QtCore.QThread):
746750

747751
def __init__(self, repos: List[Addon]) -> None:
748752
QtCore.QThread.__init__(self)
753+
self.setObjectName("CacheMacroCodeWorker")
749754
self.repos = repos
750755
self.workers = []
751756
self.terminators = []
@@ -893,6 +898,7 @@ class GetMacroDetailsWorker(QtCore.QThread):
893898
def __init__(self, repo):
894899

895900
QtCore.QThread.__init__(self)
901+
self.setObjectName("GetMacroDetailsWorker")
896902
self.macro = repo.macro
897903

898904
def run(self):
@@ -930,6 +936,7 @@ class GetBasicAddonStatsWorker(QtCore.QThread):
930936

931937
def __init__(self, url: str, addons: List[Addon], parent: QtCore.QObject = None):
932938
super().__init__(parent)
939+
self.setObjectName("GetBasicAddonStatsWorker")
933940
self.url = url
934941
self.addons = addons
935942

@@ -962,6 +969,7 @@ class GetAddonScoreWorker(QtCore.QThread):
962969

963970
def __init__(self, url: str, addons: List[Addon], parent: QtCore.QObject = None):
964971
super().__init__(parent)
972+
self.setObjectName("GetAddonScoreWorker")
965973
self.url = url
966974
self.addons = addons
967975

addonmanager_workers_utility.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class ConnectionChecker(QtCore.QThread):
4949

5050
def __init__(self):
5151
QtCore.QThread.__init__(self)
52+
self.setObjectName("ConnectionChecker")
5253
self.done = False
5354
self.request_id = None
5455
self.data = None

main.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
# * *
2222
# ***************************************************************************
2323

24-
import AddonManager
25-
2624
import sys
2725

2826
# Check if PySide6 is used
@@ -43,6 +41,9 @@
4341

4442

4543
def run_addon_manager():
44+
import AddonManager # Must not be imported until there is a QApplication instance
45+
46+
QtCore.QThread.currentThread().setObjectName("Main GUI thread")
4647
command = AddonManager.CommandAddonManager()
4748
command.Activated()
4849

0 commit comments

Comments
 (0)