Changeset 3299

Timestamp:

04/27/08 15:51:24 (3 months ago)

Author:

dgollub

Message:

Ported file-sync to new hashtable API.

Quick porting description:

1. osync_hashtable_free() -> osync_hashtable_unref()
2. add osync_hashtable_load() in plugin initialize function, right

after osync_hashtable_new()

3. remove osync_hashtable_report() and osync_hashtable_reset_reports(),

they're deprecated.

4. osync_hashtable_update_hash() -> osync_hashtable_update_change()

Parameter list now takes just the hashtable object and the change
object.

5. Order functions in get_changes() plugin function so

osync_hashtable_update_change() get called with the new OSyncChange, when
the change entry got uid, hash and changetype set.

6. Make sure osync_hashtable_update_change() get called for every entry.

Don't skip this call, even if the changetype is UNMODIFIED.

7. osync_hashtable_get_deleted() returns now instead of a char* array,

an OSyncList. The entries are (const char*) strings which store the
UID. No need to free the UIDs.

8. Iterate over the list like this:

OSyncList *u, *uids = osync_hashtable_get_deleted(YourHashtable?);
for (u = uids; u; u = u->next) {

const char *uid = u->data;
...

}
osync_list_free(uids);
...

9. Call osync_hashtable_save() in your sync_done() function.
10. Test your plugin :)

Files:

• plugins/file-sync/src/file_sync.c (modified) (15 diffs)

plugins/file-sync/src/file_sync.c

@@ -39 +39 @@
-
-        if (dir->hashtable)
-free
+unref
-
-        g_free(dir);
@@ -452 +452 @@
-                        relative_filename = g_build_filename(subdir, de, NULL);
-                        
-                osync_hashtable_report(directory->hashtable, relative_filename);
-                osync_trace(TRACE_INTERNAL, "path2 %s %s", filename, relative_filename);
-                
@@ -463 +462 @@
-                        struct stat buf;
-                        stat(filename, &buf);
-                        char *hash = osync_filesync_generate_hash(&buf);
-                        
-
-                        OSyncChangeType type = osync_hashtable_get_changetype(directory->hashtable, relative_filename, hash);
-                        if (type == OSYNC_CHANGE_TYPE_UNMODIFIED) {
-                                g_free(hash);
-                                g_free(filename);
-                                g_free(relative_filename);
-                                continue;
-                        }
-                        osync_hashtable_update_hash(directory->hashtable, type, relative_filename, hash);
-
-                        /* Report normal files */
@@ -480 +468 @@
-                                osync_context_report_osyncwarning(ctx, error);
-                                osync_error_unref(&error);
-                                g_free(hash);
-                                g_free(filename);
-                                g_free(relative_filename);
-                                continue;
-                        }
-
+
-                        osync_change_set_uid(change, relative_filename);
+
+                        char *hash = osync_filesync_generate_hash(&buf);
-                        osync_change_set_hash(change, hash);
+                        g_free(hash);
+
+                        OSyncChangeType type = osync_hashtable_get_changetype(directory->hashtable, change);
-                        osync_change_set_changetype(change, type);
-
-
-
+
+
+
+
+
+
+
+
-
-                        char *data;
@@ -501 +498 @@
-                                osync_error_unref(&error);
-                                g_free(filename);
+                                g_free(relative_filename);
-                                continue;
-                        }
@@ -516 +514 @@
-                                        osync_error_unref(&error);
-                                        g_free(data);
+                                        g_free(filename);
+                                        g_free(relative_filename);
+
-                                        continue;
-                                }
@@ -541 +542 @@
-                                        osync_error_unref(&error);
-                                        g_free(data);
+                                        g_free(filename);
+                                        g_free(relative_filename);
+                                        g_free(file->path);
-                                        continue;
-                                }
@@ -575 +579 @@
-
-        
-        osync_hashtable_reset_reports(dir->hashtable);
-        if (osync_objtype_sink_get_slowsync(dir->sink)) {
-                osync_trace(TRACE_INTERNAL, "Slow sync requested");
@@ -591 +594 @@
-        osync_filesync_report_dir(dir, info, NULL, ctx);
-        
-char *
-i = 0; uids[i]; i++
+OSyncList *u, 
+u = uids; uids; u = u->next
-                OSyncChange *change = osync_change_new(&error);
-                if (!change) {
-                        g_free(uids[i]);
-                        osync_context_report_osyncwarning(ctx, error);
-                        osync_error_unref(&error);
@@ -601 +603 @@
-                }
-                
-
+
+
-                osync_change_set_changetype(change, OSYNC_CHANGE_TYPE_DELETED);
-                
-                OSyncData *odata = osync_data_new(NULL, 0, dir->objformat_output, &error);
-                if (!odata) {
-                        g_free(uids[i]);
-                        osync_change_unref(change);
-                        osync_context_report_osyncwarning(ctx, error);
@@ -619 +621 @@
-                osync_context_report_change(ctx, change);
-                
-hash(dir->hashtable, osync_change_get_changetype(change), osync_change_get_uid(change), NULL
+change(dir->hashtable, change
-        
-                osync_change_unref(change);
-
-
-
+
+
-        
-        osync_context_report_success(ctx);
@@ -653 +654 @@
-        g_free(filename);
-
-hash(dir->hashtable, osync_change_get_changetype(change), osync_change_get_uid(change), hash
+change(dir->hashtable, change
-        g_free(hash);
-        
@@ -664 +665 @@
-{
-        osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx);
+
+        OSyncError *error = NULL;
+
-        OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
-        OSyncFileDir *dir = osync_objtype_sink_get_userdata(sink);
@@ -672 +676 @@
-        g_free(anchorpath);
-        g_free(path_field);
+
+        if (!osync_hashtable_save(dir->hashtable, &error))
+                goto error;
-        
-        osync_context_report_success(ctx);
-        
-        osync_trace(TRACE_EXIT, "%s", __func__);
+        return;
+
+error:
+        osync_context_report_osyncerror(ctx, error);
+        osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(&error));
+        osync_error_unref(&error);
+        return;
-}
-
@@ -746 +760 @@
-                        goto error_free_env;
-
+                if (!osync_hashtable_load(dir->hashtable, error))
+                        goto error_free_env;
+
-                char *anchorpath = g_strdup_printf("%s/anchor.db", osync_plugin_info_get_configdir(info));
-                char *path_field = g_strdup_printf("path_%s", osync_objtype_sink_get_name(sink));