From 8ef39dfaded694bc7a509f943b7de4ae8617a7d8 Mon Sep 17 00:00:00 2001 From: WorldTeacher <41587052+WorldTeacher@users.noreply.github.com> Date: Mon, 12 Feb 2024 15:50:05 +0100 Subject: [PATCH] small fix --- src/logic/threads.py | 4 ++++ src/logic/userInterface.py | 17 +++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/logic/threads.py b/src/logic/threads.py index 2a935e5..f1b82d3 100644 --- a/src/logic/threads.py +++ b/src/logic/threads.py @@ -91,6 +91,7 @@ class BookGrabber(QThread): self.updateSignal.emit(item, len(self.data)) self.logger.log_info("Worker thread finished") # self.done.emit() + self.stop() if not self.is_Running: break def stop(self): @@ -205,6 +206,9 @@ class AutoAdder(QThread): # teminate thread self.finished.emit() +class BackgroundChecker(QThread): + """Check all apparats for available Books""" + pass class MockAvailCheck: diff --git a/src/logic/userInterface.py b/src/logic/userInterface.py index b22ac46..87077f9 100644 --- a/src/logic/userInterface.py +++ b/src/logic/userInterface.py @@ -265,9 +265,7 @@ class Ui(Ui_Semesterapparat): # set self.app_fach viable inputs to be # create a thread, that continually checks the validity of the inputs - self.grabbers = [] - self.threadeds = [] - self.thread = QThread() + self.validate_thread = QThread() self.validate_thread.started.connect(self.thread_check) self.validate_thread.start() @@ -328,7 +326,7 @@ class Ui(Ui_Semesterapparat): params = {key: value for key, value in params.items() if value is not None} ic(params) retdata = self.db.searchBook(params) - if retdata == None: + if retdata is None: return for book in retdata: @@ -1547,9 +1545,13 @@ class Ui(Ui_Semesterapparat): # worker.finished.connect(worker.deleteLater) grabber.start() + if grabber.is_Running is False: + grabber.quit() + grabber.wait() + grabber.deleteLater() # self.thread = thread # kill grabber after completion - self.grabbers.append(grabber) + # self.grabbers.append(grabber) def unlock_apparate(self): self.tableWidget_apparate.setEnabled(True) @@ -1985,8 +1987,11 @@ def launch_gui(): print(aui.active_user) MainWindow.show() - atexit.register(aui.thread.terminate) + atexit.register() + atexit.register(delete_temp_contents) + atexit.register(aui.validate_thread.quit) sys.exit(app.exec()) + elif ui.lresult == 0: warning_dialog = QtWidgets.QMessageBox() warning_dialog.setIcon(QtWidgets.QMessageBox.Icon.Warning)