lbkit 0.6.8__tar.gz → 0.7.0__tar.gz

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

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

lbkit-0.7.0/lbkit/__init__.py

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

{lbkit-0.6.8 → lbkit-0.7.0}/lbkit/codegen/codegen.py

@@ -17,7 +17,7 @@ from lbkit.misc import SmartFormatter
 lb_cwd = os.path.split(os.path.realpath(__file__))[0]
 log = Logger("codegen")
 
-__version__=3
+__version__=4
 
 class CodeGen(object):
     def __init__(self, args):

{lbkit-0.6.8 → lbkit-0.7.0}/lbkit/codegen/template/client.c.mako

@@ -182,6 +182,105 @@ ${class_name}_Properties *${class_name}_properties(void)
     return &${properties};
 }
 
+% if codegen_version >= 4:
+const ${class_name} *${class_name}_get(const gchar *name)
+{
+    return lb_impl._get(&_${class_name}_interface, name);
+}
+
+const ${class_name} *${class_name}_new(const gchar *well_known, const gchar *obj_name)
+{
+    LBO *obj = lb_impl._cli_new(&_${class_name}_interface, well_known, obj_name);
+    return (const ${class_name} *)obj;
+}
+
+/* 减对象引用计数 */
+void ${class_name}_unref(const ${class_name} **obj)
+{
+    lb_impl._unref((LBO **)obj);
+}
+
+/* 加对象引用计数 */
+const ${class_name} *${class_name}_ref(const ${class_name} *obj)
+{
+    return (const ${class_name} *)lb_impl._ref((LBO *)obj);
+}
+
+/* 绑定数据 */
+void ${class_name}_bind(const ${class_name} *lb_obj, gpointer data, GDestroyNotify destroy_func)
+{
+    lb_impl._bind((LBO *)lb_obj, data, destroy_func);
+}
+
+/* 获取绑定数据 */
+gpointer ${class_name}_data(const ${class_name} *lb_obj)
+{
+    return lb_impl._data((LBO *)lb_obj);
+}
+
+/* @notes 属性对象属性值变更(后)事件 */
+gint ${class_name}_on_prop_changed(const ${class_name} *lb_obj, const gchar *prop, ${class_name}_after_changed_hook pc, gpointer user_data, GDestroyNotify destroy)
+{
+    return lb_impl._on_prop_changed((LBO *)lb_obj, prop, (lbo_after_changed_hook)pc, user_data, destroy);
+}
+
+/* 取消监听，成功取消监听时会调用监听时设置的destroy回调清除注册时的user_data */
+void ${class_name}_on_prop_changed_cancel(const ${class_name} *lb_obj, const gchar *prop, ${class_name}_after_changed_hook pc, gconstpointer user_data)
+{
+    lb_impl._on_prop_changed_cancel((LBO *)lb_obj, prop, (lbo_after_changed_hook)pc, user_data);
+}
+
+/* 对象变更事件 */
+void ${class_name}_on_changed(${class_name}_on_changed_hook cb, gpointer user_data, GDestroyNotify destroy)
+{
+    lb_impl._on_changed(&_${class_name}_interface, (LbObjectHook)cb, user_data, destroy);
+}
+
+/* 注册对象释放回调 */
+void ${class_name}_before_destroy(const ${class_name} *lb_obj, GHookFunc cb, gpointer user_data)
+{
+    lb_impl._before_destroy((LBO *)lb_obj, cb, user_data);
+}
+
+/* 查询第n个对象 */
+const ${class_name} *${class_name}_nth(int nth)
+{
+    return (const ${class_name} *)lb_impl._nth(&_${class_name}_interface, nth);
+}
+
+/* 查询对象名称 */
+const gchar *${class_name}_name(const ${class_name} *obj)
+{
+    return lbo_name((LBO *)obj);
+}
+
+/* 对象加锁 */
+void ${class_name}_lock(const ${class_name} *obj)
+{
+    lbo_lock((LBO *)obj);
+}
+
+/* 对象解锁 */
+void ${class_name}_unlock(const ${class_name} *obj)
+{
+    lbo_unlock((LBO *)obj);
+}
+
+/* 对象列表查询接口 */
+GSList *${class_name}_list(void)
+{
+    return lb_impl._list(&_${class_name}_interface);
+}
+
+% for prop in intf.properties:
+/* 监听属性${prop.name}变更 */
+void ${class_name}_${prop.name}_hook(const ${class_name}_property_hook *hook)
+{
+    lb_impl._prop_hook(&${properties}.${prop.name}, (const LBPropertyHook *)hook);
+}
+
+% endfor
+% endif
 static void __attribute__((constructor(150))) ${class_name}_register(void)
 {
     // 从公共库中复制信号处理函数

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

@@ -110,6 +110,89 @@ ${class_name}_Properties *${class_name}_properties(void);
 LBInterface *${class_name}_interface(void);
 #define ${hump2underline(class_name).upper()}    ${class_name}_interface()
 
+% if codegen_version >= 4:
+/* notes: 对象变更加回调函数 */
+typedef void (*${class_name}_on_changed_hook)(const ${class_name} *lb_obj, gpointer user_data);
+/* notes: 属性变更后回调，远程对象或本地对象变更后都会调用 */
+typedef void (*${class_name}_after_changed_hook)(const ${class_name} *object, const LBProperty *prop, GVariant *value, gpointer user_data);
+/* notes: 属性变更前回调，返回-1表示阻止值变更，一般用于值合法性校验，只在被远程操作时才会生效，本地变更值不会回调 */
+typedef gint (*${class_name}_before_change_hook)(const ${class_name} *object, const LBProperty *prop, GVariant *value, gpointer user_data, GError **error);
+
+/* 属性值变更回调钩子 */
+typedef struct {
+    ${class_name}_after_changed_hook after; /* 属性变更(写入对象数据区后)后回调函数 */
+    ${class_name}_before_change_hook before; /* 属性变更前回调函数，返回0后继续调用，返回非0时中止，所有before都成功时执行属性变更 */
+    gpointer user_data;
+} ${class_name}_property_hook;
+/* 查询对象 */
+const ${class_name} *${class_name}_get(const gchar *name);
+/* 创建对象 */
+const ${class_name} *${class_name}_new(const gchar *well_known, const gchar *obj_name);
+/* 减对象引用计数 */
+void ${class_name}_unref(const ${class_name} **obj);
+/* 加对象引用计数 */
+const ${class_name} *${class_name}_ref(const ${class_name} *obj);
+/* 绑定数据 */
+void ${class_name}_bind(const ${class_name} *lb_obj, gpointer data, GDestroyNotify destroy_func);
+/* 获取绑定数据 */
+gpointer ${class_name}_data(const ${class_name} *lb_obj);
+/* @notes 属性对象属性值变更(后)事件 */
+gint ${class_name}_on_prop_changed(const ${class_name} *lb_obj, const gchar *prop, ${class_name}_after_changed_hook pc, gpointer user_data, GDestroyNotify destroy);
+/* 取消监听，成功取消监听时会调用监听时设置的destroy回调清除注册时的user_data */
+void ${class_name}_on_prop_changed_cancel(const ${class_name} *lb_obj, const gchar *prop, ${class_name}_after_changed_hook pc, gconstpointer user_data);
+/* 对象变更事件 */
+void ${class_name}_on_changed(${class_name}_on_changed_hook cb, gpointer user_data, GDestroyNotify destroy);
+/* 注册对象释放回调 */
+void ${class_name}_before_destroy(const ${class_name} *lb_obj, GHookFunc cb, gpointer user_data);
+/*
+ * 查询第n个对象
+ * @notes: 支持正逆向查询第n个对象，返回的对象需要使用lbo_unref减引用计数
+ *     正向查找传入非负n，以0开始计数，表示查找最早创建的第n个对象;
+ *     逆向查找传入负数n，以-1开始计数，依次为-2、-3等，表示查找最后创建的第n个对象。
+ */
+const ${class_name} *${class_name}_nth(int nth);
+/* 查询对象名称 */
+const gchar *${class_name}_name(const ${class_name} *obj);
+/* 对象加锁 */
+void ${class_name}_lock(const ${class_name} *obj);
+/* 对象解锁 */
+void ${class_name}_unlock(const ${class_name} *obj);
+/* 对象列表查询接口 */
+GSList *${class_name}_list(void);
+/* 监听属性 */
+% for prop in intf.properties:
+void ${class_name}_${prop.name}_hook(const ${class_name}_property_hook *hook);
+% endfor
+
+static inline void ${class_name}_unref_p(const ${class_name} *obj)
+{
+    ${class_name}_unref(&obj);
+}
+
+static inline void _cleanup_${class_name}_(const ${class_name} **ptr)
+{
+    if (ptr && *ptr) {
+        ${class_name}_unref(ptr);
+    }
+}
+
+static inline void ${class_name}_list_free(GSList **list)
+{
+    g_assert(list);
+    g_slist_free_full(*list, (GDestroyNotify)${class_name}_unref_p);
+    *list = NULL;
+}
+
+static inline void _cleanup_${class_name}_list(GSList **ptr)
+{
+    if (ptr && *ptr) {
+        ${class_name}_list_free(ptr);
+    }
+}
+
+#define cleanup_${class_name} __attribute__((cleanup(_cleanup_${class_name}_)))
+#define cleanup_${class_name}_list __attribute__((cleanup(_cleanup_${class_name}_list)))
+% endif
 #ifdef __cplusplus
 }
 #endif

{lbkit-0.6.8 → lbkit-0.7.0}/lbkit/codegen/template/server.c.mako

@@ -458,6 +458,116 @@ ${class_name}_Properties *${class_name}_properties(void)
     return &${properties};
 }
 
+% if codegen_version >= 4:
+const ${class_name} *${class_name}_get(const gchar *name)
+{
+    return lb_impl._get(&_${class_name}_interface, name);
+}
+
+const ${class_name} *${class_name}_new(const gchar *name, gboolean *exist)
+{
+    LBO *obj = lb_impl._new(&_${class_name}_interface, name, exist);
+    return (const ${class_name} *)obj;
+}
+
+void ${class_name}_unref(const ${class_name} **obj)
+{
+    lb_impl._unref((LBO **)obj);
+}
+
+/* 加对象引用计数 */
+const ${class_name} *${class_name}_ref(const ${class_name} *obj)
+{
+    return (const ${class_name} *)lb_impl._ref((LBO *)obj);
+}
+
+/* 设置在位状态 */
+void ${class_name}_present_set(const ${class_name} *obj, gboolean present)
+{
+    lb_impl._present_set((LBO *)obj, present);
+}
+
+/* 获取在位状态 */
+gboolean ${class_name}_present(const ${class_name} *obj)
+{
+    return lb_impl._present((LBO *)obj);
+}
+
+/* 绑定数据 */
+void ${class_name}_bind(const ${class_name} *lb_obj, gpointer data, GDestroyNotify destroy_func)
+{
+    lb_impl._bind((LBO *)lb_obj, data, destroy_func);
+}
+
+/* 获取绑定数据 */
+gpointer ${class_name}_data(const ${class_name} *lb_obj)
+{
+    return lb_impl._data((LBO *)lb_obj);
+}
+
+/* @notes 属性对象属性值变更(后)事件 */
+gint ${class_name}_on_prop_changed(const ${class_name} *lb_obj, const gchar *prop, ${class_name}_after_changed_hook pc, gpointer user_data, GDestroyNotify destroy)
+{
+    return lb_impl._on_prop_changed((LBO *)lb_obj, prop, (lbo_after_changed_hook)pc, user_data, destroy);
+}
+
+/* 取消监听，成功取消监听时会调用监听时设置的destroy回调清除注册时的user_data */
+void ${class_name}_on_prop_changed_cancel(const ${class_name} *lb_obj, const gchar *prop, ${class_name}_after_changed_hook pc, gconstpointer user_data)
+{
+    lb_impl._on_prop_changed_cancel((LBO *)lb_obj, prop, (lbo_after_changed_hook)pc, user_data);
+}
+
+/* 对象变更事件 */
+void ${class_name}_on_changed(${class_name}_on_changed_hook cb, gpointer user_data, GDestroyNotify destroy)
+{
+    lb_impl._on_changed(&_${class_name}_interface, (LbObjectHook)cb, user_data, destroy);
+}
+
+/* 注册对象释放回调 */
+void ${class_name}_before_destroy(const ${class_name} *lb_obj, GHookFunc cb, gpointer user_data)
+{
+    lb_impl._before_destroy((LBO *)lb_obj, cb, user_data);
+}
+
+/* 查询第n个对象 */
+const ${class_name} *${class_name}_nth(int nth)
+{
+    return (const ${class_name} *)lb_impl._nth(&_${class_name}_interface, nth);
+}
+
+/* 查询对象名称 */
+const gchar *${class_name}_name(const ${class_name} *obj)
+{
+    return lbo_name((LBO *)obj);
+}
+
+/* 对象加锁 */
+void ${class_name}_lock(const ${class_name} *obj)
+{
+    lbo_lock((LBO *)obj);
+}
+
+/* 对象解锁 */
+void ${class_name}_unlock(const ${class_name} *obj)
+{
+    lbo_unlock((LBO *)obj);
+}
+
+/* 对象列表查询接口 */
+GSList *${class_name}_list(void)
+{
+    return lb_impl._list(&_${class_name}_interface);
+}
+
+% for prop in intf.properties:
+/* 监听属性${prop.name}变更 */
+void ${class_name}_${prop.name}_hook(const ${class_name}_property_hook *hook)
+{
+    lb_impl._prop_hook(&${properties}.${prop.name}, (const LBPropertyHook *)hook);
+}
+
+% endfor
+% endif
 static void __attribute__((constructor(150))) ${class_name}_register(void)
 {
     // 从公共库中复制信号处理函数

lbkit-0.7.0/lbkit/codegen/template/server.h.mako

@@ -0,0 +1,153 @@
+<% from lbkit.tools import hump2underline %>\
+#ifndef __${"_".join(intf.name.upper().split(".", -1))}_SRV_H__
+#define __${"_".join(intf.name.upper().split(".", -1))}_SRV_H__
+
+#include <glib-2.0/glib.h>
+#include <glib-2.0/gio/gio.h>
+#include "lb_base.h"
+#include "public/${intf.name}.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+<% class_name = intf.alias %>\
+
+% for prop in intf.properties:
+/*
+ * property: ${prop.name}
+% if len(prop.description.strip()) > 0:
+ *
+ % for line in prop.description.split("\n"):
+   % if len(line.strip()) > 0:
+ * ${line.strip()}
+   % endif
+ % endfor
+% endif
+ */
+    % if prop.deprecated:
+__attribute__((__deprecated__)) void ${class_name}_set_${prop.name}(const ${class_name} *object, ${", ".join(prop.declare()).replace("<arg_name>", "value").replace("<const>", "const ")});
+    % else:
+void ${class_name}_set_${prop.name}(const ${class_name} *object, ${", ".join(prop.declare()).replace("<arg_name>", "value").replace("<const>", "const ")});
+    % endif
+% endfor
+
+% for signal in intf.signals:
+/*
+ * signal: ${signal.name}
+% if len(signal.description.strip()) > 0:
+ *
+ % for line in signal.description.split("\n"):
+   % if len(line.strip()) > 0:
+ * ${line.strip()}
+   % endif
+ % endfor
+% endif
+ */
+    % 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
+
+LBInterface *${class_name}_interface(void);
+${class_name}_Properties *${class_name}_properties(void);
+
+#define ${hump2underline(class_name).upper()} ${class_name}_interface()
+
+% if codegen_version >= 4:
+/* notes: 对象变更加回调函数 */
+typedef void (*${class_name}_on_changed_hook)(const ${class_name} *lb_obj, gpointer user_data);
+/* notes: 属性变更后回调，远程对象或本地对象变更后都会调用 */
+typedef void (*${class_name}_after_changed_hook)(const ${class_name} *object, const LBProperty *prop, GVariant *value, gpointer user_data);
+/* notes: 属性变更前回调，返回-1表示阻止值变更，一般用于值合法性校验，只在被远程操作时才会生效，本地变更值不会回调 */
+typedef gint (*${class_name}_before_change_hook)(const ${class_name} *object, const LBProperty *prop, GVariant *value, gpointer user_data, GError **error);
+
+/* 属性值变更回调钩子 */
+typedef struct {
+    ${class_name}_after_changed_hook after; /* 属性变更(写入对象数据区后)后回调函数 */
+    ${class_name}_before_change_hook before; /* 属性变更前回调函数，返回0后继续调用，返回非0时中止，所有before都成功时执行属性变更 */
+    gpointer user_data;
+} ${class_name}_property_hook;
+/* 查询对象 */
+const ${class_name} *${class_name}_get(const gchar *name);
+/* 创建对象 */
+const ${class_name} *${class_name}_new(const gchar *name, gboolean *exist);
+void ${class_name}_unref(const ${class_name} **obj);
+/* 加对象引用计数 */
+const ${class_name} *${class_name}_ref(const ${class_name} *obj);
+/* 设置在位状态 */
+void ${class_name}_present_set(const ${class_name} *obj, gboolean present);
+/* 获取在位状态 */
+gboolean ${class_name}_present(const ${class_name} *obj);
+/* 绑定数据 */
+void ${class_name}_bind(const ${class_name} *lb_obj, gpointer data, GDestroyNotify destroy_func);
+/* 获取绑定数据 */
+gpointer ${class_name}_data(const ${class_name} *lb_obj);
+/* @notes 属性对象属性值变更(后)事件 */
+gint ${class_name}_on_prop_changed(const ${class_name} *lb_obj, const gchar *prop, ${class_name}_after_changed_hook pc, gpointer user_data, GDestroyNotify destroy);
+/* 取消监听，成功取消监听时会调用监听时设置的destroy回调清除注册时的user_data */
+void ${class_name}_on_prop_changed_cancel(const ${class_name} *lb_obj, const gchar *prop, ${class_name}_after_changed_hook pc, gconstpointer user_data);
+/* 对象添加删除事件 */
+void ${class_name}_on_changed(${class_name}_on_changed_hook cb, gpointer user_data, GDestroyNotify destroy);
+/* 注册对象释放回调 */
+void ${class_name}_before_destroy(const ${class_name} *lb_obj, GHookFunc cb, gpointer user_data);
+/*
+ * 查询第n个对象
+ * @notes: 支持正逆向查询第n个对象，返回的对象需要使用lbo_unref减引用计数
+ *     正向查找传入非负n，以0开始计数，表示查找最早创建的第n个对象;
+ *     逆向查找传入负数n，以-1开始计数，依次为-2、-3等，表示查找最后创建的第n个对象。
+ */
+const ${class_name} *${class_name}_nth(int nth);
+/* 查询对象名称 */
+const gchar *${class_name}_name(const ${class_name} *obj);
+/* 对象加锁 */
+void ${class_name}_lock(const ${class_name} *obj);
+/* 对象解锁 */
+void ${class_name}_unlock(const ${class_name} *obj);
+/* 对象列表查询接口
+ * @notes: 返回的单链需要lbo_unref减每个单链数据的引用计数
+ *         或者调用${class_name}_list_free释放
+ *         或者申明GSList时使用cleanup_${class_name}_list在作用域结束时自动释放
+ */
+GSList *${class_name}_list(void);
+/* 监听属性 */
+% for prop in intf.properties:
+void ${class_name}_${prop.name}_hook(const ${class_name}_property_hook *hook);
+% endfor
+
+static inline void ${class_name}_unref_p(const ${class_name} *obj)
+{
+    ${class_name}_unref(&obj);
+}
+
+static inline void _cleanup_${class_name}_(const ${class_name} **ptr)
+{
+    if (ptr && *ptr) {
+        ${class_name}_unref(ptr);
+    }
+}
+
+static inline void ${class_name}_list_free(GSList **list)
+{
+    g_assert(list);
+    g_slist_free_full(*list, (GDestroyNotify)${class_name}_unref_p);
+    *list = NULL;
+}
+
+static inline void _cleanup_${class_name}_list(GSList **ptr)
+{
+    if (ptr && *ptr) {
+        ${class_name}_list_free(ptr);
+    }
+}
+
+#define cleanup_${class_name} __attribute__((cleanup(_cleanup_${class_name}_)))
+#define cleanup_${class_name}_list __attribute__((cleanup(_cleanup_${class_name}_list)))
+% endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __${"_".join(intf.name.upper().split(".", -1))}_H__ */

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

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

lbkit-0.6.8/lbkit/__init__.py

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

lbkit-0.6.8/lbkit/codegen/template/server.h.mako

@@ -1,63 +0,0 @@
-<% from lbkit.tools import hump2underline %>\
-#ifndef __${"_".join(intf.name.upper().split(".", -1))}_SRV_H__
-#define __${"_".join(intf.name.upper().split(".", -1))}_SRV_H__
-
-#include <glib-2.0/glib.h>
-#include <glib-2.0/gio/gio.h>
-#include "lb_base.h"
-#include "public/${intf.name}.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-<% class_name = intf.alias %>\
-
-% for prop in intf.properties:
-/*
- * property: ${prop.name}
-% if len(prop.description.strip()) > 0:
- *
- % for line in prop.description.split("\n"):
-   % if len(line.strip()) > 0:
- * ${line.strip()}
-   % endif
- % endfor
-% endif
- */
-    % if prop.deprecated:
-__attribute__((__deprecated__)) void ${class_name}_set_${prop.name}(const ${class_name} *object, ${", ".join(prop.declare()).replace("<arg_name>", "value").replace("<const>", "const ")});
-    % else:
-void ${class_name}_set_${prop.name}(const ${class_name} *object, ${", ".join(prop.declare()).replace("<arg_name>", "value").replace("<const>", "const ")});
-    % endif
-% endfor
-
-% for signal in intf.signals:
-/*
- * signal: ${signal.name}
-% if len(signal.description.strip()) > 0:
- *
- % for line in signal.description.split("\n"):
-   % if len(line.strip()) > 0:
- * ${line.strip()}
-   % endif
- % endfor
-% endif
- */
-    % 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
-
-LBInterface *${class_name}_interface(void);
-${class_name}_Properties *${class_name}_properties(void);
-
-#define ${hump2underline(class_name).upper()} ${class_name}_interface()
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __${"_".join(intf.name.upper().split(".", -1))}_H__ */