dav: comparison dav/sync.c

-:41b4cc024249
+:0d352b79363a
 rename_conflict_file(dir, db, res->path, issplit);
 sync_conflict++;
 }
 // download the resource
-if(sync_get_resource(a, dir, res->path, res, db, &sync_success)) {
+if(sync_get_resource(a, dir, res->path, res, db, TRUE, &sync_success)) {
 fprintf(stderr, "resource download failed: %s\n", res->path);
 sync_error++;
 }
 }
 CmdArgs *a,
 SyncDirectory *dir,
 const char *path,
 DavResource *res,
 SyncDatabase *db,
+DavBool update_db,
 int *counter)
 {
 char *link = SYNC_SYMLINK(dir) ?
 dav_get_string_property_ns(res, DAV_PROPS_NS, "link") : NULL;
 free(tmp_path);
 free(local_path);
 return -1;
 }
 }
+} else if(tmp_path) {
+if(sys_unlink(tmp_path)) {
+fprintf(stderr, "Cannot remove tmp file: %s\n", tmp_path);
+}
+}
+if(update_db && ret == 0) {
 if(!local) {
 // new local resource
 local = calloc(1, sizeof(LocalResource));
 local->path = strdup(path);
 ucx_map_cstr_put(db->resources, local->path, local);
 if(content_hash) {
 local->hash = content_hash;
 }
 sync_set_metadata_from_stat(local, &s);
 local->skipped = FALSE;
-} else if(tmp_path) {
-if(sys_unlink(tmp_path)) {
-fprintf(stderr, "Cannot remove tmp file: %s\n", tmp_path);
-}
 }
 if(tmp_path) {
 free(tmp_path);
 }
 fprintf(stderr, "Resource %s broken\n", res->path);
 continue;
 }
 DavResource *vres = NULL;
+DavBool update_local_entry = TRUE;
 if(version) {
 if(dir->versioning->type == VERSIONING_SIMPLE) {
 vres = versioning_simple_find(res, version);
 } else if(dir->versioning->type == VERSIONING_DELTAV) {
 vres = versioning_deltav_find(res, version);
 if(!vres) {
 fprintf(stderr, "Cannot find  specified version for resource %s\n", res->path);
 ret = 1;
 break;
 }
+// By restoring an old version of a file, the local dir is not
+// in sync with the server anymore. Mark this file to change
+// the metadata later, to make sure, the file will be detected
+// as locally modified, on the next push/pull
+update_local_entry = FALSE;
 } else {
 vres = res;
 }
 // download the resource
 "Cannot create directory %s: %s",
 local_path, strerror(errno));
 }
 free(local_path);
 } else {
-if(sync_get_resource(a, dir, res->path, vres, db, &sync_success)) {
+if(sync_get_resource(a, dir, res->path, vres, db, update_local_entry, &sync_success)) {
 fprintf(stderr, "sync_get_resource failed for resource: %s\n", res->path);
 sync_error++;
+} else if(!update_local_entry) {
+LocalResource *lr = ucx_map_cstr_get(db->resources, res->path);
+if(lr) {
+lr->last_modified = 0;
+nullfree(lr->hash);
+lr->hash = NULL;
+} // else should not happen
 }
 }
 }
 }
 } else {
 return 0;
 }
 }
-int versioning_delete(SyncDirectory *dir, DavResource *res) {
+int versioning_delete_begin(SyncDirectory *dir, DavResource *res, int *exists) {
 if(dir->versioning->type == VERSIONING_SIMPLE) {
-// TODO
+versioning_begin(dir, res, exists);
-}
+} else {
+// versioning delete with DeltaV currently not supported in dav-sync
+*exists = 1;
+}
+return 0;
+}
+int versioning_delete_end(SyncDirectory *dir, DavResource *res) {
 return 0;
 }
 static void update_metadata_hashes(LocalResource *local, MetadataHashes hashes) {
 if(hashes.update_tags) {
 if(!nullstrcmp(etag, local_res->etag)) {
 // local resource metadata == remote resource metadata
 // resource can be deleted
 printf("delete: %s\n", res->path);
+int exists = 1;
+int vend_required = 0;
 if(dir->versioning && dir->versioning->always) {
-if(versioning_delete(dir, res)) {
+if(versioning_delete_begin(dir, res, &exists)) {
 fprintf(
 stderr,
 "Cannot save resource version before deletion\n");
 ret = 1;
+} else {
+vend_required = 1;
 }
 }
-if(!ret && dav_delete(res)) {
+if(!ret && dav_delete(res) && exists) {
 if(sn->error != DAV_NOT_FOUND) {
 fprintf(stderr, "Cannot delete resource %s\n", res->path);
 ret = 1;
 }
 } else {
 (*counter)++;
+}
+if(vend_required) {
+versioning_delete_end(dir, res);
 }
 }
 // else TODO: should we inform the user that the file was modified on
 // the server and delete was skipped?
 }
 char *hex_hash = util_hexstr((unsigned char*)dec_hash, len);
 free(dec_hash);
 return hex_hash;
 }
 } else {
-return dav_get_string_property_ns(res, DAV_NS, "content-hash");
+char *hash = dav_get_string_property_ns(res, DAV_NS, "content-hash");
+if(hash) {
+return strdup(hash);
+}
 }
 return NULL;
 }
 void sync_set_content_hash(DavResource *res, const unsigned char *hashdata) {

Mercurial > hg > dav / file comparison

comparison: dav/sync.c

dav/sync.c