small fix

This commit is contained in:
WorldTeacher
2024-02-12 15:50:05 +01:00
parent 892fa97f58
commit 8ef39dfade
2 changed files with 15 additions and 6 deletions

View File

@@ -91,6 +91,7 @@ class BookGrabber(QThread):
self.updateSignal.emit(item, len(self.data)) self.updateSignal.emit(item, len(self.data))
self.logger.log_info("Worker thread finished") self.logger.log_info("Worker thread finished")
# self.done.emit() # self.done.emit()
self.stop()
if not self.is_Running: if not self.is_Running:
break break
def stop(self): def stop(self):
@@ -205,6 +206,9 @@ class AutoAdder(QThread):
# teminate thread # teminate thread
self.finished.emit() self.finished.emit()
class BackgroundChecker(QThread):
"""Check all apparats for available Books"""
pass
class MockAvailCheck: class MockAvailCheck:

View File

@@ -265,9 +265,7 @@ class Ui(Ui_Semesterapparat):
# set self.app_fach viable inputs to be # set self.app_fach viable inputs to be
# create a thread, that continually checks the validity of the inputs # 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 = QThread()
self.validate_thread.started.connect(self.thread_check) self.validate_thread.started.connect(self.thread_check)
self.validate_thread.start() 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} params = {key: value for key, value in params.items() if value is not None}
ic(params) ic(params)
retdata = self.db.searchBook(params) retdata = self.db.searchBook(params)
if retdata == None: if retdata is None:
return return
for book in retdata: for book in retdata:
@@ -1547,9 +1545,13 @@ class Ui(Ui_Semesterapparat):
# worker.finished.connect(worker.deleteLater) # worker.finished.connect(worker.deleteLater)
grabber.start() grabber.start()
if grabber.is_Running is False:
grabber.quit()
grabber.wait()
grabber.deleteLater()
# self.thread = thread # self.thread = thread
# kill grabber after completion # kill grabber after completion
self.grabbers.append(grabber) # self.grabbers.append(grabber)
def unlock_apparate(self): def unlock_apparate(self):
self.tableWidget_apparate.setEnabled(True) self.tableWidget_apparate.setEnabled(True)
@@ -1985,8 +1987,11 @@ def launch_gui():
print(aui.active_user) print(aui.active_user)
MainWindow.show() MainWindow.show()
atexit.register(aui.thread.terminate) atexit.register()
atexit.register(delete_temp_contents)
atexit.register(aui.validate_thread.quit)
sys.exit(app.exec()) sys.exit(app.exec())
elif ui.lresult == 0: elif ui.lresult == 0:
warning_dialog = QtWidgets.QMessageBox() warning_dialog = QtWidgets.QMessageBox()
warning_dialog.setIcon(QtWidgets.QMessageBox.Icon.Warning) warning_dialog.setIcon(QtWidgets.QMessageBox.Icon.Warning)