PHB/SemesterapparatsManager
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

rework threads and also use app_ids where applicable

Browse Source
This commit is contained in:
WorldTeacher
2025-10-07 14:11:14 +02:00
parent 8e9eff4f3a
commit e061c1f5a9
4 changed files with 225 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/backend/thread_bookgrabber.py
View File

@@ -1,11 +1,12 @@
from PySide6.QtCore import QThread
from PySide6.QtCore import Signal
from src.backend import Database
from src.logic.webrequest import BibTextTransformer, WebRequest
import loguru
import sys
import loguru
from PySide6.QtCore import QThread, Signal
from src import LOG_DIR
from src.backend import Database
from src.logic.webrequest import BibTextTransformer, WebRequest
log = loguru.logger
log.remove()
log.add(sys.stdout, level="INFO")
@@ -31,9 +32,11 @@ class BookGrabber(QThread):
self.book_id = None
self.use_any = False
self.use_exact = False
self.app_id = None
self.app_nr = None
self.tstate = (self.app_id, self.prof_id, self.mode, self.data)
self.request = WebRequest()
self.db = Database()
def add_values(
self, app_id: int, prof_id: int, mode: str, data, any_book=False, exact=False
@@ -45,13 +48,13 @@ class BookGrabber(QThread):
self.use_any = any_book
self.use_exact = exact
log.info(f"Working on {len(self.data)} entries")
self.tstate = (self.app_id, self.prof_id, self.mode, self.data)
self.tstate = (self.app_nr, self.prof_id, self.mode, self.data)
log.debug("State: " + str(self.tstate))
self.request.set_apparat(self.app_id)
app_nr = self.db.query_db("SELECT appnr FROM semesterapparat WHERE id = ?", (self.app_id,))[0][0]
self.request.set_apparat(app_nr)
# log.debug(self.tstate)
def run(self):
self.db = Database()
item = 0
iterdata = self.data
# log.debug(iterdata)
@@ -91,7 +94,7 @@ class BookGrabber(QThread):
state = 0
for result in transformer.RDS_DATA:
# log.debug(result.RDS_LOCATION)
if str(self.app_id) in result.RDS_LOCATION:
if str(self.app_nr) in result.RDS_LOCATION:
state = 1
break
@@ -126,27 +129,27 @@ class BookGrabberTest(QThread):
self.is_Running = True
log.info("Starting worker thread")
self.data = None
self.app_id = None
self.app_nr = None
self.prof_id = None
self.mode = None
self.book_id = None
self.use_any = False
self.use_exact = False
self.app_id = appnr
self.tstate = (self.app_id, self.prof_id, self.mode, self.data)
self.app_nr = appnr
self.tstate = (self.app_nr, self.prof_id, self.mode, self.data)
self.results = []
def add_values(
self, app_id: int, prof_id: int, mode: str, data, any_book=False, exact=False
self, app_nr: int, prof_id: int, mode: str, data, any_book=False, exact=False
):
self.app_id = app_id
self.app_nr = app_nr
self.prof_id = prof_id
self.mode = mode
self.data = data
self.use_any = any_book
self.use_exact = exact
log.info(f"Working on {len(self.data)} entries")
self.tstate = (self.app_id, self.prof_id, self.mode, self.data)
self.tstate = (self.app_nr, self.prof_id, self.mode, self.data)
log.debug("State: " + str(self.tstate))
# log.debug(self.tstate)
@@ -159,7 +162,7 @@ class BookGrabberTest(QThread):
signature = str(entry)
log.info("Processing entry: " + signature)
webdata = WebRequest().set_apparat(self.app_id).get_ppn(entry)
webdata = WebRequest().set_apparat(self.app_nr).get_ppn(entry)
if self.use_any:
webdata = webdata.use_any_book
webdata = webdata.get_data()
@@ -186,7 +189,7 @@ class BookGrabberTest(QThread):
state = 0
for result in transformer.RDS_DATA:
# log.debug(result.RDS_LOCATION)
if str(self.app_id) in result.RDS_LOCATION:
if str(self.app_nr) in result.RDS_LOCATION:
state = 1
break