From b874656ebaaea87cb6bb4bdf9f31cabbcbb09a08 Mon Sep 17 00:00:00 2001 From: WorldTeacher Date: Tue, 3 Jun 2025 13:17:13 +0200 Subject: [PATCH] set log level to INFO for improved logging clarity --- src/backend/create_file.py | 2 +- src/backend/semester.py | 2 +- src/backend/thread_bookgrabber.py | 4 +-- src/backend/threads_autoadder.py | 2 +- src/backend/threads_availchecker.py | 2 +- src/logic/webrequest.py | 2 +- src/transformers/transformers.py | 2 +- src/ui/dialogs/login.py | 2 +- src/ui/dialogs/mail.py | 2 +- src/ui/dialogs/parsed_titles.py | 2 +- src/ui/dialogs/settings.py | 6 ++-- src/ui/userInterface.py | 55 +++++++++++++++++++++++++---- src/ui/widgets/MessageCalendar.py | 2 +- src/ui/widgets/admin_edit_prof.py | 2 +- src/ui/widgets/elsa_main.py | 2 +- src/ui/widgets/graph.py | 2 +- src/ui/widgets/searchPage.py | 2 +- 17 files changed, 68 insertions(+), 25 deletions(-) diff --git a/src/backend/create_file.py b/src/backend/create_file.py index b19e1e0..5be6d59 100644 --- a/src/backend/create_file.py +++ b/src/backend/create_file.py @@ -9,7 +9,7 @@ import sys log = loguru.logger log.remove() -log.add(sys.stdout) +log.add(sys.stdout, level="INFO") log.add("logs/application.log", rotation="1 MB", retention="10 days") diff --git a/src/backend/semester.py b/src/backend/semester.py index d2fb51e..42a101a 100644 --- a/src/backend/semester.py +++ b/src/backend/semester.py @@ -6,7 +6,7 @@ import sys log = loguru.logger log.remove() -log.add(sys.stdout) +log.add(sys.stdout, level="INFO") log.add("logs/application.log", rotation="1 MB", retention="10 days") diff --git a/src/backend/thread_bookgrabber.py b/src/backend/thread_bookgrabber.py index 5d5ab49..36c99f9 100644 --- a/src/backend/thread_bookgrabber.py +++ b/src/backend/thread_bookgrabber.py @@ -8,12 +8,12 @@ import sys log = loguru.logger log.remove() -log.add(sys.stdout) +log.add(sys.stdout, level="INFO") log.add("logs/application.log", rotation="1 MB", retention="10 days") # logger.add(sys.stderr, format="{time} {level} {message}", level="INFO") -log.add(sys.stdout) +log.add(sys.stdout, level="INFO") class BookGrabber(QThread): diff --git a/src/backend/threads_autoadder.py b/src/backend/threads_autoadder.py index 2ceec0e..fa73c55 100644 --- a/src/backend/threads_autoadder.py +++ b/src/backend/threads_autoadder.py @@ -10,7 +10,7 @@ import sys log = loguru.logger log.remove() -log.add(sys.stdout) +log.add(sys.stdout, level="INFO") log.add("logs/application.log", rotation="1 MB", retention="10 days") diff --git a/src/backend/threads_availchecker.py b/src/backend/threads_availchecker.py index 5aebb4f..7d6b3b4 100644 --- a/src/backend/threads_availchecker.py +++ b/src/backend/threads_availchecker.py @@ -14,7 +14,7 @@ import sys log = loguru.logger log.remove() -log.add(sys.stdout) +log.add(sys.stdout, level="INFO") log.add("logs/application.log", rotation="1 MB", retention="10 days") diff --git a/src/logic/webrequest.py b/src/logic/webrequest.py index 5626ccf..ee12047 100644 --- a/src/logic/webrequest.py +++ b/src/logic/webrequest.py @@ -13,7 +13,7 @@ import loguru import sys log = loguru.logger log.remove() -log.add(sys.stdout) +log.add(sys.stdout, level="INFO") log.add("logs/application.log", rotation="1 MB", retention="10 days") # logger.add(sys.stderr, format="{time} {level} {message}", level="INFO") diff --git a/src/transformers/transformers.py b/src/transformers/transformers.py index 98d5758..84f8a22 100644 --- a/src/transformers/transformers.py +++ b/src/transformers/transformers.py @@ -13,7 +13,7 @@ import sys log = loguru.logger log.remove() -log.add(sys.stdout) +log.add(sys.stdout, level="INFO") log.add("logs/application.log", rotation="1 MB", retention="10 days") diff --git a/src/ui/dialogs/login.py b/src/ui/dialogs/login.py index e1e563e..a446ec0 100644 --- a/src/ui/dialogs/login.py +++ b/src/ui/dialogs/login.py @@ -13,7 +13,7 @@ from src import Icon log = loguru.logger log.remove() -log.add(sys.stdout) +log.add(sys.stdout, level="INFO") log.add("logs/application.log", rotation="1 MB", retention="10 days") diff --git a/src/ui/dialogs/mail.py b/src/ui/dialogs/mail.py index d7e0362..7b59e9b 100644 --- a/src/ui/dialogs/mail.py +++ b/src/ui/dialogs/mail.py @@ -13,7 +13,7 @@ import sys log = loguru.logger log.remove() -log.add(sys.stdout) +log.add(sys.stdout, level="INFO") log.add("logs/application.log", rotation="1 MB", retention="10 days") diff --git a/src/ui/dialogs/parsed_titles.py b/src/ui/dialogs/parsed_titles.py index 1142fe2..e1f2777 100644 --- a/src/ui/dialogs/parsed_titles.py +++ b/src/ui/dialogs/parsed_titles.py @@ -9,7 +9,7 @@ import sys log = loguru.logger log.remove() -log.add(sys.stdout) +log.add(sys.stdout, level="INFO") log.add("logs/application.log", rotation="1 MB", retention="10 days") class ParsedTitles(QtWidgets.QWidget, Ui_Form): diff --git a/src/ui/dialogs/settings.py b/src/ui/dialogs/settings.py index 5211a1b..51ed07b 100644 --- a/src/ui/dialogs/settings.py +++ b/src/ui/dialogs/settings.py @@ -7,7 +7,7 @@ import sys log = loguru.logger log.remove() -log.add(sys.stdout) +log.add(sys.stdout, level="INFO") log.add("logs/application.log", rotation="1 MB", retention="10 days") @@ -80,8 +80,8 @@ class Settings(QtWidgets.QDialog, _settings): def load_config(self): self.db_name.setText(settings.database.name) - self.db_path.setText(settings.database.path) - self.save_path.setText(settings.database.temp) + self.db_path.setText(str(settings.database.path.expanduser())) + self.save_path.setText(str(settings.database.temp.expanduser())) self.smtp_address.setText(settings.mail.smtp_server) self.smtp_port.setText(str(settings.mail.port)) self.sender_email.setText(settings.mail.sender) diff --git a/src/ui/userInterface.py b/src/ui/userInterface.py index fb45198..f79c41f 100644 --- a/src/ui/userInterface.py +++ b/src/ui/userInterface.py @@ -60,7 +60,7 @@ import loguru log = loguru.logger log.remove() -log.add(sys.stdout) +log.add(sys.stdout, level="INFO") log.add("logs/application.log", rotation="1 MB", retention="10 days") log.add( @@ -556,6 +556,7 @@ class Ui(Ui_Semesterapparat): else: self.__setValidState(self.valid_check_semester, 0, self._mand, 5) self.check_eternal_app.setEnabled(False) + return valid def display_valid_semester(self): print(f""" @@ -563,6 +564,7 @@ class Ui(Ui_Semesterapparat): Sommer: {self.sem_sommer.isChecked()} Winter: {self.sem_winter.isChecked()} Eternal: {self.check_eternal_app.isChecked()} + Valid: {self.validate_semester()} """) def change_state(self, index, state): @@ -985,7 +987,7 @@ class Ui(Ui_Semesterapparat): self.confirm_popup("Bitte erst ein document auswählen!", title="Fehler") return if not _selected_doc_location == "Database": - path = Path(_selected_doc_location + "/" + _selected_doc_name) + path = Path(_selected_doc_location) # path: Path = path.resolve() # path. # path = path + "/" + _selected_doc_name @@ -1119,12 +1121,53 @@ class Ui(Ui_Semesterapparat): return self.prof_mail.setText(data.mail) - self.prof_tel_nr.setText(str(data.phoneNumber)) - self.app_name.setText(data.title) - self.app_fach.setCurrentText(data.subject) + self.prof_tel_nr.setText(str(data.phoneNumber).replace("-", "")) + if len(data.title_suggestions) > 0: + # create a dialog that has a dropdown with the suggestions, and oc and cancel button. on ok return the selected text and set it as title + dialog = QtWidgets.QDialog() + dialog.setWindowTitle("Titelvorschläge") + dialog.setModal(True) + layout = QtWidgets.QVBoxLayout() + label = QtWidgets.QLabel( + f"Bitte wählen Sie einen Titel aus:/nDer Titel darf max. {data.title_max_length} Zeichen lang sein." + ) + layout.addWidget(label) + dropdown = QtWidgets.QComboBox() + titles = [f"{title} [{len(title)}]" for title in data.title_suggestions] + dropdown.addItems(titles) + layout.addWidget(dropdown) + button_box = QtWidgets.QDialogButtonBox() + button_box.setStandardButtons( + QtWidgets.QDialogButtonBox.StandardButton.Cancel + | QtWidgets.QDialogButtonBox.StandardButton.Ok + ) + button_box.accepted.connect(dialog.accept) + button_box.rejected.connect(dialog.reject) + layout.addWidget(button_box) + dialog.setLayout(layout) + dialog.exec() + + if dialog.result() == QtWidgets.QDialog.DialogCode.Accepted: + print("Selected title:", dropdown.currentText()) + self.app_name.setText(dropdown.currentText().split(" [")[0].strip()) + else: + self.app_name.setText("CHANGEME") + # self.app_name.setText(data.title) + subjects = self.db.getSubjects() + subjects = [subject[1] for subject in subjects] + self.app_fach.setCurrentText(data.subject if data.subject in subjects else "") self.prof_title.setText(data.personTitle) self.drpdwn_prof_name.setCurrentText(data.personName) - self.sem_year.setText("20" + data.semester.year) + self.sem_year.setText("20" + str(data.semester.year)) + if data.semester.semester == "SoSe": + self.sem_sommer.setChecked(True) + self.sem_winter.setChecked(False) + else: + self.sem_winter.setChecked(True) + self.sem_sommer.setChecked(False) + if data.eternal: + self.check_eternal_app.setChecked(True) + self.validate_semester() def btn_check_file_threaded(self): for runner in self.bookGrabber: diff --git a/src/ui/widgets/MessageCalendar.py b/src/ui/widgets/MessageCalendar.py index 487153e..00ee0d0 100644 --- a/src/ui/widgets/MessageCalendar.py +++ b/src/ui/widgets/MessageCalendar.py @@ -9,7 +9,7 @@ import sys log = loguru.logger log.remove() -log.add(sys.stdout) +log.add(sys.stdout, level="INFO") log.add("logs/application.log", rotation="1 MB", retention="10 days") diff --git a/src/ui/widgets/admin_edit_prof.py b/src/ui/widgets/admin_edit_prof.py index dfb9195..d4f4384 100644 --- a/src/ui/widgets/admin_edit_prof.py +++ b/src/ui/widgets/admin_edit_prof.py @@ -8,7 +8,7 @@ import sys log = loguru.logger log.remove() -log.add(sys.stdout) +log.add(sys.stdout, level="INFO") log.add("logs/application.log", rotation="1 MB", retention="10 days") diff --git a/src/ui/widgets/elsa_main.py b/src/ui/widgets/elsa_main.py index 0a0b5a4..ef3052f 100644 --- a/src/ui/widgets/elsa_main.py +++ b/src/ui/widgets/elsa_main.py @@ -14,7 +14,7 @@ import sys log = loguru.logger log.remove() -log.add(sys.stdout) +log.add(sys.stdout, level="INFO") log.add("logs/application.log", rotation="1 MB", retention="10 days") diff --git a/src/ui/widgets/graph.py b/src/ui/widgets/graph.py index cc9cfc0..e17523c 100644 --- a/src/ui/widgets/graph.py +++ b/src/ui/widgets/graph.py @@ -8,7 +8,7 @@ import sys log = loguru.logger log.remove() -log.add(sys.stdout) +log.add(sys.stdout, level="INFO") log.add("logs/application.log", rotation="1 MB", retention="10 days") diff --git a/src/ui/widgets/searchPage.py b/src/ui/widgets/searchPage.py index 87fe6ea..27b556f 100644 --- a/src/ui/widgets/searchPage.py +++ b/src/ui/widgets/searchPage.py @@ -13,7 +13,7 @@ import sys log = loguru.logger log.remove() -log.add(sys.stdout) +log.add(sys.stdout, level="INFO") log.add("logs/application.log", rotation="1 MB", retention="10 days")