lbkit 0.5.7__tar.gz → 0.5.9__tar.gz

{lbkit-0.5.7/lbkit.egg-info → lbkit-0.5.9}/PKG-INFO

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

lbkit-0.5.9/lbkit/__init__.py

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

{lbkit-0.5.7 → lbkit-0.5.9}/lbkit/codegen/idf_interface.py

@@ -48,6 +48,7 @@ ANNOTATION_MAP = {
     "emits_false": IdfAnnotation("org.freedesktop.DBus.Property.EmitsChangedSignal", "false"),
     "private": IdfAnnotation("com.litebmc.Dbus.Property.Private", "const"),
     "refobj": IdfAnnotation("com.litebmc.Dbus.Property.RefObject", "true"),
+    "required": IdfAnnotation("com.litebmc.Dbus.Property.Required", "true"),
 }
 
 ACCESS_MAP = {
@@ -715,7 +716,10 @@ class IdfInterface(IdfInterfaceBase):
     def odf_schema(self):
         schema = {}
         with_schema_prop_cnt = 0
+        required = []
         for prop in self.properties:
+            if "required" in prop.flags:
+                required.append(prop.name)
             odf = prop.odf_schema(True)
             if odf is not None:
                 schema[prop.name] = odf
@@ -734,6 +738,8 @@ class IdfInterface(IdfInterfaceBase):
             "type": "object",
             "additionalProperties": False
         }
+        if len(required) > 0:
+            odf["required"] = required
         if with_schema_prop_cnt > 0:
             odf["properties"] = schema
             odf["$defs"] = {

{lbkit-0.5.7 → lbkit-0.5.9}/lbkit/codegen/template/client.c.mako

@@ -45,6 +45,14 @@ gint ${class_name}_get_${prop.name}(const ${class_name} *object, GVariant **valu
 % endfor
 
 % for method in intf.methods:
+<% RSP_PARA = f'' %>\
+<% REQ_PARA = f'' %>\
+    % if len(method.returns.parameters) > 0:
+<% RSP_PARA = f'{intf.alias}_{method.name}_Rsp **rsp, ' %>\
+    % endif
+    % if len(method.parameters.parameters) > 0:
+<% REQ_PARA = f'const {intf.alias}_{method.name}_Req *req, ' %>\
+    % endif
 /*
  * ${method.description}
  *
@@ -56,8 +64,9 @@ gint ${class_name}_get_${prop.name}(const ${class_name} *object, GVariant **valu
  *   @out_${arg.name}: ${arg.description}, signature: ${arg.signature}
     % endfor
  */
-int ${class_name}_Call_${method.name}(const ${class_name} *object, const ${intf.alias}_${method.name}_Req *req,
-    ${intf.alias}_${method.name}_Rsp **rsp, gint timeout, GError **error)
+int ${class_name}_Call_${method.name}(const ${class_name} *object,
+    ${REQ_PARA}${RSP_PARA}gint timeout,
+    GError **error)
 {
     if (error == NULL) {
         log_error("Emit method ${method.name} with parameter error, error is NULL");
@@ -67,6 +76,12 @@ int ${class_name}_Call_${method.name}(const ${class_name} *object, const ${intf.
         *error = g_error_new(G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Call method ${method.name} with parameter error, object is NULL");
         return -1;
     }
+    % if len(method.returns.parameters) == 0:
+    void **rsp = NULL;
+    % endif
+    % if len(method.parameters.parameters) == 0:
+    void *req = NULL;
+    % endif
     return gcl_impl.call_method((GclObject *)object, (const GclMethod *)&${method_processer}->${method.name},
                                  (void *)req, (void **)rsp, timeout, error);
 }

{lbkit-0.5.7 → lbkit-0.5.9}/lbkit/codegen/template/client.h.mako

@@ -29,15 +29,23 @@ gint ${class_name}_get_${prop.name}(const ${class_name} *object, GVariant **valu
 % endfor
 
 % for method in intf.methods:
+<% RSP_PARA = f'' %>\
+<% REQ_PARA = f'' %>\
+    % if len(method.returns.parameters) > 0:
+<% RSP_PARA = f'{intf.alias}_{method.name}_Rsp **rsp, ' %>\
+    % endif
+    % if len(method.parameters.parameters) > 0:
+<% REQ_PARA = f'const {intf.alias}_{method.name}_Req *req, ' %>\
+    % endif
 /* method.description */
     % if method.deprecated:
 __attribute__((__deprecated__)) int ${class_name}_Call_${method.name}(const ${class_name} *object,
-    const ${intf.alias}_${method.name}_Req *req, ${intf.alias}_${method.name}_Rsp **rsp,
-    gint timeout, GError **error);
+    ${REQ_PARA}${RSP_PARA}gint timeout,
+    GError **error);
     % else:
 int ${class_name}_Call_${method.name}(const ${class_name} *object,
-    const ${intf.alias}_${method.name}_Req *req, ${intf.alias}_${method.name}_Rsp **rsp,
-    gint timeout, GError **error);
+    ${REQ_PARA}${RSP_PARA}gint timeout,
+    GError **error);
     % endif
 % endfor
 

{lbkit-0.5.7 → lbkit-0.5.9}/lbkit/codegen/template/public.c.mako

@@ -176,6 +176,7 @@ gboolean _validate_odf_as_struct_${name}(yaml_document_t *doc, yaml_node_t *node
         g_string_truncate(prop, len);
     }
     % endfor
+    g_hash_table_destroy(prop_table);
     return valid;
 }
 
@@ -1028,16 +1029,30 @@ void ${class_name}_${action.name}_unregister(${class_name}_${action.name}_action
     g_mutex_unlock(&_${class_name}_${action.name}_lock);
 }
 
-int ${class_name}_${action.name}_run(const ${class_name} *object, const ${class_name}_${action.name}_Req *req, ${class_name}_${action.name}_Rsp **rsp)
+<% RSP_PARA = f'' %>\
+<% REQ_PARA = f'' %>\
+<% REQ_NAME = f'' %>\
+    % if len(action.returns.parameters) > 0:
+<% RSP_PARA = f', {class_name}_{action.name}_Rsp **rsp' %>\
+    % endif
+    % if len(action.parameters.parameters) > 0:
+<% REQ_PARA = f', const {class_name}_{action.name}_Req *req' %>\
+<% REQ_NAME = f', req' %>\
+    % endif
+int ${class_name}_${action.name}_run(const ${class_name} *object${REQ_PARA}${RSP_PARA})
 {
     gint result = 0;
     g_mutex_lock(&_${class_name}_${action.name}_lock);
     for (GSList *item = _${class_name}_${action.name}_actions; item; item = item->next) {
+        _${class_name}_${action.name}_PluginAction *handler = (_${class_name}_${action.name}_PluginAction *)item->data;
+    % if len(action.returns.parameters) > 0:
         if (rsp && *rsp) {
             ${class_name}_${action.name}_Rsp_free(rsp);
         }
-        _${class_name}_${action.name}_PluginAction *handler = (_${class_name}_${action.name}_PluginAction *)item->data;
-        gint ret = handler->action(object, req, rsp, handler->user_data);
+        gint ret = handler->action(object${REQ_NAME}, rsp, handler->user_data);
+    % else:
+        gint ret = handler->action(object${REQ_NAME}, handler->user_data);
+    % endif
         if (ret != 0)
             result = ret;
         % if action.policy == "return_any_success":
@@ -1147,8 +1162,14 @@ static gboolean _validate_odf_prop_${prop.name}(yaml_document_t *doc, GHashTable
     gsize len = prop->len;
     yaml_node_t *node = g_hash_table_lookup(prop_table, "${prop.name}");
     do {
-        if (!node)
+        if (!node) {
+    ## 检查属性是否存在
+    % if "required" in prop.flags:
+            *error_list = g_slist_append(*error_list, g_error_new(ODF_ERROR, ODF_ERROR_PROP_MISSING, "Property %s is missing", prop->str));
+            valid = FALSE;
+    % endif
             break;
+        }
         g_string_append(prop, ".${prop.name}");
     % if "refobj" not in prop.flags:
         if (validate_odf_as_ref_prop(doc, node, prop))
@@ -1183,13 +1204,14 @@ gboolean ${intf.name.replace(".", "_")}_validate_odf(yaml_document_t *doc, yaml_
             "the node type of object %s is not a mapping, get %s", object_name, gcl_yaml_node_type_str(node->type)));
         return FALSE;
     }
-    GString *prop = g_string_sized_new(128);
+    cleanup_gstring GString *prop = g_string_sized_new(128);
     g_string_printf(prop, "%s", object_name);
     gboolean valid = TRUE;
     GHashTable *prop_table = load_yaml_mapping_to_hash_table(doc, node);
     % for prop in stru.values.parameters:
     valid = _validate_odf_prop_${prop.name}(doc, prop_table, prop, error_list) && valid;
     % endfor
+    g_hash_table_destroy(prop_table);
     return valid;
 }
 

{lbkit-0.5.7 → lbkit-0.5.9}/lbkit/codegen/template/public.h.mako

@@ -176,13 +176,21 @@ typedef struct {
 
 % if len(intf.plugin.actions) > 0:
 % for action in intf.plugin.actions:
-typedef int (*${class_name}_${action.name}_action)(const ${class_name} *object, const ${class_name}_${action.name}_Req *req, ${class_name}_${action.name}_Rsp **rsp, gpointer user_data);
+<% RSP_PARA = f'' %>\
+<% REQ_PARA = f'' %>\
+    % if len(action.returns.parameters) > 0:
+<% RSP_PARA = f', {class_name}_{action.name}_Rsq **rsp' %>\
+    % endif
+    % if len(action.parameters.parameters) > 0:
+<% REQ_PARA = f', const {class_name}_{action.name}_Req *req' %>\
+    % endif
+typedef int (*${class_name}_${action.name}_action)(const ${class_name} *object${REQ_PARA}${RSP_PARA}, gpointer user_data);
 
 /* Register a new plugin action, can't register repeated with same action and user_data */
 int ${class_name}_${action.name}_register(const gchar *req_signature, const gchar *rsp_signature,
     ${class_name}_${action.name}_action action, gpointer user_data);
 void ${class_name}_${action.name}_unregister(${class_name}_${action.name}_action action);
-int ${class_name}_${action.name}_run(const ${class_name} *object, const ${class_name}_${action.name}_Req *req, ${class_name}_${action.name}_Rsp **rsp);
+int ${class_name}_${action.name}_run(const ${class_name} *object${REQ_PARA}${RSP_PARA});
 
 % endfor
 % endif

{lbkit-0.5.7 → lbkit-0.5.9}/lbkit/codegen/template/server.c.mako

@@ -213,12 +213,16 @@ void ${class_name}_set_${prop.name}(const ${class_name} *object,
  * Signal: ${signal.name}
  * ${signal.description}
  */
+<% REQ_PARA = f'' %>\
+    % if len(signal.properties.parameters) > 0:
+<% REQ_PARA = f'const {class_name}_{signal.name}_Msg *msg, ' %>\
+    % endif
     % if signal.deprecated:
 __attribute__((__deprecated__)) gboolean ${class_name}_${signal.name}_Signal(const ${class_name} *object,
-    const gchar *destination, const ${class_name}_${signal.name}_Msg *msg, GError **error)
+    const gchar *destination, ${REQ_PARA}GError **error)
     % else:
 gboolean ${class_name}_${signal.name}_Signal(const ${class_name} *object, const gchar *destination,
-    const ${class_name}_${signal.name}_Msg *msg, GError **error)
+    ${REQ_PARA}GError **error)
     % endif
 {
     if (error == NULL) {
@@ -229,6 +233,9 @@ gboolean ${class_name}_${signal.name}_Signal(const ${class_name} *object, const
         *error = g_error_new(G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Emit ${signal.name} with parameter error, object is NULL");
         return FALSE;
     }
+    % if len(signal.properties.parameters) == 0:
+    void *msg = NULL;
+    % endif
     return gcl_impl.emit_signal((GclObject *)object, destination,
         (const GclSignal *)&${signal_processer}->${signal.name}, msg, error);
 }
@@ -265,9 +272,11 @@ static void _load_odf_as_prop_${prop.name}(yaml_document_t *doc, GHashTable *pro
         flags = val->data.scalar.value;
     }
     val = g_hash_table_lookup(prop_table, "${prop.name}");
+    ## validate接口在加载odf前完成属性是否必选校验，此处如果是必选属性一定存在
     if (!val) {
         if (flags) {
-            ref_loaded(obj, &${properties}.${prop.name}, NULL, NULL, user_data, flags);
+            ## 属性不存在时传入的value为空，需要开发者在回调函数中完成异常（有flags无属性值）处理
+            ref_loaded(obj, &${properties}.${prop.name}, doc, NULL, user_data, flags);
         }
         return;
     }

{lbkit-0.5.7 → lbkit-0.5.9}/lbkit/codegen/template/server.h.mako

@@ -26,7 +26,11 @@ void ${class_name}_set_${prop.name}(const ${class_name} *object,
 /*
  * ${signal.description}
  */
-gboolean ${class_name}_${signal.name}_Signal(const ${class_name} *object, const gchar *destination, const ${class_name}_${signal.name}_Msg *req, GError **error);
+    % if len(signal.properties.parameters) > 0:
+gboolean ${class_name}_${signal.name}_Signal(const ${class_name} *object, const gchar *destination, const ${class_name}_${signal.name}_Msg *msg, GError **error);
+    % else:
+gboolean ${class_name}_${signal.name}_Signal(const ${class_name} *object, const gchar *destination, GError **error);
+    % endif
 % endfor
 
 #define ${class_name.upper()}_NAME    "${intf.name}"

{lbkit-0.5.7 → lbkit-0.5.9/lbkit.egg-info}/PKG-INFO

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

lbkit-0.5.7/lbkit/__init__.py

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