dav: comparison dav/sync.c

-:bc2cdbf5e68f
+:046b869a1c49
 return -1;
 }
 remove_deleted_conflicts(dir, db);
 UcxMap *hashes = NULL;
-if(dir->hashing) {
+if(SYNC_HASHING(dir)) {
 hashes = create_hash_index(db);
 }
 DavSession *sn = create_session(ctx, repo, dir->collection);
 ucx_mempool_reg_destr(sn->mp, db, (ucx_destructor)destroy_db);
 UCX_FOREACH(elm, res_conflict) {
 DavResource *res = elm->data;
 ucx_map_cstr_put(conflicts, res->path, res);
 }
-if(dir->hashing) {
+if(SYNC_HASHING(dir)) {
 // check for moved/copied files
 UcxList *elm = res_new;
 UcxList *prev = NULL;
 UcxList *next = NULL;
 SYS_STAT s;
 perror("symlink");
 ret = 1;
 }
 }
-if((issplit || dir->hashing) && !link) {
+if(issplit || (SYNC_HASHING(dir) && !link)) {
 if(truncate_file >= 0) {
 // only true if issplit is true
 if(truncate(local_path, truncate_file)) {
 perror("truncate");
 }
 ucx_mempool_reg_destr(sn->mp, db, (ucx_destructor)destroy_db);
 if (cmd_getoption(a, "verbose")) {
 curl_easy_setopt(sn->handle, CURLOPT_VERBOSE, 1L);
 curl_easy_setopt(sn->handle, CURLOPT_STDERR, stderr);
 }
-if(dir->hashing) {
+if(SYNC_STORE_HASH(dir)) {
 sn->flags |= DAV_SESSION_STORE_HASH;
 }
 DavBool restore_removed = cmd_getoption(a, "restore-removed") ? 1 : 0;
 DavBool restore_modified = cmd_getoption(a, "restore-modified") ? 1 : 0;
 }
 DavBool remove_file = cmd_getoption(a, "remove") ? 1 : 0;
 UcxMap *db_hashes = NULL;
-if(dir->hashing) {
+if(SYNC_HASHING(dir)) {
 db_hashes = create_hash_index(db);
 }
 int sync_success = 0;
 int sync_delete = 0;
 local_resource_path(local_res));
 }
 }
 }
-if(dir->hashing) {
+if(SYNC_STORE_HASH(dir)) {
 // calculate hashes of all new files and check if a file
 // was moved or is a copy
 UcxList *elm = ls_new;
 while(elm) {
 LocalResource *local = elm->data;
 return 1;
 }
 }
 }
+// copy some metadata from db_res, that localscan does not deliver
 res->tags_updated = db_res->tags_updated;
 if(db_res->etag) {
 res->etag = strdup(db_res->etag);
 }
 if(db_res->tags_hash) {
 }
 if(db_res->xattr_hash) {
 res->xattr_hash = strdup(db_res->xattr_hash);
 }
+// if the resource is splitted, move the part infos to the new
+// LocalResource obj, because we need it later
+if(db_res->parts) {
+res->parts = db_res->parts;
+res->numparts = db_res->numparts;
+db_res->parts = NULL;
+db_res->numparts = 0;
+}
+// check if metadata has changed
+// metadata are tags, mode, owner, xattr
+// set res->metadata_updated to 1 in case any metadata has changed
+// check if tags have changed
 if(dir->tagconfig && dir->tagconfig->detect_changes && !res->tags_updated) {
 UcxBuffer *tags = sync_get_file_tag_data(dir, res);
 if(tags) {
 if(db_res->tags_hash) {
 char *hash = dav_create_hash(tags->space, tags->size);
 res->tags_updated = 1; // tags removed
 }
 res->metadata_updated = res->tags_updated;
 }
+// check if mode has changed
 if((dir->metadata & FINFO_MODE) == FINFO_MODE) {
 if(db_res->mode != res->mode) {
 res->finfo_updated = 1;
 res->metadata_updated = 1;
 }
 }
+// check if owner has changed
 if((dir->metadata & FINFO_OWNER) == FINFO_OWNER) {
 if(db_res->uid != res->uid || db_res->gid != res->gid) {
 res->finfo_updated = 1;
 res->metadata_updated = 1;
 }
 }
+// check if xattr have changed
 if((dir->metadata & FINFO_XATTR) == FINFO_XATTR) {
 char *path = create_local_path(dir, local_resource_path(db_res));
 XAttributes *xattr = file_get_attributes(path, (xattr_filter_func)xattr_filter, dir);
 // test if xattr are added, removed or changed
 if((db_res->xattr_hash && !xattr) ||
 } else if(xattr) {
 xattributes_free(xattr);
 }
 }
+// check if the content of the file was modified
+// in case of links, just check if the link target has changed
+// for normal files, check last modified and size
+// or compare content hashes
 if(nullstrcmp(db_res->link_target, res->link_target)) {
 res->link_updated = 1;
-} else if(
+} else {
+if(db_res->hash && res->hash) {
+// we already have hashes
+if(!strcmp(db_res->hash, res->hash)) {
+return 0; // hashes equal -> file content unchanged
+}
+} else if(
 db_res->last_modified == res->last_modified &&
 db_res->size == res->size &&
 db_res->isdirectory == res->isdirectory)
 {
-return 0;
+// mtime and size unchanged, content also likely unchanged
-}
+return 0;
+} else if(SYNC_HASHING(dir) && db_res->hash) {
-if(db_res->parts) {
+// in case of activated hashing, we check if the content
-// if the resource is splitted, move the part infos to the new
+// has really changed
-// LocalResource obj, because we need it later
-res->parts = db_res->parts;
+// res->hash missing (see above)
-res->numparts = db_res->numparts;
+char *local_path = util_concat_path(dir->path, local_resource_path(res));
-db_res->parts = NULL;
+res->hash = util_file_hash(local_path);
-db_res->numparts = 0;
+free(local_path);
+if(res->hash && !strcmp(res->hash, db_res->hash)) {
+return 0;
+}
+}
 }
 } else {
 res->tags_updated = 1;
 res->finfo_updated = 1;
 res->xattr_updated = 1;
 } else {
 // everything seems fine, we can update the local resource
 char *etag = dav_get_string_property(up_res, "D:getetag");
 local_resource_set_etag(local, etag);
-if(!issplit && dir->hashing) {
+if(!issplit && SYNC_STORE_HASH(dir)) {
 if(local->hash) {
 free(local->hash);
 }
 // TODO: calculate hash on upload
 local->hash = util_file_hash(local_path);

Mercurial > hg > dav / file comparison

comparison: dav/sync.c

dav/sync.c