dav: comparison dav/main.c

-:39fd327f81da
+:222997d48ae1
 }
 } else if(!cfgret) {
 if(!strcasecmp(cmd, "list") || !strcasecmp(cmd, "ls")) {
 ret = cmd_list(args);
 } else if(!strcasecmp(cmd, "get")) {
-ret = cmd_get(args);
+ret = cmd_get(args, FALSE);
 } else if(!strcasecmp(cmd, "put")) {
-ret = cmd_put(args);
+ret = cmd_put(args, FALSE);
 } else if(
 !strcasecmp(cmd, "remove") ||
 !strcasecmp(cmd, "rm") ||
 !strcasecmp(cmd, "delete"))
 {
 ret = cmd_mkdir(args);
 } else if(!strcasecmp(cmd, "copy") || !strcasecmp(cmd, "cp")) {
 ret = cmd_move(args, true);
 } else if(!strcasecmp(cmd, "move") || !strcasecmp(cmd, "mv")) {
 ret = cmd_move(args, false);
+} else if(!strcasecmp(cmd, "export")) {
+ret = cmd_get(args, TRUE);
+} else if(!strcasecmp(cmd, "import")) {
+ret = cmd_put(args, TRUE);
 } else if(!strcasecmp(cmd, "date")) {
 ret = cmd_date(args);
 } else if(!strcasecmp(cmd, "set-property")) {
 ret = cmd_set_property(args);
 } else if(!strcasecmp(cmd, "get-property")) {
 return ret;
 }
 static char *cmdusageinfo[] = {
 "list [-altdepcR] [-u <date>] <url>",
-"get [-pcRKA] [-o <file>] [-u <date>] <url>",
+"get [-pcRK] [-o <file>] [-u <date>] <url>",
-"put [-pcRA] [-k <key>] [-L <lock>] <url> <file>",
+"put [-pcR] [-k <key>] [-L <lock>] <url> <file>",
 "mkdir [-pc] [-k <key>] [-L <lock>] <url>",
 "remove [-pc] [-L <lock>] <url>",
 "copy [-pcO] [-L <lock>] <url> <url>",
 "move [-pcO] [-L <lock>] <url> <url>",
+"export [-pc] [-o <file>] [-u <date>] <url>",
+"import [-pc] [-k <key>] [-L <lock>] <url> <file>",
 "get-property [-pcx] [-n <uri>] <url> <property>",
 "set-property [-pcx] [-L <lock>] [-n <uri>] <url> <property> [value]",
 "remove-property [-pc] [-n <uri>] <url> <property>",
 "lock [-pc] [-T timeout] <url>",
 "unlock [-pc] [-L <lock>] <url>",
 void download_progress(DavResource *res, int64_t total, int64_t now, void *data) {
 Progress *p = data;
 int newres = update_progress(res, total, now, p);
 time_t newts = time(NULL);
-if(newres || (p->ts != newts)) {
+if((p->ts != newts)) {
 fprintf(p->out, "[%s]: %" PRId64 "k/%" PRId64 "k total: %" PRId64 "M/%" PRId64 "M\n", res->name, now/1024, total/1024, p->cur/(1024*1024), p->total/(1024*1024));
 fflush(p->out);
 }
 p->ts = newts;
 }
 GetResource *getres = r;
 free(getres->path);
 free(getres);
 }
-int cmd_get(CmdArgs *a) {
+int cmd_get(CmdArgs *a, DavBool export) {
 if(a->argc != 1) {
 // TODO: change this, when get supports retrieval of multiple files
 fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few":"many");
 fprintf(stderr, "Usage: dav %s\n", find_usage_str("get"));
 return -1;
+}
+if(export) {
+ucx_map_cstr_put(a->options, "recursive", "");
 }
 char *url = a->argv[0];
 char *path = NULL;
 Repository *repo = url2repo(url, &path);
 * determine the output file
 * use stdout if the output file is -
 */
 char *outfile = cmd_getoption(a, "output");
 char *basepath = outfile;
-char *tar = cmd_getoption(a, "tar");
 if(!outfile) {
 if(res->iscollection) {
 basepath = "";
 } else {
 basepath = res->name;
 }
-if(tar) {
+if(export) {
 outfile = "-";
 }
-} else if(tar) {
+} else if(export) {
 basepath = "";
 } else if(res->iscollection && !strcmp(outfile, "-")) {
 fprintf(
 stderr,
 "Cannot write output to stdout "
 pdata.total = totalsize;
 int ret;
 getfunc get;
 TarOutputStream *tout = NULL;
-if(tar) {
+if(export) {
 get = (getfunc)resource2tar;
 FILE *tarfile = strcmp(outfile, "-") ? fopen(outfile, "wb") : stdout;
 if(!tarfile) {
 perror("Cannot open tar output file");
 return -1;
 ret = get(repo, getres, a, tout);
 if(ret) {
 break;
 }
 }
-if(tar) {
+if(export) {
 // close tar stream
 if(tar_close(tout)) {
 fprintf(stderr, "tar stream broken\n");
 ret = -1;
 }
 // download content
 return tar_end_file(tar);
 }
-int cmd_put(CmdArgs *a) {
+int cmd_put(CmdArgs *a, DavBool import) {
 if(a->argc != 2) {
 // TODO: change, when put supports multiple files (however it should do)
 fprintf(stderr, "Too %s arguments\n", a->argc < 2 ? "few":"many");
 fprintf(stderr, "Usage: dav %s\n", find_usage_str("put"));
 return -1;
+}
+if(import) {
+ucx_map_cstr_put(a->options, "resursive", "");
 }
 char *url = a->argv[0];
 char *file = a->argv[1];
 char *path = NULL;
 "but no default key is configured.\n"
 "You may specify a custom key with the '-k' option.\n");
 return -1;
 }
-char *tar = cmd_getoption(a, "tar");
 int ret;
-if(!tar) {
+if(!import) {
 if(!strcmp(file, "-")) {
 FILE *in = stdin;
 ret = put_file(repo, a, sn, path, "stdin", in, 0);
 } else {
 ret = put_entry(repo, a, sn, path, file, TRUE);

Mercurial > hg > dav / file comparison

comparison: dav/main.c

dav/main.c