lbkit 0.5.8__tar.gz → 0.5.9__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lbkit
-Version: 0.5.8
+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.8 → 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.8 → 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;
 }
 
@@ -1161,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))
@@ -1197,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.8 → lbkit-0.5.9}/lbkit/codegen/template/server.c.mako

@@ -272,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.8 → lbkit-0.5.9/lbkit.egg-info}/PKG-INFO

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

lbkit-0.5.8/lbkit/__init__.py

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