Changeset 3311

Timestamp:

05/04/08 01:24:22 (5 months ago)

Author:

dgollub

Message:

Implemented Ressource subcomponennt of OSyncPluginConfig.
See wiki:PluginConfigXsd

XML Schema changed slightly. <Ressources> is represented in API as
OSyncList of OSyncPluginRessource.

Files:

• trunk/misc/schemas/plugin_config.xsd (modified) (2 diffs)
• trunk/opensync/CMakeLists.txt (modified) (1 diff)
• trunk/opensync/opensync.h (modified) (1 diff)
• trunk/opensync/plugin/opensync_plugin_config.c (modified) (6 diffs)
• trunk/opensync/plugin/opensync_plugin_config.h (modified) (1 diff)
• trunk/opensync/plugin/opensync_plugin_config_internals.h (modified) (1 diff)
• trunk/opensync/plugin/opensync_plugin_ressource.c (added)
• trunk/opensync/plugin/opensync_plugin_ressource.h (added)
• trunk/opensync/plugin/opensync_plugin_ressource_internals.h (added)
• trunk/tests/plugin-tests/check_plugin_config.c (modified) (7 diffs)

trunk/misc/schemas/plugin_config.xsd

@@ -8 +8 @@
-        <xsd:element maxOccurs="1" minOccurs="0" name="Connection" type="Connection"/>
-        <xsd:element maxOccurs="1" minOccurs="0" name="Localization" type="Localization"/>
-<!--    <xsd:element maxOccurs="1" minOccurs="0" name="Ressources" type="Ressources"/> --
+       <xsd:element maxOccurs="1" minOccurs="0" name="Ressources" type="Ressources"/
-<!--    <xsd:element maxOccurs="1" minOccurs="0" name="AdvancedOptions" type="AdvancedOptions"/> -->
-      </xsd:sequence>
@@ -37 +37 @@
-  </xsd:complexType>
-
-
+
+
+
+
+
+
+
+
+
+
-  <xsd:complexType name="Ressources">
-    <xsd:sequence>
-
-
-
-
-
+
-    </xsd:sequence>
-  </xsd:complexType>
-  -->
-
-  <xsd:complexType name="ConnectionBluetooth">

trunk/opensync/CMakeLists.txt

@@ -54 +54 @@
-   plugin/opensync_plugin_info.c
-   plugin/opensync_plugin_localization.c
+   plugin/opensync_plugin_ressource.c
-   plugin/opensync_sink.c
-   version/opensync_version.c

trunk/opensync/opensync.h

@@ -151 +151 @@
-typedef struct OSyncPluginConnection OSyncPluginConnection;
-typedef struct OSyncPluginLocalization OSyncPluginLocalization;
+typedef struct OSyncPluginRessource OSyncPluginRessource;
-
-/* Engine component */

trunk/opensync/plugin/opensync_plugin_config.c

@@ -331 +331 @@
-}
-
+
+static OSyncPluginRessource *_osync_plugin_config_parse_ressource(OSyncPluginConfig *config, xmlNode *cur, OSyncError **error)
+{
+
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, config, cur, error);
+
+        OSyncPluginRessource *res = osync_plugin_ressource_new(error);
+        if (!res)
+                goto error;
+
+        for (; cur != NULL; cur = cur->next) {
+
+                if (cur->type != XML_ELEMENT_NODE)
+                        continue;
+
+                char *str = (char*)xmlNodeGetContent(cur);
+                if (!str)
+                        continue;
+
+                if (!xmlStrcmp(cur->name, (const xmlChar *)"Name"))
+                        osync_plugin_ressource_set_name(res, str);
+                else if (!xmlStrcmp(cur->name, (const xmlChar *)"MIME"))
+                        osync_plugin_ressource_set_mime(res, str);
+                else if (!xmlStrcmp(cur->name, (const xmlChar *)"ObjFormat"))
+                        osync_plugin_ressource_set_objformat(res, str);
+                else if (!xmlStrcmp(cur->name, (const xmlChar *)"Path"))
+                        osync_plugin_ressource_set_path(res, str);
+                else if (!xmlStrcmp(cur->name, (const xmlChar *)"Url"))
+                        osync_plugin_ressource_set_url(res, str);
+
+                xmlFree(str);
+        }
+
+        osync_trace(TRACE_EXIT, "%s", __func__);
+        return res;
+
+error:
+        osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
+        return NULL;
+}
+
-static osync_bool _osync_plugin_config_parse_ressources(OSyncPluginConfig *config, xmlNode *cur, OSyncError **error)
-{
@@ -336 +377 @@
-        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, config, cur, error);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
-        return FALSE;
@@ -625 +669 @@
-}
-
+static osync_bool _osync_plugin_config_assemble_ressource(xmlNode *cur, OSyncPluginRessource *res, OSyncError **error)
+{
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, cur, res, error);
+
+        const char *name, *mime, *objformat, *path, *url;
+
+        xmlNode *node = xmlNewChild(cur, NULL, (xmlChar*)"Ressource", NULL);
+        if (!node) {
+                osync_error_set(error, OSYNC_ERROR_GENERIC, "No memory left to assemble configuration.");
+                goto error;
+        }
+
+        if ((name = osync_plugin_ressource_get_name(res)))
+                xmlNewChild(node, NULL, (xmlChar*)"Name", (xmlChar*)name);
+
+        if ((mime = osync_plugin_ressource_get_mime(res)))
+                xmlNewChild(node, NULL, (xmlChar*)"MIME", (xmlChar*)mime);
+
+        if ((objformat = osync_plugin_ressource_get_objformat(res)))
+                xmlNewChild(node, NULL, (xmlChar*)"ObjFormat", (xmlChar*)objformat);
+
+        if ((path = osync_plugin_ressource_get_path(res)))
+                xmlNewChild(node, NULL, (xmlChar*)"Path", (xmlChar*)path);
+
+        if ((url = osync_plugin_ressource_get_url(res)))
+                xmlNewChild(node, NULL, (xmlChar*)"Url", (xmlChar*)url);
+
+        osync_trace(TRACE_EXIT, "%s", __func__);
+        return TRUE;
+error:
+        osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
+        return FALSE;
+}
+
+static osync_bool _osync_plugin_config_assemble_ressources(xmlNode *cur, OSyncList *ressources, OSyncError **error)
+{
+        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, cur, ressources, error);
+
+        OSyncList *res;
+
+        xmlNode *node = xmlNewChild(cur, NULL, (xmlChar*)"Ressources", NULL);
+        if (!node) {
+                osync_error_set(error, OSYNC_ERROR_GENERIC, "No memory left to assemble configuration.");
+                goto error;
+        }
+
+        for (res = ressources; res; res = res->next)
+                if (!_osync_plugin_config_assemble_ressource(node, res->data, error))
+                        goto error;
+
+
+        osync_trace(TRACE_EXIT, "%s", __func__);
+        return TRUE;
+error:
+        osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
+        return FALSE;
+}
+
+
-OSyncPluginConfig *osync_plugin_config_new(OSyncError **error)
-{
@@ -679 +782 @@
-        OSyncPluginAuthentication *auth;
-        OSyncPluginLocalization *local;
+        OSyncList *ressources;
-        
-        doc = xmlNewDoc((xmlChar*)"1.0");
@@ -713 +817 @@
-
-        /* Ressources */
-
-
-
+
+
-                        goto error_and_free;
-        */
-
-        xmlSaveFormatFile(path, doc, 1);
@@ -765 +867 @@
-
-/* Ressources */
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-OSyncPluginConnection *osync_plugin_config_get_connection(OSyncPluginConfig *config)

trunk/opensync/plugin/opensync_plugin_config.h

@@ -38 +38 @@
-
-/* Ressources */
-
-
-
-
+
+
-
-/* Connection */

trunk/opensync/plugin/opensync_plugin_config_internals.h

@@ -35 +35 @@
-        /** Localization configuration */
-        OSyncPluginLocalization *localization;
+        /** List of ressource configurations */
+        OSyncList *ressources;
-
-        /** Object reference counting */

trunk/tests/plugin-tests/check_plugin_config.c

@@ -147 +147 @@
-        osync_error_unref(&error);
-
+        /* Ressource(s) */
+        OSyncPluginRessource *res = osync_plugin_ressource_new(&error);
+        fail_unless(error != NULL, NULL);
+        fail_unless(res == NULL, NULL);
+        osync_error_unref(&error);
+
-        osync_plugin_config_unref(config);
-
@@ -369 +375 @@
-END_TEST
-
+START_TEST (plugin_config_ressources)
+{
+        char *testbed = setup_testbed(NULL);
+
+        OSyncError *error = NULL;
+        OSyncPluginConfig *config = osync_plugin_config_new(&error);
+        fail_unless(error == NULL, NULL);
+        fail_unless(config != NULL, NULL);
+
+        /* Ressources */
+        OSyncList *ressources = NULL;
+
+        /* Ressource */
+        OSyncPluginRessource *ressource = osync_plugin_ressource_new(&error);
+        fail_unless(error == NULL, NULL);
+        fail_unless(ressource != NULL, NULL);
+
+        /* Name */
+        osync_plugin_ressource_set_name(ressource, "foobar");
+        fail_unless(!strcmp(osync_plugin_ressource_get_name(ressource), "foobar"), NULL);
+
+        /* Overwrite (leak check) */
+        osync_plugin_ressource_set_name(ressource, "barfoo");
+        fail_unless(!strcmp(osync_plugin_ressource_get_name(ressource), "barfoo"), NULL);
+
+        /* MIME */
+        osync_plugin_ressource_set_mime(ressource, "foobar");
+        fail_unless(!strcmp(osync_plugin_ressource_get_mime(ressource), "foobar"), NULL);
+
+        /* Overwrite (leak check) */
+        osync_plugin_ressource_set_mime(ressource, "barfoo");
+        fail_unless(!strcmp(osync_plugin_ressource_get_mime(ressource), "barfoo"), NULL);
+
+        /* ObjFormat */
+        osync_plugin_ressource_set_objformat(ressource, "foobar");
+        fail_unless(!strcmp(osync_plugin_ressource_get_objformat(ressource), "foobar"), NULL);
+
+        /* Overwrite (leak check) */
+        osync_plugin_ressource_set_objformat(ressource, "barfoo");
+        fail_unless(!strcmp(osync_plugin_ressource_get_objformat(ressource), "barfoo"), NULL);
+
+        /* Path */
+        osync_plugin_ressource_set_path(ressource, "foobar");
+        fail_unless(!strcmp(osync_plugin_ressource_get_path(ressource), "foobar"), NULL);
+
+        /* Overwrite (leak check) */
+        osync_plugin_ressource_set_path(ressource, "barfoo");
+        fail_unless(!strcmp(osync_plugin_ressource_get_path(ressource), "barfoo"), NULL);
+
+        /* URL */
+        osync_plugin_ressource_set_url(ressource, "foobar");
+        fail_unless(!strcmp(osync_plugin_ressource_get_url(ressource), "foobar"), NULL);
+
+        /* Overwrite (leak check) */
+        osync_plugin_ressource_set_url(ressource, "barfoo");
+        fail_unless(!strcmp(osync_plugin_ressource_get_url(ressource), "barfoo"), NULL);
+
+        /* Invoke OSyncPluginConfig */
+        ressources = osync_list_prepend(ressources, ressource);
+        osync_plugin_config_set_ressources(config, ressources);
+        /* Twice to check for correct order of ref/unref calls in set_ressources() */
+        osync_plugin_config_set_ressources(config, ressources);
+        ressources = osync_plugin_config_get_ressources(config);
+        fail_unless(!strcmp(osync_plugin_ressource_get_url(ressources->data), "barfoo"), NULL);
+        osync_plugin_ressource_unref(ressources->data);
+
+        fail_unless(osync_plugin_ressource_ref(ressource) != NULL, NULL);
+        osync_plugin_ressource_unref(ressource);
+        osync_plugin_ressource_unref(ressource);
+
+        osync_plugin_config_unref(config);
+
+        destroy_testbed(testbed);
+}
+END_TEST
-
-START_TEST (plugin_config_save_and_load)
@@ -402 +483 @@
-        osync_plugin_authentication_set_password(auth, "bar");
-        osync_plugin_authentication_set_reference(auth, "ref");
+
+        /* Ressources */
+        OSyncList *ressources = NULL;
+
+        /* Ressource #1 */
+        OSyncPluginRessource *ressource1 = osync_plugin_ressource_new(&error);
+        fail_unless(error == NULL, NULL);
+        fail_unless(ressource1 != NULL, NULL);
+
+        /* Name */
+        osync_plugin_ressource_set_name(ressource1, "foobar1");
+        osync_plugin_ressource_set_mime(ressource1, "foobar1");
+        osync_plugin_ressource_set_objformat(ressource1, "foobar1");
+        osync_plugin_ressource_set_path(ressource1, "foobar1");
+        osync_plugin_ressource_set_url(ressource1, "foobar1");
+
+        ressources = osync_list_prepend(ressources, ressource1);
+
+        /* Ressource #2 */
+        OSyncPluginRessource *ressource2 = osync_plugin_ressource_new(&error);
+        fail_unless(error == NULL, NULL);
+        fail_unless(ressource2 != NULL, NULL);
+
+        osync_plugin_ressource_set_name(ressource2, "foobar2");
+        osync_plugin_ressource_set_mime(ressource2, "foobar2");
+        osync_plugin_ressource_set_objformat(ressource2, "foobar2");
+        osync_plugin_ressource_set_path(ressource2, "foobar2");
+        osync_plugin_ressource_set_url(ressource2, "foobar2");
+
+        ressources = osync_list_prepend(ressources, ressource2);
-
-        /* Set subcomponents */
@@ -408 +519 @@
-        osync_plugin_config_set_localization(config, local);
-        osync_plugin_localization_unref(local);
+        osync_plugin_config_set_ressources(config, ressources);
+        osync_plugin_ressource_unref(ressource1);
+        osync_plugin_ressource_unref(ressource2);
-
-        char *config_file = g_strdup_printf("%s/dummy_config.xml", testbed);
@@ -418 +532 @@
-        OSyncPluginLocalization *reloaded_local = osync_plugin_config_get_localization(reloaded_config);
-        OSyncPluginAuthentication *reloaded_auth = osync_plugin_config_get_authentication(reloaded_config);
+        OSyncList *reloaded_ressources = osync_plugin_config_get_ressources(reloaded_config);
-
-        fail_unless(reloaded_local != NULL, NULL);
+        fail_unless(reloaded_auth != NULL, NULL);
+        fail_unless(reloaded_ressources != NULL, NULL);
-
-        fail_unless(!strcmp(osync_plugin_localization_get_language(reloaded_local), "de_DE"), NULL);
@@ -429 +546 @@
-        fail_unless(!strcmp(osync_plugin_authentication_get_reference(reloaded_auth), "ref"), NULL);
-
+        OSyncList *r;
+        int i;
+        for (i = 1, r = reloaded_ressources; r; r = r->next, i++) {
+                char *value = g_strdup_printf("foobar%i", i);
+                fail_unless(!strcmp(osync_plugin_ressource_get_name(r->data), value), NULL);
+                fail_unless(!strcmp(osync_plugin_ressource_get_mime(r->data), value), NULL);
+                fail_unless(!strcmp(osync_plugin_ressource_get_objformat(r->data), value), NULL);
+                fail_unless(!strcmp(osync_plugin_ressource_get_path(r->data), value), NULL);
+                fail_unless(!strcmp(osync_plugin_ressource_get_url(r->data), value), NULL);
+                g_free(value);
+        }
-
-        osync_plugin_config_unref(config);
@@ -689 +817 @@
-        create_case(s, "plugin_config_connection", plugin_config_connection);
-        create_case(s, "plugin_config_localization", plugin_config_localization);
+        create_case(s, "plugin_config_ressources", plugin_config_ressources);
-        create_case(s, "plugin_config_save_and_load", plugin_config_save_and_load);
-        create_case(s, "plugin_config_save_and_load_connection_bluetooth", plugin_config_save_and_load_connection_bluetooth);