lbkit 0.9.0__tar.gz → 0.9.1__tar.gz

{lbkit-0.9.0/lbkit.egg-info → lbkit-0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lbkit
-Version: 0.9.0
+Version: 0.9.1
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com

lbkit-0.9.1/lbkit/__init__.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.9.1'

{lbkit-0.9.0 → lbkit-0.9.1}/lbkit/codegen/idf_interface.py

@@ -1209,12 +1209,12 @@ class IdfInterface(IdfInterfaceBase):
                 "ref_value": {
                     "type": "string",
                     "description": "Property reference syntax. The format must be `\\$\\{([<]*|:)<object>.<property name>\\}`, for example: Test_Obj.Prop",
-                    "pattern": "^\\$\\{([<]*|:)[a-zA-Z]([a-z0-9A-Z]*[a-z])?)_([a-z0-9A-Z]+)\\.[A-Za-z][a-zA-Z0-9_-]*\\}$"
+                    "pattern": "^\\$\\{([<]*|:)\\.?[a-zA-Z][a-z0-9A-Z]+_[a-zA-Z0-9][a-z0-9A-Z_]*\\.[a-zA-Z][A-Za-z0-9_-]*\\}$"
                 },
                 "ref_obj": {
                     "type": "string",
                     "description": "Property reference syntax. The format must be `\\$\\{([<]*|:)<object>.<property name>\\}`, for example: Test_Obj",
-                    "pattern": "^\\$\\{([<]*|:)[a-zA-Z]([a-z0-9A-Z]*[a-z])?)_([a-z0-9A-Z]+)\\}$"
+                    "pattern": "^\\$\\{([<]*|:)\\.?[a-zA-Z][a-z0-9A-Z]+_[a-zA-Z0-9][a-z0-9A-Z_]*\\}$"
                 },
                 "ref_obj_array": {
                     "type": "array",
@@ -1224,12 +1224,12 @@ class IdfInterface(IdfInterfaceBase):
                             {
                                 "type": "string",
                                 "description": "Object reference syntax. The format must be `\\$\\{([<]*|:)<object>\\}`, for example: Test_Obj",
-                                "pattern": "^\\$\\{([<]*|:)[a-zA-Z]([a-z0-9A-Z]*[a-z])?)_([a-z0-9A-Z]+)\\}$"
+                                "pattern": "^\\$\\{([<]*|:)\\.?[a-zA-Z][a-z0-9A-Z]+_[a-zA-Z0-9][a-z0-9A-Z_]*\\}$"
                             },
                             {
                                 "type": "string",
                                 "description": "Plain string format, if the string start with `$` must add `\\` before `$` to escape; If the string is empty it must be surrounded by `\"`",
-                                "pattern": "^[/]?[A-Z0-9a-z_]+(/[A-Z0-9a-z_]+)*$"
+                                "pattern": "^/?[A-Z0-9a-z_]+(/[A-Z0-9a-z_]+)*$"
                             }
                         ]
                     }

{lbkit-0.9.0 → lbkit-0.9.1}/lbkit/utils/images/emmc.py

@@ -68,14 +68,14 @@ class MakeImage():
         start = end
         end += self.rootfs_blk_1m * 1024 * 2
         self.tools.exec(f"parted -s -a none {output} mkpart rootfs_b {start}s {end - 1}s")
-        self.log.info("复制镜像文件到rootfs_b")
-        self.tools.exec(f"dd if={rootfs} of={output} bs=512 seek={start} conv=notrunc")
+        # self.log.info("复制镜像文件到rootfs_b")
+        # self.tools.exec(f"dd if={rootfs} of={output} bs=512 seek={start} conv=notrunc")
         self.log.info("制作rootfs_c")
         start = end
         end += self.rootfs_blk_1m * 1024 * 2
         self.tools.exec(f"parted -s -a none {output} mkpart rootfs_c {start}s {end - 1}s")
-        self.log.info("复制镜像文件到rootfs_c")
-        self.tools.exec(f"dd if={rootfs} of={output} bs=512 seek={start} conv=notrunc")
+        # self.log.info("复制镜像文件到rootfs_c")
+        # self.tools.exec(f"dd if={rootfs} of={output} bs=512 seek={start} conv=notrunc")
         start = end
         self.log.info("制作userdata区")
         end += self.userdata_blk_1m * 1024 * 2

{lbkit-0.9.0 → lbkit-0.9.1/lbkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lbkit
-Version: 0.9.0
+Version: 0.9.1
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com

{lbkit-0.9.0 → lbkit-0.9.1}/test/test_codegen.py

@@ -33,10 +33,10 @@ class TestCodeGenClass(unittest.TestCase):
 
     def mk_interface_with_number_property(self, name, type, max, min, default_val):
         with open(self.tmp_file, mode="w+") as fp:
-            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v1.json\n")
+            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v2.json\n")
             fp.write("version: 1\n")
             fp.write("description: 测试接口，用于验证lb_base/lb_core，同时验证自动生成逻辑\n")
-            fp.write("alias: Test\n")
+            fp.write("interface: com.litebmc.Test\n")
             fp.write("properties:\n")
             fp.write(f"   - name: {name}\n")
             fp.write(f"     description: {name}\n")
@@ -47,10 +47,10 @@ class TestCodeGenClass(unittest.TestCase):
 
     def mk_interface_with_string_property(self, name, type, pattern, default_val):
         with open(self.tmp_file, mode="w+") as fp:
-            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v1.json\n")
+            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v2.json\n")
             fp.write("version: 1\n")
             fp.write("description: 测试接口，用于验证lb_base/lb_core，同时验证自动生成逻辑\n")
-            fp.write("alias: Test\n")
+            fp.write("interface: com.litebmc.Test\n")
             fp.write("properties:\n")
             fp.write(f"   - name: {name}\n")
             fp.write(f"     description: {name}\n")
@@ -61,10 +61,10 @@ class TestCodeGenClass(unittest.TestCase):
 
     def mk_interface_with_double_property(self, name, type, default_val, max=None, min=None, exclusive_max=None, exclusive_min=None):
         with open(self.tmp_file, mode="w+") as fp:
-            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v1.json\n")
+            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v2.json\n")
             fp.write("version: 1\n")
             fp.write("description: 测试接口，用于验证lb_base/lb_core，同时验证自动生成逻辑\n")
-            fp.write("alias: Test\n")
+            fp.write("interface: com.litebmc.Test\n")
             fp.write("properties:\n")
             fp.write(f"   - name: {name}\n")
             fp.write(f"     description: {name}\n")
@@ -82,10 +82,10 @@ class TestCodeGenClass(unittest.TestCase):
 
     def validate_boolean(self, name, type, default):
         with open(self.tmp_file, mode="w+") as fp:
-            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v1.json\n")
+            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v2.json\n")
             fp.write("version: 1\n")
             fp.write("description: 测试接口，用于验证lb_base/lb_core，同时验证自动生成逻辑\n")
-            fp.write("alias: Test\n")
+            fp.write("interface: com.litebmc.Test\n")
             fp.write("properties:\n")
             fp.write(f"   - name: {name}\n")
             fp.write(f"     description: {name}\n")
@@ -380,10 +380,10 @@ class TestCodegenPropertyFlagsClass(unittest.TestCase):
 
     def mk_interface_unique(self, type):
         with open(self.intf_yaml, mode="w+") as fp:
-            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v1.json\n")
+            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v2.json\n")
             fp.write("version: 1\n")
             fp.write("description: 测试接口，用于验证lb_base/lb_core，同时验证自动生成逻辑\n")
-            fp.write("alias: Test\n")
+            fp.write("interface: com.litebmc.Test\n")
             fp.write("properties:\n")
             fp.write(f"   - name: ar\n")
             fp.write(f"     description: ar\n")
@@ -446,10 +446,10 @@ class TestCodegenUniqueClass(unittest.TestCase):
 
     def mk_interface_unique(self, type, unique):
         with open(self.intf_yaml, mode="w+") as fp:
-            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v1.json\n")
+            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v2.json\n")
             fp.write("version: 1\n")
             fp.write("description: 测试接口，用于验证lb_base/lb_core，同时验证自动生成逻辑\n")
-            fp.write("alias: Test\n")
+            fp.write("interface: com.litebmc.Test\n")
             fp.write("properties:\n")
             fp.write(f"   - name: ar\n")
             fp.write(f"     description: ar\n")
@@ -548,10 +548,10 @@ class TestCodegenItemsCountClass(unittest.TestCase):
 
     def mk_interface_min_max_items(self, type, min_items=None, max_items=None):
         with open(self.intf_yaml, mode="w+") as fp:
-            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v1.json\n")
+            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v2.json\n")
             fp.write("version: 1\n")
             fp.write("description: 测试接口，用于验证lb_base/lb_core，同时验证自动生成逻辑\n")
-            fp.write("alias: Test\n")
+            fp.write("interface: com.litebmc.Test\n")
             fp.write("properties:\n")
             fp.write(f"   - name: ar\n")
             fp.write(f"     description: ar\n")
@@ -684,10 +684,10 @@ class TestCodegenItemsMatchesClass(unittest.TestCase):
 
     def mk_interface_property_matches(self, type, matches):
         with open(self.intf_yaml, mode="w+") as fp:
-            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v1.json\n")
+            fp.write(f"# yaml-language-server: $schema={schema_dir}/idf.v2.json\n")
             fp.write("version: 1\n")
             fp.write("description: 测试接口，用于验证lb_base/lb_core，同时验证自动生成逻辑\n")
-            fp.write("alias: Test\n")
+            fp.write("interface: com.litebmc.Test\n")
             fp.write("properties:\n")
             fp.write(f"   - name: ar\n")
             fp.write(f"     description: ar\n")

lbkit-0.9.0/lbkit/__init__.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.9.0'