lbkit 0.5.14__tar.gz → 0.5.16__tar.gz

{lbkit-0.5.14/lbkit.egg-info → lbkit-0.5.16}/PKG-INFO

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

lbkit-0.5.16/lbkit/__init__.py

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

{lbkit-0.5.14 → lbkit-0.5.16}/lbkit/codegen/ctype_defination.py

@@ -414,12 +414,14 @@ class RefObjArrayValidator(RefObjValidator):
 
 class CTypeBase(object):
     """C语言相关的操作函数＆类型定义"""
-    def __init__(self, declare, free_func, encode_func, decode_func,
+    def __init__(self, declare, out_declare, free_func, encode_func, decode_func,
                  validator: IdfValidator = None,
                  const_declare = None,
                  const_free_func = None,
                  const_decode_func = None):
         self.declare = declare
+        # 作为函数出参时的变量申明
+        self.out_declare = out_declare
         self.free_func = free_func
         self.encode_func = encode_func
         self.decode_func = decode_func
@@ -440,6 +442,7 @@ class CTypeBase(object):
 CTYPE_OBJS = {
     "boolean": CTypeBase(
         ["gboolean <arg_name>"],
+        ["gboolean *<arg_name>"],
         [],
         ["<arg_out> = g_variant_new_boolean(<arg_name>)"],
         ["<arg_in> = g_variant_get_boolean(<arg_name>)"],
@@ -447,6 +450,7 @@ CTYPE_OBJS = {
     ),
     "byte": CTypeBase(
         ["guint8 <arg_name>"],
+        ["guint8 *<arg_name>"],
         [],
         ["<arg_out> = g_variant_new_byte(<arg_name>)"],
         ["<arg_in> = g_variant_get_byte(<arg_name>)"],
@@ -454,6 +458,7 @@ CTYPE_OBJS = {
     ),
     "int16": CTypeBase(
         ["gint16 <arg_name>"],
+        ["gint16 *<arg_name>"],
         [],
         ["<arg_out> = g_variant_new_int16(<arg_name>)"],
         ["<arg_in> = g_variant_get_int16(<arg_name>)"],
@@ -461,6 +466,7 @@ CTYPE_OBJS = {
     ),
     "uint16": CTypeBase(
         ["guint16 <arg_name>"],
+        ["guint16 *<arg_name>"],
         [],
         ["<arg_out> = g_variant_new_uint16(<arg_name>)"],
         ["<arg_in> = g_variant_get_uint16(<arg_name>)"],
@@ -468,6 +474,7 @@ CTYPE_OBJS = {
     ),
     "int32": CTypeBase(
         ["gint32 <arg_name>"],
+        ["gint32 *<arg_name>"],
         [],
         ["<arg_out> = g_variant_new_int32(<arg_name>)"],
         ["<arg_in> = g_variant_get_int32(<arg_name>)"],
@@ -475,6 +482,7 @@ CTYPE_OBJS = {
     ),
     "uint32": CTypeBase(
         ["guint32 <arg_name>"],
+        ["guint32 *<arg_name>"],
         [],
         ["<arg_out> = g_variant_new_uint32(<arg_name>)"],
         ["<arg_in> = g_variant_get_uint32(<arg_name>)"],
@@ -482,6 +490,7 @@ CTYPE_OBJS = {
     ),
     "int64": CTypeBase(
         ["gint64 <arg_name>"],
+        ["gint64 *<arg_name>"],
         [],
         ["<arg_out> = g_variant_new_int64(<arg_name>)"],
         ["<arg_in> = g_variant_get_int64(<arg_name>)"],
@@ -489,6 +498,7 @@ CTYPE_OBJS = {
     ),
     "uint64": CTypeBase(
         ["guint64 <arg_name>"],
+        ["guint64 *<arg_name>"],
         [],
         ["<arg_out> = g_variant_new_uint64(<arg_name>)"],
         ["<arg_in> = g_variant_get_uint64(<arg_name>)"],
@@ -496,6 +506,7 @@ CTYPE_OBJS = {
     ),
     "size": CTypeBase(
         ["gsize <arg_name>"],
+        ["gsize *<arg_name>"],
         [],
         ["<arg_out> = g_variant_new_uint64(<arg_name>)"],
         ["<arg_in> = g_variant_get_uint64(<arg_name>)"],
@@ -503,6 +514,7 @@ CTYPE_OBJS = {
     ),
     "ssize": CTypeBase(
         ["gssize <arg_name>"],
+        ["gssize *<arg_name>"],
         [],
         ["<arg_out> = g_variant_new_int64(<arg_name>)"],
         ["<arg_in> = g_variant_get_int64(<arg_name>)"],
@@ -510,6 +522,7 @@ CTYPE_OBJS = {
     ),
     "double": CTypeBase(
         ["gdouble <arg_name>"],
+        ["gdouble *<arg_name>"],
         [],
         ["<arg_out> = g_variant_new_double(<arg_name>)"],
         ["<arg_in> = g_variant_get_double(<arg_name>)"],
@@ -517,6 +530,7 @@ CTYPE_OBJS = {
     ),
     "unixfd": CTypeBase(
         ["gint32 <arg_name>"],
+        ["gint32 *<arg_name>"],
         [],
         ["<arg_out> = g_variant_new_handle(<arg_name>)"],
         ["<arg_in> = g_variant_get_handle(<arg_name>)"],
@@ -524,6 +538,7 @@ CTYPE_OBJS = {
     ),
     "string": CTypeBase(
         ["<const>gchar *<arg_name>"],
+        ["gchar **<arg_name>"],
         ["gcl_free_p((void **)&<arg_name>)"],
         ["<arg_out> = gcl_string_encode(<arg_name>)"],
         ["<arg_in> = g_strdup(g_variant_get_string(<arg_name>, NULL))"],
@@ -534,6 +549,7 @@ CTYPE_OBJS = {
     ),
     "object_path": CTypeBase(
         ["<const>gchar *<arg_name>"],
+        ["gchar **<arg_name>"],
         ["gcl_free_p((void **)&<arg_name>)"],
         ["<arg_out> = gcl_object_path_encode(<arg_name>)"],
         ["<arg_in> = g_strdup(g_variant_get_string(<arg_name>, NULL))"],
@@ -544,6 +560,7 @@ CTYPE_OBJS = {
     ),
     "signature": CTypeBase(
         ["<const>gchar *<arg_name>"],
+        ["gchar **<arg_name>"],
         ["gcl_free_p((void **)&<arg_name>)"],
         ["<arg_out> = gcl_signature_encode(<arg_name>)"],
         ["<arg_in> = g_strdup(g_variant_get_string(<arg_name>, NULL))"],
@@ -554,6 +571,7 @@ CTYPE_OBJS = {
     ),
     "variant": CTypeBase(
         ["GVariant *<arg_name>"],
+        ["GVariant **<arg_name>"],
         ["gcl_unref_p((GVariant **)&<arg_name>)"],
         ["g_variant_take_ref(<arg_name>)", "<arg_out> = g_variant_new_variant(<arg_name>)"],
         ["<arg_in> = g_variant_get_variant(<arg_name>)"],
@@ -561,6 +579,7 @@ CTYPE_OBJS = {
     ),
     "array[boolean]": CTypeBase(
         ["gsize n_<arg_name>" ,"<const>gboolean *<arg_name>"],
+        ["gsize *n_<arg_name>" ,"gboolean **<arg_name>"],
         ["gcl_free_p((void **)&<arg_name>)"],
         ["<arg_out> = gcl_array_boolean_encode(<arg_name>, n_<arg_name>)"],
         ["<arg_in> = gcl_array_boolean_decode(<arg_name>, &n_<arg_in>)"],
@@ -568,6 +587,7 @@ CTYPE_OBJS = {
     ),
     "array[byte]": CTypeBase(
         ["gsize n_<arg_name>" ,"<const>guint8 *<arg_name>"],
+        ["gsize *n_<arg_name>" ,"guint8 **<arg_name>"],
         ["gcl_free_p((void **)&<arg_name>)"],
         ["<arg_out> = gcl_array_byte_encode(<arg_name>, n_<arg_name>)"],
         ["<arg_in> = gcl_array_byte_decode(<arg_name>, &n_<arg_in>)"],
@@ -575,6 +595,7 @@ CTYPE_OBJS = {
     ),
     "array[int16]": CTypeBase(
         ["gsize n_<arg_name>" ,"<const>gint16 *<arg_name>"],
+        ["gsize *n_<arg_name>" ,"gint16 **<arg_name>"],
         ["gcl_free_p((void **)&<arg_name>)"],
         ["<arg_out> = gcl_array_int16_encode(<arg_name>, n_<arg_name>)"],
         ["<arg_in> = gcl_array_int16_decode(<arg_name>, &n_<arg_in>)"],
@@ -582,6 +603,7 @@ CTYPE_OBJS = {
     ),
     "array[uint16]": CTypeBase(
         ["gsize n_<arg_name>" ,"<const>guint16 *<arg_name>"],
+        ["gsize *n_<arg_name>" ,"guint16 **<arg_name>"],
         ["gcl_free_p((void **)&<arg_name>)"],
         ["<arg_out> = gcl_array_uint16_encode(<arg_name>, n_<arg_name>)"],
         ["<arg_in> = gcl_array_uint16_decode(<arg_name>, &n_<arg_in>)"],
@@ -589,6 +611,7 @@ CTYPE_OBJS = {
     ),
     "array[int32]": CTypeBase(
         ["gsize n_<arg_name>" ,"<const>gint32 *<arg_name>"],
+        ["gsize *n_<arg_name>" ,"gint32 **<arg_name>"],
         ["gcl_free_p((void **)&<arg_name>)"],
         ["<arg_out> = gcl_array_int32_encode(<arg_name>, n_<arg_name>)"],
         ["<arg_in> = gcl_array_int32_decode(<arg_name>, &n_<arg_in>)"],
@@ -596,6 +619,7 @@ CTYPE_OBJS = {
     ),
     "array[uint32]": CTypeBase(
         ["gsize n_<arg_name>" ,"<const>guint32 *<arg_name>"],
+        ["gsize *n_<arg_name>" ,"guint32 **<arg_name>"],
         ["gcl_free_p((void **)&<arg_name>)"],
         ["<arg_out> = gcl_array_uint32_encode(<arg_name>, n_<arg_name>)"],
         ["<arg_in> = gcl_array_uint32_decode(<arg_name>, &n_<arg_in>)"],
@@ -603,6 +627,7 @@ CTYPE_OBJS = {
     ),
     "array[int64]": CTypeBase(
         ["gsize n_<arg_name>" ,"<const>gint64 *<arg_name>"],
+        ["gsize *n_<arg_name>" ,"gint64 **<arg_name>"],
         ["gcl_free_p((void **)&<arg_name>)"],
         ["<arg_out> = gcl_array_int64_encode(<arg_name>, n_<arg_name>)"],
         ["<arg_in> = gcl_array_int64_decode(<arg_name>, &n_<arg_in>)"],
@@ -610,6 +635,7 @@ CTYPE_OBJS = {
     ),
     "array[uint64]": CTypeBase(
         ["gsize n_<arg_name>" ,"<const>guint64 *<arg_name>"],
+        ["gsize *n_<arg_name>" ,"guint64 **<arg_name>"],
         ["gcl_free_p((void **)&<arg_name>)"],
         ["<arg_out> = gcl_array_uint64_encode(<arg_name>, n_<arg_name>)"],
         ["<arg_in> = gcl_array_uint64_decode(<arg_name>, &n_<arg_in>)"],
@@ -617,6 +643,7 @@ CTYPE_OBJS = {
     ),
     "array[ssize]": CTypeBase(
         ["gsize n_<arg_name>" ,"<const>gssize *<arg_name>"],
+        ["gsize *n_<arg_name>" ,"gssize **<arg_name>"],
         ["gcl_free_p((void **)&<arg_name>)"],
         ["<arg_out> = gcl_array_int64_encode(<arg_name>, n_<arg_name>)"],
         ["<arg_in> = gcl_array_int64_decode(<arg_name>, &n_<arg_in>)"],
@@ -624,6 +651,7 @@ CTYPE_OBJS = {
     ),
     "array[size]": CTypeBase(
         ["gsize n_<arg_name>" ,"<const>gsize *<arg_name>"],
+        ["gsize *n_<arg_name>" ,"gsize **<arg_name>"],
         ["gcl_free_p((void **)&<arg_name>)"],
         ["<arg_out> = gcl_array_uint64_encode(<arg_name>, n_<arg_name>)"],
         ["<arg_in> = gcl_array_uint64_decode(<arg_name>, &n_<arg_in>)"],
@@ -631,6 +659,7 @@ CTYPE_OBJS = {
     ),
     "array[double]": CTypeBase(
         ["gsize n_<arg_name>" ,"<const>gdouble *<arg_name>"],
+        ["gsize *n_<arg_name>" ,"gdouble **<arg_name>"],
         ["gcl_free_p((void **)&<arg_name>)"],
         ["<arg_out> = gcl_array_double_encode(<arg_name>, n_<arg_name>)"],
         ["<arg_in> = gcl_array_double_decode(<arg_name>, &n_<arg_in>)"],
@@ -638,6 +667,7 @@ CTYPE_OBJS = {
     ),
     "array[unixfd]": CTypeBase(
         ["gsize n_<arg_name>" ,"<const>gint32 *<arg_name>"],
+        ["gsize *n_<arg_name>" ,"gint32 **<arg_name>"],
         ["gcl_free_p((void **)&<arg_name>)"],
         ["<arg_out> = gcl_array_handle_encode(<arg_name>, n_<arg_name>)"],
         ["<arg_in> = gcl_array_handle_decode(<arg_name>, &n_<arg_in>)"],
@@ -645,6 +675,7 @@ CTYPE_OBJS = {
     ),
     "array[string]": CTypeBase(
         ["gchar *<const>*<arg_name>"],
+        ["gchar ***<arg_name>"],
         ["gcl_strfreev_p(&<arg_name>)"],
         ["<arg_out> = gcl_array_string_encode(<arg_name>)"],
         ["<arg_in> = gcl_array_string_decode(<arg_name>)"],
@@ -652,6 +683,7 @@ CTYPE_OBJS = {
     ),
     "array[object_path]": CTypeBase(
         ["gchar *<const>*<arg_name>"],
+        ["gchar ***<arg_name>"],
         ["gcl_strfreev_p(&<arg_name>)"],
         ["<arg_out> = gcl_array_object_path_encode(<arg_name>)"],
         ["<arg_in> = gcl_array_object_path_decode(<arg_name>)"],
@@ -659,6 +691,7 @@ CTYPE_OBJS = {
     ),
     "array[signature]": CTypeBase(
         ["gchar *<const>*<arg_name>"],
+        ["gchar ***<arg_name>"],
         ["gcl_strfreev_p(&<arg_name>)"],
         ["<arg_out> = gcl_array_signature_encode(<arg_name>)"],
         ["<arg_in> = gcl_array_signature_decode(<arg_name>)"],

{lbkit-0.5.14 → lbkit-0.5.16}/lbkit/codegen/idf_interface.py

@@ -245,6 +245,46 @@ class IdfCtypeRender():
                 }
             return schema
 
+    def out_declare(self):
+        """输出变量申明，用于结构体（接口类、方法请求和响应、信号消息等）申明"""
+        log.debug(f"Get out_declare info, name: {self.name}, ctype: {self.ctype}")
+        match = re.match(f"^array\[({CTYPE_BASE_REG})\]$", self.ctype)
+        if match:
+            ctype_obj = CTYPE_OBJS.get(self.ctype)
+            return ctype_obj.out_declare
+        match = re.match(f"^({CTYPE_REGEX})$", self.ctype)
+        if match:
+            ctype_obj = CTYPE_OBJS.get(self.ctype)
+            return ctype_obj.out_declare
+        # 非基础类型
+        is_array = False
+        ctype = self.ctype
+        match = re.match(f"^array\[(.*)\]$", ctype)
+        if match:
+            is_array = True
+            ctype = match.group(1)
+        match = re.match(f"^(struct|enum|dict)\[(.*)\]$", ctype)
+        _, stru_name = get_intfname_and_ctype(match.group(2))
+        if match.group(1) == "struct":
+            if is_array:
+                # 结构体数组初始化时为二级空指针，以空指针结束
+                return [f"{stru_name} ***<arg_name>"]
+            else:
+                # 结构体成员初始化时为空结构体，由反序列化时填充内容
+                return [f"{stru_name} **<arg_name>"]
+        elif match.group(1) == "enum":
+            if is_array:
+                # 枚举数组初始化时为数组空指针
+                return [f"gsize *n_<arg_name>", f"{stru_name} **<arg_name>"]
+            else:
+                return [f"{stru_name} *<arg_name>"]
+        else:
+            if is_array:
+                # 字典数组初始化为二级空指针，以空指针
+                return [f"{stru_name} ***<arg_name>"]
+            else:
+                return [f"{stru_name} **<arg_name>"]
+
     def declare(self):
         """变量申明，用于结构体（接口类、方法请求和响应、信号消息等）申明"""
         log.debug(f"Get declare info, name: {self.name}, ctype: {self.ctype}")
@@ -466,7 +506,7 @@ class IdfProperty(IdfCtypeRender):
         self.ctype = prop_data.get("type", "")
         super().__init__()
         self.name = prop_data.get("name")
-        self.access = "read"
+        self.access = "readwrite"
         self.annotations: list[IdfAnnotation] = []
         self.description = prop_data.get("description", "")
         flags = prop_data.get("flags", "").split(",")
@@ -485,24 +525,23 @@ class IdfProperty(IdfCtypeRender):
             if k in flags:
                 self.annotations.append(v)
 
-        flags = []
+        c_flags = []
         if self.private:
-            flags.append("PM_FLAGS_PROPERTY_PRIVATE")
+            c_flags.append("PM_FLAGS_PROPERTY_PRIVATE")
         elif "emits_const" in flags:
-            flags.append("PM_FLAGS_PROPERTY_EMIT_CONST")
+            c_flags.append("PM_FLAGS_PROPERTY_EMIT_CONST")
         elif "emits_false" in flags:
-            flags.append("PM_FLAGS_PROPERTY_EMIT_FALSE")
+            c_flags.append("PM_FLAGS_PROPERTY_EMIT_FALSE")
         elif "emits_invalidates" in flags:
-            flags.append("PM_FLAGS_PROPERTY_EMIT_INVALIDATES")
+            c_flags.append("PM_FLAGS_PROPERTY_EMIT_INVALIDATES")
         else:
-            flags.append("PM_FLAGS_PROPERTY_EMIT_TRUE")
+            c_flags.append("PM_FLAGS_PROPERTY_EMIT_TRUE")
         if self.deprecated:
-            flags.append("PM_FLAGS_PROPERTY_DEPRECATED")
-        flags.append(self.access_flag)
-        if len(flags) == 0:
+            c_flags.append("PM_FLAGS_PROPERTY_DEPRECATED")
+        if len(c_flags) == 0:
             self.desc_flags = "0"
         else:
-            self.desc_flags = " | ".join(flags)
+            self.desc_flags = " | ".join(c_flags)
 
 
     @property

{lbkit-0.5.14 → lbkit-0.5.16}/lbkit/codegen/template/client.c.mako

@@ -11,6 +11,8 @@ static ${intf.alias}_Properties ${properties};
 static const ${intf.alias}_Signals *${signal_processer} = NULL;
 
 % for prop in intf.properties:
+## 私有属性或者只读属性
+% if not prop.private and prop.access != "read":
     % if prop.deprecated:
 __attribute__((__deprecated__)) gint ${class_name}_set_${prop.name}(const ${class_name} *object,
     ${", ".join(prop.declare()).replace("<arg_name>", prop.name).replace("<const>", "const ")}, GError **error)
@@ -25,22 +27,48 @@ gint ${class_name}_set_${prop.name}(const ${class_name} *object,
     % endfor
     return gcl_impl.write_property((GclObject *)object, &${properties}.${prop.name}, tmp, error);
 }
+
+% endif
+## 私有或只写属性不允许读
+% if not prop.private and prop.access != "write":
     % if prop.deprecated:
 __attribute__((__deprecated__)) gint ${class_name}_get_${prop.name}(const ${class_name} *object,
-    GVariant **value, GError **error)
+    ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error)
     % else:
-gint ${class_name}_get_${prop.name}(const ${class_name} *object, GVariant **value, GError **error)
+gint ${class_name}_get_${prop.name}(const ${class_name} *object, ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error)
     % endif
 {
+    % if "gsize n_" in prop.declare()[0]:
+    g_assert(n_value && value);
+    % else:
+    g_assert(value);
+    % endif
+    % for line in prop.declare():
+        % if "*" in line:
+    ${line.strip().replace("<arg_name>", "tmp_value").replace("<const>", "")} = NULL;
+        % else:
+    ${line.strip().replace("<arg_name>", "tmp_value").replace("<const>", "")};
+        % endif
+    % endfor
     GVariant *out = NULL;
+
     gint ret = gcl_impl.read_property((GclObject *)object, &${properties}.${prop.name}, &out, error);
-    if (value) {
-        *value = out;
-    } else if (out) {
+    if (ret == 0 && out) {
+    % for line in prop.decode_func():
+        ${line.replace("<arg_in>", "tmp_value").replace("<arg_name>", "out")};
+    % endfor
+        *value = tmp_value;
+    % if "gsize n_" in prop.declare()[0]:
+        *n_value = n_tmp_value;
+    % endif
+    }
+    if (out) {
         g_variant_unref(out);
     }
     return ret;
 }
+
+% endif
 % endfor
 
 % for method in intf.methods:

{lbkit-0.5.14 → lbkit-0.5.16}/lbkit/codegen/template/client.h.mako

@@ -14,6 +14,7 @@ typedef ${intf.alias} ${class_name};
 typedef ${intf.alias}_Properties ${class_name}_Properties;
 
 % for prop in intf.properties:
+% if not prop.private:
 /*
  * property: ${prop.name}
 % if len(prop.description.strip()) > 0:
@@ -25,17 +26,22 @@ typedef ${intf.alias}_Properties ${class_name}_Properties;
  % endfor
 % endif
  */
+## 私有属性或者只读属性不允许写
+% if not prop.private and prop.access != "read":
     % if prop.deprecated:
-__attribute__((__deprecated__)) gint ${class_name}_set_${prop.name}(const ${class_name} *object,
-    ${", ".join(prop.declare()).replace("<arg_name>", "value").replace("<const>", "const ")},
-    GError **error);
+__attribute__((__deprecated__)) gint ${class_name}_set_${prop.name}(const ${class_name} *object, ${", ".join(prop.declare()).replace("<arg_name>", "value").replace("<const>", "const ")}, GError **error);
     % else:
-gint ${class_name}_set_${prop.name}(const ${class_name} *object,
-    ${", ".join(prop.declare()).replace("<arg_name>", "value").replace("<const>", "const ")},
-    GError **error);
+gint ${class_name}_set_${prop.name}(const ${class_name} *object, ${", ".join(prop.declare()).replace("<arg_name>", "value").replace("<const>", "const ")}, GError **error);
     % endif
-gint ${class_name}_get_${prop.name}(const ${class_name} *object, GVariant **value,
-    GError **error);
+% endif
+% if not prop.private and prop.access != "write":
+    % if prop.deprecated:
+__attribute__((__deprecated__)) gint ${class_name}_get_${prop.name}(const ${class_name} *object, ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error);
+    % else:
+gint ${class_name}_get_${prop.name}(const ${class_name} *object, ${", ".join(prop.out_declare()).replace("<arg_name>", "value").replace("<const>", "")}, GError **error);
+    % endif
+% endif
+% endif
 % endfor
 
 % for method in intf.methods:

{lbkit-0.5.14 → lbkit-0.5.16/lbkit.egg-info}/PKG-INFO

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

lbkit-0.5.14/lbkit/__init__.py

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