obstruct 0.2.14__tar.gz → 0.3.0__tar.gz

{obstruct-0.2.14 → obstruct-0.3.0}/.idea/workspace.xml

@@ -4,7 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="b482b6b4-48ce-4be1-bf3c-a72ec254fa35" name="更改" comment="chore: 更新项目信息和 README 文档" />
+    <list default="true" id="b482b6b4-48ce-4be1-bf3c-a72ec254fa35" name="更改" comment="fix: 更新版本号至 0.2.15，修复延迟加载不会应用到类属性的问题">
+      <change beforePath="$PROJECT_DIR$/src/obstruct/aot/base.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/obstruct/aot/base.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/obstruct/aot/unpack.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/obstruct/aot/unpack.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/test_speed.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/test_speed.py" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -252,7 +256,39 @@
       <option name="project" value="LOCAL" />
       <updated>1786969506672</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="fix: 更新版本号至 0.2.13，修复类变量识别错误的问题">
+      <option name="closed" value="true" />
+      <created>1786969885468</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1786969885469</updated>
+    </task>
+    <task id="LOCAL-00017" summary="fix: 更新版本号至 0.2.13，修复类变量识别错误的问题">
+      <option name="closed" value="true" />
+      <created>1786969895079</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1786969895079</updated>
+    </task>
+    <task id="LOCAL-00018" summary="fix: 更新版本号至 0.2.14，修复 __cendian__ 类变量识别错误的问题">
+      <option name="closed" value="true" />
+      <created>1786969988797</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1786969988797</updated>
+    </task>
+    <task id="LOCAL-00019" summary="fix: 更新版本号至 0.2.15，修复延迟加载不会应用到类属性的问题">
+      <option name="closed" value="true" />
+      <created>1786971691114</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1786971691114</updated>
+    </task>
+    <option name="localTasksCounter" value="20" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -285,6 +321,9 @@
     <MESSAGE value="feat: 更新版本号（跳过一次版本号更改），添加 NOT_A_FIELD 标记控制一个字段是否该被当作二进制字段解析" />
     <MESSAGE value="feat: 更新版本号，添加一些更加清晰明确的类型别名" />
     <MESSAGE value="chore: 更新项目信息和 README 文档" />
-    <option name="LAST_COMMIT_MESSAGE" value="chore: 更新项目信息和 README 文档" />
+    <MESSAGE value="fix: 更新版本号至 0.2.13，修复类变量识别错误的问题" />
+    <MESSAGE value="fix: 更新版本号至 0.2.14，修复 __cendian__ 类变量识别错误的问题" />
+    <MESSAGE value="fix: 更新版本号至 0.2.15，修复延迟加载不会应用到类属性的问题" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix: 更新版本号至 0.2.15，修复延迟加载不会应用到类属性的问题" />
   </component>
 </project>

{obstruct-0.2.14 → obstruct-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: obstruct
-Version: 0.2.14
+Version: 0.3.0
 Author-email: LittleNightSong <LittleNightSongYO@outlook.com>
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python

obstruct-0.3.0/src/obstruct/__version__.py

@@ -0,0 +1 @@
+version = "0.3.0"

{obstruct-0.2.14 → obstruct-0.3.0}/src/obstruct/aot/base.py

@@ -5,6 +5,8 @@ import itertools
 import typing
 from typing import Any
 
+if typing.TYPE_CHECKING:
+    from obstruct import Struct
 
 
 class _objective_node_operator:
@@ -121,8 +123,9 @@ def unique_name_generator():
                        itertools.combinations(available_characters, cnt))
 
 
-def is_struct(tp):
-    return hasattr(tp, '__cstruct__')
+def is_struct(tp) -> typing.TypeIs[type[Struct]]:
+    from obstruct.struct_type import Struct
+    return isinstance(tp, type) and issubclass(tp, Struct)
 
 
 def is_array(tp):

{obstruct-0.2.14 → obstruct-0.3.0}/src/obstruct/aot/unpack.py

@@ -7,10 +7,14 @@ import typing
 from .base import unique_name_generator, is_struct, is_array, get_array_ctype, function_def, for_stmt, get_array_length
 
 if typing.TYPE_CHECKING:
-    from .. import struct_type
+    from obstruct.struct_type import Struct
 
 
-def create_unpack_methods(cls: type[struct_type.Struct]):
+def batch_add_code(objs, code: str):
+    for obj in objs:
+        obj.add_code(code)
+
+def create_unpack_methods(cls: type[Struct]):
     from ..methods import get_ctype
 
     with (
@@ -52,58 +56,74 @@ def create_unpack_methods(cls: type[struct_type.Struct]):
         iter_update.add_node(iter_update_inner.node)
 
         array_fields = []
-
-        def walk(fields, path, parent_name=None, current_class_name='cls', offset=0):
-            name = 'self'
-
-            if len(path) > 1:  # 在处理内嵌的结构体
-                name = next(ung)  # 临时变量的名称
-                update_add_code(f"{name} = {parent_name}.{path[-1]}")
-
-                unpack_add_code(f"{parent_name}.{path[-1]} = {name} = __new__({current_class_name})")  # 组合赋值
+        post_inits = []
+
+        def walk(
+                struct_type: type[Struct],
+                absolute_xpath: tuple[str, ...],
+                current_xname: str = 'self',
+                parent_xname=None,
+                current_type_name='cls',
+                offset=0
+        ):
+            name = current_xname
+
+            if len(absolute_xpath) > 1:  # 在处理内嵌的结构体
+                current_field_name = absolute_xpath[-1]
+                update_add_code(f"{name} = {parent_xname}.{current_field_name}")
+                unpack_add_code(f"{parent_xname}.{current_field_name} = {name} = __new__({current_type_name})")  # 组合赋值
             else:
-                unpack_add_code(f"{name} = __new__({current_class_name})")  # 不需要临时变量存储根对象
+                unpack_add_code(f"{name} = __new__({current_type_name})")  # 不需要临时变量存储根对象
                 # update 在这里不需要创建新对象
 
+            fields = struct_type.__cfields__
+
             for field in fields:  # 遍历字段
                 field_xpath = f'{name}.{field.name}'
 
-                # ctype = get_ctype(field.type)
-                # print(f"当前字段：{field_xpath}，类型：{field.type} '{ctype}'，偏移量：{offset}+{struct.calcsize(ctype)}")
-
                 if is_struct(field.type):  # 是个内嵌的结构体
                     if field.type not in inner_classes:  # 如果这个内嵌的结构体类型不在已知的结构体中（没有分配类名称）
                         type_name = next(ung)  # 生成一个唯一的类名
-                        inner_classes[field.type] = type_name  # 添加
+                        inner_classes[field.type] = type_name
                     else:
                         type_name = inner_classes[field.type]  # 如果在，那么提取
 
-                    walk(field.type.__cfields__, path + (field.name,), name, type_name, offset)
+                    field_xname = next(ung)
+                    walk(
+                        field.type,
+                        absolute_xpath + (field.name,),
+                        field_xname,
+                        name,
+                        type_name,
+                        offset
+                    )
                     offset += field.type.__cstruct__.size
 
-                elif is_array(field.type):
-                    dtype = get_array_ctype(field.type)
-                    nbytes = get_array_length(field.type) * struct.calcsize(dtype)
-                    array_fields.append((next(ung), field_xpath, dtype, offset, nbytes))
-                    offset += nbytes
-                else:
+                    post_inits.append(field_xname)
+
+                elif is_array(field.type):  # 如果是一个数组类型
+                    dtype = get_array_ctype(field.type)  # 获取内容数据类型
+                    nbytes = get_array_length(field.type) * struct.calcsize(dtype)  # 计算数组实际大小
+                    array_fields.append((next(ung), field_xpath, dtype, offset, nbytes))  # 记录这个数组
+                    offset += nbytes  # 增加当前偏移量
+
+                else:  # 不是特殊的类型，正常处理（添加 assign 目标，并增加偏移量）
                     assigns.append(field_xpath)
                     offset += struct.calcsize(get_ctype(field.type))
 
-        walk(cls.__cfields__, ('A',))
+        walk(cls, ('A',))
 
-        assign_code = f"{', '.join(assigns)} = _unpack(buffer)"  # 生成普通的 unpack, update 用的赋值语句
+        assigns_expr = ', '.join(assigns)
+        assign_code = f"{assigns_expr} = _unpack(buffer)"  # 生成普通的 unpack, update 用的赋值语句
         # {assigns} = _unpack(buffer)
         unpack.add_code(assign_code)
         update.add_code(assign_code)
 
-        assign_code = assign_code.replace("_unpack(buffer)", "values")  # 生成 iter_xxx 的赋值语句
-        # {assigns} = values
+        assign_code = f"{assigns_expr} = values"  # 生成 iter_xxx 的赋值语句
         iter_unpack_inner.add_code(assign_code)
         iter_update_inner.add_code(assign_code)
 
-        assign_code = assign_code.replace("values", "_unpack_from(buffer, offset)")  # 生成 xxx_from 的赋值语句
-        # {assigns} = _unpack_from(buffer, offset)
+        assign_code = f"{assigns_expr} = _unpack_from(buffer, offset)"  # 生成 xxx_from 的赋值语句
         unpack_from.add_code(assign_code)
         update_from.add_code(assign_code)
 
@@ -145,6 +165,13 @@ def create_unpack_methods(cls: type[struct_type.Struct]):
         if array_fields:
             unpack.insert_code(0, 'buffer = memoryview(buffer)')
 
+
+        for init in post_inits:
+            batch_add_code(
+                [unpack, update, unpack_from, update_from, iter_unpack_inner, iter_update_inner],
+                f"{init}.__post_unpack__()"
+            )
+
         unpack.add_return('self')
         update.add_return('self')
         unpack_from.add_return('self')
@@ -156,12 +183,12 @@ def create_unpack_methods(cls: type[struct_type.Struct]):
         for n, *_ in array_fields:
             iter_update_inner.add_code(f'{n}.clear()')
 
-        # print(unpack.generate_code())
-        # print(update.generate_code())
-        # print(unpack_from.generate_code())
-        # print(update_from.generate_code())
-        # print(iter_unpack.generate_code())
-        # print(iter_update.generate_code())
+        print(unpack.generate_code())
+        print(update.generate_code())
+        print(unpack_from.generate_code())
+        print(update_from.generate_code())
+        print(iter_unpack.generate_code())
+        print(iter_update.generate_code())
 
         globals = {
             v: k for k, v in inner_classes.items()  # 翻转字典

{obstruct-0.2.14 → obstruct-0.3.0}/src/obstruct/struct_type.py

@@ -81,6 +81,13 @@ class StructMeta(type):
             create_unpack_methods(cls)
         )
 
+    def __getattr__(self, item):
+        if item in self.__struct_methods__:
+            self.__compile_struct__()
+            return getattr(self, item)
+
+        raise AttributeError(item)
+
 
 endian_mapping = {
     'little': '<',

{obstruct-0.2.14 → obstruct-0.3.0}/test/test_speed.py

@@ -21,6 +21,9 @@ class MyStruct(obs.Struct):
     k: obs.unsigned_char
     l: obs.long_long
 
+    def __post_unpack__(self):
+        ...
+
 
 @dataclasses.dataclass()
 class AnotherStruct(obs.Struct):
@@ -36,15 +39,15 @@ print('MyStruct size', MyStruct.__cstruct__.size)
 print('AnotherStruct size', AnotherStruct.__cstruct__.size)
 
 
-data = MyStruct(
-    1,2,1.0,4,5,6,7,8,9,b'8',1,2
-)
-
-packed_data = data.pack()
+# data = MyStruct(
+#     1,2,1.0,4,5,6,7,8,9,b'8',1,2
+# )
+#
+# packed_data = data.pack()
 
 
-complex_data = AnotherStruct(data, array('i', [100]*100), data)
-packed_complex_data = complex_data.pack()
+# complex_data = AnotherStruct(data, array('i', [100]*100), data)
+# packed_complex_data = complex_data.pack()
 
 
 def test_timeit(name, code):
@@ -71,31 +74,31 @@ def test_timeit(name, code):
     print(f'Average: {sum(res)/(len(res))/NUMBER:.3f} ns per step', '\n\n')
 
 
-print("\n\nMyStruct:", MyStruct.__cstruct__.size)
+# print("\n\nMyStruct:", MyStruct.__cstruct__.size)
 print("AnotherStruct:", AnotherStruct.__cstruct__.size, '\n\n')
 
 NUMBER = 10000
 REPEAT = 128
 SORT = 32
 
-test_timeit(
-    name='Pack',
-    code="""data.pack()""",
-)
-
-test_timeit(
-    name='Unpack',
-    code="""MyStruct.unpack(packed_data)""",
-)
-
-
-
-test_timeit(
-    name='Complex Pack',
-    code="""complex_data.pack()""",
-)
-
-test_timeit(
-    name='Complex Unpack',
-    code="""AnotherStruct.unpack(packed_complex_data)""",
-)
+# test_timeit(
+#     name='Pack',
+#     code="""data.pack()""",
+# )
+#
+# test_timeit(
+#     name='Unpack',
+#     code="""MyStruct.unpack(packed_data)""",
+# )
+#
+#
+#
+# test_timeit(
+#     name='Complex Pack',
+#     code="""complex_data.pack()""",
+# )
+#
+# test_timeit(
+#     name='Complex Unpack',
+#     code="""AnotherStruct.unpack(packed_complex_data)""",
+# )

obstruct-0.2.14/src/obstruct/__version__.py

@@ -1 +0,0 @@
-version = "0.2.14"