Changeset 2348

Timestamp:

07/22/07 14:48:22 (1 year ago)

Author:

dgollub

Message:

New implementation of configurable object formats.

Request "file" objformat from the engine. This makes storing of
configured objformats easier - since the engine takes care about
marshalling... and we can make use of the OSyncFile helpers.

For making 1:1 backups configure the <objformat> to "file" and disable
the converters in the engine...

e.g.: msynctool --sync BLUBB --disable-converters

Syncing with <objformat> set formatB and sourceformat formatA with
--disable-converters is non-sense ... because the converter gets involded.

Recommendation for UI Backup Wizard:

Create a spearate Backup group with the plugin for the device which
should get backuped and file-sync. file-sync with
<objformat>filer</objformat> (<objtype>data</objtype> (?)) and disable
the converters for each sync.

TODO: implement syncgroup config property to disable converters for the
group.

Files:

• plugins/file-sync/src/file_sync.c (modified) (5 diffs)
• plugins/file-sync/src/file_sync.h (modified) (1 diff)

plugins/file-sync/src/file_sync.c

@@ -66 +66 @@
-                        } else if (!xmlStrcmp(cur->name, (const xmlChar *)"objtype")) {
-                                dir->objtype = g_strdup(str);
+                        } else if (!xmlStrcmp(cur->name, (const xmlChar *)"objformat")) {
+                                dir->objformat = g_strdup(str);
-                        } else if (!xmlStrcmp(cur->name, (const xmlChar *)"recursive")) {
-                                dir->recursive = (g_ascii_strcasecmp(str, "TRUE") == 0);
@@ -267 +269 @@
-        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, data, info, ctx, change);
-        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
+        OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info);
-        OSyncFileDir *dir = osync_objtype_sink_get_userdata(sink);
-        OSyncError *error = NULL;
@@ -289 +292 @@
-                        /* No break. Continue below */
-                case OSYNC_CHANGE_TYPE_MODIFIED:
+
-                        //FIXME add ownership for file-sync
+
-                        odata = osync_change_get_data(change);
-                        g_assert(odata);
+
+                        /* Convert to the configured store object format */
+                        if (dir->objformat && strcmp("file", dir->objformat)) {
+
+                                OSyncFormatConverterPath *path = NULL;
+
+                                OSyncObjFormat *fileformat = osync_format_env_find_objformat(formatenv, "file");
+                                OSyncObjFormat *targetformat = osync_format_env_find_objformat(formatenv, dir->objformat);
+                                OSyncObjFormat *detectedFormat = osync_format_env_detect_objformat_full(formatenv, odata, &error);
+
+                                /* Sanity check - if the converters are disable the engine sends not the requested "file" object format */
+                                if (fileformat == osync_data_get_objformat(odata)) {
+                                        /* Find converter path from file to detected format */
+                                        path = osync_format_env_find_path(formatenv, fileformat, detectedFormat, &error);
+
+                                        if (!osync_format_env_convert(formatenv, path, odata, &error)) {
+                                                osync_error_set(&error, OSYNC_ERROR_EXISTS, "Can't convert to customized objformat.");
+                                                goto error;
+                                        }
+                                }
+
+                                /* Find converter path from detectedFormat to targetFromat.
+                                   This is needed to avoid shortcuts path:
+                                     "another object format with plain converter (or detector)" -> plain -> file
+                                
+                                   To be safe we convert $detectedFormat -> $targetformat in advance.
+                                   And later convert $targetformat to fileFormat.
+                                */
+                                path = osync_format_env_find_path(formatenv, detectedFormat, targetformat, &error);
+
+                                if (!osync_format_env_convert(formatenv, path, odata, &error)) {
+                                        osync_error_set(&error, OSYNC_ERROR_EXISTS, "Can't convert to customized objformat.");
+                                        goto error;
+                                }
+
+
+                                /* Find converter path fromat $targetformat to fileFormat. */
+                                path = osync_format_env_find_path(formatenv, targetformat, fileformat, &error);
+
+                                if (!osync_format_env_convert(formatenv, path, odata, &error)) {
+                                        osync_error_set(&error, OSYNC_ERROR_EXISTS, "Can't convert to customized objformat.");
+                                        goto error;
+                                }
+
+                        }
+
-                        osync_data_get_data(odata, &buffer, &size);
-                        g_assert(buffer);
@@ -571 +622 @@
-        if (!osync_filesync_parse_settings(env, osync_plugin_info_get_config(info), error))
-                goto error_free_env;
-
+
-        /* Now we register the objtypes that we can sync. This plugin is special. It can
-         * synchronize any objtype we configure it to sync and where a conversion
@@ -583 +634 @@
-                        goto error_free_env;
-                
+
+                if (!osync_format_env_find_objformat(formatenv, dir->objformat)) {
+                        osync_error_set(error, OSYNC_ERROR_GENERIC, "Configured storage format \"%s\" for object type \"%s\" is unknown. Is the format plugin missing?");
+                        goto error_free_env;
+                }
+        
+
-                dir->sink = sink;
-                
-* The file format is the only one we understand */
-"file"
+/osync_objtype_sink_add_objformat(sink, "file");
+dir->objformat
-                
-                /* All sinks have the same functions of course */

plugins/file-sync/src/file_sync.h

@@ -45 +45 @@
-typedef struct OSyncFileDir {
-        char *objtype;
+        char *objformat;
-        char *path;
-        GDir *dir;