dav: comparison dav/sync.c

-:cdaf5a3d3a50
+:8a0c727aa409
 ret = cmd_empty_trash(args);
 } else if(!strcmp(cmd, "add-tag")) {
 ret = cmd_add_tag(args);
 } else if(!strcmp(cmd, "remove-tag")) {
 ret = cmd_remove_tag(args);
-} else if(!strcmp(cmd, "update-tags")) {
+} else if(!strcmp(cmd, "set-tags")) {
-ret = cmd_update_tags(args);
+ret = cmd_set_tags(args);
 } else if(!strcmp(cmd, "list-tags")) {
 ret = cmd_list_tags(args);
 } else if(!strcmp(cmd, "add-dir")
 || !strcmp(cmd, "add-directory")) {
 ret = cmd_add_directory(args);
 void print_usage(char *cmd) {
 fprintf(stderr, "Usage: %s command [options] arguments...\n\n", cmd);
 fprintf(stderr, "Commands:\n");
-fprintf(stderr, "        pull [-cld] <directory>\n");
+fprintf(stderr, "        pull [-cld] [-t <tags>] <directory>\n");
-fprintf(stderr, "        push [-cld] <directory>\n");
+fprintf(stderr, "        push [-cld] [-t <tags>] <directory>\n");
 fprintf(stderr, "        archive [-cld] <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, "        remove-tag [-s <syncdir>] <file> <tag>\n");
-fprintf(stderr, "        update-tags [-s <syncdir>] <file> [tags]\n");
+fprintf(stderr, "        set-tags [-s <syncdir>] <file> [tags]\n");
 fprintf(stderr, "        list-tags [-s <syncdir>] <file>\n\n");
 fprintf(stderr, "Options:\n");
 fprintf(stderr, "        -c         Disable conflict detection\n");
 fprintf(stderr, "        -l         Lock the repository before access\n");
 fprintf(stderr, "        -d         Don't lock the repository\n");
-//fprintf(stderr, "        -r         Read changes from stdin\n\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, "        -v         verbose output (all commands)\n\n");
 fprintf(stderr, "Config commands:\n");
 fprintf(stderr, "        add-directory\n");
 fprintf(stderr, "        list-directories\n");
 }
 }
 return 0;
 }
 }
+return 1;
+}
+static int matches_tags(UcxList *resource_tags, UcxList *tags) {
+if(!tags) {
+return 1;
+}
+if(!resource_tags) {
+return 0;
+}
+UcxMap *res_tagmap = ucx_map_new(32);
+UCX_FOREACH(elm, resource_tags) {
+DavTag *t = elm->data;
+// the value actually doesn't matter
+ucx_map_cstr_put(res_tagmap, t->name, t);
+}
+int ret = 1;
+// TODO: replace FOREACH with new tag expression evaluation
+UCX_FOREACH(elm, tags) {
+DavTag *matches_tag = elm->data;
+if(!ucx_map_cstr_get(res_tagmap, matches_tag->name)) {
+ret = 0;
+break;
+}
+}
+ucx_map_free(res_tagmap);
+return ret;
+}
+static int res_matches_tags(DavResource *res, UcxList *tags) {
+if(!tags) {
+return 1;
+}
+DavXmlNode *tagsprop = dav_get_property_ns(res, DAV_NS, "tags");
+UcxList *res_tags = parse_dav_xml_taglist(tagsprop);
+int ret = matches_tags(res_tags, tags);
+// TODO: free list content
+ucx_list_free(res_tags);
+return ret;
+}
+static int localres_matches_tags(LocalResource *res, UcxList *tags) {
+// TODO: implement
 return 1;
 }
 static DavSession* create_session(DavContext *ctx, Repository *repo, char *url) {
 DavSession *sn = dav_session_new_auth(
 fprintf(stderr, "%sarchive", sep);
 }
 fprintf(stderr, "\n");
 }
+static void localres_keep(SyncDatabase *db, const char *path) {
+LocalResource *local = ucx_map_cstr_remove(db->resources, path);
+if(local) {
+local->keep = TRUE;
+}
+}
 int cmd_pull(CmdArgs *a) {
 if(a->argc != 1) {
 fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few" : "many");
 return -1;
 }
 }
 return -1;
 }
+UcxList *tags = NULL;
+char *tags_str = cmd_getoption(a, "tags");
+if(tags_str) {
+tags = parse_csv_taglist(tags_str, strlen(tags_str));
+}
+DavBool rm_tagmismatch = cmd_getoption(a, "remove") ? 1 : 0;
 int sync_success = 0;
 int sync_delete = 0;
 int sync_error = 0;
 UcxMap *svrres = ucx_map_new(db->resources->count);
 if (res_matches_filter(dir, res->path)) {
 res = res->next;
 continue;
 }
+if (!res_matches_tags(res, tags)) {
+if(!rm_tagmismatch) {
+localres_keep(db, res->path);
+}
+res = res->next;
+continue;
+}
 char *status = dav_get_string_property(res, "idav:status");
 if(status && !strcmp(status, "broken")) {
 res = res->next;
+localres_keep(db, res->path);
 continue;
 }
 // download the resource
 if(!sync_shutdown && sync_get_resource(a, dir, res, db, &sync_success)) {
 UCX_MAP_FOREACH(key, local, i) {
 if (res_matches_filter(dir, local->path)) {
 continue;
 }
-if(sync_shutdown) {
+if(sync_shutdown || local->keep) {
 ucx_map_cstr_put(svrres, local->path, local_resource_copy(local));
 } else {
 // sync_remove_resource does all necessary tests
 int ret = sync_remove_local_resource(dir, local);
 if(ret == -1) {
 }
 newres->skipped = res->skipped;
 newres->size = res->size;
 newres->last_modified = res->last_modified;
 newres->isdirectory = res->isdirectory;
+if(res->tags_hash) {
+newres->tags_hash = strdup(res->tags_hash);
+}
+newres->tags_updated = res->tags_updated;
 return newres;
 }
 int local_resource_is_changed(SyncDirectory *dir, SyncDatabase *db, LocalResource *res) {
 LocalResource *db_res = ucx_map_cstr_get(db->resources, res->path);
 return 0;
 }
 #define CMD_TAG_ADD    0
 #define CMD_TAG_REMOVE 1
-#define CMD_TAG_UPDATE 2
+#define CMD_TAG_SET 2
 #define CMD_TAG_LIST   3
 int cmd_add_tag(CmdArgs *args) {
 if(args->argc != 2) {
 fprintf(stderr, "Too %s arguments\n", args->argc <= 1 ? "few" : "many");
 return -1;
 return -1;
 }
 return cmd_tagopt(args, CMD_TAG_REMOVE);
 }
-int cmd_update_tags(CmdArgs *args) {
+int cmd_set_tags(CmdArgs *args) {
 if(args->argc < 1 || args->argc > 2) {
 fprintf(stderr, "Too %s arguments\n", args->argc < 1 ? "few" : "many");
 return -1;
 }
-return cmd_tagopt(args, CMD_TAG_UPDATE);
+return cmd_tagopt(args, CMD_TAG_SET);
 }
 int cmd_list_tags(CmdArgs *args) {
 if(args->argc != 1) {
 fprintf(stderr, "Too %s arguments\n", args->argc <= 1 ? "few" : "many");
 LocalResource *localres = ucx_map_cstr_get(db->resources, file.path);
 UcxList *tags = NULL;
 DavBool store_tags = FALSE;
-if(cmd != CMD_TAG_UPDATE) {
+if(cmd != CMD_TAG_SET) {
 char *tag = args->argv[1];
 char *tagcolor = NULL; // TODO: get color
 tags = sync_get_file_tags(file.dir, localres, NULL);
 UcxList *x = NULL;

Mercurial > hg > dav / file comparison

comparison: dav/sync.c

dav/sync.c