dav: comparison dav/sync.c

-:0fe1514667e6
+:868da3f76267
 int sync_success = 0;
 int sync_delete = 0;
 int sync_skipped = 0;
 int sync_error = 0;
+UcxList *ls_put = NULL;
+UcxList *ls_conflict = NULL;
+UcxList *ls_update = NULL;
+UcxList *ls_delete = NULL;
 // upload all changed files
 //UcxList *resources = cmd_getoption(a, "read") ?
 //        read_changes(dir, db) : local_scan(dir, db);
 UcxList *resources = local_scan(dir, db);
+UcxMap *resources_map = ucx_map_new(ucx_list_size(resources)+16);
-UcxMap *lclres = ucx_map_new(db->resources->count);
-int ret = 0;
 UCX_FOREACH(elm, resources) {
 LocalResource *local_res = elm->data;
-int error = 0;
+// ignore all files, that are excluded by a static filter (sync.xml)
-DavBool res_filtered = FALSE;
+// static include/exclude filter
 if(res_matches_filter(dir, local_res->path+1)) {
-res_filtered = TRUE;
+continue;
-} else {
+}
-UCX_FOREACH(elm, dir->tagfilter) {
+// static tag filter
-SyncTagFilter *tf = elm->data;
+UCX_FOREACH(elm, dir->tagfilter) {
-if(!localres_matches_tags(dir, local_res, tf)) {
+SyncTagFilter *tf = elm->data;
-res_filtered = TRUE;
+if(!localres_matches_tags(dir, local_res, tf)) {
-break;
+continue;
 }
 }
-}
-if (res_filtered) {
+// we need a fast file lookup map later
-local_res->keep = TRUE;
+ucx_map_cstr_put(resources_map, local_res->path, local_res);
-} else if (!localres_matches_tags(dir, local_res, tagfilter)) {
+// dynamic tag filter
+if(!localres_matches_tags(dir, local_res, tagfilter)) {
 if(!remove_file) {
-local_res->keep = TRUE;
+LocalResource *dbres = ucx_map_cstr_get(
-}
+db->resources,
-} else {
+local_res->path);
-if(sync_shutdown) {
+if(dbres) {
-LocalResource *lr = ucx_map_cstr_remove(db->resources, local_res->path);
+// this makes sure the file will not be deleted later
-if(lr) {
+dbres->keep = TRUE;
-local_res->size = lr->size;
+}
-local_res->last_modified = lr->last_modified;
+}
-local_res->etag = lr->etag ? strdup(lr->etag) : NULL;
+continue;
-local_resource_free(lr);
+}
-ucx_map_cstr_put(lclres, local_res->path, local_res);
-}
+if(res_isconflict(db, local_res)) {
-elm->data = NULL;
+ls_conflict = ucx_list_append(ls_conflict, local_res);
 continue;
 }
+int is_changed = local_resource_is_changed(
-if(res_isconflict(db, local_res)) {
-printf("skip: %s\n", local_res->path);
-sync_skipped++;
-continue;
-}
-// upload every changed file
-int is_changed = local_resource_is_changed(
 dir,
 db,
 local_res,
 svrres,
 restore_removed,
 restore_modified);
-if (is_changed || local_res->tags_updated) {
+if(is_changed) {
-DavResource *res = dav_resource_new(sn, local_res->path);
+ls_put = ucx_list_append(ls_put, local_res);
-if(!res) {
+} else if(local_res->tags_updated) {
-print_resource_error(sn, local_res->path);
+ls_update = ucx_list_append(ls_update, local_res);
+}
+}
+// find all deleted files and cleanup the database
+UcxMapIterator i = ucx_map_iterator(db->resources);
+LocalResource *local;
+UCX_MAP_FOREACH(key, local, i) {
+// all filtered files should be removed from the database
+if(res_matches_filter(dir, local->path+1)) {
+ucx_map_cstr_remove(db->resources, local->path);
+continue;
+}
+UCX_FOREACH(elm, dir->tagfilter) {
+SyncTagFilter *tf = elm->data;
+if(!localres_matches_tags(dir, local, tf)) {
+ucx_map_cstr_remove(db->resources, local->path);
+continue;
+}
+}
+if(!ucx_map_get(resources_map, key)) {
+// The current LocalResource is in the database but doesn't exist
+// in the filesystem anymore. This means the file was deleted
+// and should be deleted on server
+if(!archive) {
+ls_delete = ucx_list_append(ls_delete, local);
+} else {
+ucx_map_cstr_remove(db->resources, local->path);
+}
+}
+}
+ls_delete = ucx_list_sort(ls_delete, (cmp_func)resource_pathlen_cmp, NULL);
+//
+// BEGIN PUSH
+//
+// upload changed files
+int ret = 0;
+int error = 0;
+for(UcxList *elm=ls_put;elm && !sync_shutdown;elm=elm->next) {
+LocalResource *local_res = elm->data;
+DavResource *res = dav_resource_new(sn, local_res->path);
+if(!res) {
+print_resource_error(sn, local_res->path);
+ret = -1;
+sync_error++;
+}
+if(local_res->isdirectory) {
+dav_exists(res);
+if(sn->error == DAV_NOT_FOUND) {
+int abort = 0;
+// make sure to store tags for newly created cols
+local_res->tags_updated = 1;
+// create collection
+// TODO: show 405
+printf("mkcol: %s\n", local_res->path);
+if(sync_mkdir(dir, res, local_res) && sn->error != DAV_METHOD_NOT_ALLOWED) {
+print_resource_error(sn, res->path);
 ret = -1;
 sync_error++;
-}
+error = 1;
+abort = 1;
-if(local_res->isdirectory) {
+}
-dav_exists(res);
-if(sn->error == DAV_NOT_FOUND) {
+if(dir->tagconfig && local_res->tags_updated && !abort) {
-int abort = 0;
+sync_update_tags(dir, sn, res, local_res);
-// make sure to store tags for newly created cols
+}
-local_res->tags_updated = 1;
+} else if(sn->error != DAV_OK) {
-// create collection
+// dav_exists() failed
-// TODO: show 405
+print_resource_error(sn, local_res->path);
-printf("mkcol: %s\n", local_res->path);
+ret = -1;
-if(sync_mkdir(dir, res, local_res) && sn->error != DAV_METHOD_NOT_ALLOWED) {
+sync_error++;
-print_resource_error(sn, res->path);
+error = 1;
-ret = -1;
+}
-sync_error++;
+} else {
-error = 1;
+if(cdt && remote_resource_is_changed(sn, dir, db, local_res)) {
-abort = 1;
+printf("conflict: %s\n", local_res->path);
-}
+local_res->last_modified = 0;
+local_res->skipped = TRUE;
-if(dir->tagconfig && local_res->tags_updated && !abort) {
+sync_skipped++;
-sync_update_tags(dir, sn, res, local_res);
+} else {
-}
+printf("put: %s\n", local_res->path);
-} else if(sn->error != DAV_OK) {
+if(sync_put_resource(dir, res, local_res, &sync_success)) {
-// dav_exists() failed
+sync_error++;
-print_resource_error(sn, local_res->path);
+print_resource_error(sn, res->path);
 ret = -1;
-sync_error++;
+error = 1;
-error = 1;
+}
 }
-} else if(!is_changed) {
+}
-if(dir->tagconfig && local_res->tags_updated) {
+dav_resource_free(res);
-sync_update_tags(dir, sn, res, local_res);
-}
+LocalResource *dbres = ucx_map_cstr_remove(db->resources, local_res->path);
-} else {
+ucx_map_cstr_put(db->resources, local_res->path, local_res);
-if(cdt && remote_resource_is_changed(sn, dir, db, local_res)) {
+//if(dbres) local_resource_free(dbres);
-printf("conflict: %s\n", local_res->path);
+}
-local_res->last_modified = 0;
-local_res->skipped = TRUE;
+// metadata updates
-sync_skipped++;
+for(UcxList *elm=ls_update;elm && !sync_shutdown;elm=elm->next) {
-} else {
+LocalResource *local_res = elm->data;
-printf("put: %s\n", local_res->path);
-if(sync_put_resource(dir, res, local_res, &sync_success)) {
+DavResource *res = dav_resource_new(sn, local_res->path);
-sync_error++;
-print_resource_error(sn, res->path);
+if(dir->tagconfig && local_res->tags_updated) {
-ret = -1;
+sync_update_tags(dir, sn, res, local_res);
-error = 1;
+}
 }
-}
-}
-dav_resource_free(res);
-}
-}
-// remove every locally available resource from db->resource
-// the remaining elements are all deleted files
-elm->data = NULL;
-if(!error) {
-ucx_map_cstr_put(lclres, local_res->path, local_res);
-}
-LocalResource *lr = ucx_map_cstr_remove(db->resources, local_res->path);
-if(lr) {
-local_resource_free(lr);
-}
-}
 // delete all removed files
-if(ret == 0 && !archive) {
+UcxList *cols = NULL;
-UcxList *cols = NULL;
+UcxList **col_list = &cols;
+UcxList *deletelist = ls_delete;
-UcxMapIterator i = ucx_map_iterator(db->resources);
+for(int i=0;i<2;i++) {
-LocalResource *local;
+// the first iteration deletes everything from ls_delete except
-UCX_MAP_FOREACH(key, local, i) {
+// all collections, which are stored in cols
-if (!local->keep && !res_matches_filter(dir, local->path+1)) {
+// in the second run all collections will be deleted
-if(sync_shutdown) {
+for(UcxList *elm=deletelist;elm && !sync_shutdown;elm=elm->next) {
-ucx_map_cstr_put(lclres, local->path, local_resource_copy(local));
+LocalResource *local = elm->data;
-} else if(sync_delete_remote_resource(dir, sn, local, &sync_delete, &cols)) {
+if(local->keep) {
-ucx_map_cstr_put(lclres, local->path, local_resource_copy(local));
+continue;
-if(sn->error != DAV_NOT_FOUND) {
+}
-print_resource_error(sn, local->path);
+if(sync_delete_remote_resource(dir, sn, local, &sync_delete, col_list)) {
-sync_error++;
+if(sn->error != DAV_NOT_FOUND) {
-break;
+print_resource_error(sn, local->path);
-}
+sync_error++;
-}
+break;
 }
-}
+} else {
+LocalResource *dbres = ucx_map_cstr_remove(db->resources, local->path);
-cols = ucx_list_sort(cols, (cmp_func)resource_pathlen_cmp, NULL);
+//local_resource_free(dbres);
+}
-UCX_FOREACH(elm, cols) {
+}
-local = elm->data;
+deletelist = cols;
-if (!local->keep && !res_matches_filter(dir, local->path+1)) {
+col_list = NULL;
-if(sync_shutdown) {
+}
-ucx_map_cstr_put(lclres, local->path, local_resource_copy(local));
-} else if(sync_delete_remote_resource(dir, sn, local, &sync_delete, NULL)) {
-ucx_map_cstr_put(lclres, local->path, local_resource_copy(local));
-if(sn->error != DAV_NOT_FOUND) {
-print_resource_error(sn, local->path);
-sync_error++;
-break;
-}
-}
-}
-}
-ucx_list_free(cols);
-}
-ucx_map_free_content(db->resources, (ucx_destructor)local_resource_free);
-ucx_map_free(db->resources);
-db->resources = lclres;
 // unlock repository
 if(locked) {
 if(dav_unlock(root)) {
 print_resource_error(sn, "/");
 // cleanup
 if(!locked && locktokenfile) {
 remove(locktokenfile);
 }
+//ucx_map_free_content(db->resources, (ucx_destructor)local_resource_free);
+//ucx_map_free(db->resources);
 dav_session_destroy(sn);
-while(resources) {
-UcxList *next = resources->next;
-if(resources->data) {
-local_resource_free(resources->data);
-}
-free(resources);
-resources = next;
-}
 // Report
 if(ret != -2) {
 char *str_success = sync_success == 1 ? "file" : "files";
 char *str_delete = sync_delete == 1 ? "file" : "files";

Mercurial > hg > dav / file comparison

comparison: dav/sync.c

dav/sync.c