mirror of
https://github.com/KenanZhu/AutoLibrary.git
synced 2026-06-18 07:23:03 +08:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b99431476a | |||
| 977c0835b7 |
+6
-19
@@ -160,23 +160,6 @@ class LibChecker(LibOperator):
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
def __decodeReserveRecords(
|
|
||||||
self,
|
|
||||||
reservations
|
|
||||||
) -> list:
|
|
||||||
|
|
||||||
records = []
|
|
||||||
|
|
||||||
for reservation in reservations:
|
|
||||||
record = self.__decodeReserveRecord(reservation)
|
|
||||||
if record["date"] == "":
|
|
||||||
record = None
|
|
||||||
if record["time"] == {"begin": "", "end": ""}:
|
|
||||||
record = None
|
|
||||||
records.append(record)
|
|
||||||
return records
|
|
||||||
|
|
||||||
|
|
||||||
def __loadReserveRecords(
|
def __loadReserveRecords(
|
||||||
self
|
self
|
||||||
) -> list:
|
) -> list:
|
||||||
@@ -240,11 +223,15 @@ class LibChecker(LibOperator):
|
|||||||
reservations = self.__loadReserveRecords()
|
reservations = self.__loadReserveRecords()
|
||||||
if reservations is None:
|
if reservations is None:
|
||||||
return None
|
return None
|
||||||
records = self.__decodeReserveRecords(reservations[checked_count:])
|
for reservation in reservations[checked_count:]:
|
||||||
for record in records:
|
record = self.__decodeReserveRecord(reservation)
|
||||||
checked_count += 1
|
checked_count += 1
|
||||||
if record is None:
|
if record is None:
|
||||||
continue
|
continue
|
||||||
|
if record["date"] == "":
|
||||||
|
continue
|
||||||
|
if record["time"] == {"begin": "", "end": ""}:
|
||||||
|
continue
|
||||||
# record date is later than the given date, check the next one
|
# record date is later than the given date, check the next one
|
||||||
if datetime.strptime(record["date"], "%Y-%m-%d").date() >\
|
if datetime.strptime(record["date"], "%Y-%m-%d").date() >\
|
||||||
datetime.strptime(wanted_date, "%Y-%m-%d").date():
|
datetime.strptime(wanted_date, "%Y-%m-%d").date():
|
||||||
|
|||||||
+5
-3
@@ -13,7 +13,7 @@ import time
|
|||||||
import queue
|
import queue
|
||||||
|
|
||||||
from PySide6.QtCore import (
|
from PySide6.QtCore import (
|
||||||
Qt, Signal, Slot, QTimer, QThread
|
Qt, Signal, Slot, QDir, QFileInfo, QTimer, QThread
|
||||||
)
|
)
|
||||||
from PySide6.QtWidgets import (
|
from PySide6.QtWidgets import (
|
||||||
QMainWindow, QMenu
|
QMainWindow, QMenu
|
||||||
@@ -129,9 +129,11 @@ class ALMainWindow(QMainWindow, Ui_ALMainWindow):
|
|||||||
self.setupUi(self)
|
self.setupUi(self)
|
||||||
self.__input_queue = queue.Queue()
|
self.__input_queue = queue.Queue()
|
||||||
self.__output_queue = queue.Queue()
|
self.__output_queue = queue.Queue()
|
||||||
|
script_path = sys.executable
|
||||||
|
script_dir = QFileInfo(script_path).absoluteDir()
|
||||||
self.__config_paths = {
|
self.__config_paths = {
|
||||||
"system": "",
|
"system": QDir.toNativeSeparators(script_dir.absoluteFilePath("system.json")),
|
||||||
"users": "",
|
"users": QDir.toNativeSeparators(script_dir.absoluteFilePath("users.json")),
|
||||||
}
|
}
|
||||||
self.__alConfigWidget = None
|
self.__alConfigWidget = None
|
||||||
self.__auto_lib_thread = None
|
self.__auto_lib_thread = None
|
||||||
|
|||||||
Reference in New Issue
Block a user