mirror of
https://github.com/KenanZhu/AutoLibrary.git
synced 2026-06-18 07:23:03 +08:00
feat(ALConfigWidget): 大更新 - 用户树状列表和其它
1. 在这个 commit 中,我们思考了许久,最终决定将现有的 用户管理列表转为树状列表,以解决用户数量增多时,用户的 选择性管理,分组等问题。 2. 同时因为该更改需要重构很多内容,我们也在该 commit 中决定将所有‘系统配置’更换为‘运行配置’,同时文件名称和 内容变量也相应变为‘run’和‘user’。 3. 重构 AutoLib 和 ALMainWorkers 中的配置相关代码, 以适应新的用户树状列表。 当前迭代更新至 v1.0.0-beta.4, 同时,在该版本的 rc 阶段前,我们计划不再发布 beta 阶段相关的 release
This commit is contained in:
+54
-11
@@ -63,6 +63,35 @@ class AutoLibWorker(QThread):
|
||||
return True
|
||||
|
||||
|
||||
def loadConfigs(
|
||||
self
|
||||
) -> bool:
|
||||
|
||||
self.showTraceSignal.emit(
|
||||
f"正在加载配置文件, 运行配置文件路径: {self.__config_paths["run"]}"
|
||||
)
|
||||
self.__run_config = ConfigReader(
|
||||
self.__config_paths["run"]
|
||||
).getConfigs()
|
||||
self.showTraceSignal.emit(
|
||||
f"正在加载配置文件, 用户配置文件路径: {self.__config_paths["user"]}"
|
||||
)
|
||||
self.__user_config = ConfigReader(
|
||||
self.__config_paths["user"]
|
||||
).getConfigs()
|
||||
if self.__run_config is None or self.__user_config is None:
|
||||
self.showTraceSignal.emit(
|
||||
"配置文件加载失败, 请检查配置文件是否正确。"
|
||||
)
|
||||
return False
|
||||
if not self.__user_config.get("groups"):
|
||||
self.showTraceSignal.emit(
|
||||
"用户配置文件中无有效任务组, 请检查用户配置文件是否正确"
|
||||
)
|
||||
return False
|
||||
return True
|
||||
|
||||
|
||||
def run(
|
||||
self
|
||||
):
|
||||
@@ -71,21 +100,39 @@ class AutoLibWorker(QThread):
|
||||
try:
|
||||
if not self.checkTimeAvailable():
|
||||
self.showTraceSignal.emit(
|
||||
"当前时间不在图书馆开放时间内。\n"\
|
||||
"当前时间不在图书馆开放时间内\n"\
|
||||
" 请在 07:30 - 23:30 之间尝试"
|
||||
)
|
||||
return
|
||||
if not self.checkConfigPaths():
|
||||
return
|
||||
self.showTraceSignal.emit("AutoLibrary 开始运行")
|
||||
if not self.loadConfigs():
|
||||
return
|
||||
auto_lib = AutoLib(
|
||||
self.__input_queue,
|
||||
self.__output_queue,
|
||||
self.__run_config
|
||||
)
|
||||
auto_lib.run(
|
||||
ConfigReader(self.__config_paths["system"]),
|
||||
ConfigReader(self.__config_paths["users"]),
|
||||
)
|
||||
if auto_lib is None:
|
||||
self.showTraceSignal.emit(
|
||||
"AutoLibrary 初始化失败"
|
||||
)
|
||||
return
|
||||
groups = self.__user_config.get("groups")
|
||||
for group in groups:
|
||||
time.sleep(0.2) # wait for the message queue to be empty
|
||||
if not group["enabled"]:
|
||||
self.showTraceSignal.emit(
|
||||
f"任务组 {group["name"]} 已跳过"
|
||||
)
|
||||
continue
|
||||
self.showTraceSignal.emit(
|
||||
f"正在运行任务组 {group["name"]}"
|
||||
)
|
||||
auto_lib.run(
|
||||
{ "users": group.get("users", []) }
|
||||
)
|
||||
except Exception as e:
|
||||
self.showTraceSignal.emit(
|
||||
f"AutoLibrary 运行时发生异常 : {e}"
|
||||
@@ -93,6 +140,7 @@ class AutoLibWorker(QThread):
|
||||
finally:
|
||||
if auto_lib:
|
||||
auto_lib.close()
|
||||
time.sleep(0.2) # wait for the message queue to be empty
|
||||
self.showTraceSignal.emit("AutoLibrary 运行结束")
|
||||
self.finishedSignal.emit()
|
||||
|
||||
@@ -109,14 +157,9 @@ class TimerTaskWorker(AutoLibWorker):
|
||||
config_paths: dict
|
||||
):
|
||||
|
||||
super().__init__(
|
||||
input_queue,
|
||||
output_queue,
|
||||
config_paths,
|
||||
)
|
||||
super().__init__(input_queue, output_queue, config_paths)
|
||||
|
||||
self.__timer_task = timer_task
|
||||
self.__stopped = False
|
||||
|
||||
def run(
|
||||
self
|
||||
|
||||
Reference in New Issue
Block a user