lbkit 0.6.6__tar.gz → 0.6.8__tar.gz

{lbkit-0.6.6/lbkit.egg-info → lbkit-0.6.8}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: lbkit
-Version: 0.6.6
+Version: 0.6.8
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com
@@ -21,5 +21,13 @@ Requires-Dist: requests
 Requires-Dist: gitpython
 Requires-Dist: inflection
 Requires-Dist: meson>=1.4.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: summary
 
 build and code generate tools

lbkit-0.6.8/lbkit/__init__.py

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

{lbkit-0.6.6 → lbkit-0.6.8}/lbkit/codegen/idf_interface.py

@@ -7,7 +7,7 @@ from lbkit.log import Logger
 from lbkit.codegen.renderer import Renderer
 from lbkit.codegen.ctype_defination import CTYPE_OBJS, RefObjArrayValidator, RefObjValidator
 from lbkit.misc import load_yml_with_json_schema_validate
-from lbkit.errors import OdfValidateException
+from lbkit.errors import OdfValidateException, LiteBmcException
 from lbkit.helper import SigInvalidException, validate_glib_signature
 
 log = Logger("gen_interface")
@@ -16,7 +16,9 @@ class IDFException(Exception):
     pass
 
 class IdfInterfacePlugin(Renderer):
-    actions = []
+    def __init__(self):
+        super().__init__()
+        self.actions = []
 
 class IdfInterfaceBase(Renderer):
     def __init__(self) -> None:
@@ -65,6 +67,24 @@ ACCESS_FLAG_MAP = {
     "readwrite": "G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE | G_DBUS_PROPERTY_INFO_FLAGS_READABLE"
 }
 
+# 简单类型的格式化符号
+PRINT_FORMATTER_MAP = {
+    "byte": "%u",
+    "uint16": "G_GUINT16_FORMAT",
+    "uint32": "G_GUINT32_FORMAT",
+    "uint64": "G_GUINT64_FORMAT",
+    "int16": "G_GINT16_FORMAT",
+    "int32": "G_GINT32_FORMAT",
+    "int64": "G_GINT64_FORMAT",
+    "size": "G_GSIZE_FORMAT",
+    "ssize": "G_GSSIZE_FORMAT",
+    "double": "%d",
+    "boolean": "%i",
+    "string": "%s",
+    "object_path": "%s",
+    "signature": "%s"
+}
+
 # ^(byte|uint16|uint32|uint64|int16|int32|int64|double|boolean|string|object_path|signature|unixfd|(array\\[(byte|uint16|uint32|uint64|int16|int32|int64|double|boolean|string|object_path|signature|unixfd)\\])|((struct|enum|dict)\\[[a-zA-Z][A-Za-z0-9.]*\\])|(array\\[(struct|enum|dict)\\[[a-zA-Z][A-Za-z0-9.]*\\]\\]))$"
 
 METHOD_NAME_REGEX = "[A-Z][a-zA-Z0-9_]*"
@@ -816,11 +836,12 @@ class IdfBase():
 
 
 class IdfMethod(IdfBase):
-    is_plugin = False
     def __init__(self, intf: IdfInterfaceBase, method_data):
+        self.is_plugin = False
         super().__init__(intf, method_data)
         self.parameters: IdfParameters = IdfParameters(intf, method_data.get("parameters", []))
         self.returns: IdfParameters = IdfParameters(intf, method_data.get("returns", []))
+        self.errors: list[str] = method_data.get("errors", [])
 
     @property
     def in_signature(self):
@@ -835,8 +856,17 @@ class IdfMethod(IdfBase):
         deps = []
         deps.extend(self.parameters.dependency_interface)
         deps.extend(self.returns.dependency_interface)
+        deps.extend(self.errors_dependency())
         return list(set(deps))
 
+    def errors_dependency(self):
+        deps = []
+        for error in self.errors:
+            pos = error.rfind(".Error.")
+            if pos > 0:
+                deps.append(error[0:pos])
+        return deps
+
 class IdfSignal(IdfBase):
     def __init__(self, intf: IdfInterfaceBase, signal_data):
         super().__init__(intf, signal_data)
@@ -881,9 +911,8 @@ class IdfStructure(IdfBase):
 
 
 class IdfPluginAction(IdfMethod):
-    is_plugin = True
-
     def __init__(self, intf: IdfInterfaceBase, method_data):
+        self.is_plugin = True
         self.policy = method_data.get("policy", "continue_always")
         super().__init__(intf, method_data)
 
@@ -1012,10 +1041,11 @@ class IdfInterface(IdfInterfaceBase):
         self.methods: list[IdfMethod] = []
         self.signals: list[IdfSignal] = []
         self.structures: dict[str, IdfStructure] = {}
+        self.errors: dict[str, IdfStructure] = {}
         self.dictionaries: dict[str, IdfDictionary] = {}
         self.enumerations: dict[str, IdfEnumeration] = {}
         self.annotations: list[IdfAnnotation] = []
-        self.plugin: IdfInterfacePlugin = IdfInterfacePlugin()
+        self.plugin: IdfInterfacePlugin = None
         self.description = None
         self.version = None
         self.alias = None
@@ -1064,6 +1094,8 @@ class IdfInterface(IdfInterfaceBase):
             deps.extend(signal.dependency_interface)
         for method in self.methods:
             deps.extend(method.dependency_interface)
+        for _, error in self.errors.items():
+            deps.extend(error.dependency_interface)
         return list(set(deps))
 
     @property
@@ -1159,12 +1191,18 @@ class IdfInterface(IdfInterfaceBase):
         for item in items:
             self.signals.append(IdfSignal(self, item))
         items = idf.get("methods", [])
+        self.methods = []
         for item in items:
             self.methods.append(IdfMethod(self, item))
         items = idf.get("structures", [])
         for item in items:
             obj = IdfStructure(self, item)
             self.structures[obj.name] = obj
+        items = idf.get("errors", [])
+        for item in items:
+            obj = IdfStructure(self, item, "parameters")
+            self.errors[obj.name] = obj
+        self._check_errors_format()
         items = idf.get("dictionaries", [])
         for item in items:
             obj = IdfDictionary(self, item)
@@ -1174,6 +1212,7 @@ class IdfInterface(IdfInterfaceBase):
             obj = IdfEnumeration(self, item)
             self.enumerations[obj.name] = obj
         plugin = idf.get("plugin", None)
+        self.plugin = IdfInterfacePlugin()
         if plugin is not None:
             items = plugin.get("actions", [])
             for item in items:
@@ -1208,3 +1247,34 @@ class IdfInterface(IdfInterfaceBase):
         out = self.render(self.lookup, template, intf=self, codegen_version=codegen_version)
         with open(out_file, "w") as fd:
             fd.write(out)
+
+    def _check_errors_format(self):
+        for name, error in self.errors.items():
+            desc = error.description
+            chunks = []
+            prev_line = ""
+            for chunk in desc.split("$?"):
+                if prev_line:
+                    chunks.append(prev_line + chunk)
+                    prev_line = ""
+                elif chunk[-1:] == "\\":
+                    prev_line = chunk[:-1] + "$?"
+                else:
+                    chunks.append(chunk)
+            # 如果剩余prev_line示处理，表示纯粹剩余一个\
+            if prev_line:
+                chunks.append(prev_line[:-2] + "\\")
+            # 参数个数检验
+            if len(chunks) != len(error.values.parameters) + 1:
+                raise LiteBmcException(f"The number({len(chunks) - 1}) of $? in the description string(Error: ${name}) does not match the number({len(error.values.parameters)}) of parameters")
+            new_desc = chunks[0]
+            id = 1
+            for param in error.values.parameters:
+                formatter = PRINT_FORMATTER_MAP[param.ctype]
+                if formatter.startswith("%"):
+                    new_desc += formatter
+                else:
+                    new_desc += f"%\"{formatter}\""
+                new_desc += chunks[id]
+                id += 1
+            error.description = new_desc

{lbkit-0.6.6 → lbkit-0.6.8}/lbkit/codegen/template/client.h.mako

@@ -1,3 +1,4 @@
+<% from lbkit.tools import hump2underline %>\
 #ifndef __${"_".join(intf.name.upper().split(".", -1))}_CLI_H__
 #define __${"_".join(intf.name.upper().split(".", -1))}_CLI_H__
 
@@ -104,14 +105,10 @@ void ${class_name}_Unsubscribe_${signal.name}(guint *id);
     % endif
 
 % endfor
-#define ${class_name.upper()}_NAME    "${intf.name}"
-% for prop in intf.properties:
-#define ${class_name.upper()}_${prop.name}_NAME    "${prop.name}"
-% endfor
 
 ${class_name}_Properties *${class_name}_properties(void);
 LBInterface *${class_name}_interface(void);
-#define ${class_name.upper()}_INTERFACE ${class_name}_interface()
+#define ${hump2underline(class_name).upper()}    ${class_name}_interface()
 
 #ifdef __cplusplus
 }

{lbkit-0.6.6 → lbkit-0.6.8}/lbkit/codegen/template/public.c.mako

@@ -2,6 +2,64 @@
 #include "${intf.name}.h"
 
 <% class_name = intf.alias %>\
+### 生成Errors错误 START
+% if len(intf.errors):
+### 定义错误码表
+static const GDBusErrorEntry _dbus_error_entries[] =
+{
+% for name, stru in intf.errors.items():
+  {
+    .error_code = ${class_name}_Error_${name},
+    .dbus_error_name = "${intf.name}.Error.${name}"
+  },
+% endfor
+};
+
+### 初始化quark表
+static GQuark _dbus_error_quark(void)
+{
+  static gsize quark = 0;
+  g_dbus_error_register_error_domain("${intf.name.replace(".", "-")}-quark",
+                                      &quark,
+                                      _dbus_error_entries,
+                                      G_N_ELEMENTS (_dbus_error_entries));
+  return (GQuark) quark;
+}
+### 构建参数原型和参数列表
+% for name, stru in intf.errors.items():
+
+<% proto_str="" %>\
+<% param_str="" %>\
+        % for prop in stru.values.parameters:
+            % for dec in prop.declare():
+<% proto_str += dec.replace("<arg_name>", prop.name).replace("<const>", "const ") + ", " %>\
+            % endfor
+<% param_str += prop.name + ", " %>\
+        % endfor
+% if stru.description:
+/*
+ * Error: ${stru.description.strip()}
+ */
+% endif
+### 生成错误消息
+% if len(proto_str):
+GError *${intf.alias}_Error_${name}_new(${proto_str[:-2]})
+{
+    return g_error_new(_dbus_error_quark(), ${class_name}_Error_${name},
+                       "${stru.description.strip()}",
+                       ${param_str[:-2]});
+}
+% else:
+GError *${intf.alias}_Error_${name}_new(void)
+{
+    return g_error_new(_dbus_error_quark(), ${class_name}_Error_${name},
+                       "${stru.description.strip()}");
+}
+%endif
+%endfor
+
+%endif
+### 生成Errors错误 END
 ## 定义结构体ODF加载函数
 % for name, stru in intf.structures.items():
 /* ${name} structure object */

{lbkit-0.6.6 → lbkit-0.6.8}/lbkit/codegen/template/public.h.mako

@@ -15,6 +15,17 @@ extern "C" {
 /* Interface ${intf.alias} codegen start */
 
 <% class_name = intf.alias %>\
+### 生成Errors错误 START >>>>>
+% if len(intf.errors):
+### 定义枚举类型
+typedef enum {
+% for name, stru in intf.errors.items():
+    ${class_name}_Error_${name},
+% endfor
+} ${class_name}_Error;
+
+%endif
+### 生成Errors错误 END <<<<<
 % for name, stru in intf.structures.items():
 /*
  * structure: ${name}
@@ -41,8 +52,36 @@ typedef struct _${name} ${name};
  % endfor
 % endif
  */
-typedef enum _${name} ${name};
+typedef enum {
+    % for value in enum.values.parameters:
+    ${name}_${value.name},
+    % endfor
+    _${name}Invalid,
+} ${name};
+const gchar *${name}_as_string(${name} value);
+
 % endfor
+### 生成Errors错误 START
+% if len(intf.errors):
+% for name, stru in intf.errors.items():
+<% proto_str="" %>\
+        % for prop in stru.values.parameters:
+            % for dec in prop.declare():
+<% proto_str += dec.replace("<arg_name>", prop.name).replace("<const>", "const ") + ", " %>\
+            % endfor
+        % endfor
+/*
+ * Error: ${stru.description.strip()}
+ */
+% if len(proto_str):
+GError *${intf.alias}_Error_${name}_new(${proto_str[:-2]});
+% else:
+GError *${intf.alias}_Error_${name}_new(void);
+%endif
+%endfor
+
+%endif
+### 生成Errors错误 END
 % for name, dictionary in intf.dictionaries.items():
 /*
  * dictionary: ${name}
@@ -57,8 +96,8 @@ typedef enum _${name} ${name};
  */
 typedef struct _${name}${dictionary.key} ${name}${dictionary.key};
 typedef struct _${name} ${name};
-% endfor
 
+% endfor
 % for name, stru in intf.structures.items():
     % if name != class_name:
 /*
@@ -82,18 +121,6 @@ struct _${name} {
 
     % endif
 %endfor
-% for name, enum in intf.enumerations.items():
-## 枚举定义
-enum _${name} {
-    % for value in enum.values.parameters:
-    ${name}_${value.name},
-    % endfor
-    _${name}Invalid,
-};
-
-const gchar *${name}_as_string(${name} value);
-
-% endfor
 % for name, dictionary in intf.dictionaries.items():
 struct _${name}${dictionary.key} {
     % for value in dictionary.values.parameters:

{lbkit-0.6.6 → lbkit-0.6.8}/lbkit/codegen/template/server.h.mako

@@ -1,3 +1,4 @@
+<% from lbkit.tools import hump2underline %>\
 #ifndef __${"_".join(intf.name.upper().split(".", -1))}_SRV_H__
 #define __${"_".join(intf.name.upper().split(".", -1))}_SRV_H__
 
@@ -50,15 +51,11 @@ gboolean ${class_name}_${signal.name}_Signal(const ${class_name} *object, const
     % endif
 % endfor
 
-#define ${class_name.upper()}_NAME    "${intf.name}"
-% for prop in intf.properties:
-#define ${class_name.upper()}_${prop.name}_NAME    "${prop.name}"
-% endfor
-
 LBInterface *${class_name}_interface(void);
-#define ${class_name.upper()}_INTERFACE ${class_name}_interface()
 ${class_name}_Properties *${class_name}_properties(void);
 
+#define ${hump2underline(class_name).upper()} ${class_name}_interface()
+
 #ifdef __cplusplus
 }
 #endif

{lbkit-0.6.6 → lbkit-0.6.8}/lbkit/component/template/conanbase.mako

@@ -199,8 +199,19 @@ class LiteBmcConan(ConanFile):
             tc.variables["BUILD_TEST"] = False
 
 % if len(pkg.get("options", [])) > 0:
-    % for op, _ in pkg["options"].items():
-        tc.variables["BUILD_${op.upper()}"] = self.options.${op}
+    % for op, value in pkg["options"].items():
+       % if type(value["default"]) == type(False):
+        if self.options.${op}:
+            tc.variables["BUILD_${op.upper()}"] = True
+            tc.preprocessor_definitions["BUILD_${op.upper()}"] = True
+        % elif type(value["default"]) == type(""):
+        tc.variables["BUILD_${op.upper()}"] = str(self.options.${op})
+        tc.preprocessor_definitions["BUILD_${op.upper()}"] = str(self.options.${op}.value)
+        % elif type(value["default"]) == type(123):
+        tc.preprocessor_definitions["BUILD_${op.upper()}"] = int(self.options.${op}.value)
+        % elif type(value["default"]) == type(123.22):
+        tc.preprocessor_definitions["BUILD_${op.upper()}"] = float(self.options.${op}.value)
+        % endif
     % endfor
 % endif
         tc.extra_cflags = self._append_default_flags()

{lbkit-0.6.6 → lbkit-0.6.8}/lbkit/tools.py

@@ -8,6 +8,7 @@ import tempfile
 import requests
 import shlex
 import hashlib
+import re
 from lbkit.log import Logger
 from lbkit import errors
 from lbkit import misc
@@ -170,4 +171,11 @@ class Tools(object):
         if sha256sum is None or digest == sha256sum:
             self.log.info("Download %s successfully", url, uptrace=2)
             return
-        raise errors.DigestNotMatchError(f"File {dst_file} with sha256 error, need: {sha256sum}, get: {digest}")
+        raise errors.DigestNotMatchError(f"File {dst_file} with sha256 error, need: {sha256sum}, get: {digest}")
+
+def hump2underline(hunp_str):
+    # 匹配正则，匹配小写字母和大写字母的分界位置
+    p = re.compile(r'([a-z]|\d)([A-Z])')
+    # 这里第二个参数使用了正则分组的后向引用
+    sub = re.sub(p, r'\1_\2', hunp_str).lower()
+    return sub

{lbkit-0.6.6 → lbkit-0.6.8/lbkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: lbkit
-Version: 0.6.6
+Version: 0.6.8
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com
@@ -21,5 +21,13 @@ Requires-Dist: requests
 Requires-Dist: gitpython
 Requires-Dist: inflection
 Requires-Dist: meson>=1.4.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: summary
 
 build and code generate tools

lbkit-0.6.6/lbkit/__init__.py

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