Changeset 2345

Timestamp:

07/21/07 11:21:17 (1 year ago)

Author:

dgollub

Message:

Initial 0.30 API port - by Petr Janecek.

Files:

• plugins/google-calendar/src/Makefile.am (modified) (1 diff)
• plugins/google-calendar/src/gcalendar.c (modified) (20 diffs)
• plugins/google-calendar/src/google-cal-helper.py (modified) (3 diffs)

plugins/google-calendar/src/Makefile.am

@@ -20 +20 @@
-gcalendar_la_CFLAGS = -DGCAL_HELPER=\"$(libexecdir)/google-cal-helper\"
-gcalendar_la_LDFLAGS = -avoid-version -export-dynamic -module
- -lopensync-xml
+
-
-google-cal-helper: $(srcdir)/google-cal-helper.py

plugins/google-calendar/src/gcalendar.c

@@ -21 +21 @@
-
-#include <opensync/opensync.h>
-
+
+
+
+
+
+
-
-#include <glib.h>
@@ -39 +44 @@
-        char *username;
-        char *password;
-        OSyncMember *member;
-        OSyncHashTable *hashtable;
+        OSyncObjTypeSink *sink;
+        OSyncObjFormat *objformat;
-};
+
+static void free_plg(struct gc_plgdata *plgdata)
+{
+        if (plgdata->url)
+                xmlFree(plgdata->url);
+        if (plgdata->username)
+                xmlFree(plgdata->username);
+        if (plgdata->password)
+                xmlFree(plgdata->password);
+        if (plgdata->hashtable)
+                osync_hashtable_free(plgdata->hashtable);
+        if (plgdata->sink)
+                osync_objtype_sink_unref(plgdata->sink);
+        if (plgdata->objformat)
+                osync_objformat_unref(plgdata->objformat);
+        g_free(plgdata);
+}
-
-/** Run gchelper and return the file descriptors for its stdin/stdout
@@ -162 +185 @@
-}
-
-har *cfg, int cfgsize
+onst char *cfg
-{
-        xmlNode *node;
@@ -168 +191 @@
-        osync_bool ret = FALSE;
-
-cfgsize
+strlen(cfg) + 1
-        if (!doc) {
-                osync_error_set(error, OSYNC_ERROR_GENERIC, "Couldn't parse configuration");
@@ -209 +232 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        OSyncError *error = NULL;
-
+
+
+
+
+
+
+
-                osync_context_report_osyncerror(ctx, &error);
-                return;
@@ -253 +251 @@
-
-        osync_context_report_success(ctx);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        OSyncError *error = NULL;
-
@@ -266 +269 @@
-        int status;
-
-member_get_slow_sync(plgdata->member, "event"
-set_slow_sync(plgdata->hashtable, "event"
+objtype_sink_get_slowsync(sink
+reset(plgdata->hashtable
-        }
-
@@ -278 +281 @@
-        out = fdopen(output, "r");
-        if (!out) {
-
+ 
-                close(output);
-                goto error_fdopen;
@@ -312 +315 @@
-                if (fread(xmldata, size, 1, out) < 1) {
-                        osync_context_report_error(ctx, OSYNC_ERROR_GENERIC, "Error reading xml data from helper");
-
-
+
-                }
-
-                if (fread(uid, uidsize, 1, out) < 1) {
-                        osync_context_report_error(ctx, OSYNC_ERROR_GENERIC, "Error reading xml data from helper");
-read
+
-                }
-                uid[uidsize] = '\0';
@@ -324 +326 @@
-                if (fread(hash, hashsize, 1, out) < 1) {
-                        osync_context_report_error(ctx, OSYNC_ERROR_GENERIC, "Error reading xml data from helper");
-read
+
-                }
-                hash[hashsize] = '\0';
-
-xmlDoc *doc = xmlParseMemory(xmldata, size
+OSyncXMLFormat *doc = osync_xmlformat_parse(xmldata, size, &error
-                if (!doc) {
-                        osync_context_report_error(ctx, OSYNC_ERROR_GENERIC, "Invalid XML data from helper");
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                if (!chg) {
-                        osync_context_report_error(ctx, OSYNC_ERROR_GENERIC, "No memory");
+                        osync_error_unref(&error);
-                        goto error_chg;
-                }
-
-                osync_change_set_uid(chg, uid);
-
-
-
-
-
+
+
+
-                osync_change_set_hash(chg, hash);
-
+
+
+
+
+
-                        osync_context_report_change(ctx, chg);
-chg
-
-
-xmlFreeDoc(doc
+osync_change_get_changetype(chg), uid, hash
+
+
+osync_change_unref(chg
-                free(hash);
-                free(uid);
-                free(xmldata);
-
-
-
-
-
+       
+       
+
+       
-        error_chg:
-
-
-
+
+
-                free(hash);
-        error_hash:
@@ -373 +392 @@
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        fclose(out);
@@ -385 +428 @@
-        osync_context_report_success(ctx);
-
+        osync_trace(TRACE_EXIT, "%s", __func__);
-        return;
-
@@ -394 +438 @@
-        waitpid(pid, NULL, 0);
-error:
+        osync_trace(TRACE_EXIT, "%s", __func__);
-        return;
-}
-
-
-
-
+
+
+
+
+
+
+
-
-        pid_t pid;
@@ -409 +458 @@
-        int status;
-        char sizeline[1024];
-
-
+
+
+
-
-        switch (osync_change_get_changetype(change)) {
-CHANG
+OSYNC_CHANGE_TYP
-                        cmd = "add";
-                        arg = NULL;
-                break;
-CHANG
+OSYNC_CHANGE_TYP
-                        cmd = "edit";
-osync_change_get_hash(change)
+hash
-                break;
-CHANG
+OSYNC_CHANGE_TYP
-                        cmd = "delete";
-osync_change_get_hash(change)
+hash
-                break;
-                default:
@@ -437 +487 @@
-        }
-
+        g_free(hash);
+
-        out = fdopen(output, "r");
-        if (!out) {
@@ -445 +497 @@
-
-        switch (osync_change_get_changetype(change)) {
-CHANG
-CHANG
+OSYNC_CHANGE_TYP
+OSYNC_CHANGE_TYP
-                {
-
-
+
-                        int size;
+                        char *buffer;
+
+                        osync_xmlformat_assemble(doc, &buffer, &size);
+                        osync_trace(TRACE_INTERNAL, "input to helper:\n%s", buffer);
+                        if (write(input, buffer, size) < size) {
+                                osync_context_report_error(ctx, OSYNC_ERROR_GENERIC, "Couldn't write data to helper");
+                                close(input);
+                                g_free(buffer);
+                                goto error_write;
+                        }
+
+                        close(input);
+                        g_free(buffer);
+
-                        int xmlsize, uidsize, hashsize;
-                        char *xmldata, *uid, *hash;
-
-                        xmlDocDumpMemory(doc, &data, &size);
-                        if (write(input, data, size) < size) {
-                                osync_context_report_error(ctx, OSYNC_ERROR_GENERIC, "Couldn't write data to helper");
-                                close(input);
-                                goto error_write;
-                        }
-
-                        close(input);
-
-                        if (!fgets(sizeline, sizeof(sizeline), out)) {
@@ -531 +587 @@
-                }
-                break;
-CHANG
+OSYNC_CHANGE_TYP
-                        close(input);
-                break;
@@ -538 +594 @@
-        }
-
-
+
+
+
+
-
-        fclose(out);
@@ -551 +610 @@
-        osync_context_report_success(ctx);
-
-
+
+
-
-error_read:
@@ -560 +620 @@
-        waitpid(pid, NULL, 0);
-error:
+        osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(&error));
+        return;
+}
+
+static void gc_disconnect(void *data, OSyncPluginInfo *info, OSyncContext *ctx)
+{
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx);
+        struct gc_plgdata *plgdata = data;
+
+        osync_hashtable_free(plgdata->hashtable);
+        plgdata->hashtable = NULL;
+
+        osync_context_report_success(ctx);
+        osync_trace(TRACE_EXIT, "%s", __func__);
+}
+
+static void gc_finalize(void *data)
+{
+        osync_trace(TRACE_ENTRY, "%s(%p)", __func__, data);
+        struct gc_plgdata *plgdata = data;
+
+        free_plg(plgdata);
+        osync_trace(TRACE_EXIT, "%s", __func__);
+}
+
+static void *gc_initialize(OSyncPlugin *plugin,
+                           OSyncPluginInfo *info,
+                           OSyncError **error)
+{
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, plugin, info, error);
+        struct gc_plgdata *plgdata;
+        const char *cfg;
+
+        plgdata = osync_try_malloc0(sizeof(struct gc_plgdata), error);
+        if (!plgdata)
+                goto out;
+
+        cfg = osync_plugin_info_get_config(info);
+        if (!cfg) {
+                osync_error_set(error, OSYNC_ERROR_GENERIC,
+                                "Unable to get config data.");
+                goto error_freeplg;
+        }
+
+        if (!gc_parse_config(plgdata, cfg, error))
+                goto error_freeplg;
+
+        OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info);
+        plgdata->objformat = osync_format_env_find_objformat(formatenv, "xmlformat-event");
+        if (!plgdata->objformat)
+                goto error_freeplg;
+        osync_objformat_ref(plgdata->objformat);
+
+        plgdata->sink = osync_objtype_sink_new("event", error);
+        if (!plgdata->sink)
+                goto error_freeplg;
+
+        osync_objtype_sink_add_objformat(plgdata->sink, "xmlformat-event");
+
+        OSyncObjTypeSinkFunctions functions;
+        memset(&functions, 0, sizeof(functions));
+        functions.connect = gc_connect;
+        functions.disconnect = gc_disconnect;
+        functions.get_changes = gc_get_changes;
+        functions.commit = gc_commit_change;
+
+        osync_objtype_sink_set_functions(plgdata->sink, functions, plgdata);
+        osync_plugin_info_add_objtype(info, plgdata->sink);
+
+        osync_trace(TRACE_EXIT, "%s", __func__);
+
+        return plgdata;
+
+error_freeplg:
+        free_plg(plgdata);
+out:
+        osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
+        return NULL;
+}
+
+static osync_bool gc_discover(void *data, OSyncPluginInfo *info, OSyncError **error)
+{
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, error);
+
+        struct gc_plgdata *plgdata = data;
+
+        osync_objtype_sink_set_available(plgdata->sink, TRUE);
+
+        OSyncVersion *version = osync_version_new(error);
+        osync_version_set_plugin(version, "google-calendar");
+        osync_plugin_info_set_version(info, version);
+        osync_version_unref(version);
+
+        osync_trace(TRACE_EXIT, "%s", __func__);
+        return TRUE;
+}
+
+osync_bool get_sync_info(OSyncPluginEnv *env, OSyncError **error)
+{
+        osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, env, error);
+        OSyncPlugin *plugin = osync_plugin_new(error);
+        if (!plugin)
+                goto error;
+
+        osync_plugin_set_name(plugin, "google-calendar");
+        osync_plugin_set_longname(plugin, "Google Calendar");
+        osync_plugin_set_description(plugin, "Google Calendar plugin");
+        osync_plugin_set_config_type(plugin, OSYNC_PLUGIN_NEEDS_CONFIGURATION);
+
+        osync_plugin_set_initialize(plugin, gc_initialize);
+        osync_plugin_set_finalize(plugin, gc_finalize);
+        osync_plugin_set_discover(plugin, gc_discover);
+
+        osync_plugin_env_register_plugin(env, plugin);
+        osync_plugin_unref(plugin);
+
+        osync_trace(TRACE_EXIT, "%s", __func__);
+        return TRUE;
+
+error:
+        osync_trace(TRACE_EXIT_ERROR, "Unable to register: %s", osync_error_print(error));
+        osync_error_unref(error);
-        return FALSE;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+

plugins/google-calendar/src/google-cal-helper.py

@@ -214 +214 @@
-                self.element = element
-
-Event/
-Event/
-
-Event/
+
+
+
+
-                self.dtstart = osyncToXsdate(dtstart)
-
-Event/
+
-                if not dtend:
-                        dtend = dtstart
-                self.dtend = osyncToXsdate(dtend)
-
-Event/
+
-
-                #TODO: UID, editUri, dtstart, dtend, recurrency, eventStatus
@@ -232 +232 @@
-        def dumpOsync(self):
-                di = md.getDOMImplementation()
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-                self.addElementContent(doc, event, 'DateStarted', xsdateToOsync(self.dtstart))
@@ -244 +245 @@
-                        self.addElementContent(doc, event, 'RecurrenceRule',
-                                               self.dtrecur)
-
-
+
+       
-
-                #TODO: UID, editUri, dtstart, dtend, eventStatus