Ver código fonte

feat(atom): assets_extract

runhey 3 anos atrás
pai
commit
2bf7424b5f

+ 3 - 4
module/config/config_model.py

@@ -1,17 +1,16 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
-import json
 
 from pathlib import Path
-from pydantic import BaseModel, ValidationError, validator, Field, root_validator
+from pydantic import BaseModel, ValidationError, Field
 
 from module.config.utils import *
 from module.logger import logger
 
 # 导入配置的Python文件
-from module.tasks.Script.config import Script
-from module.tasks.Restart.config import Restart
+from tasks.Script.config import Script
+from tasks.Restart.config import Restart
 
 
 

+ 284 - 0
module/dev_tools/assets_extract.py

@@ -0,0 +1,284 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+import json
+import numpy as np
+
+# from tqdm.contrib.concurrent import process_map
+from pathlib import Path
+
+from module.logger import logger
+
+MODULE_FOLDER = 'tasks'
+ASSETS_FILE = 'assets.py'
+ASSETS_CLASS = '\nclass Assets: \n'
+IMPORT_EXP = """
+from module.atom.image import RuleImage
+from module.atom.click import RuleClick
+from module.atom.long_click import RuleLongClick
+from module.atom.swipe import RuleSwipe
+
+# This file was automatically generated by module/dev_tools/assets_extract.py.
+# Don't modify it manually.
+"""
+IMPORT_EXP = IMPORT_EXP.strip().split('MODULE_FOLDER') + ['']
+
+
+
+def name_transform(name: str) -> str:
+    """
+    转换名称, 把小写的转化为大写的, 带有数字的不变,有下划线继续有下划线,
+    如果是全部的大写就不管
+    :param name: 任务名
+    :return: 转换后的名称
+    """
+    if name.isupper():
+        return name
+    if name.islower():
+        return name.upper()
+    return name.upper()
+
+class ImageExtractor:
+
+    def __init__(self, file: str, data: list) -> None:
+        """
+        image rule 提取
+        :param data:  json解析后的数据
+        """
+        # 这个时候的路径分隔符变成了 /
+        self.file = str(Path(file).resolve().relative_to((Path.cwd()).resolve()).as_posix())
+        self.image_path = Path(self.file).parent.as_posix()
+
+        self._result = '\n\t# Image Rule Assets\n'
+        for item in data:
+            self._result += self.extract_item(item)
+
+    @property
+    def result(self) -> str:
+        return self._result
+
+
+    def extract_item(self, item) -> str:
+        """
+        解析每一项,返回字符串
+        :param item:
+        :return:
+        """
+        description: str = f'\t# {item["description"]} \n'
+        name: str = f'\tI_{name_transform(item["itemName"])} = RuleImage(' \
+                    f'roi_front=({item["roiFront"]}), ' \
+                    f'roi_back=({item["roiBack"]}), ' \
+                    f'threshold={item["threshold"]}, ' \
+                    f'method="{item["method"]}", ' \
+                    f'file="./{self.image_path}/{item["imageName"]}")\n'
+        return description + name
+
+class ClickExtractor:
+
+    def __init__(self, file: str, data: list) -> None:
+        """
+        click rule 提取
+        :param data:  json解析后的数据
+        """
+        self._result = '\t# Click Rule Assets\n'
+        for item in data:
+            self._result += self.extract_item(item)
+
+    @property
+    def result(self) -> str:
+        return self._result
+
+    def extract_item(self, item) -> str:
+        """
+        解析每一项,返回字符串
+        :param item:
+        :return:
+        """
+        description: str = f'\t# {item["description"]} \n'
+        name: str = f'\tC_{name_transform(item["itemName"])} = RuleClick(' \
+                    f'roi_front=({item["roiFront"]}), ' \
+                    f'roi_back=({item["roiBack"]}))\n'
+        return description + name
+
+class LongClickExtractor:
+
+    def __init__(self, file: str, data: list) -> None:
+        """
+        long click rule 提取
+        :param data:  json解析后的数据
+        """
+        self._result = '\t# Long Click Rule Assets\n'
+        for item in data:
+            self._result += self.extract_item(item)
+
+    @property
+    def result(self) -> str:
+        return self._result
+
+    def extract_item(self, item) -> str:
+        """
+        解析每一项,返回字符串
+        :param item:
+        :return:
+        """
+        description: str = f'\t# {item["description"]} \n'
+        name: str = f'\tL_{name_transform(item["itemName"])} = RuleLongClick(' \
+                    f'roi_front=({item["roiFront"]}), ' \
+                    f'roi_back=({item["roiBack"]}), ' \
+                    f'duration={item["duration"]})\n'
+        return description + name
+
+class SwipeExtractor:
+
+    def __init__(self, file: str, data: list) -> None:
+        """
+        swipe rule 提取
+        :param data:  json解析后的数据
+        """
+        self._result = '\t# Swipe Rule Assets\n'
+        for item in data:
+            self._result += self.extract_item(item)
+
+    @property
+    def result(self) -> str:
+        return self._result
+
+    def extract_item(self, item) -> str:
+        """
+        解析每一项,返回字符串
+        :param item:
+        :return:
+        """
+        description: str = f'\t# {item["description"]} \n'
+        name: str = f'\tS_{name_transform(item["itemName"])} = RuleSwipe(' \
+                    f'roi_front=({item["roiFront"]}), ' \
+                    f'roi_back=({item["roiBack"]}), ' \
+                    f'mode="{item["mode"]}")\n'
+        return description + name
+
+
+class AssetsExtractor:
+
+    def __init__(self, task_name: str) -> None:
+        """
+        assets 提取某个任务文件夹下的所以的资源
+        :param task_name: 任务名
+        """
+        self.task_name = task_name
+        self.task_path = Path.cwd() / MODULE_FOLDER / task_name
+        self.assets_file = Path.cwd() / MODULE_FOLDER / task_name / ASSETS_FILE
+
+        self._result = ''
+        for import_exp in IMPORT_EXP:
+            self._result += import_exp
+        self._result += ASSETS_CLASS
+
+
+    def all_json_file(self) -> list:
+        """
+        获取所有json文件
+        :return: json文件(带后缀)列表
+        """
+        return [str(x) for x in self.task_path.rglob('*.json')]
+
+    @classmethod
+    def read_file(cls, file: str) -> list:
+        """
+        读文件并随带解析
+        :param file:
+        :return:
+        """
+        with open(file, 'r', encoding='utf-8') as f:
+            data = json.load(f)
+        if not isinstance(data, list):
+            logger.error(f'{file} 文件解析错误,不是list')
+            return None
+        return data
+
+    @classmethod
+    def is_image_file(cls, data: list) -> bool:
+        """
+        判断是不是imagerule 文件
+        :param data: 解析后的json数据,是list
+        :return:
+        """
+        item = data[0]
+        if 'imageName' in item:
+            return True
+        return False
+
+    @classmethod
+    def is_click_file(cls, data: list) -> bool:
+        """
+        判断是不是clickrule 文件, 我这样的判断是有点不合规的
+        :param data: 解析后的json数据,是list
+        :return:
+        """
+        item = data[0]
+        return len(item) == 4
+
+    @classmethod
+    def is_long_click_file(cls, data: list) -> bool:
+        """
+        判断是不是longclickrule 文件
+        :param data: 解析后的json数据,是list
+        :return:
+        """
+        item = data[0]
+        if 'duration' in item:
+            return True
+        return False
+
+    @classmethod
+    def is_swipe_file(cls, data: list) -> bool:
+        """
+        判断是不是swiperule 文件
+        :param data: 解析后的json数据,是list
+        :return:
+        """
+        item = data[0]
+        if 'mode' in item:
+            return True
+        return False
+
+    def write_file(self) -> None:
+        """
+        将自身的_resule写入文件
+        :return:
+        """
+        with open(self.assets_file, 'w', encoding='utf-8') as f:
+            f.write(self._result)
+
+    def extract(self) -> str:
+        """
+        生成一个assets.py文件
+        :return:
+        """
+        for file in self.all_json_file():
+            data = self.read_file(file)
+            if not data:
+                continue
+            if self.is_image_file(data):
+                self._result += ImageExtractor(file, data).result
+            elif self.is_click_file(data):
+                self._result += ClickExtractor(file, data).result
+            elif self.is_long_click_file(data):
+                self._result += LongClickExtractor(file, data).result
+            elif self.is_swipe_file(data):
+                self._result += SwipeExtractor(file, data).result
+
+        self._result += '\n\n'
+        self.write_file()
+
+
+class AllAssetsExtractor:
+    pass
+
+
+if __name__ == "__main__":
+    c = AssetsExtractor('CoinChallenge')
+    # print(c.assets_file)
+    # print(c.task_path)
+    # print(c.all_json_file())
+
+    c.extract()

+ 3 - 3
module/gui/qml/Content/ImageRule.qml

@@ -303,7 +303,7 @@ Item {
             onClicked: {
                 const i = ruleFile.file.lastIndexOf("/")
                 const imagepath = ruleFile.file.substring(0, i)
-                mirrorImage.save_target_image(ruleFile.currentItem.roiFront, imagepath +"/"+ruleFile.currentItem.imageName + ".png")
+                mirrorImage.save_target_image(ruleFile.currentItem.roiFront, imagepath +"/"+ruleFile.currentItem.imageName)
                 showSuccess("Save target image")
             }
         }
@@ -312,7 +312,7 @@ Item {
     function add(){
         const item ={}
         item["itemName"] = "new"
-        item["imageName"] = "image name"
+        item["imageName"] = "image_name.png"
         item["roiFront"] = "0,0,100,100"
         item["roiBack"] = "0,0,100,100"
         item["method"] = "Template matching"
@@ -323,7 +323,7 @@ Item {
     }
 
     function edit(model){
-        model.imageName = ruleFile.folder +"_"+ model.itemName
+        model.imageName = ruleFile.folder +"_"+ model.itemName + ".png"
     }
 
     function save(){

+ 0 - 29
module/tasks/CoinChallenge/res/test.json

@@ -1,29 +0,0 @@
-[
-    {
-        "itemName": "new1",
-        "imageName": "res_new1",
-        "roiFront": "157,240,70,79",
-        "roiBack": "41,185,279,207",
-        "method": "Template matching",
-        "threshold": 0.8,
-        "description": "description"
-    },
-    {
-        "itemName": "new2",
-        "imageName": "res_new2",
-        "roiFront": "362,243,100,100",
-        "roiBack": "803,101,100,100",
-        "method": "Template matching",
-        "threshold": 0.8,
-        "description": "description"
-    },
-    {
-        "itemName": "new3",
-        "imageName": "res_new3",
-        "roiFront": "568,212,240,220",
-        "roiBack": "0,0,100,100",
-        "method": "Template matching",
-        "threshold": 0.9,
-        "description": "desc55"
-    }
-]

+ 0 - 20
module/tasks/CoinChallenge/res/test_click.json

@@ -1,20 +0,0 @@
-[
-    {
-        "itemName": "new1",
-        "roiFront": "268,268,100,100",
-        "roiBack": "614,214,100,100",
-        "description": "description"
-    },
-    {
-        "itemName": "new2",
-        "roiFront": "171,236,100,100",
-        "roiBack": "554,225,100,100",
-        "description": "description"
-    },
-    {
-        "itemName": "new3",
-        "roiFront": "180,150,100,100",
-        "roiBack": "596,247,100,100",
-        "description": "desc444n"
-    }
-]

+ 0 - 23
module/tasks/CoinChallenge/res/test_long_click.json

@@ -1,23 +0,0 @@
-[
-    {
-        "itemName": "new1",
-        "roiFront": "208,151,100,100",
-        "roiBack": "542,279,100,100",
-        "duration": 1500,
-        "description": "description"
-    },
-    {
-        "itemName": "new2",
-        "roiFront": "355,191,100,100",
-        "roiBack": "526,323,100,100",
-        "duration": 1500,
-        "description": "description"
-    },
-    {
-        "itemName": "new3",
-        "roiFront": "112,156,100,100",
-        "roiBack": "469,200,100,100",
-        "duration": 1000,
-        "description": "de66666n"
-    }
-]

+ 0 - 30
module/tasks/CoinChallenge/res/test_swipe.json

@@ -1,30 +0,0 @@
-[
-    {
-        "itemName": "new1",
-        "roiFront": "253,212,100,100",
-        "roiBack": "652,292,100,100",
-        "mode": "default",
-        "description": "description"
-    },
-    {
-        "itemName": "new2",
-        "roiFront": "265,272,100,100",
-        "roiBack": "622,338,100,100",
-        "mode": "default",
-        "description": "description"
-    },
-    {
-        "itemName": "new3",
-        "roiFront": "198,160,100,100",
-        "roiBack": "626,305,100,100",
-        "mode": "default",
-        "description": "description"
-    },
-    {
-        "itemName": "new4",
-        "roiFront": "150,145,100,100",
-        "roiBack": "535,199,100,100",
-        "mode": "vector",
-        "description": "description"
-    }
-]

+ 41 - 0
tasks/CoinChallenge/assets.py

@@ -0,0 +1,41 @@
+from module.atom.image import RuleImage
+from module.atom.click import RuleClick
+from module.atom.long_click import RuleLongClick
+from module.atom.swipe import RuleSwipe
+
+# This file was automatically generated by module/dev_tools/assets_extract.py.
+# Don't modify it manually.
+class Assets: 
+
+	# Image Rule Assets
+	# description 
+	I_NEW1 = RuleImage(roi_front=(157,240,70,79), roi_back=(41,185,279,207), threshold=0.8, method="Template matching", file="./tasks/CoinChallenge/res/res_new1.png")
+	# description 
+	I_NEW2 = RuleImage(roi_front=(362,243,100,100), roi_back=(803,101,100,100), threshold=0.8, method="Template matching", file="./tasks/CoinChallenge/res/res_new2.png")
+	# desc55 
+	I_NEW3 = RuleImage(roi_front=(568,212,240,220), roi_back=(0,0,100,100), threshold=0.9, method="Template matching", file="./tasks/CoinChallenge/res/res_new3.png")
+	# Click Rule Assets
+	# description 
+	C_NEW1 = RuleClick(roi_front=(268,268,100,100), roi_back=(614,214,100,100))
+	# description 
+	C_NEW2 = RuleClick(roi_front=(171,236,100,100), roi_back=(554,225,100,100))
+	# desc444n 
+	C_NEW3 = RuleClick(roi_front=(180,150,100,100), roi_back=(596,247,100,100))
+	# Long Click Rule Assets
+	# description 
+	L_NEW1 = RuleLongClick(roi_front=(208,151,100,100), roi_back=(542,279,100,100), duration=1500)
+	# description 
+	L_NEW2 = RuleLongClick(roi_front=(355,191,100,100), roi_back=(526,323,100,100), duration=1500)
+	# de66666n 
+	L_NEW3 = RuleLongClick(roi_front=(112,156,100,100), roi_back=(469,200,100,100), duration=1000)
+	# Swipe Rule Assets
+	# description 
+	S_NEW1 = RuleSwipe(roi_front=(253,212,100,100), roi_back=(652,292,100,100), mode="default")
+	# description 
+	S_NEW2 = RuleSwipe(roi_front=(265,272,100,100), roi_back=(622,338,100,100), mode="default")
+	# description 
+	S_NEW3 = RuleSwipe(roi_front=(198,160,100,100), roi_back=(626,305,100,100), mode="default")
+	# description 
+	S_NEW4 = RuleSwipe(roi_front=(150,145,100,100), roi_back=(535,199,100,100), mode="vector")
+
+

+ 0 - 0
module/tasks/General/config.py → tasks/General/config.py


+ 2 - 3
module/tasks/Restart/config.py → tasks/Restart/config.py

@@ -1,10 +1,9 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
-from pydantic import BaseModel, ValidationError, validator, Field
+from pydantic import BaseModel, Field
 
-from module.logger import logger
-from module.tasks.Restart.config_scheduler import Scheduler
+from tasks.Restart.config_scheduler import Scheduler
 
 class Restart(BaseModel):
     scheduler: Scheduler = Field(default_factory=Scheduler)

+ 0 - 0
module/tasks/Restart/config_scheduler.py → tasks/Restart/config_scheduler.py


+ 5 - 5
module/tasks/Script/config.py → tasks/Script/config.py

@@ -1,12 +1,12 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
-from pydantic import BaseModel, ValidationError, validator, Field
+from pydantic import BaseModel, Field
+
+from tasks.Script.config_device import Device
+from tasks.Script.config_error import Error
+from tasks.Script.config_optimization import Optimization
 
-from module.tasks.Script.config_device import Device
-from module.tasks.Script.config_error import Error
-from module.tasks.Script.config_optimization import Optimization
-from module.logger import logger
 
 class Script(BaseModel):
     device: Device = Field(default_factory=Device)

+ 0 - 0
module/tasks/Script/config_device.py → tasks/Script/config_device.py


+ 0 - 0
module/tasks/Script/config_error.py → tasks/Script/config_error.py


+ 0 - 0
module/tasks/Script/config_optimization.py → tasks/Script/config_optimization.py