修复导出错误会中断其他prefab问题

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "robotframework-airtest"
-version = "0.2.0"
+version = "0.3.2"
 description = "网易Airtest/pocoui的Robotframework测试库"
 authors = ["kaluluosi <[email protected]>"]
 license = "MIT"

robotframework_airtest/cli/vmg.py

@@ -1,12 +1,13 @@
-from typing import Callable
 import click
 import os
-
+import logging
 import glob
+from typing import Callable
 from .util import title
 from robotframework_airtest.vmg import get_valid_generator_names, get_valid_generators
 from robotframework_airtest.vmg.settings import Setting, Settings
 
+logger = logging.getLogger(__name__)
 
 @click.group()
 def vmg():
@@ -53,7 +54,11 @@ def gen():
                     outpath = file.replace(source, dist)
                     # 修改扩展名
                     output = os.path.splitext(outpath)[0] + ".resource"
-                    generator(file, output, setting)
+                    try:
+                        generator(file, output, setting)
+                    except Exception as e:
+                        logger.error(e, exc_info=e)
+
 
 
 @vmg.command
@@ -94,7 +99,7 @@ def init(default: bool):
         vm_generator: str = click.prompt(
             ">选择导出器",
             default="unity",
-            type=click.Choice(get_valid_generators().keys()),
+            type=click.Choice(list(get_valid_generators().keys())),
             show_default=True,
             show_choices=True,
         )

robotframework_airtest/vmg/__init__.py

@@ -1,13 +1,13 @@
 import glob
 import os
 from importlib import metadata
-from typing import Optional
+from typing import Dict, Optional
 from .generatorbase import GeneratorFunc, LoadError
 from .logger import logger  # noqa
 from .settings import Setting
 
 
-def get_valid_generators() -> dict:
+def get_valid_generators() -> Dict[str, GeneratorFunc]:
     entrypoints = metadata.entry_points().get(
         "robotframework_airtest.vmg.generator", []
     )
@@ -17,7 +17,7 @@ def get_valid_generators() -> dict:
             generator = ep.load()
             all_generators[ep.name] = generator
         except Exception as e:
-            logger.error(f"{ep.__name__} {e}")
+            logger.error(f"{ep.name} {e}")
 
     return all_generators
 
@@ -35,9 +35,7 @@ def gen_viewmodel(setting: Setting, name: Optional[str] = None):
     installed_generators = get_valid_generators()
     if generator_name not in installed_generators:
         logger.info(
-            f">{generator_name} 导出器没有安装，目前安装的导出器只有{get_valid_generator_names()}",
-            err=True,
-        )
+            f">{generator_name} 导出器没有安装，目前安装的导出器只有{get_valid_generator_names()}",)
         logger.info(f">配置 {name} 无法处理")
     else:
         generator: GeneratorFunc = installed_generators[generator_name]

robotframework_airtest/vmg/generatorbase.py

@@ -1,7 +1,8 @@
 import os
 from abc import ABC, abstractmethod
 from enum import Enum
-from typing import Callable, Dict, Sequence, Set
+from typing import Callable, Dict, Optional, Sequence, Set
+from .settings import Setting
 
 from jinja2 import Template
 import pkg_resources
@@ -27,7 +28,7 @@
 )
 
 ActionMap = Dict
-GeneratorFunc = Callable[[str, str, dict], None]
+GeneratorFunc = Callable[[str, str, Setting], None]
 
 
 class ControlType(Enum):
@@ -68,13 +69,14 @@ class ElementNode(ABC):
         ],
     }
 
-    QUERY = "?nameMatches\={}.*"
+    QUERY = r"?nameMatches\={}.*"
 
-    def __init__(self):
+    def __init__(self,parent:Optional["ElementNode"]=None):
         """节点抽象基类，要怎么实现这个基类的所有虚方法看具体情况。"""
         self._path = ""
         self._name = ""
         self._type = []
+        self._parent = parent
 
     @property
     @abstractmethod
@@ -94,18 +96,19 @@ def path(self, value: str):
 
     @property
     @abstractmethod
-    def name(self, value) -> str:
-        self._name = value
-
-    @name.setter
-    @abstractmethod
     def name(self) -> str:
         """返回元素名
 
         Returns:
             str: 元素名
         """
         return self._name
+
+    @name.setter
+    @abstractmethod
+    def name(self, value) -> str:
+        self._name = value
+
 
     @property
     @abstractmethod
@@ -118,7 +121,7 @@ def type(self) -> Set[ControlType]:
         return self.type
 
     @property
-    def parent(self) -> "ElementNode":
+    def parent(self) -> Optional["ElementNode"]:
         return self._parent
 
     @property
@@ -141,7 +144,7 @@ def actions(self) -> Sequence[Action]:
 
 
 class ViewModel(ABC):
-    def __init__(self, ui_file: str, extra_info: dict = None) -> None:
+    def __init__(self, ui_file: str, extra_info: Optional[dict] = None) -> None:
         """[summary]
 
         Args:
@@ -201,24 +204,18 @@ def DFS(node: ElementNode):
     def gen(self, output: str):
         vm = self
 
-        try:
-            # package data 文件需要用 pkg_resources来定位访问，不要自行拼接相对路径
-            temp_txt = pkg_resources.resource_string(__name__, "template.robot").decode(
-                "utf-8"
-            )
-            template = Template(temp_txt)
-            txt = template.render(ui=vm, type=ControlType)
-
-            outdir = os.path.dirname(output)
-
-            if not os.path.exists(outdir):
-                os.makedirs(outdir)
-
-            with open(output, "w", encoding="utf-8") as f:
-                f.write(txt)
-                logger.info("导出%s-->%s", self._ui_file, output)
-        except Exception as e:
-            logger.error(e, exc_info=1)
+        # package data 文件需要用 pkg_resources来定位访问，不要自行拼接相对路径
+        temp_txt = pkg_resources.resource_string(__name__, "template.robot").decode(
+            "utf-8"
+        )
+        template = Template(temp_txt)
+        txt = template.render(ui=vm, type=ControlType)
+        outdir = os.path.dirname(output)
+        if not os.path.exists(outdir):
+            os.makedirs(outdir)
+        with open(output, "w", encoding="utf-8") as f:
+            f.write(txt)
+            logger.info("导出%s-->%s", self._ui_file, output)
 
 
 class LoadError(Exception):

robotframework_airtest/vmg/generators/unity.py

@@ -1,4 +1,4 @@
-from typing import Any, Sequence, Set
+from typing import Any, Optional, Sequence, Set
 from ..generatorbase import (
     ControlType,
     ElementNode,
@@ -74,9 +74,9 @@ def find_root_entry(doc: UnityDocument):
 
 
 class UnityElementNode(ElementNode):
-    def __init__(self, raw_data: RawData, parent: ElementNode = None):
+    def __init__(self, raw_data: RawData, parent: Optional[ElementNode] = None):
+        super().__init__(parent)
         self._raw_data = raw_data
-        self._parent = parent
         self._name = self.path = str(self._raw_data.entry.m_Name)
 
     @property
@@ -98,7 +98,7 @@ def name(self) -> str:
         return self._name
 
     @name.setter
-    def name(self, value: str) -> str:
+    def name(self, value: str):
         self._name = value
 
     @property
@@ -151,7 +151,7 @@ def rect_transform(self) -> Any:
 
 
 class UnityViewModel(ViewModel):
-    def __init__(self, ui_file: str, extra_info: dict = None) -> None:
+    def __init__(self, ui_file: str, extra_info: Optional[dict] = None) -> None:
         super().__init__(ui_file, extra_info)
         self._libraries = ["robotframework_airtest.poco.UnityPocoLibrary"]
 
@@ -167,5 +167,5 @@ def load(self, ui_file: str) -> ElementNode:
         return root
 
 
-def generate(input: str, output: str, extra_info: dict = None):
+def generate(input: str, output: str, extra_info: Optional[dict] = None):
     UnityViewModel(input, extra_info).gen(output)