dav: comparison dav/sync.c

-:2f019a4bc78a
+:761dc4867208
 void print_usage(char *cmd) {
 fprintf(stderr, "Usage: %s command [options] arguments...\n\n", cmd);
 fprintf(stderr, "Commands:\n");
 fprintf(stderr, "        pull [-cldr] [-t <tags>] <directory>\n");
-fprintf(stderr, "        push [-cldr] [-t <tags>] <directory>\n");
+fprintf(stderr, "        push [-cldrDM] [-t <tags>] <directory>\n");
-fprintf(stderr, "        archive [-cld] [-t <tags>] <directory>\n");
+fprintf(stderr, "        archive [-cldDM] [-t <tags>] <directory>\n");
 fprintf(stderr, "        resolve-conflicts <directory>\n");
 fprintf(stderr, "        delete-conflicts <directory>\n");
 fprintf(stderr, "        trash-info <directory>\n");
 fprintf(stderr, "        empty-trash <directory>\n");
 fprintf(stderr, "        add-tag [-s <syncdir>] <file> <tag>\n");
 fprintf(stderr, "        -d         Don't lock the repository\n");
 fprintf(stderr, "        -t <tags>  "
 "Only sync files which have the specified tags\n");
 fprintf(stderr, "        -r         "
 "Remove resources not matching the tag filter\n");
+fprintf(stderr, "        -D         restore deleted files\n");
+fprintf(stderr, "        -M         restore modified files\n");
 fprintf(stderr, "        -v         verbose output (all commands)\n\n");
 fprintf(stderr, "Config commands:\n");
 fprintf(stderr, "        add-directory\n");
 fprintf(stderr, "        list-directories\n");
 LocalResource *local = ucx_map_cstr_remove(db->resources, path);
 if(local) {
 local->keep = TRUE;
 }
+}
+void res2map(DavResource *root, UcxMap *map) {
+UcxList *stack = ucx_list_prepend(NULL, root->children);
+while(stack) {
+DavResource *res = stack->data;
+stack = ucx_list_remove(stack, stack);
+while(res) {
+ucx_map_cstr_put(map, res->path, res);
+if(res->children) {
+stack = ucx_list_prepend(stack, res->children);
+}
+res = res->next;
+}
+}
 }
 int cmd_pull(CmdArgs *a) {
 if(a->argc != 1) {
 fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few" : "many");
 if (cmd_getoption(a, "verbose")) {
 curl_easy_setopt(sn->handle, CURLOPT_VERBOSE, 1L);
 curl_easy_setopt(sn->handle, CURLOPT_STDERR, stderr);
 }
-DavResource *root = dav_query(sn, "select - from / with depth = 0");
+DavBool restore_deleted = cmd_getoption(a, "restore-deleted") ? 1 : 0;
+DavBool restore_modified = cmd_getoption(a, "restore-modified") ? 1 : 0;
+DavBool restore = restore_deleted || restore_modified;
+int depth = restore ? -1 : 0;
+DavResource *root = dav_query(sn, "select D:getetag,idav:status from / with depth = %d", depth);
 if(!root) {
 print_resource_error(sn, "/");
 dav_session_destroy(sn);
 fprintf(stderr, "Abort\n");
 return -1;
+}
+UcxMap *svrres = NULL;
+if(restore) {
+svrres = ucx_map_new(1024);
+res2map(root, svrres);
 }
 int cdt = cmd_getoption(a, "conflict") ? 0 : 1; // conflict detection
 // lock repository
 sync_skipped++;
 continue;
 }
 // upload every changed file
-int is_changed = local_resource_is_changed(dir, db, local_res);
+int is_changed = local_resource_is_changed(
+dir,
+db,
+local_res,
+svrres,
+restore_deleted,
+restore_modified);
 if (is_changed || local_res->tags_updated) {
 DavResource *res = dav_resource_new(sn, local_res->path);
 if(!res) {
 print_resource_error(sn, local_res->path);
 ret = -1;
 }
 newres->tags_updated = res->tags_updated;
 return newres;
 }
-int local_resource_is_changed(SyncDirectory *dir, SyncDatabase *db, LocalResource *res) {
+int local_resource_is_changed(
+SyncDirectory *dir,
+SyncDatabase *db,
+LocalResource *res,
+UcxMap *svrres,
+DavBool restore_deleted,
+DavBool restore_modified)
+{
 LocalResource *db_res = ucx_map_cstr_get(db->resources, res->path);
 res->tags_updated = 0;
 if(db_res) {
+if(svrres) {
+DavResource *remote = ucx_map_cstr_get(svrres, res->path);
+if(restore_deleted && !remote) {
+return 1;
+}
+if(!res->isdirectory && restore_modified && remote) {
+char *etag = dav_get_string_property(remote, "D:getetag");
+if(!etag || (db_res->etag && strcmp(etag, db_res->etag))) {
+res->restore = TRUE;
+return 1;
+}
+}
+}
 res->tags_updated = db_res->tags_updated;
 if(db_res->etag) {
 res->etag = strdup(db_res->etag);
 }
 if(db_res->tags_hash) {
 DavSession *sn,
 SyncDirectory *dir,
 SyncDatabase *db,
 LocalResource *res)
 {
+if(res->restore) {
+return 0;
+}
 DavResource *remote = dav_get(sn, res->path, "D:getetag");
 int ret = 0;
 if(remote) {
 char *etag = dav_get_string_property(remote, "D:getetag");
 if(!res->etag) {

Mercurial > hg > dav / file comparison

comparison: dav/sync.c

dav/sync.c