From dfa604e846f236e854267642c0f3b24d0ae07f8f Mon Sep 17 00:00:00 2001 From: "Christopher T. Johnson" Date: Tue, 25 Feb 2025 15:33:20 -0500 Subject: [PATCH] Lint --- MainWindow.py | 52 ++++++++++++++++++++++++++++++------------------- lib/dbConfig.py | 3 +++ workers.py | 2 +- 3 files changed, 36 insertions(+), 21 deletions(-) diff --git a/MainWindow.py b/MainWindow.py index 21be034..00fb4ff 100644 --- a/MainWindow.py +++ b/MainWindow.py @@ -29,7 +29,12 @@ from PySide6.QtWidgets import ( ) from docketModel import docketModel -from lib.utils import QStyleOptionViewItemInit, query_error, readGeometry, writeGeometry +from lib.utils import ( + QStyleOptionViewItemInit, + query_error, + readGeometry, + writeGeometry, +) from ui.MainWindow import Ui_MainWindow from workers import loadCases, updateThread @@ -120,7 +125,7 @@ class casesModel(QSqlTableModel): class MainWindow(QMainWindow, Ui_MainWindow): show_entries = Signal(int) update_status = Signal() - + loadThread = None def __init__(self) -> None: @@ -181,17 +186,19 @@ class MainWindow(QMainWindow, Ui_MainWindow): layout.addWidget(self.status) layout.addStretch() self.progress = QProgressBar() - self.progress.setRange(0,100) + self.progress.setRange(0, 100) self.progress.setValue(0) self.progress.setMinimumWidth(150) self.progress.setMaximumWidth(150) - self.progress.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred) + self.progress.setSizePolicy( + QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred + ) layout.addWidget(self.progress) self.loadButton = QPushButton() self.loadButton.setObjectName("loadButton") self.loadButton.setText("Load Cases") layout.addWidget(self.loadButton) - self.statusbar.addWidget(widget,10) + self.statusbar.addWidget(widget, 10) self.loadButton.clicked.connect(self.loadCases) self.update_status.connect(self.statusBarUpdate) @@ -212,36 +219,41 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.loadButton.setEnabled(False) self.loadThread.start() return + @Slot() def loadCasesDone(self) -> None: self.loadButton.setEnabled(True) self.update_status.emit() return - + @Slot() def statusBarUpdate(self) -> None: if self.loadThread is None: - year = '' - max = 'unknown' + year = "" + max = "unknown" else: year = self.loadThread.year - max = self.loadThread.number + max = str(self.loadThread.number) query = QSqlQuery() - query.prepare("SELECT COUNT(*) AS number_active FROM cases WHERE active=1") + query.prepare( + "SELECT COUNT(*) AS number_active FROM cases WHERE active=1" + ) if not query.exec(): query_error(query) if query.next(): - active = query.value('number_active') - query.prepare("select SUBSTRING(docket_id,1,2) AS year, " - "SUBSTRING(docket_id,3,1) AS type, " - "MAX(CAST(SUBSTRING(docket_id,4) AS INTEGER)) AS number " - "FROM cases " - "GROUP BY year, type " - "ORDER BY type, year, number" - "LIMIT 2") - #if not query.exec(): + active = query.value("number_active") + query.prepare( + "select SUBSTRING(docket_id,1,2) AS year, " + "SUBSTRING(docket_id,3,1) AS type, " + "MAX(CAST(SUBSTRING(docket_id,4) AS INTEGER)) AS number " + "FROM cases " + "GROUP BY year, type " + "ORDER BY type, year, number" + "LIMIT 2" + ) + # if not query.exec(): # query_error(query) - msg=f"Oldest: {year}, Active: {active}, Max. Case: {max}" + msg = f"Oldest: {year}, Active: {active}, Max. Case: {max}" self.status.setText(msg) return diff --git a/lib/dbConfig.py b/lib/dbConfig.py index ae830a3..082e586 100644 --- a/lib/dbConfig.py +++ b/lib/dbConfig.py @@ -33,18 +33,21 @@ class Entries(db.Entity): # type: ignore[name-defined] text = Required(LongStr) documents = Set("Documents") + class Documents(db.Entity): # type: ignore[name-defined] document_id = PrimaryKey(int, auto=True) entry_id = Required(Entries) name = Required(str) url = Required(LongStr) + class History(db.Entity): # type: ignore[name-defined] history_id = PrimaryKey(int, auto=True) year = Required(str, max_len=3) edocket = Required(bool) number = Required(int) + def updateDatabase(settings: QSettings) -> None: set_sql_debug(True) engine = settings.value("engine") diff --git a/workers.py b/workers.py index c51a664..068b1f9 100644 --- a/workers.py +++ b/workers.py @@ -314,7 +314,7 @@ class loadCases(QThread): caseLoaded = Signal(int) year = QDateTime.currentDateTime().toString("yy") number = 0 - + def run(self) -> None: db = QSqlDatabase.cloneDatabase("qt_sql_default_connection", "load") if not db.open():