Changeset 3373

Timestamp:

06/16/08 21:01:42 (3 months ago)

Author:

dgollub

Message:

Cleanup for OSyncPluginConfig port.
Only working/tested with osyncplugin tool.

Files:

• trunk/tests/mock-plugin/mock_sync.c (modified) (17 diffs)
• trunk/tests/mock-plugin/mock_sync.h (modified) (3 diffs)

trunk/tests/mock-plugin/mock_sync.c

@@ -44 +44 @@
-}
-
-static void free_env(mock_env *env)
-{
-        while (env->directories) {
-                MockDir *dir = env->directories->data;
-                
-                if (dir->sink)
-                        osync_objtype_sink_unref(dir->sink);
-                
-                env->directories = g_list_remove(env->directories, dir);
-        }
-
-        if (env->mainsink)
-                osync_objtype_sink_unref(env->mainsink);
-        
-        g_free(env);
-}
-
-static char *mock_generate_hash(struct stat *buf)
-{
@@ -106 +89 @@
-        char *path_field = g_strdup_printf("path_%s", osync_objtype_sink_get_name(sink));
-        if (!osync_anchor_compare(anchorpath, path_field, dir->path))
-dir->
+
-
-        g_free(anchorpath);
@@ -168 +151 @@
-        MockDir *dir = osync_objtype_sink_get_userdata(sink);
-        OSyncError *error = NULL;
-
+
-        char *filename = g_strdup_printf("%s/%s", dir->path, osync_change_get_uid(change));
-        
@@ -183 +166 @@
-                        
-        osync_assert(osync_file_read(filename, &(file->data), &(file->size), &error));
+
-        OSyncData *odata = osync_data_new((char *)file, sizeof(OSyncFileFormat), dir->objformat, &error);
-        osync_assert(odata);
@@ -266 +250 @@
-        osync_trace(TRACE_ENTRY, "%s(%p, %s, %p)", __func__, directory, subdir, ctx);
-        
+        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
+        osync_assert(sink);
+
+        OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info);
+        osync_assert(formatenv);
+
-        path = g_build_filename(directory->path, subdir, NULL);
-        osync_trace(TRACE_INTERNAL, "path %s", path);
@@ -305 +295 @@
-                                g_free(filename);
-                                g_free(relative_filename);
+                                osync_change_unref(change);
-                                continue;
-                        }
@@ -315 +306 @@
-                        OSyncData *odata = NULL;
-
-
-
-
+
-                                osync_assert(osync_file_read(filename, &(file->data), &(file->size), &error));
-
@@ -326 +315 @@
-                                osync_assert(odata);
-
+
+                                osync_change_set_data(change, odata);
+
-                        }
-                        
-
-
+
-                        osync_data_unref(odata);
-        
@@ -372 +363 @@
-                sleep(8);
-                
-dir->
+
-                osync_trace(TRACE_INTERNAL, "Slow sync requested");
-                osync_assert(osync_hashtable_slowsync(dir->hashtable, &error));
@@ -556 +547 @@
-        mock_env *env = osync_try_malloc0(sizeof(mock_env), error);
-        osync_assert(env);
-
-
+
+
+
+
+
+
-        
-        if (mock_get_error(info->memberid, "MAINSINK_CONNECT")) {
@@ -575 +570 @@
-         * synchronize any objtype we configure it to sync and where a conversion
-         * path to the file format can be found */
-
-
-
-
-
+
+
+
+
+
+
+
+
-                osync_assert(sink);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                osync_trace(TRACE_INTERNAL, "The configdir: %s", osync_plugin_info_get_configdir(info));
-                char *tablepath = g_strdup_printf("%s/hashtable.db", osync_plugin_info_get_configdir(info));
@@ -593 +615 @@
-                osync_assert(osync_hashtable_load(dir->hashtable, error));
-
+
+                /*
-                const char *objformat = osync_objformat_get_name(dir->objformat); 
-                OSyncObjFormatSink *format_sink = osync_objformat_sink_new(objformat, error);
@@ -599 +623 @@
-
-                osync_objtype_sink_add_objformat_sink(sink, format_sink);
+                */
-                
-                /* All sinks have the same functions of course */
@@ -626 +651 @@
-                 * again once the functions are called */
-                osync_objtype_sink_set_functions(sink, functions, dir);
-                osync_plugin_info_add_objtype(info, sink);
-
-                //Lets reduce the timeouts a bit so the checks work faster
@@ -671 +695 @@
-                */
-
-
+
+
-        }
-
@@ -682 +707 @@
-        mock_env *env = data;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -703 +730 @@
-        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, error);
-        
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        OSyncVersion *version = osync_version_new(error);

trunk/tests/mock-plugin/mock_sync.h

@@ -19 +19 @@
- */
-
-FILE
-FILE
+MOCK
+MOCK
-
-#include <stdlib.h>
@@ -27 +27 @@
-#include <glib.h>
-#include <string.h>
-
-#include <libxml/xmlmemory.h>
-#include <libxml/parser.h>
-
-#include <opensync/opensync.h>
@@ -66 +63 @@
-
-typedef struct MockDir {
-
+
+
+
-        char *path;
-        OSyncObjFormat *objformat;
-        GDir *dir;
-        OSyncHashTable *hashtable;
-        OSyncObjTypeSink *sink;
-        mock_env *env;
-        osync_bool committed_all;
-} MockDir;
-
-FILE
+MOCK