mirror of
https://github.com/KenanZhu/AutoLibrary.git
synced 2026-06-18 23:43:02 +08:00
refactor(gui): 统一定时任务字段命名
- 将 task_uuid 字段重命名为 uuid,添加时间字段 add_time 重命名为 added_time
This commit is contained in:
@@ -334,7 +334,7 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
|
|||||||
1000
|
1000
|
||||||
)
|
)
|
||||||
self._showTrace(
|
self._showTrace(
|
||||||
f"定时任务 {timer_task['name']} 执行{'失败' if is_error else '完成'}, uuid: {timer_task['task_uuid']}"
|
f"定时任务 {timer_task['name']} 执行{'失败' if is_error else '完成'}, uuid: {timer_task['uuid']}"
|
||||||
)
|
)
|
||||||
if not is_error:
|
if not is_error:
|
||||||
self.timerTaskIsExecuted.emit(timer_task)
|
self.timerTaskIsExecuted.emit(timer_task)
|
||||||
|
|||||||
@@ -121,11 +121,11 @@ class ALTimerTaskAddDialog(QDialog, Ui_ALTimerTaskAddDialog):
|
|||||||
)
|
)
|
||||||
task_data = {
|
task_data = {
|
||||||
"name": name,
|
"name": name,
|
||||||
"task_uuid": uuid.uuid4().hex.upper() + f"-{added_time.strftime("%Y%m%d%H%M%S")}",
|
"uuid": uuid.uuid4().hex.upper() + f"-{added_time.strftime("%Y%m%d%H%M%S")}",
|
||||||
"time_type": self.TimerTypeComboBox.currentText(),
|
"time_type": self.TimerTypeComboBox.currentText(),
|
||||||
"execute_time": execute_time,
|
"execute_time": execute_time,
|
||||||
"silent": silent,
|
"silent": silent,
|
||||||
"add_time": added_time,
|
"added_time": added_time,
|
||||||
"status": ALTimerTaskStatus.PENDING,
|
"status": ALTimerTaskStatus.PENDING,
|
||||||
"executed": False,
|
"executed": False,
|
||||||
"repeat": self.RepeatCheckBox.isChecked(),
|
"repeat": self.RepeatCheckBox.isChecked(),
|
||||||
@@ -158,7 +158,6 @@ class ALTimerTaskAddDialog(QDialog, Ui_ALTimerTaskAddDialog):
|
|||||||
task_data["repeat_minute"],
|
task_data["repeat_minute"],
|
||||||
task_data["repeat_second"]
|
task_data["repeat_second"]
|
||||||
)
|
)
|
||||||
|
|
||||||
return task_data
|
return task_data
|
||||||
|
|
||||||
@Slot(int)
|
@Slot(int)
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ class ALTimerTaskHistoryDialog(QDialog):
|
|||||||
TaskNameLabel = QLabel(f"任务: {self.__task_data.get('name', '未命名')}")
|
TaskNameLabel = QLabel(f"任务: {self.__task_data.get('name', '未命名')}")
|
||||||
TaskNameLabel.setStyleSheet("font-weight: bold; font-size: 12px;")
|
TaskNameLabel.setStyleSheet("font-weight: bold; font-size: 12px;")
|
||||||
InfoLayout.addWidget(TaskNameLabel, 0, 0)
|
InfoLayout.addWidget(TaskNameLabel, 0, 0)
|
||||||
TaskUUIDLabel = QLabel(f"UUID: {self.__task_data.get('task_uuid', '未命名')}")
|
TaskUUIDLabel = QLabel(f"UUID: {self.__task_data.get('uuid', '未命名')}")
|
||||||
TaskUUIDLabel.setStyleSheet("color: #969696; font-size: 11px;")
|
TaskUUIDLabel.setStyleSheet("color: #969696; font-size: 11px;")
|
||||||
InfoLayout.addWidget(TaskUUIDLabel, 1, 0)
|
InfoLayout.addWidget(TaskUUIDLabel, 1, 0)
|
||||||
InfoLayout.setColumnStretch(0, 1)
|
InfoLayout.setColumnStretch(0, 1)
|
||||||
|
|||||||
@@ -221,7 +221,7 @@ class ALTimerTaskManageWidget(QWidget, Ui_ALTimerTaskManageWidget):
|
|||||||
timer_tasks = self.__cfg_mgr.get(ConfigManager.ConfigType.TIMERTASK)
|
timer_tasks = self.__cfg_mgr.get(ConfigManager.ConfigType.TIMERTASK)
|
||||||
if timer_tasks and "timer_tasks" in timer_tasks:
|
if timer_tasks and "timer_tasks" in timer_tasks:
|
||||||
for task in timer_tasks["timer_tasks"]:
|
for task in timer_tasks["timer_tasks"]:
|
||||||
task["add_time"] = datetime.strptime(task["add_time"], "%Y-%m-%d %H:%M:%S")
|
task["added_time"] = datetime.strptime(task["added_time"], "%Y-%m-%d %H:%M:%S")
|
||||||
task["execute_time"] = datetime.strptime(task["execute_time"], "%Y-%m-%d %H:%M:%S")
|
task["execute_time"] = datetime.strptime(task["execute_time"], "%Y-%m-%d %H:%M:%S")
|
||||||
task["status"] = ALTimerTaskStatus(task["status"])
|
task["status"] = ALTimerTaskStatus(task["status"])
|
||||||
if "history" in task:
|
if "history" in task:
|
||||||
@@ -245,7 +245,7 @@ class ALTimerTaskManageWidget(QWidget, Ui_ALTimerTaskManageWidget):
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
for task in timer_tasks:
|
for task in timer_tasks:
|
||||||
task["add_time"] = task["add_time"].strftime("%Y-%m-%d %H:%M:%S")
|
task["added_time"] = task["added_time"].strftime("%Y-%m-%d %H:%M:%S")
|
||||||
task["execute_time"] = task["execute_time"].strftime("%Y-%m-%d %H:%M:%S")
|
task["execute_time"] = task["execute_time"].strftime("%Y-%m-%d %H:%M:%S")
|
||||||
task["status"] = task["status"].value
|
task["status"] = task["status"].value
|
||||||
if "history" in task:
|
if "history" in task:
|
||||||
@@ -309,7 +309,7 @@ class ALTimerTaskManageWidget(QWidget, Ui_ALTimerTaskManageWidget):
|
|||||||
)
|
)
|
||||||
elif policy == self.SortPolicy.BY_ADD_TIME:
|
elif policy == self.SortPolicy.BY_ADD_TIME:
|
||||||
self.__timer_tasks.sort(
|
self.__timer_tasks.sort(
|
||||||
key = lambda x: x["add_time"],
|
key = lambda x: x["added_time"],
|
||||||
reverse = order is Qt.SortOrder.DescendingOrder
|
reverse = order is Qt.SortOrder.DescendingOrder
|
||||||
)
|
)
|
||||||
elif policy == self.SortPolicy.BY_EXECUTE_TIME:
|
elif policy == self.SortPolicy.BY_EXECUTE_TIME:
|
||||||
@@ -386,7 +386,7 @@ class ALTimerTaskManageWidget(QWidget, Ui_ALTimerTaskManageWidget):
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
f"任务名称:{timer_task["name"]}\n"
|
f"任务名称:{timer_task["name"]}\n"
|
||||||
f"添加时间:{timer_task["add_time"]}\n"
|
f"添加时间:{timer_task["added_time"]}\n"
|
||||||
f"当前状态:{timer_task["status"].value}\n"
|
f"当前状态:{timer_task["status"].value}\n"
|
||||||
f"下次执行时间:{datetime.strftime(timer_task["execute_time"], "%Y-%m-%d %H:%M:%S")}\n"
|
f"下次执行时间:{datetime.strftime(timer_task["execute_time"], "%Y-%m-%d %H:%M:%S")}\n"
|
||||||
f"已执行次数:{len(timer_task['history'] if 'history' in timer_task else 0)}"
|
f"已执行次数:{len(timer_task['history'] if 'history' in timer_task else 0)}"
|
||||||
@@ -414,10 +414,10 @@ class ALTimerTaskManageWidget(QWidget, Ui_ALTimerTaskManageWidget):
|
|||||||
result = msgbox.exec()
|
result = msgbox.exec()
|
||||||
if result != QMessageBox.StandardButton.Yes:
|
if result != QMessageBox.StandardButton.Yes:
|
||||||
return
|
return
|
||||||
task_uuid = timer_task["task_uuid"]
|
task_uuid = timer_task["uuid"]
|
||||||
self.__timer_tasks = [
|
self.__timer_tasks = [
|
||||||
x for x in self.__timer_tasks
|
x for x in self.__timer_tasks
|
||||||
if x["task_uuid"] != task_uuid
|
if x["uuid"] != task_uuid
|
||||||
]
|
]
|
||||||
self.timerTasksChanged.emit()
|
self.timerTasksChanged.emit()
|
||||||
|
|
||||||
@@ -563,7 +563,7 @@ class ALTimerTaskManageWidget(QWidget, Ui_ALTimerTaskManageWidget):
|
|||||||
):
|
):
|
||||||
|
|
||||||
for task in self.__timer_tasks:
|
for task in self.__timer_tasks:
|
||||||
if task["task_uuid"] == timer_task["task_uuid"]:
|
if task["uuid"] == timer_task["uuid"]:
|
||||||
task["status"] = ALTimerTaskStatus.RUNNING
|
task["status"] = ALTimerTaskStatus.RUNNING
|
||||||
break
|
break
|
||||||
self.timerTasksChanged.emit()
|
self.timerTasksChanged.emit()
|
||||||
@@ -590,7 +590,7 @@ class ALTimerTaskManageWidget(QWidget, Ui_ALTimerTaskManageWidget):
|
|||||||
"executed_time": executed_time.strftime("%Y-%m-%d %H:%M:%S"),
|
"executed_time": executed_time.strftime("%Y-%m-%d %H:%M:%S"),
|
||||||
"result": status,
|
"result": status,
|
||||||
"duration": duration,
|
"duration": duration,
|
||||||
"uuid": timer_task["task_uuid"]
|
"uuid": timer_task["uuid"]
|
||||||
})
|
})
|
||||||
else:
|
else:
|
||||||
current_time = datetime.now()
|
current_time = datetime.now()
|
||||||
@@ -604,7 +604,7 @@ class ALTimerTaskManageWidget(QWidget, Ui_ALTimerTaskManageWidget):
|
|||||||
"executed_time": (execute_time + timedelta(days=i)).strftime("%Y-%m-%d %H:%M:%S"),
|
"executed_time": (execute_time + timedelta(days=i)).strftime("%Y-%m-%d %H:%M:%S"),
|
||||||
"result": status,
|
"result": status,
|
||||||
"duration": 0,
|
"duration": 0,
|
||||||
"uuid": timer_task["task_uuid"]
|
"uuid": timer_task["uuid"]
|
||||||
})
|
})
|
||||||
next_time = TimerUtils.calculateNextRepeatTime(
|
next_time = TimerUtils.calculateNextRepeatTime(
|
||||||
timer_task["repeat_days"],
|
timer_task["repeat_days"],
|
||||||
@@ -627,7 +627,7 @@ class ALTimerTaskManageWidget(QWidget, Ui_ALTimerTaskManageWidget):
|
|||||||
):
|
):
|
||||||
|
|
||||||
for task in self.__timer_tasks:
|
for task in self.__timer_tasks:
|
||||||
if task["task_uuid"] == timer_task["task_uuid"]:
|
if task["uuid"] == timer_task["uuid"]:
|
||||||
if task.get("repeat", False):
|
if task.get("repeat", False):
|
||||||
self.onRepeatTimerTaskIs(ALTimerTaskStatus.EXECUTED, task)
|
self.onRepeatTimerTaskIs(ALTimerTaskStatus.EXECUTED, task)
|
||||||
else:
|
else:
|
||||||
@@ -642,7 +642,7 @@ class ALTimerTaskManageWidget(QWidget, Ui_ALTimerTaskManageWidget):
|
|||||||
):
|
):
|
||||||
|
|
||||||
for task in self.__timer_tasks:
|
for task in self.__timer_tasks:
|
||||||
if task["task_uuid"] == timer_task["task_uuid"]:
|
if task["uuid"] == timer_task["uuid"]:
|
||||||
if task.get("repeat", False):
|
if task.get("repeat", False):
|
||||||
self.onRepeatTimerTaskIs(ALTimerTaskStatus.ERROR, task)
|
self.onRepeatTimerTaskIs(ALTimerTaskStatus.ERROR, task)
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user