From c4be1d8bfab6f72d42e7ec35e99c026328f9b01f Mon Sep 17 00:00:00 2001 From: WorldTeacher Date: Mon, 22 Sep 2025 09:42:15 +0200 Subject: [PATCH] files: reorganize imports, remove print lines --- src/ui/dialogs/Ui_login.py | 11 ++++--- src/ui/dialogs/Ui_mail_preview.py | 48 ++++++++++++++++++++---------- src/ui/dialogs/Ui_parsed_titles.py | 4 +-- src/ui/dialogs/Ui_settings.py | 2 +- src/ui/dialogs/about.py | 8 +++-- src/ui/dialogs/app_ext.py | 4 ++- src/ui/dialogs/bookdata.py | 2 +- src/ui/dialogs/docuprint.py | 21 ++++++------- src/ui/dialogs/elsa_add_entry.py | 12 ++++---- src/ui/dialogs/elsa_gen_confirm.py | 3 +- src/ui/dialogs/login.py | 2 +- src/ui/dialogs/medienadder.py | 5 ++-- src/ui/dialogs/parsed_titles.py | 14 +++++---- src/ui/dialogs/popup_confirm.py | 2 +- src/ui/dialogs/settings.py | 19 ++++++------ src/ui/widgets/MessageCalendar.py | 2 -- src/ui/widgets/admin_edit_prof.py | 18 ++++++----- src/ui/widgets/admin_edit_user.py | 9 +++--- src/ui/widgets/calendar_entry.py | 10 ++++--- src/ui/widgets/collapse.py | 17 +---------- src/ui/widgets/filepicker.py | 4 +-- src/ui/widgets/graph.py | 15 +++++----- src/utils/icon.py | 5 ++-- 23 files changed, 127 insertions(+), 110 deletions(-) diff --git a/src/ui/dialogs/Ui_login.py b/src/ui/dialogs/Ui_login.py index 7e807ac..7844c6b 100644 --- a/src/ui/dialogs/Ui_login.py +++ b/src/ui/dialogs/Ui_login.py @@ -10,8 +10,9 @@ import hashlib from PySide6 import QtCore, QtWidgets -from src.backend.database import Database from src.backend.admin_console import AdminCommands +from src.backend.database import Database + class Ui_Dialog(object): def setupUi(self, Dialog): @@ -64,13 +65,11 @@ class Ui_Dialog(object): def login(self): username = self.lineEdit.text() password = self.lineEdit_2.text() - print(type(username), password) + # print(type(username), password) # Assuming 'Database' is a class to interact with your database - db = Database() + db = Database() - hashed_password = hashlib.sha256( - password.encode() - ).hexdigest() + hashed_password = hashlib.sha256(password.encode()).hexdigest() if len(db.getUsers()) == 0: AdminCommands().create_admin() self.lresult = 1 # Indicate successful login diff --git a/src/ui/dialogs/Ui_mail_preview.py b/src/ui/dialogs/Ui_mail_preview.py index 32ed57d..1980790 100644 --- a/src/ui/dialogs/Ui_mail_preview.py +++ b/src/ui/dialogs/Ui_mail_preview.py @@ -6,17 +6,18 @@ # run again. Do not edit this file unless you know what you are doing. -from PySide6 import QtCore, QtGui, QtWidgets -import subprocess -import tempfile import os import re +import subprocess +import tempfile + from omegaconf import OmegaConf +from PySide6 import QtCore, QtWidgets config = OmegaConf.load("config.yaml") -class Ui_eMailPreview(object): +class Ui_eMailPreview(object): def setupUi( self, eMailPreview, @@ -31,7 +32,10 @@ class Ui_eMailPreview(object): self.buttonBox = QtWidgets.QDialogButtonBox(eMailPreview) self.buttonBox.setGeometry(QtCore.QRect(310, 630, 341, 32)) self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) - self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) + self.buttonBox.setStandardButtons( + QtWidgets.QDialogButtonBox.StandardButton.Cancel + | QtWidgets.QDialogButtonBox.StandardButton.Ok + ) self.buttonBox.setObjectName("buttonBox") self.gridLayoutWidget = QtWidgets.QWidget(eMailPreview) self.gridLayoutWidget.setGeometry(QtCore.QRect(10, 10, 661, 621)) @@ -46,7 +50,11 @@ class Ui_eMailPreview(object): self.prof_name.setObjectName("prof_name") self.gridLayout.addWidget(self.prof_name, 2, 2, 1, 1) self.label_3 = QtWidgets.QLabel(self.gridLayoutWidget) - self.label_3.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignTop) + self.label_3.setAlignment( + QtCore.Qt.AlignmentFlag.AlignLeading + | QtCore.Qt.AlignmentFlag.AlignLeft + | QtCore.Qt.AlignmentFlag.AlignTop + ) self.label_3.setObjectName("label_3") self.gridLayout.addWidget(self.label_3, 5, 0, 1, 1) self.mail_name = QtWidgets.QLineEdit(self.gridLayoutWidget) @@ -81,7 +89,12 @@ class Ui_eMailPreview(object): self.gender_non = QtWidgets.QRadioButton(self.gridLayoutWidget) self.gender_non.setObjectName("gender_non") self.horizontalLayout_3.addWidget(self.gender_non) - spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + spacerItem = QtWidgets.QSpacerItem( + 40, + 20, + QtWidgets.QSizePolicy.Policy.Expanding, + QtWidgets.QSizePolicy.Policy.Minimum, + ) self.horizontalLayout_3.addItem(spacerItem) self.gridLayout.addLayout(self.horizontalLayout_3, 4, 2, 1, 1) self.label_6 = QtWidgets.QLabel(self.gridLayoutWidget) @@ -89,8 +102,8 @@ class Ui_eMailPreview(object): self.gridLayout.addWidget(self.label_6, 4, 0, 1, 1) self.retranslateUi(eMailPreview) - self.buttonBox.accepted.connect(eMailPreview.accept) # type: ignore - self.buttonBox.rejected.connect(eMailPreview.reject) # type: ignore + self.buttonBox.accepted.connect(eMailPreview.accept) # type: ignore + self.buttonBox.rejected.connect(eMailPreview.reject) # type: ignore QtCore.QMetaObject.connectSlotsByName(eMailPreview) self._appid = app_id self._appname = app_name @@ -127,7 +140,6 @@ class Ui_eMailPreview(object): return "Sehr geehrte Frau" elif self.gender_non.isChecked(): return "Guten Tag" - def set_mail(self): email_template = self.comboBox.currentText() @@ -145,14 +157,19 @@ class Ui_eMailPreview(object): mail_html = mail_template.split("")[1] mail_html = "" + mail_html mail_html = mail_html.format( - Profname=self.prof_name.text().split(" ")[1], Appname=self._appname, AppNr=self._appid, AppSubject = self._subject,greeting = self.get_greeting() + Profname=self.prof_name.text().split(" ")[1], + Appname=self._appname, + AppNr=self._appid, + AppSubject=self._subject, + greeting=self.get_greeting(), ) self.mail_body.setHtml(mail_html) + def load_mail_templates(self): mail_templates = os.listdir("mail_vorlagen") mail_templates = [f for f in mail_templates if f.endswith(".eml")] - print(mail_templates) + # print(mail_templates) self.comboBox.addItems(mail_templates) def save_mail(self): @@ -168,16 +185,17 @@ class Ui_eMailPreview(object): ) as f: f.write(mail) self.mail_path = f.name - print(self.mail_path) + # print(self.mail_path) # open the file using thunderbird subprocess.Popen([f"{self.mail_path}"]) # delete the file # os.remove(self.mail_path) + def launch(): app = QtWidgets.QApplication([]) eMailPreview = QtWidgets.QDialog() ui = Ui_eMailPreview() - ui.setupUi(eMailPreview, "1","Test","Biologie","Kirchner, Alexander") + ui.setupUi(eMailPreview, "1", "Test", "Biologie", "Kirchner, Alexander") eMailPreview.show() - app.exec() \ No newline at end of file + app.exec() diff --git a/src/ui/dialogs/Ui_parsed_titles.py b/src/ui/dialogs/Ui_parsed_titles.py index b05ad32..b42eb2a 100644 --- a/src/ui/dialogs/Ui_parsed_titles.py +++ b/src/ui/dialogs/Ui_parsed_titles.py @@ -110,7 +110,7 @@ class Ui_Form(object): self.progressBar.setValue(value) def thread_quit(self): - print("Terminating thread") + # print("Terminating thread") self.thread.terminate() self.thread.quit() self.thread.deleteLater() @@ -144,7 +144,7 @@ class Ui_Form(object): def determine_progress(self, signal): # check length of listWidget length = self.listWidget.count() - print(f"Length of listWidget: {length}") + # print(f"Length of listWidget: {length}") if length == 0: logger.log_info("AutoAdder finished") self.buttonBox.accepted.emit() diff --git a/src/ui/dialogs/Ui_settings.py b/src/ui/dialogs/Ui_settings.py index 36c39f2..4009cf6 100644 --- a/src/ui/dialogs/Ui_settings.py +++ b/src/ui/dialogs/Ui_settings.py @@ -169,7 +169,7 @@ class Ui_Dialog(object): name = application.application file_type = application.extensions display_name = application.name - print(name, file_type, display_name) # + # print(name, file_type, display_name) # # create new item item = QtWidgets.QTreeWidgetItem(self.treeWidget) item.setText(0, display_name) diff --git a/src/ui/dialogs/about.py b/src/ui/dialogs/about.py index 972495e..496aadf 100644 --- a/src/ui/dialogs/about.py +++ b/src/ui/dialogs/about.py @@ -1,7 +1,9 @@ -from .dialog_sources.Ui_about import Ui_about -from PySide6 import QtWidgets import PySide6 -from src import Icon, __version__, __author__ +from PySide6 import QtWidgets + +from src import Icon, __author__, __version__ + +from .dialog_sources.about_ui import Ui_about class About(QtWidgets.QDialog, Ui_about): diff --git a/src/ui/dialogs/app_ext.py b/src/ui/dialogs/app_ext.py index 8db924f..5bf77e7 100644 --- a/src/ui/dialogs/app_ext.py +++ b/src/ui/dialogs/app_ext.py @@ -1,7 +1,9 @@ from PySide6 import QtWidgets -from .dialog_sources.Ui_apparat_extend import Ui_Dialog + from src import Icon +from .dialog_sources.apparat_extend_ui import Ui_Dialog + class ApparatExtendDialog(QtWidgets.QDialog, Ui_Dialog): def __init__( diff --git a/src/ui/dialogs/bookdata.py b/src/ui/dialogs/bookdata.py index 9561604..553a59f 100644 --- a/src/ui/dialogs/bookdata.py +++ b/src/ui/dialogs/bookdata.py @@ -2,7 +2,7 @@ from PySide6 import QtWidgets from src.logic.dataclass import BookData -from .dialog_sources.Ui_edit_bookdata import Ui_Dialog +from .dialog_sources.edit_bookdata_ui import Ui_Dialog class BookDataUI(QtWidgets.QDialog, Ui_Dialog): diff --git a/src/ui/dialogs/docuprint.py b/src/ui/dialogs/docuprint.py index 3f87c1c..98b399d 100644 --- a/src/ui/dialogs/docuprint.py +++ b/src/ui/dialogs/docuprint.py @@ -1,10 +1,11 @@ -from .dialog_sources.documentprint_ui import Ui_Dialog -from PySide6 import QtWidgets, QtCore -from src import Icon - -from src.utils.richtext import SemapSchilder, SemesterDocument -from src.backend import Semester, Database from natsort import natsorted +from PySide6 import QtWidgets + +from src import Icon +from src.backend import Database, Semester +from src.utils.richtext import SemapSchilder, SemesterDocument + +from .dialog_sources.documentprint_ui import Ui_Dialog class DocumentPrintDialog(QtWidgets.QDialog, Ui_Dialog): @@ -23,25 +24,25 @@ class DocumentPrintDialog(QtWidgets.QDialog, Ui_Dialog): # Ensure the signal is connected only once try: self.pushButton_2.clicked.disconnect() - except TypeError: + except (TypeError, RuntimeWarning): pass # Signal was not connected before self.pushButton_2.clicked.connect(self.on_pushButton_2_clicked) try: self.pushButton.clicked.disconnect() - except TypeError: + except (TypeError, RuntimeWarning): pass self.pushButton.clicked.connect(self.on_pushButton_clicked) try: self.btn_load_current_apparats.clicked.disconnect() - except TypeError: + except (TypeError, RuntimeWarning): pass self.btn_load_current_apparats.clicked.connect(self.load_current_clicked) try: self.manualCheck.clicked.disconnect() - except TypeError: + except (TypeError, RuntimeWarning): pass self.manualCheck.clicked.connect(self.manual_request) diff --git a/src/ui/dialogs/elsa_add_entry.py b/src/ui/dialogs/elsa_add_entry.py index c15a0ab..db2c0cc 100644 --- a/src/ui/dialogs/elsa_add_entry.py +++ b/src/ui/dialogs/elsa_add_entry.py @@ -1,9 +1,11 @@ -from .dialog_sources.Ui_elsa_add_table_entry import Ui_Dialog -from src.logic.webrequest import WebRequest, BibTextTransformer -from src import Icon from PySide6 import QtWidgets -from src.transformers.transformers import DictToTable + +from src import Icon +from src.logic.webrequest import BibTextTransformer, WebRequest from src.logic.zotero import ZoteroController +from src.transformers.transformers import DictToTable + +from .dialog_sources.elsa_add_table_entry_ui import Ui_Dialog zot = ZoteroController() dtt = DictToTable() @@ -174,7 +176,7 @@ class ElsaAddEntry(QtWidgets.QDialog, Ui_Dialog): self.stackedWidget.setCurrentIndex(3) def search(self, pages=None): - print("searching") + # #print("searching") param = self.searchIdent.text() web = WebRequest() web.get_ppn(param) diff --git a/src/ui/dialogs/elsa_gen_confirm.py b/src/ui/dialogs/elsa_gen_confirm.py index 8b15842..e63cc7a 100644 --- a/src/ui/dialogs/elsa_gen_confirm.py +++ b/src/ui/dialogs/elsa_gen_confirm.py @@ -1,6 +1,7 @@ -from .dialog_sources.Ui_elsa_generator_confirm import Ui_Dialog from PySide6 import QtWidgets +from .dialog_sources.elsa_generator_confirm_ui import Ui_Dialog + class ElsaGenConfirm(QtWidgets.QDialog, Ui_Dialog): def __init__(self, parent=None, data=None): diff --git a/src/ui/dialogs/login.py b/src/ui/dialogs/login.py index cc8fa34..649cbaf 100644 --- a/src/ui/dialogs/login.py +++ b/src/ui/dialogs/login.py @@ -70,7 +70,7 @@ class LoginDialog(Ui_Dialog): def login(self): username = self.lineEdit.text() password = self.lineEdit_2.text() - # print(type(username), password) + # #print(type(username), password) # Assuming 'Database' is a class to interact with your database hashed_password = hashlib.sha256(password.encode()).hexdigest() diff --git a/src/ui/dialogs/medienadder.py b/src/ui/dialogs/medienadder.py index ecdeac6..e8b5da5 100644 --- a/src/ui/dialogs/medienadder.py +++ b/src/ui/dialogs/medienadder.py @@ -1,8 +1,9 @@ from PySide6 import QtCore, QtGui, QtWidgets -from .dialog_sources.medianadder_ui import Ui_Dialog from src import Icon +from .dialog_sources.medianadder_ui import Ui_Dialog + class MedienAdder(QtWidgets.QDialog, Ui_Dialog): def __init__(self, parent=None): @@ -78,4 +79,4 @@ def launch_gui(): dialog = MedienAdder() dialog.show() app.exec() - # print(dialog.mode, dialog.data, dialog.result()) + # #print(dialog.mode, dialog.data, dialog.result()) diff --git a/src/ui/dialogs/parsed_titles.py b/src/ui/dialogs/parsed_titles.py index d5ba73b..dca3cdd 100644 --- a/src/ui/dialogs/parsed_titles.py +++ b/src/ui/dialogs/parsed_titles.py @@ -1,17 +1,19 @@ +import sys + +import loguru from PySide6 import QtWidgets +from src import LOG_DIR from src.backend import AutoAdder - from .dialog_sources.parsed_titles_ui import Ui_Form -import loguru -import sys -from src import LOG_DIR + log = loguru.logger log.remove() log.add(sys.stdout, level="INFO") log.add(f"{LOG_DIR}/application.log", rotation="1 MB", retention="10 days") + class ParsedTitles(QtWidgets.QWidget, Ui_Form): def __init__(self, parent=None): super().__init__(parent) @@ -32,7 +34,7 @@ class ParsedTitles(QtWidgets.QWidget, Ui_Form): self.progressBar.setValue(value) def worker_quit(self): - # print("Terminating worker") + # #print("Terminating worker") self.worker.terminate() self.worker.quit() self.worker.deleteLater() @@ -66,7 +68,7 @@ class ParsedTitles(QtWidgets.QWidget, Ui_Form): def determine_progress(self, signal): # check length of listWidget length = self.listWidget.count() - # print(f"Length of listWidget: {length}") + # #print(f"Length of listWidget: {length}") if length == 0: log.info("AutoAdder finished") self.buttonBox.accepted.emit() diff --git a/src/ui/dialogs/popup_confirm.py b/src/ui/dialogs/popup_confirm.py index 8b7f19c..2d8401a 100644 --- a/src/ui/dialogs/popup_confirm.py +++ b/src/ui/dialogs/popup_confirm.py @@ -10,7 +10,7 @@ from PySide6 import QtWidgets from src import Icon -from .dialog_sources.Ui_confirm_extend import Ui_extend_confirm +from .dialog_sources.confirm_extend_ui import Ui_extend_confirm class ConfirmDialog(QtWidgets.QDialog, Ui_extend_confirm): diff --git a/src/ui/dialogs/settings.py b/src/ui/dialogs/settings.py index df918d0..c21b70d 100644 --- a/src/ui/dialogs/settings.py +++ b/src/ui/dialogs/settings.py @@ -1,10 +1,12 @@ -from PySide6 import QtCore, QtGui, QtWidgets -from src import Icon, settings -from .dialog_sources.settings_ui import Ui_Dialog as _settings -from src.ui.widgets.iconLine import IconWidget -import loguru import sys -from src import LOG_DIR + +import loguru +from PySide6 import QtCore, QtGui, QtWidgets + +from src import LOG_DIR, Icon, settings +from src.ui.widgets.iconLine import IconWidget + +from .dialog_sources.settings_ui import Ui_Dialog as _settings log = loguru.logger log.remove() @@ -12,7 +14,6 @@ log.add(sys.stdout, level="INFO") log.add(f"{LOG_DIR}/application.log", rotation="1 MB", retention="10 days") - base = """'