Menu
▾
▴
[Opensync-commits] r5982 - in trunk: . wrapper
|
From: <svn...@op...> - 2010-01-10 15:09:30
|
Author: markellis Date: Sun Jan 10 16:09:19 2010 New Revision: 5982 URL: http://www.opensync.org/changeset/5982 Log: wrapper modifications due to API changes, sufficient to allow a clean import into python Modified: trunk/ChangeLog trunk/wrapper/opensync-engine.i trunk/wrapper/opensync-format.i trunk/wrapper/opensync-group.i trunk/wrapper/opensync-merger.i trunk/wrapper/opensync-plugin.i trunk/wrapper/opensync-version.i Modified: trunk/ChangeLog ============================================================================== --- trunk/ChangeLog Sun Jan 10 15:59:08 2010 (r5981) +++ trunk/ChangeLog Sun Jan 10 16:09:19 2010 (r5982) @@ -1,3 +1,8 @@ +2010-01-10 Mark Ellis <ma...@mp...> + + * wrapper/opensync-{engine,format,group,merger,plugin,version}.i: modifications due to API + changes, sufficient to allow a clean import into python + 2009-02-04 Graham Cobb <g+...@co...> * opensync/group/opensync_member.c (osync_member_load): Use osync_member_add_objtype_sink Modified: trunk/wrapper/opensync-engine.i ============================================================================== --- trunk/wrapper/opensync-engine.i Sun Jan 10 15:59:08 2010 (r5981) +++ trunk/wrapper/opensync-engine.i Sun Jan 10 16:09:19 2010 (r5982) @@ -250,7 +250,7 @@ %pythoncode %{ - group = property(get_group) + # group = property(get_group) # archive = property(get_archive) %} } Modified: trunk/wrapper/opensync-format.i ============================================================================== --- trunk/wrapper/opensync-format.i Sun Jan 10 15:59:08 2010 (r5981) +++ trunk/wrapper/opensync-format.i Sun Jan 10 16:09:19 2010 (r5982) @@ -278,9 +278,9 @@ __oldinit = __init__ def __init__(self, *args): self.__oldinit(*args) - /* - self.filters = _ListWrapper(self.num_filters, self.nth_filter) - */ + + # self.filters = _ListWrapper(self.num_filters, self.nth_filter) + %} } Modified: trunk/wrapper/opensync-group.i ============================================================================== --- trunk/wrapper/opensync-group.i Sun Jan 10 15:59:08 2010 (r5981) +++ trunk/wrapper/opensync-group.i Sun Jan 10 16:09:19 2010 (r5982) @@ -38,11 +38,29 @@ osync_group_env_remove_group(self, group); } + int num_groups() { + OSyncList *groups = osync_group_env_get_groups(self); + unsigned int num = osync_list_length(groups); + osync_list_free(groups); + return num; + } + + Group *nth_group(int nth) { + OSyncList *groups = osync_group_env_get_groups(self); + + Group *group = (OSyncGroup*)osync_list_nth_data(groups, nth); + if (group) + osync_group_ref(group); + osync_list_free(groups); + return group; + } + %pythoncode %{ # extend the SWIG-generated constructor, so that we can setup our list-wrapper classes __oldinit = __init__ def __init__(self, *args): self.__oldinit(*args) + self.groups = _ListWrapper(self.num_groups, self.nth_group) %} } @@ -132,7 +150,24 @@ Member *member = osync_group_find_member(self, id); if (member) osync_member_ref(member); - return member; + return member; + } + + int num_members() { + OSyncList *members = osync_group_get_members(self); + unsigned int num = osync_list_length(members); + osync_list_free(members); + return num; + } + + Member *nth_member(int nth) { + OSyncList *members = osync_group_get_members(self); + + Member *member = (Member*)osync_list_nth_data(members, nth); + if (member) + osync_member_ref(member); + osync_list_free(members); + return member; } const char *get_configdir() { @@ -143,6 +178,21 @@ osync_group_set_configdir(self, directory); } + int num_objtypes() { + OSyncList *objtypes = osync_group_get_objtypes(self); + unsigned int num = osync_list_length(objtypes); + osync_list_free(objtypes); + return num; + } + + const char *nth_objtype(int nth) { + OSyncList *objtypes = osync_group_get_objtypes(self); + + const char *objtype = (const char*)osync_list_nth_data(objtypes, nth); + osync_list_free(objtypes); + return objtype; + } + void set_objtype_enabled(const char *objtype, bool enabled) { osync_group_set_objtype_enabled(self, objtype, enabled); } @@ -205,7 +255,7 @@ %pythoncode %{ name = property(get_name, set_name) configdir = property(get_configdir, set_configdir) - last_synchronization = property(get_last_synchronization, set_last_synchronization) + last_synchronization = property(get_last_synchronization) merger_enabled = property(get_merger_enabled, set_merger_enabled) converter_enabled = property(get_converter_enabled, set_converter_enabled) @@ -213,21 +263,14 @@ __oldinit = __init__ def __init__(self, *args): self.__oldinit(*args) - /* - self.filters = _ListWrapper(self.num_filters, self.nth_filter) - */ + + self.members = _ListWrapper(self.num_members, self.nth_member) + self.objtypes = _ListWrapper(self.num_objtypes, self.nth_objtype) + # self.filters = _ListWrapper(self.num_filters, self.nth_filter) %} } -typedef enum {} StartType; - -%constant int START_TYPE_UNKNOWN = OSYNC_START_TYPE_UNKNOWN; -%constant int START_TYPE_PROCESS = OSYNC_START_TYPE_PROCESS; -%constant int START_TYPE_THREAD = OSYNC_START_TYPE_THREAD; -%constant int START_TYPE_EXTERNAL = OSYNC_START_TYPE_EXTERNAL; - - typedef struct {} Member; %extend Member { Member() { Modified: trunk/wrapper/opensync-merger.i ============================================================================== --- trunk/wrapper/opensync-merger.i Sun Jan 10 15:59:08 2010 (r5981) +++ trunk/wrapper/opensync-merger.i Sun Jan 10 16:09:19 2010 (r5982) @@ -130,6 +130,10 @@ return; } + const char *get_objtype() { + return osync_xmlformat_get_objtype(self); + } + %pythoncode %{ objtype = property(get_objtype) %} Modified: trunk/wrapper/opensync-plugin.i ============================================================================== --- trunk/wrapper/opensync-plugin.i Sun Jan 10 15:59:08 2010 (r5981) +++ trunk/wrapper/opensync-plugin.i Sun Jan 10 16:09:19 2010 (r5982) @@ -4,6 +4,13 @@ %constant int PLUGIN_OPTIONAL_CONFIGURATION = OSYNC_PLUGIN_OPTIONAL_CONFIGURATION; %constant int PLUGIN_NEEDS_CONFIGURATION = OSYNC_PLUGIN_NEEDS_CONFIGURATION; +typedef enum {} StartType; + +%constant int START_TYPE_UNKNOWN = OSYNC_START_TYPE_UNKNOWN; +%constant int START_TYPE_PROCESS = OSYNC_START_TYPE_PROCESS; +%constant int START_TYPE_THREAD = OSYNC_START_TYPE_THREAD; +%constant int START_TYPE_EXTERNAL = OSYNC_START_TYPE_EXTERNAL; + typedef struct {} Plugin; %extend Plugin { @@ -123,7 +130,9 @@ int num_plugins() { OSyncList *plugins = osync_plugin_env_get_plugins(self); - return osync_list_length(plugins); + unsigned int num = osync_list_length(plugins); + osync_list_free(plugins); + return num; } Plugin *nth_plugin(int nth) { @@ -132,6 +141,7 @@ Plugin *plugin = (OSyncPlugin*)osync_list_nth_data(plugins, nth); if (plugin) osync_plugin_ref(plugin); + osync_list_free(plugins); return plugin; } @@ -270,7 +280,7 @@ config = property(get_config, set_config) main_sink = property(get_main_sink, set_main_sink) format_env = property(get_format_env, set_format_env) - sink = property(get_sink, set_sink) + # sink = property(get_sink, set_sink) groupname = property(get_groupname, set_groupname) version = property(get_version, set_version) capabilities = property(get_capabilities, set_capabilities) @@ -411,7 +421,7 @@ void committed_all(PluginInfo *info, Context *ctx) { osync_objtype_sink_committed_all(self, info, ctx); } - + */ bool is_enabled() { return osync_objtype_sink_is_enabled(self); } @@ -443,7 +453,24 @@ void set_read(bool read) { osync_objtype_sink_set_read(self, read); } - + + unsigned int num_objformatsinks() { + OSyncList *objformatsinks = osync_objtype_sink_get_objformat_sinks(self); + unsigned int num = osync_list_length(objformatsinks); + osync_list_free(objformatsinks); + return num; + } + + ObjFormatSink *nth_objformatsink(int nth) { + OSyncList *objformatsinks = osync_objtype_sink_get_objformat_sinks(self); + ObjFormatSink *ret = (ObjFormatSink*)osync_list_nth_data(objformatsinks, nth); + if (ret) + osync_objformat_sink_ref(ret); + osync_list_free(objformatsinks); + return ret; + } + + /* void set_slowsync(bool slowsync) { osync_objtype_sink_set_slowsync(self, slowsync); } @@ -463,14 +490,14 @@ available = property(is_available, set_available) write = property(get_write, set_write) read = property(get_read, set_read) - slowsync = property(get_slowsync, set_slowsync) - callback_obj = property(get_callback_obj) + #slowsync = property(get_slowsync, set_slowsync) + #callback_obj = property(get_callback_obj) # extend the SWIG-generated constructor, so that we can setup our list-wrapper classes __oldinit = __init__ def __init__(self, *args): self.__oldinit(*args) - self.objformats = _ListWrapper(self.num_objformats, self.nth_objformat) + self.objformats = _ListWrapper(self.num_objformatsinks, self.nth_objformatsink) %} } Modified: trunk/wrapper/opensync-version.i ============================================================================== --- trunk/wrapper/opensync-version.i Sun Jan 10 15:59:08 2010 (r5981) +++ trunk/wrapper/opensync-version.i Sun Jan 10 16:09:19 2010 (r5982) @@ -99,13 +99,13 @@ } %pythoncode %{ - plugin = property(get_plugin, set_plugin) - priority = property(get_priority, set_priority) - vendor = property(get_vendor, set_vendor) - modelversion = property(get_modelversion, set_modelversion) - firmwareversion = property(get_firmwareversion, set_firmwareversion) - softwareversion = property(get_softwareversion, set_softwareversion) - hardwareversion = property(get_hardwareversion, set_hardwareversion) - identifier = property(get_identifier, set_identifier) +# plugin = property(get_plugin, set_plugin) +# priority = property(get_priority, set_priority) +# vendor = property(get_vendor, set_vendor) +# modelversion = property(get_modelversion, set_modelversion) +# firmwareversion = property(get_firmwareversion, set_firmwareversion) +# softwareversion = property(get_softwareversion, set_softwareversion) +# hardwareversion = property(get_hardwareversion, set_hardwareversion) +# identifier = property(get_identifier, set_identifier) %} }; |
