comparison: dav/sync.c
dav/sync.c
- changeset 56
- 99f7816fcf01
- parent 55
- 4cb389452a44
- child 57
- 3c1ce5f203d7
equal
deleted
inserted
replaced
| 55:4cb389452a44 | 56:99f7816fcf01 |
|---|---|
| 128 if(!db) { | 128 if(!db) { |
| 129 fprintf(stderr, "Cannot load database file: %s\n", dir->database); | 129 fprintf(stderr, "Cannot load database file: %s\n", dir->database); |
| 130 return -1; | 130 return -1; |
| 131 } | 131 } |
| 132 | 132 |
| 133 char *new_url = NULL; | |
| 134 if(dir->collection) { | |
| 135 new_url = util_concat_path(repo->url, dir->collection); | |
| 136 } | |
| 133 DavSession *sn = dav_session_new_auth( | 137 DavSession *sn = dav_session_new_auth( |
| 134 ctx, | 138 ctx, |
| 135 repo->url, | 139 new_url ? new_url : repo->url, |
| 136 repo->user, | 140 repo->user, |
| 137 repo->password); | 141 repo->password); |
| 142 if(new_url) { | |
| 143 free(new_url); | |
| 144 } | |
| 138 dav_session_set_flags(sn, get_repository_flags(repo)); | 145 dav_session_set_flags(sn, get_repository_flags(repo)); |
| 139 sn->key = dav_context_get_key(ctx, repo->default_key); | 146 sn->key = dav_context_get_key(ctx, repo->default_key); |
| 140 | 147 |
| 141 DavResource *ls = dav_query(sn, "get D:getetag from / where lastmodified > 0 with depth -1"); | 148 DavResource *ls = dav_query(sn, "get D:getetag from / where lastmodified > 0 with depth -1"); |
| 142 if(!ls) { | 149 if(!ls) { |
| 370 if(!db) { | 377 if(!db) { |
| 371 fprintf(stderr, "Cannot load database file: %s\n", dir->database); | 378 fprintf(stderr, "Cannot load database file: %s\n", dir->database); |
| 372 return -1; | 379 return -1; |
| 373 } | 380 } |
| 374 | 381 |
| 382 char *new_url = NULL; | |
| 383 if(dir->collection) { | |
| 384 new_url = util_concat_path(repo->url, dir->collection); | |
| 385 } | |
| 375 DavSession *sn = dav_session_new_auth( | 386 DavSession *sn = dav_session_new_auth( |
| 376 ctx, | 387 ctx, |
| 377 repo->url, | 388 new_url ? new_url : repo->url, |
| 378 repo->user, | 389 repo->user, |
| 379 repo->password); | 390 repo->password); |
| 391 if(new_url) { | |
| 392 free(new_url); | |
| 393 } | |
| 380 dav_session_set_flags(sn, get_repository_flags(repo)); | 394 dav_session_set_flags(sn, get_repository_flags(repo)); |
| 381 sn->key = dav_context_get_key(ctx, repo->default_key); | 395 sn->key = dav_context_get_key(ctx, repo->default_key); |
| 382 | 396 |
| 383 // upload all changed files | 397 // upload all changed files |
| 384 //UcxList *resources = local_scan(dir, db); | 398 //UcxList *resources = local_scan(dir, db); |
