소스 검색

feat(gui): add task list overview

runhey 3 년 전
부모
커밋
e550efa31d

+ 1 - 0
module/config/config_menu.py

@@ -14,6 +14,7 @@ class ConfigMenu:
         self.menu = {}
         self.menu = {}
         # 总览
         # 总览
         self.menu["Overview"] = []
         self.menu["Overview"] = []
+        self.menu['TaskList'] = []
         # 脚本设置
         # 脚本设置
         self.menu['Script'] = ['Script', 'Restart', 'GlobalGame']
         self.menu['Script'] = ['Script', 'Restart', 'GlobalGame']
         # 刷御魂
         # 刷御魂

+ 24 - 0
module/config/config_modify.py

@@ -1,6 +1,9 @@
 # This Python file uses the following encoding: utf-8
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # @author runhey
 # github https://github.com/runhey
 # github https://github.com/runhey
+
+import json
+
 from module.config.config import Config
 from module.config.config import Config
 from module.config.utils import convert_to_underscore
 from module.config.utils import convert_to_underscore
 from module.config.config_model import ConfigModel
 from module.config.config_model import ConfigModel
@@ -66,3 +69,24 @@ class ConfigModify(Config):
         except ValidationError as e:
         except ValidationError as e:
             logger.error(e)
             logger.error(e)
             return False
             return False
+
+    def gui_task_list(self) -> str:
+        """
+        获取给gui显示的任务列表
+        :return:
+        """
+        result = {}
+        for key, value in self.model.dict().items():
+            if isinstance(value, str):
+                continue
+            if key == "restart":
+                continue
+            if "scheduler" not in value:
+                continue
+
+            scheduler = value["scheduler"]
+            item = {"enable": scheduler["enable"],
+                    "next_run": str(scheduler["next_run"])}
+            key = self.config.model.type(key)
+            result[key] = item
+        return json.dumps(result)

BIN
module/config/i18n/zh_CN.qm


+ 44 - 60
module/config/i18n/zh_CN.ts

@@ -118,18 +118,10 @@
 </context>
 </context>
 <context>
 <context>
     <name>FluTreeView</name>
     <name>FluTreeView</name>
-    <message>
-        <source>Home</source>
-        <translation>主页</translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation>更新</translation>
-    </message>
-    <message>
-        <source>Overview</source>
-        <translation>总览</translation>
-    </message>
+    <message><source>Home</source><translation>主页</translation></message>
+    <message><source>Update</source><translation>更新</translation></message>
+    <message><source>Overview</source><translation>总览</translation></message>
+	<message><source>TaskList</source><translation>任务总览</translation></message>
     <message>
     <message>
         <source>Script</source>
         <source>Script</source>
         <translation>脚本</translation>
         <translation>脚本</translation>
@@ -166,54 +158,46 @@
         <source>Swipe Rule</source>
         <source>Swipe Rule</source>
         <translation>滑动规范</translation>
         <translation>滑动规范</translation>
     </message>
     </message>
-    <message>
-        <source>Daily Task</source>
-        <translation>日常任务</translation>
-    </message>
-    <message>
-        <source>AreaBoss</source>
-        <translation>地狱鬼王</translation>
-    </message>
-    <message>
-        <source>GoldYoukai</source>
-        <translation>金币妖怪</translation>
-    </message>
-    <message>
-        <source>ExperienceYoukai</source>
-        <translation>经验妖怪</translation>
-    </message>
-    <message>
-        <source>Nian</source>
-        <translation>年兽</translation>
-    </message>
-    <message>
-        <source>Soul Zones</source>
-        <translation>御魂副本</translation>
-    </message>
-    <message>
-        <source>Orochi</source>
-        <translation>八岐大蛇</translation>
-    </message>
-    <message>
-        <source>OrochiMoans</source>
-        <translation>御魂悲鸣</translation>
-    </message>
-    <message>
-        <source>OrochiJudgement</source>
-        <translation>御魂神罚</translation>
-    </message>
-    <message>
-        <source>Sougenbi</source>
-        <translation>业原火</translation>
-    </message>
-    <message>
-        <source>FallenSun</source>
-        <translation>日轮之城</translation>
-    </message>
-    <message>
-        <source>EternitySea</source>
-        <translation>永生之海</translation>
-    </message>
+    <message><source>Daily Task</source><translation>日常任务</translation></message>
+    <message><source>AreaBoss</source><translation>地狱鬼王</translation></message>
+    <message><source>GoldYoukai</source><translation>金币妖怪</translation></message>
+    <message><source>ExperienceYoukai</source><translation>经验妖怪</translation></message>
+    <message><source>Nian</source><translation>年兽</translation></message>
+    <message><source>Soul Zones</source><translation>御魂副本</translation></message>
+    <message><source>Orochi</source><translation>八岐大蛇</translation></message>
+	<message><source>OrochiMoans</source><translation>御魂悲鸣</translation></message>
+    <message><source>OrochiJudgement</source><translation>御魂神罚</translation></message>
+    <message><source>Sougenbi</source><translation>业原火</translation></message>
+    <message><source>FallenSun</source><translation>日轮之城</translation></message>
+    <message><source>EternitySea</source><translation>永生之海</translation></message>
+	<message><source>GlobalGame</source><translation>全局游戏设置</translation></message>
+	<message><source>RealmRaid</source><translation>个人突破</translation></message>
+	<message><source>RyouToppa</source><translation>寮突破</translation></message>
+	<message><source>List Rule</source><translation>列表规则</translation></message>
+	<message><source>Activity Task</source><translation>限时活动</translation></message>
+	<message><source>ActivityShikigami</source><translation>当期式神爬塔</translation></message>
+	<message><source>Liver Emperor Exclusive</source><translation>肝帝专属</translation></message>
+	<message><source>BondlingFairyland</source><translation>契灵之境</translation></message>
+	<message><source>Weekly Task</source><translation>每周任务</translation></message>
+	<message><source>TrueOrochi</source><translation>真·八岐大蛇</translation></message>
+	<message><source>KekkaiUtilize</source><translation>结界蹭卡</translation></message>
+	<message><source>KekkaiActivation</source><translation>结界挂卡</translation></message>
+	<message><source>DemonEncounter</source><translation>封魔之时</translation></message>
+</context>
+<context>
+    <name>TaskList</name>
+	    <message><source>Daily Task</source><translation>日常任务</translation></message>
+    <message><source>AreaBoss</source><translation>地狱鬼王</translation></message>
+    <message><source>GoldYoukai</source><translation>金币妖怪</translation></message>
+    <message><source>ExperienceYoukai</source><translation>经验妖怪</translation></message>
+    <message><source>Nian</source><translation>年兽</translation></message>
+    <message><source>Soul Zones</source><translation>御魂副本</translation></message>
+    <message><source>Orochi</source><translation>八岐大蛇</translation></message>
+	<message><source>OrochiMoans</source><translation>御魂悲鸣</translation></message>
+    <message><source>OrochiJudgement</source><translation>御魂神罚</translation></message>
+    <message><source>Sougenbi</source><translation>业原火</translation></message>
+    <message><source>FallenSun</source><translation>日轮之城</translation></message>
+    <message><source>EternitySea</source><translation>永生之海</translation></message>
 	<message><source>GlobalGame</source><translation>全局游戏设置</translation></message>
 	<message><source>GlobalGame</source><translation>全局游戏设置</translation></message>
 	<message><source>RealmRaid</source><translation>个人突破</translation></message>
 	<message><source>RealmRaid</source><translation>个人突破</translation></message>
 	<message><source>RyouToppa</source><translation>寮突破</translation></message>
 	<message><source>RyouToppa</source><translation>寮突破</translation></message>

+ 16 - 2
module/gui/context/process_manager.py

@@ -289,7 +289,7 @@ class ProcessManager(QObject):
         """
         """
         if config in self.clients:
         if config in self.clients:
             logger.info(f'gui set value of {config} {task}')
             logger.info(f'gui set value of {config} {task}')
-            if self.clients[config].gui_set_task(task, group, arg, value):
+            if self.check_script(config).gui_set_task(task, group, arg, value):
                 return True
                 return True
             else:
             else:
                 return False
                 return False
@@ -310,7 +310,7 @@ class ProcessManager(QObject):
         """
         """
         if config in self.clients:
         if config in self.clients:
             logger.info(f'gui set value of {config} {task}')
             logger.info(f'gui set value of {config} {task}')
-            if self.clients[config].gui_set_task(task, group, arg, value):
+            if self.check_script(config).gui_set_task(task, group, arg, value):
                 return True
                 return True
             else:
             else:
                 return False
                 return False
@@ -347,6 +347,20 @@ class ProcessManager(QObject):
             logger.info(f'script {config} is not running')
             logger.info(f'script {config} is not running')
             return None
             return None
 
 
+
+
+    @Slot(str, result="QString")
+    def gui_task_list(self, config: str) -> str:
+        if config in self.clients:
+            logger.info(f'Gui get {config} task list')
+            return self.check_script(config).gui_task_list()
+        else:
+            logger.info(f'Script {config} is not running')
+            return None
+
+
+
+
     def start_log(self, config_name: str) -> Queue:
     def start_log(self, config_name: str) -> Queue:
         """
         """
         启动某个脚本实例config_name的log: 具体为创建一个queue信息队列,然后创建一个log线程,将queue传入log线程
         启动某个脚本实例config_name的log: 具体为创建一个queue信息队列,然后创建一个log线程,将queue传入log线程

+ 1 - 0
module/gui/qml.qrc

@@ -34,5 +34,6 @@
         <file>qml/Content/ListRule.qml</file>
         <file>qml/Content/ListRule.qml</file>
         <file>qml/Component/RuleFile2.qml</file>
         <file>qml/Component/RuleFile2.qml</file>
         <file>qml/Content/NotifyTest.qml</file>
         <file>qml/Content/NotifyTest.qml</file>
+        <file>qml/Content/TaskList.qml</file>
     </qresource>
     </qresource>
 </RCC>
 </RCC>

+ 191 - 0
module/gui/qml/Content/TaskList.qml

@@ -0,0 +1,191 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import FluentUI
+import '../Global'
+
+
+Item{
+    id: taskList
+    signal click(string title)
+    onClick: {
+
+    }
+
+    FluScrollablePage{
+        id: contentScrollable
+        width: 800
+        height: parent.height
+        spacing: 12
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+
+    // 任务组
+    Component{
+        id: group_item
+        FluExpander{
+            id: expander
+            property string groupName: ""
+            property string groupTitle: ""
+            property var argumentValue: {""}
+            property alias model: groupModel
+            expand: true
+            headerText: qsTr(groupTitle)
+            width: contentScrollable.width
+            contentHeight: groupGridView.height + 20
+            ListModel{
+                id: groupModel
+            }
+
+            GridLayout{
+                id: groupGridView
+                clip: true
+                columns: 3
+                anchors{
+                    top: parent.top
+                    topMargin: 12
+                    left: parent.left
+                    leftMargin: 12
+                    right: parent.right
+                    rightMargin: 15
+                    bottomMargin: 12
+                }
+                Repeater {
+                    delegate: task_item
+                    model: groupModel
+                }
+            }
+        }
+    }
+
+    // 任务小项
+    Component{
+        id: task_item
+        FluArea{
+            id: task_root
+            width: 250
+            height: 50
+            visible: true
+            color: FluTheme.dark ? Window.active ?  Qt.rgba(38/255,44/255,54/255,1) : Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
+
+            property alias name: taskName.text
+            property alias nextRun: taskTime.text
+            property alias enable: taskEnable.selected
+
+
+            FluText{
+                id: taskName
+                anchors{
+                    left: parent.left
+                    leftMargin: 6
+                    top: parent.top
+                    topMargin: 6
+                }
+                text: qsTr( model.task)
+                font: FluTextStyle.BodyStrong
+            }
+            FluText{
+                id: taskTime
+                anchors{
+                    left: parent.left
+                    leftMargin: 6
+                    bottom: parent.bottom
+                    bottomMargin: 6
+                }
+                text: model.next_run
+                font: FluTextStyle.Caption
+            }
+            FluCheckBox{
+                id: taskEnable
+                anchors{
+                    right: settingButton.left
+                    rightMargin: 6
+                    verticalCenter: parent.verticalCenter
+                }
+                selected: model.enable
+//                onSelectedChanged: {
+//                    if(process_manager.gui_set_task_bool(MainEvent.scriptName, task_root.name, 'scheduler', 'enable', selected)){
+//                        showSuccess("Enable")
+//                        return true
+//                    }
+//                    showSuccess('Disenable')
+//                }
+                clickFunc: function click_func(){
+                    selected = !selected
+                    if(process_manager.gui_set_task_bool(MainEvent.scriptName, task_root.name, 'scheduler', 'enable', selected)){
+                        showSuccess("Enable")
+                        return true
+                    }
+                    showSuccess('Disenable')
+                }
+
+                text: ''
+            }
+
+            FluButton{
+                id: settingButton
+                anchors{
+                    right: parent.right
+                    rightMargin: 10
+                    verticalCenter: parent.verticalCenter
+                }
+                text:"setting"
+                onClicked: {
+                    showSuccess(name)
+                    taskList.click(name)
+                    taskList.parent.parent.title = model.task
+                }
+            }
+        }
+    }
+
+
+
+    Component.onCompleted:{
+
+        const data = JSON.parse(process_manager.gui_task_list(MainEvent.scriptName))
+        const menu = JSON.parse(process_manager.gui_menu())
+        for(const key in menu){
+            if(key === "Overview" || key === 'TaskList' || key === 'Script' || key === 'Tools'){
+                continue
+            }
+            const groupData = classify(menu[key], data)
+            create_group(key, groupData)
+        }
+
+    }
+
+    // 分类对每一个任务组,
+    // 第一个参数是这个菜单组的所有, 如["Script", "Restart", "GlobalGame"]
+    // 第二个参数是整个的数据
+    // 会提取data的数据 返回一个dict
+    function classify(group, data){
+        const result = {}
+        for(const item in data){
+            if(group.includes(item)){
+                result[item] = data[item]
+            }
+        }
+        return result
+    }
+    // 创建一个的任务组
+    function create_group(groupName, groupData){
+        const object = group_item.createObject(contentScrollable)
+        if(object === null){
+            console.error('Create group item failed!')
+        }
+        object.groupName = groupName
+        object.groupTitle = qsTr(groupName)
+        object.argumentValue = groupData
+        for(const key in groupData){
+            const item ={"task": key,
+                          "enable": groupData[key]["enable"],
+                         "next_run": groupData[key]["next_run"]}
+            object.model.append(item)
+
+        }
+
+        contentScrollable.content.push(object)
+
+    }
+}

+ 10 - 0
module/gui/qml/Page/ScriptView.qml

@@ -74,6 +74,16 @@ SplitPanel{
             }
             }
             setLoader(component)
             setLoader(component)
         }
         }
+        else if(title === "TaskList"){
+            const component = Qt.createComponent("../../qml/Content/TaskList.qml")
+            if(component.status !== Component.Ready){
+                console.error("TaskList component is not ready")
+                return
+            }
+            setLoader(component)
+        }
+
+
         //最后才是一般的参数页面
         //最后才是一般的参数页面
         else{
         else{
             const component = Qt.createComponent("../../qml/Component/Args.qml")
             const component = Qt.createComponent("../../qml/Component/Args.qml")

+ 36 - 3
script.py

@@ -11,6 +11,7 @@ import time
 import os
 import os
 import inflection
 import inflection
 import asyncio
 import asyncio
+import json
 
 
 from typing import Callable
 from typing import Callable
 from datetime import datetime, timedelta
 from datetime import datetime, timedelta
@@ -23,6 +24,7 @@ from threading import Thread
 
 
 from module.config.utils import convert_to_underscore
 from module.config.utils import convert_to_underscore
 from module.config.config import Config
 from module.config.config import Config
+from module.config.config_model import ConfigModel
 from module.device.device import Device
 from module.device.device import Device
 from module.base.utils import load_module
 from module.base.utils import load_module
 from module.base.decorator import del_cached_property
 from module.base.decorator import del_cached_property
@@ -227,6 +229,38 @@ class Script:
         if self.gui_update_task is not None:
         if self.gui_update_task is not None:
             self.gui_update_task(data)
             self.gui_update_task(data)
 
 
+
+    def gui_task_list(self) -> str:
+        """
+        获取给gui显示的任务列表
+        :return:
+        """
+        result = {}
+        for key, value in self.config.model.dict().items():
+            if isinstance(value, str):
+                continue
+            if key == "restart":
+                continue
+            if "scheduler" not in value:
+                continue
+
+            scheduler = value["scheduler"]
+            item = {"enable": scheduler["enable"],
+                    "next_run": str(scheduler["next_run"])}
+            key = self.config.model.type(key)
+            result[key] = item
+        return json.dumps(result)
+
+
+
+
+
+
+
+
+
+
+
     def wait_until(self, future):
     def wait_until(self, future):
         """
         """
         Wait until a specific time.
         Wait until a specific time.
@@ -444,6 +478,5 @@ class Script:
 
 
 if __name__ == "__main__":
 if __name__ == "__main__":
     script = Script("oas1")
     script = Script("oas1")
-    # print(script.get_next_task())
-    # script.run("ActivityShikigami")
-    script.run('AreaBoss')
+    print(script.gui_task_list())
+    print(script.config.gui_menu)