dav: comparison dav/sync.c

-:f1b3873a6525
+:e22c29b7ee2f
 void print_usage(char *cmd) {
 fprintf(stderr, "Usage: %s command [options] arguments...\n\n", cmd);
 fprintf(stderr, "Commands:\n");
-fprintf(stderr, "        pull [-c] <directory>\n");
+fprintf(stderr, "        pull [-cld] <directory>\n");
-fprintf(stderr, "        push [-c] <directory>\n");
+fprintf(stderr, "        push [-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\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, "        -v         verbose output (all commands)\n\n");
 fprintf(stderr, "Config commands:\n");
 fprintf(stderr, "        add-directory\n");
 if (cmd_getoption(a, "verbose")) {
 curl_easy_setopt(sn->handle, CURLOPT_VERBOSE, 1L);
 curl_easy_setopt(sn->handle, CURLOPT_STDERR, stderr);
 }
+// lock repository
+DavBool locked = FALSE;
+DavResource *root = dav_resource_new(sn, "/");
+root->iscollection = TRUE;
+if((dir->lockpush || cmd_getoption(a, "lock")) && !cmd_getoption(a, "nolock")) {
+if(dav_lock(root)) {
+print_resource_error(sn, "/");
+dav_session_destroy(sn);
+fprintf(stderr, "Abort\n");
+return -1;
+}
+locked = TRUE;
+}
+int ret = 0;
 DavResource *ls = dav_query(sn, "select D:getetag,idav:status from / with depth = infinity");
 if(!ls) {
 print_resource_error(sn, "/");
+if(locked) {
+if(dav_unlock(root)) {
+print_resource_error(sn, "/");
+}
+}
 fprintf(stderr, "Abort\n");
 dav_session_destroy(sn);
 // TODO: free
 return -1;
 int sync_error = 0;
 if(!ls->children) {
 // TODO: free
 fprintf(stderr, "Repository is empty\n");
+if(locked) {
+if(dav_unlock(root)) {
+print_resource_error(sn, "/");
+}
+}
 return 0; // empty repository
 }
 UcxMap *svrres = ucx_map_new(db->resources->count);
 sync_remove_local_directory(dir, local_dir);
 }
 ucx_map_free(db->resources);
 db->resources = svrres;
+// unlock repository
+if(locked) {
+if(dav_unlock(root)) {
+print_resource_error(sn, "/");
+ret = -1;
+}
+}
 // store db
 if(store_db(db, dir->database)) {
 fprintf(stderr, "Cannot store sync db\n");
-fprintf(stderr, "Abort\n");
+ret = -1;
-return -1; // TODO: don't return here
 }
 // TODO: cleanup - BUT DONT CLEANUP SYNC CONFIG (do this in main!)
 dav_session_destroy(sn);
 // Report
-char *str_success = sync_success == 1 ? "file" : "files";
+if(ret == 0) {
-char *str_delete = sync_delete == 1 ? "file" : "files";
+char *str_success = sync_success == 1 ? "file" : "files";
-char *str_error = sync_error == 1 ? "error" : "errors";
+char *str_delete = sync_delete == 1 ? "file" : "files";
-printf("Result: %d %s pulled, %d %s deleted, %d %s\n",
+char *str_error = sync_error == 1 ? "error" : "errors";
-sync_success, str_success,
+printf("Result: %d %s pulled, %d %s deleted, %d %s\n",
-sync_delete,str_delete,
+sync_success, str_success,
-sync_error, str_error);
+sync_delete,str_delete,
+sync_error, str_error);
-return 0;
+}
+return ret;
 }
 int sync_get_resource(
 CmdArgs *a,
 SyncDirectory *dir,
 if (cmd_getoption(a, "verbose")) {
 curl_easy_setopt(sn->handle, CURLOPT_VERBOSE, 1L);
 curl_easy_setopt(sn->handle, CURLOPT_STDERR, stderr);
 }
-DavResource *testsvr = dav_query(sn, "select - from / with depth = 0");
+DavResource *root = dav_query(sn, "select - from / with depth = 0");
-if(!testsvr) {
+if(!root) {
 print_resource_error(sn, "/");
 dav_session_destroy(sn);
 fprintf(stderr, "Abort\n");
 return -1;
 }
 int cdt = cmd_getoption(a, "conflict") ? 0 : 1; // conflict detection
+// lock repository
+DavBool locked = FALSE;
+if((dir->lockpush || cmd_getoption(a, "lock")) && !cmd_getoption(a, "nolock")) {
+if(dav_lock(root)) {
+print_resource_error(sn, "/");
+dav_session_destroy(sn);
+fprintf(stderr, "Abort\n");
+return -1;
+}
+locked = TRUE;
+}
 int sync_success = 0;
 int sync_delete = 0;
 int sync_skipped = 0;
 int sync_error = 0;
 }
 }
 ucx_map_free(db->resources);
 db->resources = lclres;
+// unlock repository
+if(locked) {
+if(dav_unlock(root)) {
+print_resource_error(sn, "/");
+ret = -1;
+}
+}
 // store db
 if(store_db(db, dir->database)) {
 fprintf(stderr, "Cannot store sync db\n");
-return -1;
+ret = -1;
 }
-// TODO: free res
+// cleanup
+dav_session_destroy(sn);
 // Report
-char *str_success = sync_success == 1 ? "file" : "files";
+if(ret == 0) {
-char *str_delete = sync_delete == 1 ? "file" : "files";
+char *str_success = sync_success == 1 ? "file" : "files";
-char *str_skipped = sync_delete == 1 ? "file" : "files";
+char *str_delete = sync_delete == 1 ? "file" : "files";
-char *str_error = sync_error == 1 ? "error" : "errors";
+char *str_skipped = sync_delete == 1 ? "file" : "files";
-printf("Result: %d %s pushed, %d %s deleted, %d %s skipped, %d %s\n",
+char *str_error = sync_error == 1 ? "error" : "errors";
-sync_success, str_success,
+printf("Result: %d %s pushed, %d %s deleted, %d %s skipped, %d %s\n",
-sync_delete,str_delete,
+sync_success, str_success,
-sync_skipped,str_skipped,
+sync_delete,str_delete,
-sync_error, str_error);
+sync_skipped,str_skipped,
+sync_error, str_error);
-return 0;
+}
+return ret;
 }
 UcxList* local_scan(SyncDirectory *dir, SyncDatabase *db) {
 UcxList *resources = NULL;
 res->path = util_concat_path(path, "/");
 res->last_modified = s.st_mtime;
 res->isdirectory = 1;
 return res;
 }
-return NULL;
 }
 int local_resource_is_changed(SyncDirectory *dir, SyncDatabase *db, LocalResource *res) {
 LocalResource *db_res = ucx_map_cstr_get(db->resources, res->path);
 if(db_res) {

Mercurial > hg > dav / file comparison

comparison: dav/sync.c

dav/sync.c