dav: comparison dav/sync.c

-:ee9da935645d
+:112dbf7ba8b0
 // download the resource
 if(sync_get_resource(a, dir, res, db)) {
 fprintf(stderr, "sync_get_resource failed for resource: %s\n", res->path);
 }
+// add every resource from the server to svrres
+// then db-resources only contains resources which are not on the
+// server
 LocalResource *local = ucx_map_cstr_get(db->resources, res->path);
 ucx_map_cstr_put(svrres, res->path, local);
 ucx_map_cstr_remove(db->resources, res->path);
 if(res->children) {
 }
 res = res->next;
 }
 }
+// delete every remotely removed resource
 UcxMapIterator i = ucx_map_iterator(db->resources);
 LocalResource *local;
 UCX_MAP_FOREACH(key, local, i) {
 if (res_matches_filter(dir, local->path)) {
 continue;
 }
+// sync_remove_resource does all necessary tests
 sync_remove_resource(dir, local);
 }
 ucx_map_free(db->resources);
 db->resources = svrres;
 int sync_get_resource(CmdArgs *a, SyncDirectory *dir, DavResource *res, SyncDatabase *db) {
 LocalResource *removed = ucx_map_cstr_get(db->remove, res->path);
 if(removed) {
 return 0;
 }
-int cdt = cmd_getoption(a, "conflict") ? 0 : 1;
+int cdt = cmd_getoption(a, "conflict") ? 0 : 1; // conflict detection
 LocalResource *local = ucx_map_cstr_get(db->resources, res->path);
 char *local_path = util_concat_path(dir->path, res->path);
 char *etag = dav_get_property(res, "D:getetag");
 struct stat s;
 if(local) {
 if(stat(local_path, &s)) {
-if(errno == ENOENT) {
+// Ignore the fact, that the file is locally removed. If the
-printf("removed: %s\n", res->path);
+// server has an updated version, we readd the file or the
-// the file is in the database, but doesn't exists
+// next push will delete it on the server.
-// mark the file as removed to delete it on next push
+if(errno != ENOENT) {
-ucx_map_cstr_remove(db->resources, local->path);
-ucx_map_cstr_put(db->remove, local->path, local);
-return 0;
-} else {
 fprintf(stderr, "Cannot stat file: %s\n", local_path);
 free(local_path);
 return -1;
 }
 }
 } else {
 if(stat(local_path, &s)) {
 if(errno != ENOENT) {
 fprintf(stderr, "Cannot stat file: %s\n", local_path);
 }
-} else if(cdt && !S_ISDIR(s.st_mode)) {
+} else if(S_ISDIR(s.st_mode)) {
+//fprintf(stderr, "Error: file %s is a directory\n", local_path);
+} else if(cdt) {
+// rename file on conflict
 rename_local_file(dir, db, res->path);
 }
 }
 int ret = 0;
 // upload all changed files
 UcxList *resources = cmd_getoption(a, "read") ?
 read_changes(dir, db) : local_scan(dir, db);
+UcxMap *lclres = ucx_map_new(db->resources->count);
 UCX_FOREACH(elm, resources) {
 LocalResource *local_res = elm->data;
 if (!res_matches_filter(dir, local_res->path+1)) {
-printf("put: %s\n", local_res->path);
+// upload every changed file
-ucx_map_cstr_put(db->resources, local_res->path, local_res);
+if (local_resource_is_changed(dir, db, local_res)) {
-DavResource *res = dav_resource_new(sn, local_res->path);
+printf("put: %s\n", local_res->path);
-if(sync_put_resource(dir, res, db)) {
+DavResource *res = dav_resource_new(sn, local_res->path);
-ucx_map_cstr_remove(db->resources, local_res->path);
+if(sync_put_resource(dir, res, local_res)) {
-}
+// TODO: I don't know what to do now
-dav_resource_free(res);
+}
+dav_resource_free(res);
+}
+// remove every locally available resource from db->resource
+// the remaining elements are all deleted files
+ucx_map_cstr_put(lclres, local_res->path, local_res);
+ucx_map_cstr_remove(db->resources, local_res->path); // TODO: element leaked
 }
 }
 ucx_list_free(resources);
 // delete all removed files
-UcxMapIterator i = ucx_map_iterator(db->remove);
+UcxMapIterator i = ucx_map_iterator(db->resources);
 LocalResource *local;
 UCX_MAP_FOREACH(key, local, i) {
+// TODO: save deletion: check for remote changes
 DavResource *res = dav_resource_new(sn, local->path);
 printf("delete: %s\n", res->path);
 if(dav_delete(res)) {
 if(sn->error != DAV_NOT_FOUND) {
 fprintf(stderr, "Cannot delete resource %s\n", res->path);
 }
 dav_resource_free(res);
 // TODO: free local resource
 ucx_map_remove(db->remove, key);
 }
+ucx_map_free(db->resources);
+db->resources = lclres;
 // TODO: free res
 // store db
 if(store_db(db, dir->database)) {
 char *path = strdup("/");
 UcxList *stack = ucx_list_prepend(NULL, path);
 while(stack) {
 // get a directory path from the stack and read all entries
 // if an entry is a directory, put it on the stack
-// otherwise compare the metadata with the db content
 char *p = stack->data;
 stack = ucx_list_remove(stack, stack);
 char *local_path = util_concat_path(dir->path, p);
 DIR *local_dir = opendir(local_path);
 continue;
 }
 char *new_path = util_concat_path(p, ent->d_name);
 int isdir;
-LocalResource *res = path_to_local_resource(dir, db, new_path, &isdir);
+LocalResource *res = local_resource_new(dir, db, new_path, &isdir);
 if(isdir) {
 stack = ucx_list_prepend(stack, new_path);
 } else if(res) {
 resources = ucx_list_append(resources, res);
 free(new_path);
 }
 value = sstrdup(value);
 if(!sstrcmp(name, S("put"))) {
 int isdir;
-LocalResource *res = path_to_local_resource(dir, db, value.ptr, &isdir);
+LocalResource *res = local_resource_new(dir, db, value.ptr, &isdir);
 if(res) {
 resources = ucx_list_append(resources, res);
 }
 } else if(!sstrcmp(name, S("remove"))) {
 LocalResource *res = calloc(1, sizeof(LocalResource));
 ucx_properties_free(parser);
 return resources;
 }
-LocalResource* path_to_local_resource(SyncDirectory *dir, SyncDatabase *db, char *path, int *isdir) {
+LocalResource* local_resource_new(SyncDirectory *dir, SyncDatabase *db, char *path, int *isdir) {
 char *file_path = util_concat_path(dir->path, path);
 struct stat s;
 if(stat(file_path, &s)) {
 fprintf(stderr, "Cannot stat file %s\n", file_path);
 free(file_path);
 }
 free(file_path);
 if(!S_ISDIR(s.st_mode)) {
 *isdir = 0;
-LocalResource *res = ucx_map_cstr_get(db->resources, path);
+LocalResource *res = calloc(1, sizeof(LocalResource));
-if(res) {
+res->path = strdup(path);
-// the file is already in the database
+res->etag = NULL;
-// compare length and lastmodified date
+res->last_modified = s.st_mtime;
+res->size = s.st_size;
-if(res->last_modified == s.st_mtime
+return res;
-&& res->size == s.st_size)
-{
-// file unchanged
-return NULL;
-} else {
-// update db entries
-res->size = s.st_size;
-res->last_modified = s.st_mtime;
-return res;
-}
-} else {
-LocalResource *res = calloc(1, sizeof(LocalResource));
-res->path = strdup(path);
-res->etag = NULL;
-res->last_modified = s.st_mtime;
-res->size = s.st_size;
-return res;
-}
 } else {
 *isdir = 1;
 }
 return NULL;
 }
-int sync_put_resource(SyncDirectory *dir, DavResource *res, SyncDatabase *db) {
+int local_resource_is_changed(SyncDirectory *dir, SyncDatabase *db, LocalResource *res) {
+LocalResource *db_res = ucx_map_cstr_get(db->resources, res->path);
+if(db_res) {
+if(db_res->etag) {
+res->etag = strdup(db_res->etag);
+}
+if(db_res->last_modified == res->last_modified && db_res->size == res->size) {
+return 0;
+}
+}
+return 1;
+}
+int sync_put_resource(SyncDirectory *dir, DavResource *res, LocalResource *local) {
 char *local_path = util_concat_path(dir->path, res->path);
 FILE *in = fopen(local_path, "r");
 if(!in) {
 fprintf(stderr, "Cannot open file %s\n", local_path);
 free(local_path);
 }
 ret = 0;
 break;
 }
 if(ret == 0) {
-LocalResource *local_res = ucx_map_cstr_get(db->resources, res->path);
+// get new etag
-if(local_res->etag) {
-free(local_res->etag);
-}
 DavResource *up_res = dav_get(res->session, res->path, "D:getetag");
 char *etag = dav_get_property(up_res, "D:getetag");
 if(etag) {
 if(strlen(etag) > 2 && etag[0] == 'W' && etag[1] == '/') {
 etag = etag + 2;
 }
 }
+if(local->etag) {
+free(local->etag);
+}
 if(etag) {
-local_res->etag = strdup(etag);
+local->etag = strdup(etag);
 } else {
-local_res->etag = NULL;
+local->etag = NULL;
 }
+dav_resource_free(up_res);
 }
 fclose(in);
-return 0;
+return ret;
 }
 int cmd_sync(CmdArgs *a) {

Mercurial > hg > dav / file comparison

comparison: dav/sync.c

dav/sync.c