Changeset 1232

Timestamp:

08/25/06 13:57:03 (2 years ago)

Author:

abauer

Message:

Added the fixes from andrew

Location:

plugins/python-module/src

Files:

• python_module.c (modified) (16 diffs)
• sample.py (modified) (3 diffs)

plugins/python-module/src/python_module.c

@@ -30 +30 @@
 typedef struct MemberData {
         PyThreadState *interp_thread;
+        PyObject *osync_module;
         PyObject *module;
         PyObject *object;
@@ -68 +69 @@
 }
 
-static PyObject *pm_make_change(PyObject *module, OSyncChange *change, OSyncError **error)
+static PyObject *pm_make_change(PyObject *osync_module, OSyncChange *change, OSyncError **error)
 {
         PyObject *pychg_cobject = PyCObject_FromVoidPtr(change, NULL);
@@ -77 +78 @@
         }
         
-        PyObject *pychg = PyObject_CallMethod(module, "OSyncChange", "O", pychg_cobject);
+        PyObject *pychg = PyObject_CallMethod(osync_module, "OSyncChange", "O", pychg_cobject);
         if (!pychg) {
                 osync_error_set(error, OSYNC_ERROR_GENERIC, "Cannot create Python OSyncChange");
@@ -87 +88 @@
 }
 
-static PyObject *pm_make_context(PyObject *module, OSyncContext *ctx, OSyncError **error)
+static PyObject *pm_make_context(PyObject *osync_module, OSyncContext *ctx, OSyncError **error)
 {
         PyObject *pyctx_cobject = PyCObject_FromVoidPtr(ctx, NULL);
@@ -96 +97 @@
         }
         
-        PyObject *pyctx = PyObject_CallMethod(module, "OSyncContext", "O", pyctx_cobject);
+        PyObject *pyctx = PyObject_CallMethod(osync_module, "OSyncContext", "O", pyctx_cobject);
         if (!pyctx) {
                 osync_error_set(error, OSYNC_ERROR_GENERIC, "Cannot create Python OSyncContext");
@@ -106 +107 @@
 }
 
-static PyObject *pm_make_member(PyObject *module, OSyncMember *member, OSyncError **error)
+static PyObject *pm_make_member(PyObject *osync_module, OSyncMember *member, OSyncError **error)
 {
         PyObject *pymember_cobject = PyCObject_FromVoidPtr(member, NULL);
@@ -115 +116 @@
         }
         
-        PyObject *pymember = PyObject_CallMethod(module, "OSyncMember", "O", pymember_cobject);
+        PyObject *pymember = PyObject_CallMethod(osync_module, "OSyncMember", "O", pymember_cobject);
         if (!pymember) {
                 osync_error_set(error, OSYNC_ERROR_GENERIC, "Cannot create Python OSyncMember");
@@ -146 +147 @@
         }
         
-        if (!pm_load_opensync(error))
+        if (!(data->osync_module = pm_load_opensync(error)))
                 goto error_free_interp;
         
@@ -152 +153 @@
                 goto error_free_interp;
         
-        PyObject *pymember = pm_make_member(data->module, member, error);
+        PyObject *pymember = pm_make_member(data->osync_module, member, error);
         if (!pymember)
                 goto error_unload_module;
@@ -214 +215 @@
         PyEval_AcquireThread(data->interp_thread);
 
-        pycontext = pm_make_context(data->module, ctx, error);
+        pycontext = pm_make_context(data->osync_module, ctx, error);
         if (!pycontext) {
                 PyEval_ReleaseThread(data->interp_thread);
@@ -223 +224 @@
 
         if (chg) {
-                PyObject *pychange = pm_make_change(data->module, chg, error);
+                PyObject *pychange = pm_make_change(data->osync_module, chg, error);
                 if (!pychange) {
                         PyEval_ReleaseThread(data->interp_thread);
@@ -312 +313 @@
  *       accepted objtypes/formats info)
  */
-static osync_bool register_plugin(OSyncEnv *env, const char *filename, OSyncError **error)
+static osync_bool register_plugin(OSyncEnv *env, PyObject *osync_module,
+                                  const char *filename, OSyncError **error)
 {
         osync_trace(TRACE_ENTRY, "%s(%p, %s, %p)", __func__, env, filename, error);
@@ -341 +343 @@
         }
         
-        PyObject *pyinfo = PyObject_CallMethod(module, "OSyncPluginInfo", "O", pyinfo_cobject);
+        PyObject *pyinfo = PyObject_CallMethod(osync_module, "OSyncPluginInfo", "O", pyinfo_cobject);
         if (!pyinfo) {
                 osync_error_set(error, OSYNC_ERROR_GENERIC, "Cannot create Python OSyncPluginInfo");
@@ -369 +371 @@
 }
 
-static osync_bool scan_for_plugins(OSyncEnv *env)
+static osync_bool scan_for_plugins(OSyncEnv *env, PyObject *osync_module)
 {
         osync_trace(TRACE_ENTRY, "%s(%p)", __func__, env);
@@ -385 +387 @@
                 char *filename = g_build_filename(path, de, NULL);
                 OSyncError *error = NULL;
-                if (!register_plugin(env, filename, &error))
+                if (!register_plugin(env, osync_module, filename, &error))
                         osync_debug("python", 1, "Couldn't register plugin \"%s\": %s", filename, osync_error_print(&error));
 
@@ -408 +410 @@
 
         OSyncError *error = NULL;
-        if (!pm_load_opensync(&error))
+        PyObject *osync_module = pm_load_opensync(&error); 
+        if (!osync_module)
                 return;
 
-        scan_for_plugins(env);
-}
+        scan_for_plugins(env, osync_module);
+}

plugins/python-module/src/sample.py

@@ -1 @@
-from opensync import *
+import opensync
 
 class SyncClass:
@@ -13 +13 @@
                 if self.__member.get_slow_sync("data"):
                         print "Slow-sync requested"
-                change = OSyncChange()
+                change = opensync.OSyncChange()
                 change.uid = "testuid"
-                change.set_data("testdata", 9, TRUE)
+                change.data = "testdata"
                 change.format = "plain"
                 change.objtype = "data"
-                change.changetype = CHANGE_ADDED
+                change.changetype = opensync.CHANGE_ADDED
                 change.report(ctx)
                 ctx.report_success()
@@ -25 +25 @@
         def commit_change(self, ctx, chg):
                 print "commit called!!"
-                print "Opensync wants me to write data with size " + str(chg.datasize)
+                print "Opensync wants me to write data with size " + len(chg.data)
                 ctx.report_success()