feat: 初步优化调度队列样式
This commit is contained in:
@@ -20,11 +20,9 @@
|
||||
# Contact: DLmaster_361@163.com
|
||||
|
||||
|
||||
import uuid
|
||||
import asyncio
|
||||
from fastapi import APIRouter, WebSocket, WebSocketDisconnect, Body, Path
|
||||
from fastapi import APIRouter, Body
|
||||
|
||||
from app.core import TaskManager, Broadcast
|
||||
from app.core import TaskManager
|
||||
from app.services import System
|
||||
from app.models.schema import *
|
||||
|
||||
|
||||
@@ -170,8 +170,8 @@ class QueueItem(ConfigBase):
|
||||
self.Info_ScriptId = ConfigItem(
|
||||
"Info",
|
||||
"ScriptId",
|
||||
None,
|
||||
MultipleUIDValidator(None, self.related_config, "ScriptConfig"),
|
||||
"-",
|
||||
MultipleUIDValidator("-", self.related_config, "ScriptConfig"),
|
||||
)
|
||||
|
||||
|
||||
@@ -928,7 +928,7 @@ class AppConfig(GlobalConfig):
|
||||
{
|
||||
"Info": {
|
||||
"ScriptId": script_dict.get(
|
||||
queue_config["Queue"][f"Script_{i}"], None
|
||||
queue_config["Queue"][f"Script_{i}"], "-"
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -133,7 +133,7 @@ class _TaskManager:
|
||||
|
||||
task_list = []
|
||||
for queue_item in queue.QueueItem.values():
|
||||
if queue_item.get("Info", "ScriptId") is None:
|
||||
if queue_item.get("Info", "ScriptId") == "-":
|
||||
continue
|
||||
script_id = uuid.UUID(queue_item.get("Info", "ScriptId"))
|
||||
script = Config.ScriptConfig[script_id]
|
||||
|
||||
Reference in New Issue
Block a user