Sun, 11 Jun 2023 21:23:45 +0200
fix UAF in dav xml converter
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | * |
542
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
4 | * Copyright 2019 Olaf Wintermann. All rights reserved. |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | * |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | * |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | * |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | * |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
29 | #include <stdio.h> |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
30 | #include <stdlib.h> |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
31 | #include <string.h> |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
32 | #include <errno.h> |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
33 | #include <unistd.h> |
302
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
34 | #include <signal.h> |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
35 | #include <time.h> |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
36 | #include <utime.h> |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
37 | #include <libxml/xmlerror.h> |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
38 | #include <sys/types.h> |
750 | 39 | #include <cx/map.h> |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
40 | #include <cx/string.h> |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
41 | #include <cx/utils.h> |
750 | 42 | #include <cx/list.h> |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
43 | #include <cx/hash_map.h> |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
44 | #include <cx/printf.h> |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
45 | #include <dirent.h> |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
46 | |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
47 | #include <math.h> |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
48 | |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
49 | #include <libidav/webdav.h> |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
50 | #include <libidav/utils.h> |
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
51 | #include <libidav/crypto.h> |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
52 | |
399
a985a587787f
fixes header include order (dav-sync)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
397
diff
changeset
|
53 | #include <libidav/session.h> |
a985a587787f
fixes header include order (dav-sync)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
397
diff
changeset
|
54 | |
a985a587787f
fixes header include order (dav-sync)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
397
diff
changeset
|
55 | #include "sync.h" |
a985a587787f
fixes header include order (dav-sync)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
397
diff
changeset
|
56 | |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
57 | #include "config.h" |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
58 | #include "sopt.h" |
191
0e45b04236a7
more specific error messages in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
190
diff
changeset
|
59 | #include "error.h" |
200
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
60 | #include "assistant.h" |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
61 | #include "libxattr.h" |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
62 | #include "tags.h" |
399
a985a587787f
fixes header include order (dav-sync)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
397
diff
changeset
|
63 | |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
64 | #include "system.h" |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
65 | |
302
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
66 | #include <pthread.h> |
394
4826f5fdd865
implements parser for basic tag filters without subfilters
Mike Becker <universe@uap-core.de>
parents:
392
diff
changeset
|
67 | #include <ctype.h> |
302
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
68 | |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
69 | static DavContext *ctx; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
70 | |
302
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
71 | static int sync_shutdown = 0; |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
72 | |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
73 | static void xmlerrorfnc(void * c, const char * msg, ... ) { |
254
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
74 | va_list ap; |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
75 | va_start(ap, msg); |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
76 | vfprintf(stderr, msg, ap); |
d7c4ba50b7d8
implements xmlErrorFunc for dav sync + adds line numbers to error reporting in both config checkers
Mike Becker <universe@uap-core.de>
parents:
252
diff
changeset
|
77 | va_end(ap); |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
78 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
79 | |
533
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
80 | static DavPropName defprops[] = { |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
81 | { "DAV:", "getetag" }, |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
82 | { DAV_NS, "status" }, |
541
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
539
diff
changeset
|
83 | { DAV_NS, "content-hash" }, |
577
f49964cf7228
store link property on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
84 | { DAV_NS, "split" }, |
607
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
85 | { DAV_PROPS_NS, "finfo" }, |
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
86 | { DAV_PROPS_NS, "tags" }, |
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
87 | { DAV_PROPS_NS, "xattributes" }, |
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
88 | { DAV_PROPS_NS, "link" } |
533
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
89 | }; |
577
f49964cf7228
store link property on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
90 | static size_t numdefprops = 8 ; |
533
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
91 | |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
92 | /* |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
93 | * strcmp version that works with NULL pointers |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
94 | */ |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
95 | static int nullstrcmp(const char *s1, const char *s2) { |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
96 | if(!s1 && s2) { |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
97 | return -1; |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
98 | } |
532
aeda47714978
fixes dav_copy_node and improves dav-sync restore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
99 | if(s1 && !s2) { |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
100 | return 1; |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
101 | } |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
102 | if(!s1 && !s2) { |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
103 | return 0; |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
104 | } |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
105 | return strcmp(s1, s2); |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
106 | } |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
107 | |
567
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
108 | static char* nullstrdup(const char *s) { |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
109 | return s ? strdup(s) : NULL; |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
110 | } |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
111 | |
557
90ad7324bbbc
fix dav-sync push conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
112 | static void nullfree(void *p) { |
90ad7324bbbc
fix dav-sync push conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
113 | if(p) { |
90ad7324bbbc
fix dav-sync push conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
114 | free(p); |
90ad7324bbbc
fix dav-sync push conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
115 | } |
90ad7324bbbc
fix dav-sync push conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
116 | } |
90ad7324bbbc
fix dav-sync push conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
117 | |
749
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
118 | |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
119 | |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
120 | static CxIterator mapIteratorValues(CxMap *map) { |
750 | 121 | return cxMapIteratorValues(map ? map : cxEmptyMap); |
749
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
122 | } |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
123 | |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
124 | static CxIterator listIterator(CxList *list) { |
750 | 125 | return cxListIterator(list ? list : cxEmptyList); |
749
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
126 | } |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
127 | |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
128 | typedef void*(*clonefunc)(void *elm, void *userdata); |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
129 | |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
130 | static CxMap* mapClone(const CxAllocator *a, CxMap *map, clonefunc clone, void *userdata) { |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
131 | CxMap *newmap = cxHashMapCreate(a, map->store_pointer ? CX_STORE_POINTERS : map->item_size, map->size + 4); |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
132 | |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
133 | CxIterator i = cxMapIterator(map); |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
134 | if(clone) { |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
135 | cx_foreach(CxMapEntry*, entry, i) { |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
136 | void *newdata = clone(entry->value, userdata); |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
137 | cxMapPut(newmap, *entry->key, newdata); |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
138 | } |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
139 | } else { |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
140 | cx_foreach(CxMapEntry*, entry, i) { |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
141 | cxMapPut(newmap, *entry->key, entry->value); |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
142 | } |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
143 | } |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
144 | |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
145 | return newmap; |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
146 | } |
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
147 | |
687
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
148 | int dav_sync_main(int argc, char **argv); |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
149 | |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
150 | #ifdef _WIN32 |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
151 | static char* wchar2utf8(const wchar_t *wstr, size_t wlen) { |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
152 | size_t maxlen = wlen * 4; |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
153 | char *ret = malloc(maxlen + 1); |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
154 | int ret_len = WideCharToMultiByte( |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
155 | CP_UTF8, |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
156 | 0, |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
157 | wstr, |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
158 | wlen, |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
159 | ret, |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
160 | maxlen, |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
161 | NULL, |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
162 | NULL); |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
163 | ret[ret_len] = 0; |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
164 | return ret; |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
165 | } |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
166 | |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
167 | int wmain(int argc, wchar_t **argv) { |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
168 | char **argv_utf8 = calloc(argc, sizeof(char*)); |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
169 | for(int i=0;i<argc;i++) { |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
170 | argv_utf8[i] = wchar2utf8(argv[i], wcslen(argv[i])); |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
171 | } |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
172 | |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
173 | int ret = dav_sync_main(argc, argv_utf8); |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
174 | |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
175 | for(int i=0;i<argc;i++) { |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
176 | free(argv_utf8[i]); |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
177 | } |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
178 | free(argv_utf8); |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
179 | |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
180 | return ret; |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
181 | } |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
182 | #else |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
183 | int main(int argc, char **argv) { |
687
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
184 | return dav_sync_main(argc, argv); |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
185 | } |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
186 | #endif |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
187 | |
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
188 | int dav_sync_main(int argc, char **argv) { |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
189 | if(argc < 2) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
190 | fprintf(stderr, "Missing command\n"); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
191 | print_usage(argv[0]); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
192 | return -1; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
193 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
194 | |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
195 | char *cmd = argv[1]; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
196 | CmdArgs *args = cmd_parse_args(argc - 2, argv + 2); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
197 | if(!args) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
198 | print_usage(argv[0]); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
199 | return -1; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
200 | } |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
201 | int ret = EXIT_FAILURE; |
54 | 202 | |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
203 | if(!strcasecmp(cmd, "version") || !strcasecmp(cmd, "-version") |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
204 | || !strcasecmp(cmd, "--version")) { |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
205 | fprintf(stderr, "dav-sync %s\n", DAV_VERSION); |
235
0468df02e18f
fixed dav get with -u option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
233
diff
changeset
|
206 | cmd_args_free(args); |
0468df02e18f
fixed dav get with -u option
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
233
diff
changeset
|
207 | return -1; |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
208 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
209 | |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
210 | xmlGenericErrorFunc fnc = xmlerrorfnc; |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
211 | initGenericErrorDefaultFunc(&fnc); |
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
212 | sys_init(); |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
213 | ctx = dav_context_new(); |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
214 | int cfgret = load_config(ctx) || load_sync_config(); |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
215 | |
680
e66f2645be65
ignore sigpipe in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
216 | // ignore sigpipe to make sure the program doesn't exit |
e66f2645be65
ignore sigpipe in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
217 | // if stdout will be closed (for example by using dav-sync ... | head) |
687
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
218 | #ifndef _WIN32 |
680
e66f2645be65
ignore sigpipe in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
219 | struct sigaction act; |
681
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
220 | memset(&act, 0, sizeof(struct sigaction)); |
680
e66f2645be65
ignore sigpipe in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
221 | act.sa_handler = SIG_IGN; |
e66f2645be65
ignore sigpipe in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
222 | sigaction(SIGPIPE, &act, NULL); |
687
9922a349a61a
add support for unicode args on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
686
diff
changeset
|
223 | #endif |
680
e66f2645be65
ignore sigpipe in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
224 | |
e66f2645be65
ignore sigpipe in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
679
diff
changeset
|
225 | // prepare signal handler thread |
302
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
226 | pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
227 | pthread_mutex_lock(&mutex); |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
228 | pthread_t tid; |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
229 | |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
230 | if(!strcmp(cmd, "check") || !strcmp(cmd, "check-config")) { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
231 | if(!cfgret) { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
232 | fprintf(stdout, "Configuration OK.\n"); |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
233 | ret = EXIT_SUCCESS; |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
234 | } else { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
235 | /* no output, the warnings are written by load_config */ |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
236 | ret = EXIT_FAILURE; |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
237 | } |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
238 | } else if(!cfgret) { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
239 | if(!strcmp(cmd, "pull")) { |
302
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
240 | tid = start_sighandler(&mutex); |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
241 | ret = cmd_pull(args, FALSE); |
302
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
242 | stop_sighandler(&mutex, tid); |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
243 | } else if(!strcmp(cmd, "push")) { |
302
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
244 | tid = start_sighandler(&mutex); |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
245 | ret = cmd_push(args, FALSE, FALSE); |
302
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
246 | stop_sighandler(&mutex, tid); |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
247 | } else if(!strcmp(cmd, "outgoing")) { |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
248 | ret = cmd_push(args, TRUE, FALSE); |
299
c517502d3e38
adds dav-sync archive command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
249 | } else if(!strcmp(cmd, "archive")) { |
302
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
250 | tid = start_sighandler(&mutex); |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
251 | ret = cmd_push(args, FALSE, TRUE); |
302
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
252 | stop_sighandler(&mutex, tid); |
490
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
253 | } else if(!strcmp(cmd, "restore")) { |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
254 | tid = start_sighandler(&mutex); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
255 | ret = cmd_restore(args); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
256 | stop_sighandler(&mutex, tid); |
563
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
257 | } else if(!strcmp(cmd, "list-conflicts")) { |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
258 | ret = cmd_list_conflicts(args); |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
259 | } else if(!strcmp(cmd, "resolve-conflicts")) { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
260 | ret = cmd_resolve_conflicts(args); |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
261 | } else if(!strcmp(cmd, "delete-conflicts")) { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
262 | ret = cmd_delete_conflicts(args); |
529
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
263 | } else if(!strcmp(cmd, "list-versions")) { |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
264 | ret = cmd_list_versions(args); |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
265 | } else if(!strcmp(cmd, "trash-info")) { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
266 | ret = cmd_trash_info(args); |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
267 | } else if(!strcmp(cmd, "empty-trash")) { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
268 | ret = cmd_empty_trash(args); |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
269 | } else if(!strcmp(cmd, "add-tag")) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
270 | ret = cmd_add_tag(args); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
271 | } else if(!strcmp(cmd, "remove-tag")) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
272 | ret = cmd_remove_tag(args); |
380
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
273 | } else if(!strcmp(cmd, "set-tags")) { |
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
274 | ret = cmd_set_tags(args); |
377
d6d7c16dd066
adds list-tags command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
374
diff
changeset
|
275 | } else if(!strcmp(cmd, "list-tags")) { |
d6d7c16dd066
adds list-tags command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
374
diff
changeset
|
276 | ret = cmd_list_tags(args); |
256
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
277 | } else if(!strcmp(cmd, "add-dir") |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
278 | || !strcmp(cmd, "add-directory")) { |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
279 | ret = cmd_add_directory(args); |
256
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
280 | } else if(!strcmp(cmd, "list-dirs") |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
281 | || !strcmp(cmd, "list-directories")) { |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
282 | ret = cmd_list_dirs(); |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
283 | } else if(!strcmp(cmd, "check-repos") |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
284 | || !strcmp(cmd, "check-repositories")) { |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
725
diff
changeset
|
285 | ret = cmd_check_repositories(args); |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
286 | } else { |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
287 | print_usage(argv[0]); |
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
288 | } |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
289 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
290 | |
224
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
291 | // cleanup |
222
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
292 | cmd_args_free(args); |
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
293 | dav_context_destroy(ctx); |
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
294 | |
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
295 | free_config(); |
224
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
296 | free_sync_config(); |
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
297 | |
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
298 | curl_global_cleanup(); |
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
299 | xmlCleanupParser(); |
58
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
300 | |
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
301 | sys_uninit(); |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
302 | |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
303 | return ret; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
304 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
305 | |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
306 | void print_usage(char *cmd) { |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
307 | fprintf(stderr, "Usage: %s command [options] arguments...\n\n", cmd); |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
308 | |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
309 | fprintf(stderr, "Commands:\n"); |
405
6b85d745e402
fixes some char type mismatch warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
403
diff
changeset
|
310 | fprintf(stderr, " pull [-cldr] [-t <tags>] <directory>\n"); |
533
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
311 | fprintf(stderr, " push [-cldrSRM] [-t <tags>] <directory>\n"); |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
312 | fprintf(stderr, " archive [-cldSRM] [-t <tags>] <directory>\n"); |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
313 | fprintf(stderr, |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
314 | " restore [-ldRM] [-V <version>] [-s <directory>] [file...]\n"); |
563
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
315 | fprintf(stderr, " list-conflicts <directory>\n"); |
219
9792cfe63b80
added resolve-conflicts and delete-conflicts to help text and fixed crash with unknown cmd options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
218
diff
changeset
|
316 | fprintf(stderr, " resolve-conflicts <directory>\n"); |
9792cfe63b80
added resolve-conflicts and delete-conflicts to help text and fixed crash with unknown cmd options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
218
diff
changeset
|
317 | fprintf(stderr, " delete-conflicts <directory>\n"); |
204
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
318 | fprintf(stderr, " trash-info <directory>\n"); |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
319 | fprintf(stderr, " empty-trash <directory>\n"); |
702
444aa8fe133f
finish documentation of new dav-sync commands and options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
693
diff
changeset
|
320 | fprintf(stderr, " list-versions [-s <syncdir>] <file>\n"); |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
321 | fprintf(stderr, " add-tag [-s <syncdir>] <file> <tag>\n"); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
322 | fprintf(stderr, " remove-tag [-s <syncdir>] <file> <tag>\n"); |
380
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
323 | fprintf(stderr, " set-tags [-s <syncdir>] <file> [tags]\n"); |
379
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
324 | fprintf(stderr, " list-tags [-s <syncdir>] <file>\n\n"); |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
325 | |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
326 | fprintf(stderr, "Options:\n"); |
693
8ca795c1ae1c
add -s option to dav-sync usage output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
327 | fprintf(stderr, " -c Disable conflict detection\n"); |
8ca795c1ae1c
add -s option to dav-sync usage output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
328 | fprintf(stderr, " -l Lock the repository before access\n"); |
8ca795c1ae1c
add -s option to dav-sync usage output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
329 | fprintf(stderr, " -d Don't lock the repository\n"); |
8ca795c1ae1c
add -s option to dav-sync usage output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
330 | fprintf(stderr, " -t <tags> " |
380
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
331 | "Only sync files which have the specified tags\n"); |
693
8ca795c1ae1c
add -s option to dav-sync usage output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
332 | fprintf(stderr, " -r " |
380
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
333 | "Remove resources not matching the tag filter\n"); |
693
8ca795c1ae1c
add -s option to dav-sync usage output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
334 | fprintf(stderr, " -V <vers> Restore specific version\n"); |
8ca795c1ae1c
add -s option to dav-sync usage output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
335 | fprintf(stderr, " -S Save previous file version\n"); |
8ca795c1ae1c
add -s option to dav-sync usage output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
336 | fprintf(stderr, " -R Restore removed files\n"); |
8ca795c1ae1c
add -s option to dav-sync usage output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
337 | fprintf(stderr, " -M Restore modified files\n"); |
8ca795c1ae1c
add -s option to dav-sync usage output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
338 | fprintf(stderr, " -s <syncdir> Name of the syncdir the file is in\n"); |
8ca795c1ae1c
add -s option to dav-sync usage output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
339 | fprintf(stderr, " -v Verbose output (all commands)\n\n"); |
198
44054c452de1
added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
192
diff
changeset
|
340 | |
44054c452de1
added list-repositories and list-directories commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
192
diff
changeset
|
341 | fprintf(stderr, "Config commands:\n"); |
200
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
342 | fprintf(stderr, " add-directory\n"); |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
343 | fprintf(stderr, " list-directories\n"); |
256
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
344 | fprintf(stderr, " check-config\n"); |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
345 | fprintf(stderr, " check-repositories\n\n"); |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
346 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
347 | |
302
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
348 | static void handlesig(int sig) { |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
349 | if(sync_shutdown) { |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
350 | exit(-1); |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
351 | } |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
352 | fprintf(stderr, "abort\n"); |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
353 | sync_shutdown = 1; |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
354 | } |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
355 | |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
356 | static void* sighandler(void *data) { |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
357 | signal(SIGTERM, handlesig); |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
358 | signal(SIGINT, handlesig); |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
359 | |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
360 | pthread_mutex_t *mutex = data; |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
361 | pthread_mutex_lock(mutex); // block thread |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
362 | return NULL; |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
363 | } |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
364 | |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
365 | pthread_t start_sighandler(pthread_mutex_t *mutex) { |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
366 | pthread_t tid; |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
367 | if(pthread_create(&tid, NULL, sighandler, mutex)) { |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
368 | perror("pthread_create"); |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
369 | exit(-1); |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
370 | } |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
371 | return tid; |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
372 | } |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
373 | |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
374 | void stop_sighandler(pthread_mutex_t *mutex, pthread_t tid) { |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
375 | pthread_mutex_unlock(mutex); |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
376 | void *data; |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
377 | pthread_join(tid, &data); |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
378 | } |
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
379 | |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
380 | static char* create_local_path(SyncDirectory *dir, const char *path) { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
381 | char *local_path = util_concat_path(dir->path, path); |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
382 | size_t local_path_len = strlen(local_path); |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
383 | if(local_path[local_path_len-1] == '/') { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
384 | local_path[local_path_len-1] = '\0'; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
385 | } |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
386 | return local_path; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
387 | } |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
388 | |
648
fefe4b6f1048
change split config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
646
diff
changeset
|
389 | static int res_matches_filter(Filter *filter, char *res_path) { |
fefe4b6f1048
change split config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
646
diff
changeset
|
390 | // include/exclude filter |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
391 | CxIterator i = cxListIterator(filter->include); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
392 | cx_foreach(regex_t*, pattern, i) { |
648
fefe4b6f1048
change split config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
646
diff
changeset
|
393 | if (regexec(pattern, res_path, 0, NULL, 0) == 0) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
394 | CxIterator e = cxListIterator(filter->exclude); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
395 | cx_foreach(regex_t*, expat, e) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
396 | if (regexec(expat, res_path, 0, NULL, 0) == 0) { |
648
fefe4b6f1048
change split config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
646
diff
changeset
|
397 | return 1; |
fefe4b6f1048
change split config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
646
diff
changeset
|
398 | } |
fefe4b6f1048
change split config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
646
diff
changeset
|
399 | } |
fefe4b6f1048
change split config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
646
diff
changeset
|
400 | return 0; |
fefe4b6f1048
change split config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
646
diff
changeset
|
401 | } |
fefe4b6f1048
change split config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
646
diff
changeset
|
402 | } |
fefe4b6f1048
change split config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
646
diff
changeset
|
403 | return 1; |
fefe4b6f1048
change split config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
646
diff
changeset
|
404 | } |
fefe4b6f1048
change split config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
646
diff
changeset
|
405 | |
fefe4b6f1048
change split config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
646
diff
changeset
|
406 | static int res_matches_dir_filter(SyncDirectory *dir, char *res_path) { |
65
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
407 | // trash filter |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
408 | if (dir->trash) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
409 | cxmutstr rpath = cx_mutstr(util_concat_path(dir->path, res_path)); |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
410 | if (util_path_isrelated(dir->trash, rpath.ptr)) { |
65
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
411 | free(rpath.ptr); |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
412 | return 1; |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
413 | } |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
414 | free(rpath.ptr); |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
415 | } |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
416 | |
543
2f85df8cd35e
fixes that pull downloads the history collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
417 | // versioning filter |
2f85df8cd35e
fixes that pull downloads the history collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
418 | if (dir->versioning) { |
2f85df8cd35e
fixes that pull downloads the history collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
419 | if(util_path_isrelated(dir->versioning->collection, res_path)) { |
2f85df8cd35e
fixes that pull downloads the history collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
420 | return 1; |
2f85df8cd35e
fixes that pull downloads the history collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
421 | } |
2f85df8cd35e
fixes that pull downloads the history collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
422 | } |
2f85df8cd35e
fixes that pull downloads the history collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
423 | |
648
fefe4b6f1048
change split config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
646
diff
changeset
|
424 | return res_matches_filter(&dir->filter, res_path); |
58
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
425 | } |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
426 | |
389
fe855ce911f9
introduces SyncTagFilter type which for now implements the old tag list filter
Mike Becker <universe@uap-core.de>
parents:
386
diff
changeset
|
427 | static int res_matches_tags(DavResource *res, SyncTagFilter *tagfilter) { |
415
6e1861e8262c
check tagfilter scope after checking tagfilter existence
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
414
diff
changeset
|
428 | if(!tagfilter || tagfilter->mode == DAV_SYNC_TAGFILTER_OFF) { |
6e1861e8262c
check tagfilter scope after checking tagfilter existence
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
414
diff
changeset
|
429 | return 1; |
6e1861e8262c
check tagfilter scope after checking tagfilter existence
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
414
diff
changeset
|
430 | } |
417
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
431 | // NOTE: currently not implementable |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
432 | //int scope = res->iscollection ? |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
433 | // DAV_SYNC_TAGFILTER_SCOPE_COLLECTION |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
434 | // : DAV_SYNC_TAGFILTER_SCOPE_RESOURCE; |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
435 | //if((tagfilter->scope & scope) != scope) { |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
436 | // return 1; |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
437 | //} |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
438 | if(res->iscollection) { |
414
ea50585ec9d9
adds tagfilter scope
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
412
diff
changeset
|
439 | return 1; |
ea50585ec9d9
adds tagfilter scope
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
412
diff
changeset
|
440 | } |
380
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
441 | |
607
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
442 | DavXmlNode *tagsprop = dav_get_property_ns(res, DAV_PROPS_NS, "tags"); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
443 | CxList *res_tags = parse_dav_xml_taglist(tagsprop); |
380
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
444 | |
397
ddda42712f39
fixes tag filter evaluation not respecting mode for subfilter combination
Mike Becker <universe@uap-core.de>
parents:
396
diff
changeset
|
445 | int ret = matches_tagfilter(res_tags, tagfilter); |
390
26998dc980f9
adds tag filter evaluation functions
Mike Becker <universe@uap-core.de>
parents:
389
diff
changeset
|
446 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
447 | cxListDestroy(res_tags); |
390
26998dc980f9
adds tag filter evaluation functions
Mike Becker <universe@uap-core.de>
parents:
389
diff
changeset
|
448 | |
380
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
449 | return ret; |
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
450 | } |
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
451 | |
403
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
452 | static int localres_matches_tags( |
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
453 | SyncDirectory *dir, |
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
454 | LocalResource *res, |
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
455 | SyncTagFilter *tagfilter) |
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
456 | { |
415
6e1861e8262c
check tagfilter scope after checking tagfilter existence
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
414
diff
changeset
|
457 | if(!tagfilter || tagfilter->mode == DAV_SYNC_TAGFILTER_OFF) { |
6e1861e8262c
check tagfilter scope after checking tagfilter existence
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
414
diff
changeset
|
458 | return 1; |
6e1861e8262c
check tagfilter scope after checking tagfilter existence
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
414
diff
changeset
|
459 | } |
417
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
460 | //int scope = res->isdirectory ? |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
461 | // DAV_SYNC_TAGFILTER_SCOPE_COLLECTION |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
462 | // : DAV_SYNC_TAGFILTER_SCOPE_RESOURCE; |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
463 | //if((tagfilter->scope & scope) != scope) { |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
464 | // return 1; |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
465 | //} |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
466 | if(res->isdirectory) { |
414
ea50585ec9d9
adds tagfilter scope
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
412
diff
changeset
|
467 | return 1; |
ea50585ec9d9
adds tagfilter scope
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
412
diff
changeset
|
468 | } |
403
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
469 | |
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
470 | DavBool changed = 0; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
471 | CxList *res_tags = sync_get_file_tags(dir, res, &changed, NULL); |
389
fe855ce911f9
introduces SyncTagFilter type which for now implements the old tag list filter
Mike Becker <universe@uap-core.de>
parents:
386
diff
changeset
|
472 | |
403
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
473 | int ret = matches_tagfilter(res_tags, tagfilter); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
474 | CxIterator i = cxListIterator(res_tags); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
475 | cxListDestroy(res_tags); |
403
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
476 | return ret; |
380
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
477 | } |
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
478 | |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
725
diff
changeset
|
479 | static DavSession* create_session(CmdArgs *a, DavContext *ctx, Repository *repo, char *collection) { |
497
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
480 | int flags = get_repository_flags(repo); |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
481 | DavBool find_collection = TRUE; |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
482 | if((flags & DAV_SESSION_DECRYPT_NAME) != DAV_SESSION_DECRYPT_NAME) { |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
725
diff
changeset
|
483 | char *url = util_concat_path(repo->url, collection); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
725
diff
changeset
|
484 | free(repo->url); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
725
diff
changeset
|
485 | repo->url = url; |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
725
diff
changeset
|
486 | collection = NULL; |
497
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
487 | find_collection = FALSE; |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
488 | } |
502
a23fedac340c
fixes DavSession creation in dav-sync when using root collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
501
diff
changeset
|
489 | if(!collection || (collection[0] == '/' && strlen(collection) == 1)) { |
a23fedac340c
fixes DavSession creation in dav-sync when using root collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
501
diff
changeset
|
490 | // collection is NULL or "/" |
a23fedac340c
fixes DavSession creation in dav-sync when using root collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
501
diff
changeset
|
491 | // we don't need to find any collection because the repo url is |
a23fedac340c
fixes DavSession creation in dav-sync when using root collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
501
diff
changeset
|
492 | // the base url |
a23fedac340c
fixes DavSession creation in dav-sync when using root collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
501
diff
changeset
|
493 | find_collection = FALSE; |
a23fedac340c
fixes DavSession creation in dav-sync when using root collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
501
diff
changeset
|
494 | } |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
725
diff
changeset
|
495 | |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
725
diff
changeset
|
496 | DavSession *sn = connect_to_repo(ctx, repo, collection, request_auth, a); |
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
725
diff
changeset
|
497 | |
497
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
498 | sn->flags = flags; |
73
41e88442ad4e
ssl version is now configurable
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
499 | sn->key = dav_context_get_key(ctx, repo->default_key); |
199
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
500 | curl_easy_setopt(sn->handle, CURLOPT_HTTPAUTH, repo->authmethods); |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
501 | curl_easy_setopt(sn->handle, CURLOPT_SSLVERSION, repo->ssl_version); |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
502 | if(repo->cert) { |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
503 | curl_easy_setopt(sn->handle, CURLOPT_CAPATH, repo->cert); |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
504 | } |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
505 | if(!repo->verification) { |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
506 | curl_easy_setopt(sn->handle, CURLOPT_SSL_VERIFYPEER, 0); |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
507 | curl_easy_setopt(sn->handle, CURLOPT_SSL_VERIFYHOST, 0); |
f448fc8c9191
enabled cert verification
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
198
diff
changeset
|
508 | } |
497
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
509 | |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
510 | if(find_collection) { |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
511 | DavResource *col = dav_resource_new(sn, collection); |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
512 | dav_exists(col); // exec this to get the href |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
513 | // we actually don't care what the result is |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
514 | // if it doesn't exists, an error will occur later |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
515 | // and we can't handle it here |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
516 | char *newurl = util_concat_path(repo->url, util_resource_name(col->href)); |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
517 | dav_session_set_baseurl(sn, newurl); |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
518 | free(newurl); |
411bd1098175
fixes DavSession creation in dav-sync with enabled encryption
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
495
diff
changeset
|
519 | } |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
725
diff
changeset
|
520 | |
73
41e88442ad4e
ssl version is now configurable
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
521 | return sn; |
41e88442ad4e
ssl version is now configurable
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
522 | } |
41e88442ad4e
ssl version is now configurable
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
72
diff
changeset
|
523 | |
347
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
524 | static void print_allowed_cmds(SyncDirectory *dir) { |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
525 | fprintf(stderr, "Allowed commands: "); |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
526 | char *sep = ""; |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
527 | if((dir->allow_cmd & SYNC_CMD_PULL) == SYNC_CMD_PULL) { |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
528 | fprintf(stderr, "pull"); |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
529 | sep = ", "; |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
530 | } |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
531 | if((dir->allow_cmd & SYNC_CMD_PUSH) == SYNC_CMD_PUSH) { |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
532 | fprintf(stderr, "%spush", sep); |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
533 | sep = ", "; |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
534 | } |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
535 | if((dir->allow_cmd & SYNC_CMD_ARCHIVE) == SYNC_CMD_ARCHIVE) { |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
536 | fprintf(stderr, "%sarchive", sep); |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
537 | } |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
538 | fprintf(stderr, "\n"); |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
539 | } |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
540 | |
380
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
541 | static void localres_keep(SyncDatabase *db, const char *path) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
542 | LocalResource *local = cxMapRemoveAndGet(db->resources, cx_hash_key_str(path)); |
380
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
543 | if(local) { |
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
544 | local->keep = TRUE; |
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
545 | } |
618
4b34d12cf211
exclude tag xattr from xattribute sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
617
diff
changeset
|
546 | } |
4b34d12cf211
exclude tag xattr from xattribute sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
617
diff
changeset
|
547 | |
4b34d12cf211
exclude tag xattr from xattribute sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
617
diff
changeset
|
548 | static int xattr_filter(const char *name, SyncDirectory *dir) { |
4b34d12cf211
exclude tag xattr from xattribute sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
617
diff
changeset
|
549 | // exclude tag xattr |
4b34d12cf211
exclude tag xattr from xattribute sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
617
diff
changeset
|
550 | if( |
4b34d12cf211
exclude tag xattr from xattribute sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
617
diff
changeset
|
551 | dir->tagconfig && |
4b34d12cf211
exclude tag xattr from xattribute sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
617
diff
changeset
|
552 | dir->tagconfig->store == TAG_STORE_XATTR && |
4b34d12cf211
exclude tag xattr from xattribute sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
617
diff
changeset
|
553 | !strcmp(dir->tagconfig->xattr_name, name)) |
4b34d12cf211
exclude tag xattr from xattribute sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
617
diff
changeset
|
554 | { |
4b34d12cf211
exclude tag xattr from xattribute sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
617
diff
changeset
|
555 | return 0; |
4b34d12cf211
exclude tag xattr from xattribute sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
617
diff
changeset
|
556 | } |
4b34d12cf211
exclude tag xattr from xattribute sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
617
diff
changeset
|
557 | return 1; |
380
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
558 | } |
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
559 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
560 | void res2map(DavResource *root, CxMap *map) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
561 | CxList *stack = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
562 | cxListInsert(stack, 0, root->children); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
563 | while(stack->size > 0) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
564 | DavResource *res = cxListAt(stack, 0); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
565 | cxListRemove(stack, 0); |
444
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
566 | |
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
567 | while(res) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
568 | cxMapPut(map, cx_hash_key_str(res->path), res); |
444
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
569 | |
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
570 | if(res->children) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
571 | cxListInsert(stack, 0, res->children); |
444
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
572 | } |
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
573 | res = res->next; |
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
574 | } |
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
575 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
576 | cxListDestroy(stack); |
444
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
577 | } |
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
578 | |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
579 | int cmd_pull(CmdArgs *a, DavBool incoming) { |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
580 | if(a->argc != 1) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
581 | fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few" : "many"); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
582 | return -1; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
583 | } |
392
4853fbad5014
adds error message for invalid tag filter syntax
Mike Becker <universe@uap-core.de>
parents:
391
diff
changeset
|
584 | // if there are syntax errors in the command line, fail asap. |
414
ea50585ec9d9
adds tagfilter scope
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
412
diff
changeset
|
585 | SyncTagFilter* tagfilter = parse_tagfilter_string( |
ea50585ec9d9
adds tagfilter scope
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
412
diff
changeset
|
586 | cmd_getoption(a, "tags"), DAV_SYNC_TAGFILTER_SCOPE_RESOURCE); |
392
4853fbad5014
adds error message for invalid tag filter syntax
Mike Becker <universe@uap-core.de>
parents:
391
diff
changeset
|
587 | if (!tagfilter) { |
4853fbad5014
adds error message for invalid tag filter syntax
Mike Becker <universe@uap-core.de>
parents:
391
diff
changeset
|
588 | fprintf(stderr, "Malformed tag filter\n"); |
4853fbad5014
adds error message for invalid tag filter syntax
Mike Becker <universe@uap-core.de>
parents:
391
diff
changeset
|
589 | return -1; |
4853fbad5014
adds error message for invalid tag filter syntax
Mike Becker <universe@uap-core.de>
parents:
391
diff
changeset
|
590 | } |
395
b491d207ee16
fixes whitespace handling and error detection for basic tag filters
Mike Becker <universe@uap-core.de>
parents:
394
diff
changeset
|
591 | // TODO: tons of memory leaks... |
b491d207ee16
fixes whitespace handling and error detection for basic tag filters
Mike Becker <universe@uap-core.de>
parents:
394
diff
changeset
|
592 | // call free_tagfilter() before each return |
392
4853fbad5014
adds error message for invalid tag filter syntax
Mike Becker <universe@uap-core.de>
parents:
391
diff
changeset
|
593 | |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
594 | SyncDirectory *dir = scfg_get_dir(a->argv[0]); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
595 | if(!dir) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
596 | fprintf(stderr, "Unknown sync dir: %s\n", a->argv[0]); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
597 | return -1; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
598 | } |
233
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
599 | if(scfg_check_dir(dir)) { |
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
600 | return -1; |
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
601 | } |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
602 | |
347
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
603 | if((dir->allow_cmd & SYNC_CMD_PULL) != SYNC_CMD_PULL) { |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
604 | fprintf(stderr, "Command 'pull' is not allowed for this sync dir\n"); |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
605 | print_allowed_cmds(dir); |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
606 | return -1; |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
607 | } |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
608 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
609 | Repository *repo = get_repository(cx_str(dir->repository)); |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
610 | if(!repo) { |
495
52cbd310b881
fixes 'Unkown repository' error message in dav-sync
Mike Becker <universe@uap-core.de>
parents:
493
diff
changeset
|
611 | fprintf(stderr, "Unknown repository %s\n", dir->repository); |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
612 | return -1; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
613 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
614 | |
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
615 | SyncDatabase *db = load_db(dir->database); |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
616 | if(!db) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
617 | fprintf(stderr, "Cannot load database file: %s\n", dir->database); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
618 | return -1; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
619 | } |
218
5f1f7602cf77
automatically remove deleted conflict files from the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
217
diff
changeset
|
620 | remove_deleted_conflicts(dir, db); |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
621 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
622 | CxMap *hashes = NULL; |
630
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
623 | if(SYNC_HASHING(dir)) { |
567
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
624 | hashes = create_hash_index(db); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
625 | } |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
626 | |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
725
diff
changeset
|
627 | DavSession *sn = create_session(a, ctx, repo, dir->collection); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
628 | util_regdestr(sn->mp, db, (cx_destructor_func)destroy_db); |
68
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
66
diff
changeset
|
629 | if (cmd_getoption(a, "verbose")) { |
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
66
diff
changeset
|
630 | curl_easy_setopt(sn->handle, CURLOPT_VERBOSE, 1L); |
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
66
diff
changeset
|
631 | curl_easy_setopt(sn->handle, CURLOPT_STDERR, stderr); |
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
66
diff
changeset
|
632 | } |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
633 | |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
634 | // lock repository |
296
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
635 | char *locktokenfile = NULL; |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
636 | DavBool locked = FALSE; |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
637 | DavResource *root = dav_resource_new(sn, "/"); |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
638 | root->iscollection = TRUE; |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
639 | if((dir->lockpush || cmd_getoption(a, "lock")) && !cmd_getoption(a, "nolock")) { |
316
9d0505d80044
adds dav-sync lock timeout config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
313
diff
changeset
|
640 | if(dav_lock_t(root, dir->lock_timeout)) { |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
641 | print_resource_error(sn, "/"); |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
642 | dav_session_destroy(sn); |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
643 | fprintf(stderr, "Abort\n"); |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
644 | return -1; |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
645 | } |
233
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
646 | DavLock *lock = dav_get_lock(sn, "/"); |
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
647 | if(lock) { |
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
648 | printf("Lock-Token: %s\n", lock->token); |
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
649 | } |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
650 | locked = TRUE; |
296
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
651 | locktokenfile = create_locktoken_file(dir->name, lock->token); |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
652 | } |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
653 | |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
654 | int ret = 0; |
681
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
655 | DavResource *ls = dav_query(sn, "select D:getetag,idav:split,idav:status,`idav:content-hash`,idavprops:tags,idavprops:finfo,idavprops:xattributes,idavprops:link from / with depth = infinity"); |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
656 | if(!ls) { |
191
0e45b04236a7
more specific error messages in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
190
diff
changeset
|
657 | print_resource_error(sn, "/"); |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
658 | if(locked) { |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
659 | if(dav_unlock(root)) { |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
660 | print_resource_error(sn, "/"); |
296
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
661 | } else { |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
662 | locked = FALSE; |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
663 | } |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
664 | } |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
665 | |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
666 | fprintf(stderr, "Abort\n"); |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
667 | |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
668 | dav_session_destroy(sn); |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
669 | // TODO: free |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
670 | return -1; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
671 | } |
224
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
672 | if(!ls->iscollection) { |
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
673 | fprintf(stderr, "%s is not a collection.\nAbort.\n", ls->path); |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
674 | if(locked) { |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
675 | if(dav_unlock(root)) { |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
676 | print_resource_error(sn, "/"); |
296
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
677 | } else { |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
678 | locked = FALSE; |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
679 | } |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
680 | } |
224
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
681 | // TODO: free |
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
682 | dav_session_destroy(sn); |
296
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
683 | |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
684 | if(!locked && locktokenfile) { |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
685 | remove(locktokenfile); |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
686 | } |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
687 | |
224
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
688 | return -1; |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
689 | } |
50
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
690 | |
402
babdf40dd22c
dav-sync pull applies config tag filter now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
400
diff
changeset
|
691 | DavBool remove_file = cmd_getoption(a, "remove") ? 1 : 0; |
babdf40dd22c
dav-sync pull applies config tag filter now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
400
diff
changeset
|
692 | |
224
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
693 | int sync_success = 0; |
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
694 | int sync_delete = 0; |
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
695 | int sync_error = 0; |
561
5e6df4f502d3
harmonizes output of push and pull
Mike Becker <universe@uap-core.de>
parents:
560
diff
changeset
|
696 | int sync_conflict = 0; |
224
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
697 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
698 | CxList *res_modified = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
699 | CxList *res_new = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
700 | CxList *res_moved = cxLinkedListCreateSimple(CX_STORE_POINTERS); // type: MovedFile |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
701 | CxList *res_link = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
702 | CxList *res_conflict = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
703 | CxList *res_mkdir = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
704 | CxList *res_metadata = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
705 | CxList *res_broken = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
706 | CxMap *lres_removed = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, 16); // type: LocalResource* |
502
a23fedac340c
fixes DavSession creation in dav-sync when using root collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
501
diff
changeset
|
707 | |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
708 | //UcxMap *svrres = ucx_map_new(db->resources->count); |
749
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
709 | CxMap *dbres = mapClone(cxDefaultAllocator, db->resources, NULL, NULL); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
710 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
711 | CxList *stack = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
712 | cxListInsert(stack, 0, ls->children); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
713 | while(stack->size > 0) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
714 | DavResource *res = cxListAt(stack, 0); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
715 | cxListRemove(stack, 0); |
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
716 | |
58
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
717 | while(res) { |
417
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
718 | DavBool res_filtered = FALSE; |
648
fefe4b6f1048
change split config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
646
diff
changeset
|
719 | if (res_matches_dir_filter(dir, res->path)) { |
417
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
720 | res_filtered = TRUE; |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
721 | } else { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
722 | CxIterator iter = cxListIterator(dir->filter.tags); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
723 | cx_foreach(SyncTagFilter *, tf, iter) { |
417
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
724 | if(!res_matches_tags(res, tf)) { |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
725 | res_filtered = TRUE; |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
726 | break; |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
727 | } |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
728 | } |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
729 | } |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
730 | if(res_filtered) { |
402
babdf40dd22c
dav-sync pull applies config tag filter now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
400
diff
changeset
|
731 | // don't delete files filtered by config |
babdf40dd22c
dav-sync pull applies config tag filter now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
400
diff
changeset
|
732 | localres_keep(db, res->path); |
58
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
733 | res = res->next; |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
734 | continue; |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
735 | } |
402
babdf40dd22c
dav-sync pull applies config tag filter now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
400
diff
changeset
|
736 | |
392
4853fbad5014
adds error message for invalid tag filter syntax
Mike Becker <universe@uap-core.de>
parents:
391
diff
changeset
|
737 | if (!res_matches_tags(res, tagfilter)) { |
402
babdf40dd22c
dav-sync pull applies config tag filter now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
400
diff
changeset
|
738 | if(!remove_file) { |
380
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
739 | localres_keep(db, res->path); |
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
740 | } |
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
741 | res = res->next; |
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
742 | continue; |
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
743 | } |
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
744 | |
331
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
318
diff
changeset
|
745 | char *status = dav_get_string_property(res, "idav:status"); |
144
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
746 | if(status && !strcmp(status, "broken")) { |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
747 | res = res->next; |
380
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
748 | localres_keep(db, res->path); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
749 | cxListAdd(res_broken, res); |
144
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
750 | continue; |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
751 | } |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
752 | |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
753 | // check if a resource has changed on the server |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
754 | int change = resource_get_remote_change(a, res, dir, db); |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
755 | switch(change) { |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
756 | case REMOTE_NO_CHANGE: break; |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
757 | case REMOTE_CHANGE_MODIFIED: { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
758 | cxListAdd(res_modified, res); |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
759 | break; |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
760 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
761 | case REMOTE_CHANGE_NEW: { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
762 | cxListAdd(res_new, res); |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
763 | break; |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
764 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
765 | case REMOTE_CHANGE_DELETED: break; // never happens |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
766 | case REMOTE_CHANGE_CONFLICT_LOCAL_MODIFIED: { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
767 | cxListAdd(res_conflict, res); |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
768 | break; |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
769 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
770 | case REMOTE_CHANGE_METADATA: { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
771 | cxListAdd(res_metadata, res); |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
772 | break; |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
773 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
774 | case REMOTE_CHANGE_MKDIR: { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
775 | cxListAdd(res_mkdir, res); |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
776 | break; |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
777 | } |
580
caf23cf7f96d
separate link changes from normal changes and create links after downloads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
579
diff
changeset
|
778 | case REMOTE_CHANGE_LINK: { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
779 | cxListAdd(res_link, res); |
580
caf23cf7f96d
separate link changes from normal changes and create links after downloads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
579
diff
changeset
|
780 | break; |
caf23cf7f96d
separate link changes from normal changes and create links after downloads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
579
diff
changeset
|
781 | } |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
782 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
783 | |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
784 | // remove every server resource from dbres |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
785 | // all remaining elements are the resources that are removed |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
786 | // on the server |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
787 | cxMapRemove(dbres, cx_hash_key_str(res->path)); |
272
b321a3be0a38
fixes unnecessary mkcol in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
257
diff
changeset
|
788 | |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
789 | if(!dav_get_property_ns(res, DAV_NS, "split") && res->children) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
790 | cxListInsert(stack, 0, res->children); |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
791 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
792 | res = res->next; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
793 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
794 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
795 | |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
796 | // find deleted resources |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
797 | // svrres currently contains all resources from the server |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
798 | // and will replace the current db->resources map later |
749
bbadf84cfc2d
fix dav-sync crash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
747
diff
changeset
|
799 | CxIterator i = mapIteratorValues(dbres); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
800 | cx_foreach(LocalResource *, local, i) { |
648
fefe4b6f1048
change split config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
646
diff
changeset
|
801 | if (res_matches_dir_filter(dir, local->path)) { |
58
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
802 | continue; |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
803 | } |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
804 | if(!local->keep) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
805 | cxMapPut(lres_removed, cx_hash_key_str(local->path), local); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
806 | if(lres_removed->size > lres_removed->size * 2) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
807 | cxMapRehash(lres_removed); |
564
fb482734e429
replace list of removed resources with a map (cmd_pull)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
808 | } |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
809 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
810 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
811 | |
566
9a88920b15d8
increase snyc_conflict counter only after conflict renaming, to make sure the counter is correct when pull is aborted
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
565
diff
changeset
|
812 | // |
9a88920b15d8
increase snyc_conflict counter only after conflict renaming, to make sure the counter is correct when pull is aborted
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
565
diff
changeset
|
813 | // BEGIN PULL |
9a88920b15d8
increase snyc_conflict counter only after conflict renaming, to make sure the counter is correct when pull is aborted
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
565
diff
changeset
|
814 | // |
9a88920b15d8
increase snyc_conflict counter only after conflict renaming, to make sure the counter is correct when pull is aborted
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
565
diff
changeset
|
815 | |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
816 | // the first thing we need are all directories to put the files in |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
817 | i = cxListIterator(res_mkdir); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
818 | cx_foreach(DavResource *, res, i) { |
613
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
819 | if(sync_get_collection(a, dir, res, db)) { |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
820 | sync_error++; |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
821 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
822 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
823 | |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
824 | // we need a map for all conflicts for fast lookups |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
825 | CxMap *conflicts = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, res_conflict->size+16); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
826 | i = cxListIterator(res_conflict); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
827 | cx_foreach(DavResource *, res, i) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
828 | cxMapPut(conflicts, cx_hash_key_str(res->path), res); |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
829 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
830 | |
630
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
831 | if(SYNC_HASHING(dir)) { |
567
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
832 | // check for moved/copied files |
608
3e4c0285a868
fix build on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
607
diff
changeset
|
833 | SYS_STAT s; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
834 | CxMutIterator mut_iter = cxListMutIterator(res_new); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
835 | cx_foreach(DavResource *, res, mut_iter) { |
607
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
836 | if(dav_get_property_ns(res, DAV_PROPS_NS, "link")) { |
578
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
837 | continue; |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
838 | } |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
839 | |
567
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
840 | char *hash = sync_get_content_hash(res); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
841 | if(!hash) { |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
842 | continue; |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
843 | } |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
844 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
845 | LocalResource *local = cxMapGet(hashes, cx_hash_key_str(hash)); |
567
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
846 | if(!local) { |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
847 | continue; |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
848 | } |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
849 | |
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
850 | char *local_path = util_concat_path(dir->path, local_resource_path(local)); |
608
3e4c0285a868
fix build on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
607
diff
changeset
|
851 | int staterr = sys_stat(local_path, &s); |
567
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
852 | free(local_path); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
853 | if(staterr) { |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
854 | // origin doesn't exist or is inaccessible |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
855 | continue; |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
856 | } |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
857 | |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
858 | MovedFile *mf = malloc(sizeof(MovedFile)); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
859 | mf->content = local; |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
860 | mf->resource = res; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
861 | if(cxMapRemoveAndGet(lres_removed, cx_hash_key_str(local->path))) { |
567
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
862 | mf->copy = FALSE; |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
863 | } else { |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
864 | mf->copy = TRUE; |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
865 | } |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
866 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
867 | cxListAdd(res_moved, mf); |
567
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
868 | |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
869 | // remove item from res_new |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
870 | cxIteratorFlagRemoval(mut_iter); |
567
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
871 | } |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
872 | } |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
873 | |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
874 | // do copy/move operations |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
875 | i = cxListIterator(res_moved); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
876 | cx_foreach(MovedFile *, mf, i) { |
567
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
877 | if(sync_shutdown) { |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
878 | break; |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
879 | } |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
880 | |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
881 | DavBool issplit = dav_get_property_ns(mf->resource, DAV_NS, "split") ? 1 : 0; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
882 | if(cxMapGet(conflicts, cx_hash_key_str(mf->resource->path))) { |
567
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
883 | rename_conflict_file(dir, db, mf->resource->path, issplit); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
884 | sync_conflict++; |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
885 | } |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
886 | |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
887 | // move file |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
888 | if(sync_move_resource(a, dir, mf->resource, mf->content, mf->copy, db, &sync_success)) { |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
889 | fprintf(stderr, "%s failed: %s\n", mf->copy?"copy":"move", mf->resource->path); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
890 | sync_error++; |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
891 | } |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
892 | } |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
893 | |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
894 | // download all new, modified and conflict files |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
895 | for(int n=0;n<4;n++) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
896 | CxList *ls; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
897 | if(n == 0) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
898 | ls = res_new; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
899 | } else if(n == 1) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
900 | ls = res_modified; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
901 | } else if(n == 2) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
902 | ls = res_conflict; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
903 | } else { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
904 | ls = res_link; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
905 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
906 | CxIterator iter = cxListIterator(ls); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
907 | cx_foreach(DavResource *, res, iter) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
908 | if(sync_shutdown) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
909 | break; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
910 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
911 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
912 | DavBool issplit = dav_get_property_ns(res, DAV_NS, "split") ? 1 : 0; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
913 | if(cxMapGet(conflicts, cx_hash_key_str(res->path))) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
914 | rename_conflict_file(dir, db, res->path, issplit); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
915 | sync_conflict++; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
916 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
917 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
918 | // download the resource |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
919 | if(sync_get_resource(a, dir, res->path, res, db, TRUE, &sync_success)) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
920 | fprintf(stderr, "resource download failed: %s\n", res->path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
921 | sync_error++; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
922 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
923 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
924 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
925 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
926 | // update metadata |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
927 | i = cxListIterator(res_metadata); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
928 | cx_foreach(DavResource *, res, i) { |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
929 | if(sync_shutdown) { |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
930 | break; |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
931 | } |
302
395763c0ee69
adds SIGINT handler to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
299
diff
changeset
|
932 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
933 | LocalResource *local = cxMapGet(db->resources, cx_hash_key_str(res->path)); |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
934 | if(local) { |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
935 | printf("update: %s\n", res->path); |
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
936 | char *res_path = resource_local_path(res); |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
937 | char *local_path = create_local_path(dir, res->path); |
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
938 | free(res_path); |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
939 | if(sync_store_metadata(dir, local_path, local, res)) { |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
940 | fprintf(stderr, "Metadata update failed: %s\n", res->path); |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
941 | sync_error++; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
942 | } else { |
608
3e4c0285a868
fix build on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
607
diff
changeset
|
943 | SYS_STAT s; |
3e4c0285a868
fix build on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
607
diff
changeset
|
944 | if(sys_stat(local_path, &s)) { |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
945 | fprintf(stderr, "Cannot stat file after update: %s\n", strerror(errno)); |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
946 | } |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
947 | sync_set_metadata_from_stat(local, &s); |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
948 | sync_success++; |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
949 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
950 | free(local_path); |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
951 | } else { |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
952 | // this should never happen but who knows |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
953 | fprintf(stderr, |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
954 | "Cannot update metadata of file %s: not in database\n", |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
955 | res->path); |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
956 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
957 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
958 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
959 | CxList *rmdirs = cxLinkedListCreate(cxDefaultAllocator, (cx_compare_func)resource_pathlen_cmp, CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
960 | i = cxMapIteratorValues(lres_removed); |
564
fb482734e429
replace list of removed resources with a map (cmd_pull)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
961 | LocalResource *removed_res; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
962 | cx_foreach(LocalResource *, removed_res, i) { |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
963 | if(sync_shutdown) { |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
964 | break; |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
965 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
966 | |
564
fb482734e429
replace list of removed resources with a map (cmd_pull)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
967 | int ret = sync_remove_local_resource(dir, removed_res); |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
968 | if(ret == -1) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
969 | cxListAdd(rmdirs, removed_res); |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
970 | } else if(ret == 0) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
971 | LocalResource *local = cxMapRemoveAndGet(db->resources, cx_hash_key_str(removed_res->path)); |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
972 | if(local) { |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
973 | local_resource_free(local); |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
974 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
975 | sync_delete++; |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
976 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
977 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
978 | cxMapDestroy(lres_removed); |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
979 | |
626
2f735b0e87fa
fix order of dir deletions in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
621
diff
changeset
|
980 | // sort dir list, we need to delete dirs with higher depth first |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
981 | cxListSort(rmdirs); |
626
2f735b0e87fa
fix order of dir deletions in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
621
diff
changeset
|
982 | // delete dirs |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
983 | i = cxListIterator(rmdirs); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
984 | cx_foreach(LocalResource *, local_dir, i) { |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
985 | if(!sync_remove_local_directory(dir, local_dir)) { |
626
2f735b0e87fa
fix order of dir deletions in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
621
diff
changeset
|
986 | // dir successfully removed, now remove the related db entry |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
987 | LocalResource *local = cxMapRemoveAndGet(db->resources, cx_hash_key_str(local_dir->path)); |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
988 | if(local) { |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
989 | local_resource_free(local); |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
990 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
991 | sync_delete++; |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
992 | } |
50
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
993 | } |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
994 | |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
995 | // unlock repository |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
996 | if(locked) { |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
997 | if(dav_unlock(root)) { |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
998 | print_resource_error(sn, "/"); |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
999 | ret = -1; |
296
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
1000 | } else { |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
1001 | locked = FALSE; |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
1002 | } |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
1003 | } |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
1004 | |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1005 | // store db |
521
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
516
diff
changeset
|
1006 | if(store_db(db, dir->database, dir->db_settings)) { |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1007 | fprintf(stderr, "Cannot store sync db\n"); |
223
cbbdf207e67e
fixed some bugs in dav_create() and dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
1008 | ret = -2; |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1009 | } |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1010 | |
224
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
1011 | // cleanup |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1012 | dav_session_destroy(sn); |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1013 | |
296
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
1014 | if(!locked && locktokenfile) { |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
1015 | remove(locktokenfile); |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
1016 | } |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
1017 | |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1018 | // Report |
223
cbbdf207e67e
fixed some bugs in dav_create() and dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
1019 | if(ret != -2) { |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
1020 | char *str_success = sync_success == 1 ? "file" : "files"; |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
1021 | char *str_delete = sync_delete == 1 ? "file" : "files"; |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
1022 | char *str_error = sync_error == 1 ? "error" : "errors"; |
561
5e6df4f502d3
harmonizes output of push and pull
Mike Becker <universe@uap-core.de>
parents:
560
diff
changeset
|
1023 | char *str_conflict = sync_conflict == 1 ? "conflict" : "conflicts"; |
5e6df4f502d3
harmonizes output of push and pull
Mike Becker <universe@uap-core.de>
parents:
560
diff
changeset
|
1024 | printf("Result: %d %s pulled, %d %s deleted, %d %s, %d %s\n", |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
1025 | sync_success, str_success, |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
1026 | sync_delete,str_delete, |
561
5e6df4f502d3
harmonizes output of push and pull
Mike Becker <universe@uap-core.de>
parents:
560
diff
changeset
|
1027 | sync_conflict, str_conflict, |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
1028 | sync_error, str_error); |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
1029 | } |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1030 | |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
1031 | return ret; |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1032 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1033 | |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1034 | |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1035 | RemoteChangeType resource_get_remote_change( |
502
a23fedac340c
fixes DavSession creation in dav-sync when using root collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
501
diff
changeset
|
1036 | CmdArgs *a, |
a23fedac340c
fixes DavSession creation in dav-sync when using root collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
501
diff
changeset
|
1037 | DavResource *res, |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1038 | SyncDirectory *dir, |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1039 | SyncDatabase *db) |
502
a23fedac340c
fixes DavSession creation in dav-sync when using root collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
501
diff
changeset
|
1040 | { |
686
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1041 | DavBool update_db = FALSE; |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1042 | |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1043 | char *etag = dav_get_string_property(res, "D:getetag"); |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1044 | if(!etag) { |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1045 | fprintf(stderr, "Error: resource %s has no etag\n", res->path); |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1046 | return REMOTE_NO_CHANGE; |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1047 | } |
649
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1048 | char *hash = sync_get_content_hash(res); |
681
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
1049 | |
543
2f85df8cd35e
fixes that pull downloads the history collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
1050 | DavBool issplit = dav_get_property(res, "idav:split") ? TRUE : FALSE; |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1051 | if(issplit) { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1052 | util_remove_trailing_pathseparator(res->path); |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1053 | } |
616
0b61755f2852
add missing isdirectory tag in db on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
615
diff
changeset
|
1054 | DavBool iscollection = res->iscollection && !issplit; |
543
2f85df8cd35e
fixes that pull downloads the history collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
1055 | |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1056 | RemoteChangeType type = cmd_getoption(a, "conflict") ? |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1057 | REMOTE_CHANGE_MODIFIED : REMOTE_CHANGE_CONFLICT_LOCAL_MODIFIED; |
502
a23fedac340c
fixes DavSession creation in dav-sync when using root collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
501
diff
changeset
|
1058 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1059 | LocalResource *local = cxMapGet(db->resources, cx_hash_key_str(res->path)); |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1060 | char *local_path = create_local_path(dir, res->path); |
502
a23fedac340c
fixes DavSession creation in dav-sync when using root collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
501
diff
changeset
|
1061 | |
580
caf23cf7f96d
separate link changes from normal changes and create links after downloads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
579
diff
changeset
|
1062 | char *link = SYNC_SYMLINK(dir) ? |
607
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
1063 | dav_get_string_property_ns(res, DAV_PROPS_NS, "link") : NULL; |
580
caf23cf7f96d
separate link changes from normal changes and create links after downloads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
579
diff
changeset
|
1064 | |
502
a23fedac340c
fixes DavSession creation in dav-sync when using root collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
501
diff
changeset
|
1065 | SYS_STAT s; |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1066 | DavBool exists = 1; |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1067 | if(sys_stat(local_path, &s)) { |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1068 | if(errno != ENOENT) { |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1069 | fprintf(stderr, "Cannot stat file: %s\n", local_path); |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1070 | free(local_path); |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1071 | return REMOTE_NO_CHANGE; |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1072 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1073 | exists = 0; |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1074 | } |
502
a23fedac340c
fixes DavSession creation in dav-sync when using root collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
501
diff
changeset
|
1075 | |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1076 | RemoteChangeType ret = REMOTE_NO_CHANGE; |
616
0b61755f2852
add missing isdirectory tag in db on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
615
diff
changeset
|
1077 | if(iscollection) { |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1078 | if(!exists) { |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1079 | ret = REMOTE_CHANGE_MKDIR; |
616
0b61755f2852
add missing isdirectory tag in db on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
615
diff
changeset
|
1080 | } else if(local && S_ISDIR(s.st_mode)) { |
0b61755f2852
add missing isdirectory tag in db on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
615
diff
changeset
|
1081 | local->isdirectory = 1; // make sure isdirectory is set |
0b61755f2852
add missing isdirectory tag in db on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
615
diff
changeset
|
1082 | } else { |
617
1c995e93bf40
change error handling in case of file/folder conflict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
616
diff
changeset
|
1083 | // set change to REMOTE_CHANGE_MKDIR, which will fail later |
1c995e93bf40
change error handling in case of file/folder conflict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
616
diff
changeset
|
1084 | ret = REMOTE_CHANGE_MKDIR; |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1085 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1086 | } else if(local) { |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1087 | DavBool nochange = FALSE; |
580
caf23cf7f96d
separate link changes from normal changes and create links after downloads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
579
diff
changeset
|
1088 | if(SYNC_SYMLINK(dir) && nullstrcmp(link, local->link_target)) { |
caf23cf7f96d
separate link changes from normal changes and create links after downloads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
579
diff
changeset
|
1089 | ret = REMOTE_CHANGE_LINK; |
caf23cf7f96d
separate link changes from normal changes and create links after downloads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
579
diff
changeset
|
1090 | nochange = TRUE; |
686
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1091 | |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1092 | if(local->link_target) { |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1093 | LocalResource *local2 = local_resource_new(dir, db, local->path); |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1094 | if(type == REMOTE_CHANGE_CONFLICT_LOCAL_MODIFIED && nullstrcmp(local->link_target, local2->link_target)) { |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1095 | ret = REMOTE_CHANGE_CONFLICT_LOCAL_MODIFIED; |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1096 | } |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1097 | local_resource_free(local2); |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1098 | |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1099 | if(!nullstrcmp(link, local->link_target)) { |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1100 | ret = REMOTE_NO_CHANGE; |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1101 | update_db = TRUE; |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1102 | } |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1103 | } |
681
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
1104 | } else if(issplit && local->hash && hash) { |
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
1105 | if(!strcmp(local->hash, hash)) { |
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
1106 | // resource is already up-to-date on the client |
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
1107 | nochange = TRUE; |
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
1108 | } |
543
2f85df8cd35e
fixes that pull downloads the history collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
1109 | } else if(local->etag) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1110 | cxstring e = cx_str(etag); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1111 | if(cx_strprefix(e, CX_STR("W/"))) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1112 | e = cx_strsubs(e, 2); |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1113 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1114 | if(!strcmp(e.ptr, local->etag)) { |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1115 | // resource is already up-to-date on the client |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1116 | nochange = TRUE; |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1117 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1118 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1119 | |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1120 | if(!nochange) { |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1121 | if(!(exists && s.st_mtime != local->last_modified)) { |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1122 | type = REMOTE_CHANGE_MODIFIED; |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1123 | } |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1124 | ret = type; |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1125 | } |
580
caf23cf7f96d
separate link changes from normal changes and create links after downloads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
579
diff
changeset
|
1126 | } else if(link) { |
686
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1127 | // new file is a link |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1128 | ret = REMOTE_CHANGE_LINK; |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1129 | |
685
487645580b5e
add symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
1130 | if(exists && type == REMOTE_CHANGE_CONFLICT_LOCAL_MODIFIED) { |
686
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1131 | // a file with the same name already exists |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1132 | // if it is a link, compare the targets |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1133 | LocalResource *local2 = local_resource_new(dir, db, res->path); |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1134 | if(local2) { |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1135 | if(local2->link_target) { |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1136 | if(strcmp(link, local2->link_target)) { |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1137 | ret = REMOTE_CHANGE_CONFLICT_LOCAL_MODIFIED; |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1138 | } |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1139 | } else { |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1140 | ret = REMOTE_CHANGE_CONFLICT_LOCAL_MODIFIED; |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1141 | } |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1142 | |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1143 | local_resource_free(local2); |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1144 | } |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1145 | } |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1146 | |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1147 | } else if(exists) { |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1148 | ret = type; |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1149 | } else { |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1150 | ret = REMOTE_CHANGE_NEW; |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1151 | } |
649
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1152 | |
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1153 | // if hashing is enabled we can compare the hash of the remote file |
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1154 | // with the local file to test if a file is really modified |
650
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1155 | char *update_hash = NULL; |
649
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1156 | if (!iscollection && |
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1157 | !link && |
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1158 | (ret == REMOTE_CHANGE_MODIFIED || ret == REMOTE_CHANGE_CONFLICT_LOCAL_MODIFIED) && |
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1159 | exists && |
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1160 | hash && |
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1161 | !dir->pull_skip_hashing) |
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1162 | { |
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1163 | // because rehashing a file is slow, there is a config element for |
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1164 | // disabling this (pull-skip-hashing) |
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1165 | char *local_hash = util_file_hash(local_path); |
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1166 | if(local_hash) { |
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1167 | if(!strcmp(hash, local_hash)) { |
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1168 | ret = REMOTE_NO_CHANGE; |
650
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1169 | update_db = TRUE; |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1170 | update_hash = local_hash; |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1171 | |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1172 | // if local already exists, update the hash here |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1173 | // because it is possible that there are metadata updates |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1174 | // and in this case the db will updated later and needs |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1175 | // the current hash |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1176 | if(local) { |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1177 | if(local->hash) { |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1178 | free(local->hash); |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1179 | } |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1180 | local->hash = local_hash; |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1181 | } |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1182 | } else { |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1183 | free(local_hash); |
649
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1184 | } |
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1185 | } |
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1186 | } |
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1187 | |
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
1188 | // if a file is not modified, check if the metadata has changed |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1189 | while(ret == REMOTE_NO_CHANGE && local) { |
524
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
1190 | // check if tags have changed |
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
1191 | if(dir->tagconfig) { |
607
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
1192 | DavXmlNode *tagsprop = dav_get_property_ns(res, DAV_PROPS_NS, "tags"); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1193 | CxList *remote_tags = NULL; |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1194 | if(tagsprop) { |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1195 | remote_tags = parse_dav_xml_taglist(tagsprop); |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1196 | } |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1197 | char *remote_hash = create_tags_hash(remote_tags); |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1198 | if(nullstrcmp(remote_hash, local->remote_tags_hash)) { |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1199 | ret = REMOTE_CHANGE_METADATA; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1200 | } |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1201 | if(remote_hash) { |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1202 | free(remote_hash); |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1203 | } |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1204 | free_taglist(remote_tags); |
524
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
1205 | |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1206 | if(ret == REMOTE_CHANGE_METADATA) { |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1207 | break; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1208 | } |
524
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
1209 | } |
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
1210 | |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1211 | // check if extended attributes have changed |
539
8deb52292c99
fixes more if statements and some warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
536
diff
changeset
|
1212 | if((dir->metadata & FINFO_XATTR) == FINFO_XATTR) { |
607
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
1213 | DavXmlNode *xattr = dav_get_property_ns(res, DAV_PROPS_NS, "xattributes"); |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1214 | char *xattr_hash = get_xattr_hash(xattr); |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1215 | if(nullstrcmp(xattr_hash, local->xattr_hash)) { |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1216 | ret = REMOTE_CHANGE_METADATA; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1217 | break; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1218 | } |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1219 | } |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1220 | |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1221 | // check if finfo has changed |
607
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
1222 | DavXmlNode *finfo = dav_get_property_ns(res, DAV_PROPS_NS, "finfo"); |
539
8deb52292c99
fixes more if statements and some warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
536
diff
changeset
|
1223 | if((dir->metadata & FINFO_MODE) == FINFO_MODE) { |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1224 | FileInfo f; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1225 | finfo_get_values(finfo, &f); |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1226 | if(f.mode_set && f.mode != local->mode) { |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1227 | ret = REMOTE_CHANGE_METADATA; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1228 | break; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1229 | } |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1230 | } |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1231 | |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1232 | break; |
524
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
1233 | } |
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
1234 | |
650
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1235 | // if update_db is set, a file was modified on the server, but we already |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1236 | // have the file content, but we need to update the db |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1237 | if(ret == REMOTE_NO_CHANGE && update_db) { |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1238 | if(!local) { |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1239 | local = calloc(1, sizeof(LocalResource)); |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1240 | local->path = strdup(res->path); |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1241 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1242 | cxMapPut(db->resources, cx_hash_key_str(local->path), local); |
650
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1243 | } |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1244 | |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1245 | // update local res |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1246 | SYS_STAT s; |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1247 | if(!sys_stat(local_path, &s)) { |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1248 | sync_set_metadata_from_stat(local, &s); |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1249 | } else { |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1250 | fprintf(stderr, "stat failed for file: %s : %s", local_path, strerror(errno)); |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1251 | } |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1252 | local_resource_set_etag(local, etag); |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1253 | if(!local->hash) { |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1254 | local->hash = update_hash; |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1255 | } // else: hash already updated |
686
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1256 | if(link) { |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1257 | nullfree(local->link_target); |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1258 | local->link_target = link; |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
1259 | } |
650
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1260 | } |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
1261 | |
502
a23fedac340c
fixes DavSession creation in dav-sync when using root collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
501
diff
changeset
|
1262 | free(local_path); |
a23fedac340c
fixes DavSession creation in dav-sync when using root collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
501
diff
changeset
|
1263 | return ret; |
a23fedac340c
fixes DavSession creation in dav-sync when using root collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
501
diff
changeset
|
1264 | } |
a23fedac340c
fixes DavSession creation in dav-sync when using root collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
501
diff
changeset
|
1265 | |
608
3e4c0285a868
fix build on windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
607
diff
changeset
|
1266 | void sync_set_metadata_from_stat(LocalResource *local, SYS_STAT *s) { |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1267 | local->last_modified = s->st_mtime; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1268 | local->mode = s->st_mode & 07777; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1269 | local->uid = s->st_uid; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1270 | local->gid = s->st_gid; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1271 | local->size = s->st_size; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1272 | } |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1273 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1274 | static CxList* sync_download_changed_parts( |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1275 | DavResource *res, |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1276 | LocalResource *local, |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1277 | FILE *out, |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1278 | size_t blocksize, |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1279 | uint64_t *blockcount, |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1280 | int64_t *truncate_file, |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1281 | int *err) |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1282 | { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1283 | CxList *updates = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1284 | updates->simple_destructor = (cx_destructor_func)filepart_free; |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1285 | |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1286 | size_t local_numparts = local ? local->numparts : 0; |
546
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1287 | fseeko(out, 0, SEEK_END); |
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1288 | off_t end = ftello(out); |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1289 | |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1290 | int error = 0; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1291 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1292 | CxBuffer *buf = cxBufferCreate(NULL, blocksize, cxDefaultAllocator, 0); |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1293 | |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1294 | int64_t maxsize = -1; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1295 | |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1296 | DavResource *part = res->children; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1297 | uint64_t i = 0; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1298 | while(part) { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1299 | char *res_name = part->name; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1300 | while(res_name[0] == '0' && res_name[1] != '\0') { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1301 | res_name++; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1302 | } |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1303 | uint64_t partnum = 0; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1304 | if(util_strtouint(res_name, &partnum)) { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1305 | DavBool download_part = FALSE; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1306 | char *etag = dav_get_string_property_ns(part, "DAV:", "getetag"); |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1307 | if(partnum >= local_numparts) { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1308 | // new part |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1309 | download_part = TRUE; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1310 | } else { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1311 | FilePart p = local->parts[partnum]; // local is always non-null here |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1312 | if(etag) { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1313 | if(nullstrcmp(etag, p.etag)) { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1314 | download_part = TRUE; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1315 | } |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1316 | } |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1317 | } |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1318 | |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1319 | uint64_t offset; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1320 | int mul_err = util_uint_mul(partnum, blocksize, &offset); |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1321 | if(mul_err || offset >= INT64_MAX) { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1322 | error = 1; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1323 | fprintf(stderr, "Error: part number too high\n"); |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1324 | break; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1325 | } |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1326 | |
546
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1327 | int64_t block_end = 0; |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1328 | if(download_part) { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1329 | if(fseeko(out, offset, SEEK_SET)) { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1330 | error = 1; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1331 | fprintf(stderr, "Error: fseek failed: %s\n", strerror(errno)); |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1332 | break; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1333 | } |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1334 | buf->pos = 0; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1335 | buf->size = 0; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1336 | if(dav_get_content(part, buf,(dav_write_func)cxBufferWrite)) { |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1337 | fprintf(stderr, "Error: cannot download part: %s\n", part->name); |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1338 | error = 1; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1339 | break; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1340 | } |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1341 | if(fwrite(buf->space, 1, buf->size, out) == 0) { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1342 | perror("write"); |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1343 | error = 1; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1344 | break; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1345 | } |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1346 | |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1347 | FilePart *update = calloc(1, sizeof(FilePart)); |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1348 | update->block = partnum; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1349 | update->etag = etag ? strdup(etag) : NULL; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1350 | update->hash = dav_create_hash(buf->space, buf->size); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1351 | cxListAdd(updates, update); |
546
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1352 | |
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1353 | block_end = offset+buf->size; |
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1354 | } else { |
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1355 | if(offset+blocksize > end) { |
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1356 | // if we don't download the block, we don't know the size |
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1357 | // but it can't be bigger than the file |
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1358 | block_end = end; |
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1359 | } else { |
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1360 | block_end = offset+blocksize; |
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1361 | } |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1362 | } |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1363 | |
546
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1364 | if(block_end > maxsize) { |
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1365 | maxsize = block_end; |
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1366 | } |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1367 | |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1368 | i++; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1369 | } // else: res is not a regular file part |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1370 | part = part->next; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1371 | } |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1372 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1373 | cxBufferFree(buf); |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1374 | |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1375 | if(error) { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1376 | *err = 1; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1377 | cxListDestroy(updates); |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1378 | return NULL; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1379 | } |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1380 | |
546
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1381 | if(maxsize < end) { |
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1382 | *truncate_file = maxsize; |
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1383 | } else { |
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1384 | *truncate_file = -1; |
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1385 | } |
33e312dd851d
truncate splitted file to correct size on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
545
diff
changeset
|
1386 | |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1387 | *err = 0; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1388 | *blockcount = i; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1389 | return updates; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1390 | } |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1391 | |
567
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1392 | int copy_file(const char *from, const char *to) { |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1393 | FILE *in = sys_fopen(from, "rb"); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1394 | if(!in) { |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1395 | return 1; |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1396 | } |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1397 | FILE *out = sys_fopen(to, "wb"); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1398 | if(!out) { |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1399 | fclose(in); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1400 | return 1; |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1401 | } |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1402 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1403 | cx_stream_copy(in, out, (cx_read_func)fread, (cx_write_func)fwrite); |
567
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1404 | fclose(in); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1405 | fclose(out); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1406 | |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1407 | return 0; |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1408 | } |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1409 | |
567
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1410 | typedef int (*renamefunc)(const char*,const char*); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1411 | |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1412 | int sync_move_resource( |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1413 | CmdArgs *a, |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1414 | SyncDirectory *dir, |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1415 | DavResource *res, |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1416 | LocalResource *content, |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1417 | DavBool copy, |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1418 | SyncDatabase *db, |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1419 | int *counter) |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1420 | { |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1421 | renamefunc fn = copy ? copy_file : sys_rename; |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1422 | |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1423 | char *new_path = util_concat_path(dir->path, res->path); |
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
1424 | char *old_path = util_concat_path(dir->path, local_resource_path(content)); |
567
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1425 | |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1426 | printf("%s: %s -> %s\n", copy?"copy":"move", content->path, res->path); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1427 | if(fn(old_path, new_path)) { |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1428 | free(new_path); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1429 | free(old_path); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1430 | return 1; |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1431 | } |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1432 | (*counter)++; |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1433 | |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1434 | char *etag = dav_get_string_property(res, "D:getetag"); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1435 | char *content_hash = sync_get_content_hash(res); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1436 | |
569
cafdc13b6820
remove dead db entry when files are moved
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
568
diff
changeset
|
1437 | LocalResource *local = NULL; |
cafdc13b6820
remove dead db entry when files are moved
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
568
diff
changeset
|
1438 | if(copy) { |
675
a8117c4feaad
fix sync_store_metadata
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
1439 | // TODO: maybe we should not copy the whole resource |
a8117c4feaad
fix sync_store_metadata
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
1440 | // with all metadata hashes |
569
cafdc13b6820
remove dead db entry when files are moved
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
568
diff
changeset
|
1441 | local = local_resource_copy(content, res->path); |
cafdc13b6820
remove dead db entry when files are moved
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
568
diff
changeset
|
1442 | } else { |
cafdc13b6820
remove dead db entry when files are moved
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
568
diff
changeset
|
1443 | // reuse previous LocalResource (content) |
cafdc13b6820
remove dead db entry when files are moved
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
568
diff
changeset
|
1444 | // remove it from db->resources, change path and put it back |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1445 | local = cxMapRemoveAndGet(db->resources, cx_hash_key_str(content->path)); |
569
cafdc13b6820
remove dead db entry when files are moved
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
568
diff
changeset
|
1446 | if(!local) { |
cafdc13b6820
remove dead db entry when files are moved
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
568
diff
changeset
|
1447 | // can't happen, but handle it nevertheless |
cafdc13b6820
remove dead db entry when files are moved
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
568
diff
changeset
|
1448 | local = content; |
cafdc13b6820
remove dead db entry when files are moved
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
568
diff
changeset
|
1449 | } |
cafdc13b6820
remove dead db entry when files are moved
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
568
diff
changeset
|
1450 | free(content->path); |
cafdc13b6820
remove dead db entry when files are moved
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
568
diff
changeset
|
1451 | local->path = strdup(res->path); |
cafdc13b6820
remove dead db entry when files are moved
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
568
diff
changeset
|
1452 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1453 | cxMapPut(db->resources, cx_hash_key_str(local->path), local); |
567
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1454 | |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1455 | if(sync_store_metadata(dir, new_path, local, res)) { |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1456 | fprintf(stderr, "Cannot store metadata: %s\n", res->path); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1457 | } |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1458 | |
621
06f9fddc82a1
don't store weak etag in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
619
diff
changeset
|
1459 | // dont free local->etag, because local_resource_set_etag will do that |
06f9fddc82a1
don't store weak etag in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
619
diff
changeset
|
1460 | |
567
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1461 | if(local->hash) { |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1462 | free(local->hash); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1463 | } |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1464 | |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1465 | SYS_STAT s; |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1466 | if(sys_stat(new_path, &s)) { |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1467 | fprintf(stderr, |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1468 | "Cannot stat file %s: %s\n", new_path, strerror(errno)); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1469 | } |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1470 | |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1471 | // set metadata from stat |
621
06f9fddc82a1
don't store weak etag in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
619
diff
changeset
|
1472 | local_resource_set_etag(local, etag); |
567
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1473 | local->hash = nullstrdup(content_hash); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1474 | |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1475 | sync_set_metadata_from_stat(local, &s); |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1476 | local->skipped = FALSE; |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1477 | |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1478 | return 0; |
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
566
diff
changeset
|
1479 | } |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1480 | |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1481 | int sync_get_resource( |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1482 | CmdArgs *a, |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1483 | SyncDirectory *dir, |
533
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
1484 | const char *path, |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1485 | DavResource *res, |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1486 | SyncDatabase *db, |
679
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
1487 | DavBool update_db, |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1488 | int *counter) |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1489 | { |
581
3f9a9c80a2d2
fix that symlink config was not used in sync_get_resource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
580
diff
changeset
|
1490 | char *link = SYNC_SYMLINK(dir) ? |
607
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
1491 | dav_get_string_property_ns(res, DAV_PROPS_NS, "link") : NULL; |
578
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1492 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1493 | LocalResource *local = cxMapGet(db->resources, cx_hash_key_str(path)); |
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
1494 | |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
1495 | char *local_path; |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
1496 | if(link) { |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
1497 | char *res_path = resource_local_path(res); |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
1498 | local_path = create_local_path(dir, res_path); |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
1499 | free(res_path); |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
1500 | } else { |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
1501 | local_path = create_local_path(dir, path); |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
1502 | } |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
1503 | |
331
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
318
diff
changeset
|
1504 | char *etag = dav_get_string_property(res, "D:getetag"); |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
1505 | SYS_STAT s; |
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
1506 | memset(&s, 0, sizeof(SYS_STAT)); |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1507 | |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1508 | char *blocksize_str = dav_get_string_property_ns(res, DAV_NS, "split"); |
558
1a9e6a5c1e79
fixes several signedness issues
Mike Becker <universe@uap-core.de>
parents:
557
diff
changeset
|
1509 | uint64_t blocksize = 0; |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1510 | DavBool issplit = FALSE; |
581
3f9a9c80a2d2
fix that symlink config was not used in sync_get_resource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
580
diff
changeset
|
1511 | if(blocksize_str && !link) { |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1512 | if(!util_strtouint(blocksize_str, &blocksize)) { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1513 | fprintf(stderr, "Error: split property does not contain an integer.\n"); |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1514 | return 1; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1515 | } |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1516 | issplit = TRUE; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1517 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1518 | CxList *part_updates = NULL; |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1519 | uint64_t blockcount = 0; |
545
268157722a0e
store content hash for splitted resources in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
1520 | char *content_hash = NULL; |
578
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1521 | |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1522 | if(res->iscollection && !issplit) { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1523 | // why are we here? |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1524 | return 0; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1525 | } |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1526 | |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1527 | int ret = 0; |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1528 | |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1529 | char *tmp_path = NULL; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1530 | FILE *out = NULL; |
578
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1531 | if(!link) { |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1532 | if(!issplit) { |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1533 | tmp_path = create_tmp_download_path(local_path); |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1534 | if(!tmp_path) { |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1535 | fprintf(stderr, "Cannot create tmp path for %s\n", local_path); |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1536 | free(local_path); |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1537 | return -1; |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1538 | } |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1539 | out = sys_fopen(tmp_path , "wb"); |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1540 | } else { |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1541 | out = sys_fopen(local_path, "r+b"); |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1542 | if(!out && errno == ENOENT) { |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1543 | out = sys_fopen(local_path, "wb"); |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1544 | } |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1545 | } |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1546 | if(!out) { |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1547 | fprintf(stderr, "Cannot open output file: %s\n", local_path); |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1548 | free(local_path); |
578
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1549 | if(tmp_path) { |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1550 | free(tmp_path); |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1551 | } |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1552 | return -1; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1553 | } |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1554 | } |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1555 | |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1556 | int64_t truncate_file = -1; |
578
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1557 | if(!link) { |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1558 | printf("get: %s\n", path); |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1559 | if(issplit) { |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1560 | part_updates = sync_download_changed_parts(res, local, out, blocksize, &blockcount, &truncate_file, &ret); |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1561 | } else { |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1562 | ret = dav_get_content(res, out, (dav_write_func)fwrite); |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1563 | } |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1564 | fclose(out); |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1565 | } else { |
578
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1566 | printf("link: %s -> %s\n", path, link); |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1567 | if(sys_symlink(link, local_path)) { |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1568 | perror("symlink"); |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1569 | ret = 1; |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1570 | } |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1571 | } |
545
268157722a0e
store content hash for splitted resources in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
1572 | |
630
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
1573 | if(issplit || (SYNC_HASHING(dir) && !link)) { |
545
268157722a0e
store content hash for splitted resources in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
1574 | if(truncate_file >= 0) { |
560
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
559
diff
changeset
|
1575 | // only true if issplit is true |
548
ab46acda1066
fixes truncate path
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
547
diff
changeset
|
1576 | if(truncate(local_path, truncate_file)) { |
ab46acda1066
fixes truncate path
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
547
diff
changeset
|
1577 | perror("truncate"); |
ab46acda1066
fixes truncate path
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
547
diff
changeset
|
1578 | } |
545
268157722a0e
store content hash for splitted resources in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
1579 | } |
268157722a0e
store content hash for splitted resources in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
1580 | |
268157722a0e
store content hash for splitted resources in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
1581 | char *res_hash = sync_get_content_hash(res); |
268157722a0e
store content hash for splitted resources in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
1582 | if(res_hash) { |
268157722a0e
store content hash for splitted resources in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
1583 | content_hash = res_hash; |
268157722a0e
store content hash for splitted resources in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
1584 | } else { |
268157722a0e
store content hash for splitted resources in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
1585 | content_hash = util_file_hash(local_path); |
268157722a0e
store content hash for splitted resources in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
1586 | } |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1587 | } |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1588 | |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1589 | if(ret == 0) { |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1590 | (*counter)++; |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1591 | |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1592 | if(tmp_path) { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1593 | if(dir->trash && dir->backuppull) { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1594 | move_to_trash(dir, local_path); |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1595 | } |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1596 | if(sys_rename(tmp_path, local_path)) { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1597 | fprintf( |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1598 | stderr, |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1599 | "Cannot rename file %s to %s\n", |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1600 | tmp_path, |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1601 | local_path); |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1602 | perror(""); |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1603 | free(tmp_path); |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1604 | free(local_path); |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1605 | return -1; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1606 | } |
145
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1607 | } |
679
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
1608 | |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
1609 | } else if(tmp_path) { |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
1610 | if(sys_unlink(tmp_path)) { |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
1611 | fprintf(stderr, "Cannot remove tmp file: %s\n", tmp_path); |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
1612 | } |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
1613 | } |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
1614 | |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
1615 | if(update_db && ret == 0) { |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1616 | if(!local) { |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1617 | // new local resource |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1618 | local = calloc(1, sizeof(LocalResource)); |
533
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
1619 | local->path = strdup(path); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1620 | cxMapPut(db->resources, cx_hash_key_str(local->path), local); |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1621 | } |
543
2f85df8cd35e
fixes that pull downloads the history collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
1622 | |
2f85df8cd35e
fixes that pull downloads the history collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
1623 | if(sync_store_metadata(dir, local_path, local, res)) { |
2f85df8cd35e
fixes that pull downloads the history collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
1624 | fprintf(stderr, "Cannot store metadata: %s\n", path); |
2f85df8cd35e
fixes that pull downloads the history collection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
542
diff
changeset
|
1625 | } |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1626 | |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1627 | if(local->etag) { |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1628 | free(local->etag); |
581
3f9a9c80a2d2
fix that symlink config was not used in sync_get_resource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
580
diff
changeset
|
1629 | local->etag = NULL; |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1630 | } |
545
268157722a0e
store content hash for splitted resources in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
1631 | if(local->hash) { |
268157722a0e
store content hash for splitted resources in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
1632 | free(local->hash); |
581
3f9a9c80a2d2
fix that symlink config was not used in sync_get_resource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
580
diff
changeset
|
1633 | local->hash = NULL; |
545
268157722a0e
store content hash for splitted resources in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
1634 | } |
578
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1635 | if(local->link_target) { |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1636 | free(local->link_target); |
581
3f9a9c80a2d2
fix that symlink config was not used in sync_get_resource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
580
diff
changeset
|
1637 | local->link_target = NULL; |
578
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1638 | } |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1639 | |
581
3f9a9c80a2d2
fix that symlink config was not used in sync_get_resource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
580
diff
changeset
|
1640 | stat_func statfn; |
578
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1641 | if(link) { |
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1642 | local->link_target = strdup(link); |
581
3f9a9c80a2d2
fix that symlink config was not used in sync_get_resource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
580
diff
changeset
|
1643 | statfn = sys_lstat; |
3f9a9c80a2d2
fix that symlink config was not used in sync_get_resource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
580
diff
changeset
|
1644 | } else { |
3f9a9c80a2d2
fix that symlink config was not used in sync_get_resource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
580
diff
changeset
|
1645 | statfn = sys_stat; |
578
bb1e60fada74
create symlinks on pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
577
diff
changeset
|
1646 | } |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1647 | |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1648 | update_parts(local, part_updates, blockcount); |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1649 | |
581
3f9a9c80a2d2
fix that symlink config was not used in sync_get_resource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
580
diff
changeset
|
1650 | if(statfn(local_path, &s)) { |
547
4a249c645ae4
fixes that metadata is updated after stat in sync_get_resource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
546
diff
changeset
|
1651 | fprintf(stderr, |
4a249c645ae4
fixes that metadata is updated after stat in sync_get_resource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
546
diff
changeset
|
1652 | "Cannot stat file %s: %s\n", local_path, strerror(errno)); |
4a249c645ae4
fixes that metadata is updated after stat in sync_get_resource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
546
diff
changeset
|
1653 | } |
4a249c645ae4
fixes that metadata is updated after stat in sync_get_resource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
546
diff
changeset
|
1654 | |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1655 | // set metadata from stat |
681
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
1656 | if(!issplit) { |
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
1657 | local_resource_set_etag(local, etag); |
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
1658 | } |
545
268157722a0e
store content hash for splitted resources in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
1659 | if(content_hash) { |
268157722a0e
store content hash for splitted resources in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
1660 | local->hash = content_hash; |
268157722a0e
store content hash for splitted resources in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
544
diff
changeset
|
1661 | } |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
1662 | sync_set_metadata_from_stat(local, &s); |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1663 | local->skipped = FALSE; |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1664 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1665 | |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1666 | if(tmp_path) { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1667 | free(tmp_path); |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1668 | } |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1669 | free(local_path); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1670 | return ret; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1671 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1672 | |
613
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1673 | int sync_get_collection( |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1674 | CmdArgs *a, |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1675 | SyncDirectory *dir, |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1676 | DavResource *res, |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1677 | SyncDatabase *db) |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1678 | { |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1679 | char *res_path = resource_local_path(res); |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1680 | char *local_path = create_local_path(dir, res->path); |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1681 | free(res_path); |
617
1c995e93bf40
change error handling in case of file/folder conflict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
616
diff
changeset
|
1682 | |
613
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1683 | printf("get: %s\n", res->path); |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1684 | // create directory |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1685 | // ignore error if it already exists |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1686 | if(sys_mkdir(local_path) && errno != EEXIST) { |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1687 | fprintf(stderr, |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1688 | "Cannot create directory %s: %s", |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1689 | local_path, strerror(errno)); |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1690 | free(local_path); |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1691 | return 1; |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1692 | } |
617
1c995e93bf40
change error handling in case of file/folder conflict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
616
diff
changeset
|
1693 | |
1c995e93bf40
change error handling in case of file/folder conflict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
616
diff
changeset
|
1694 | // stat for getting metadata |
613
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1695 | SYS_STAT s; |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1696 | if(sys_stat(local_path, &s)) { |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1697 | fprintf(stderr, "Cannot stat directory %s: %s", local_path, strerror(errno)); |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1698 | free(local_path); |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1699 | return 1; |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1700 | } |
617
1c995e93bf40
change error handling in case of file/folder conflict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
616
diff
changeset
|
1701 | |
613
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1702 | // if it doesn't exist in the db, create an entry for the dir |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1703 | LocalResource *local = cxMapGet(db->resources, cx_hash_key_str(res->path)); |
613
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1704 | if(!local) { |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1705 | local = calloc(1, sizeof(LocalResource)); |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1706 | local->path = strdup(res->path); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1707 | cxMapPut(db->resources, cx_hash_key_str(local->path), local); |
613
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1708 | } |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1709 | local->isdirectory = 1; |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1710 | |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1711 | // cleanup LocalResource |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1712 | if(local->etag) { |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1713 | free(local->etag); |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1714 | local->etag = NULL; |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1715 | } |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1716 | if(local->hash) { |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1717 | free(local->hash); |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1718 | local->hash = NULL; |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1719 | } |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1720 | if(local->link_target) { |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1721 | free(local->link_target); |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1722 | local->link_target = NULL; |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1723 | } |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1724 | local->skipped = 0; |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1725 | local->size = 0; |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1726 | |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1727 | // set metadata |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1728 | if(sync_store_metadata(dir, local_path, local, res)) { |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1729 | fprintf(stderr, "Cannot store metadata: %s\n", res->path); |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1730 | } |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1731 | sync_set_metadata_from_stat(local, &s); |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1732 | |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1733 | // cleanup |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1734 | free(local_path); |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1735 | return 0; |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1736 | } |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
1737 | |
190
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1738 | int sync_remove_local_resource(SyncDirectory *dir, LocalResource *res) { |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1739 | char *local_path = create_local_path(dir, res->path); |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
1740 | SYS_STAT s; |
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
1741 | if(sys_stat(local_path, &s)) { |
50
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1742 | free(local_path); |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1743 | return -2; |
190
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1744 | } |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1745 | |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1746 | if(S_ISDIR(s.st_mode)) { |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1747 | free(local_path); |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1748 | return -1; |
50
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1749 | } |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1750 | |
54 | 1751 | if(s.st_mtime != res->last_modified) { |
50
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1752 | free(local_path); |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1753 | return -2; |
50
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1754 | } |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1755 | |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1756 | printf("delete: %s\n", res->path); |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1757 | int ret = 0; |
65
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1758 | if(dir->trash) { |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1759 | move_to_trash(dir, local_path); |
412
dc74f736aea1
adds more fs abstraction
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
1760 | } else if(sys_unlink(local_path)) { |
50
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1761 | fprintf(stderr, "Cannot remove file %s\n", local_path); |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1762 | ret = -2; |
50
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1763 | } |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1764 | free(local_path); |
190
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1765 | |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1766 | return ret; |
190
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1767 | } |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1768 | |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1769 | int sync_remove_local_directory(SyncDirectory *dir, LocalResource *res) { |
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1770 | int ret = 0; |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1771 | char *local_path = create_local_path(dir, res->path); |
190
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1772 | |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1773 | printf("delete: %s\n", res->path); |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1774 | if(rmdir(local_path)) { |
633
b7de5ecc30fa
don't print error in case rmdir fails because of ENOTEMPTY
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
630
diff
changeset
|
1775 | // don't print error when dirs are not empty |
b7de5ecc30fa
don't print error in case rmdir fails because of ENOTEMPTY
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
630
diff
changeset
|
1776 | // because that can regulary happen, because the pull conflict |
b7de5ecc30fa
don't print error in case rmdir fails because of ENOTEMPTY
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
630
diff
changeset
|
1777 | // detection can prevent files from being deleted and in this case |
b7de5ecc30fa
don't print error in case rmdir fails because of ENOTEMPTY
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
630
diff
changeset
|
1778 | // the parent dir is not empty |
b7de5ecc30fa
don't print error in case rmdir fails because of ENOTEMPTY
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
630
diff
changeset
|
1779 | if(errno != ENOTEMPTY) { |
b7de5ecc30fa
don't print error in case rmdir fails because of ENOTEMPTY
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
630
diff
changeset
|
1780 | fprintf(stderr, "rmdir: %s : %s\n", local_path, strerror(errno)); |
b7de5ecc30fa
don't print error in case rmdir fails because of ENOTEMPTY
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
630
diff
changeset
|
1781 | } |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1782 | ret = 1; |
190
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1783 | } |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1784 | |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
1785 | free(local_path); |
503
f84e64afee61
dav-sync pull refactoring: create list of changes before sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
1786 | return ret; |
50
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1787 | } |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
1788 | |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1789 | void rename_conflict_file(SyncDirectory *dir, SyncDatabase *db, char *path, DavBool copy) { |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1790 | char *local_path = create_local_path(dir, path); |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1791 | char *parent = util_parent_path(local_path); |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1792 | |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1793 | renamefunc fn = copy ? copy_file : sys_rename; |
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1794 | |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1795 | int rev = 0; |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
1796 | SYS_STAT s; |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1797 | int loop = 1; |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1798 | do { |
216
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
1799 | char *res_parent = util_parent_path(path); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1800 | const char *res_name = util_resource_name(path); |
216
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
1801 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1802 | cxmutstr new_path = cx_asprintf( |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1803 | "%sorig.%d.%s", |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1804 | parent, |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1805 | rev, |
216
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
1806 | res_name); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1807 | cxmutstr new_res_path = cx_asprintf( |
216
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
1808 | "%sorig.%d.%s", |
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
1809 | res_parent, |
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
1810 | rev, |
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
1811 | res_name); |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1812 | |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1813 | |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
1814 | if(sys_stat(new_path.ptr, &s)) { |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1815 | if(errno == ENOENT) { |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1816 | loop = 0; |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1817 | printf("conflict: %s\n", local_path); |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
1818 | if(fn(local_path, new_path.ptr)) { |
65
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1819 | //printf("errno: %d\n", errno); |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1820 | fprintf( |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1821 | stderr, |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1822 | "Cannot rename file %s to %s\n", |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1823 | local_path, |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1824 | new_path.ptr); |
216
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
1825 | } else { |
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
1826 | LocalResource *conflict = calloc(1, sizeof(LocalResource)); |
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
1827 | conflict->path = strdup(new_res_path.ptr); |
560
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
559
diff
changeset
|
1828 | conflict->conflict_source = strdup(path); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1829 | cxMapPut(db->conflict, cx_hash_key_str(new_res_path.ptr), conflict); |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1830 | } |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1831 | } |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1832 | } |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1833 | rev++; |
216
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
1834 | free(res_parent); |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1835 | free(new_path.ptr); |
216
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
1836 | free(new_res_path.ptr); |
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
1837 | |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1838 | } while(loop); |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1839 | free(parent); |
216
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
1840 | free(local_path); |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1841 | } |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
1842 | |
145
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1843 | char* create_tmp_download_path(char *path) { |
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1844 | char *new_path = NULL; |
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1845 | char *parent = util_parent_path(path); |
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1846 | for (int i=0;;i++) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1847 | cxmutstr np = cx_asprintf( |
145
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1848 | "%sdownload%d-%s", |
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1849 | parent, |
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1850 | i, |
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1851 | util_resource_name(path)); |
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1852 | |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
1853 | SYS_STAT s; |
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
1854 | if(sys_stat(np.ptr, &s)) { |
145
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1855 | if(errno == ENOENT) { |
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1856 | new_path = np.ptr; |
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1857 | } |
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1858 | break; |
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1859 | } |
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1860 | free(np.ptr); |
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1861 | }; |
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1862 | |
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1863 | free(parent); |
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1864 | return new_path; |
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1865 | } |
82475dc12dd4
improved dav-sync data-loss prevention
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
144
diff
changeset
|
1866 | |
65
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1867 | void move_to_trash(SyncDirectory *dir, char *path) { |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1868 | char *new_path = NULL; |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1869 | for (int i=0;;i++) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1870 | cxmutstr np = cx_asprintf( |
65
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1871 | "%s%d-%s", |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1872 | dir->trash, |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1873 | i, |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1874 | util_resource_name(path)); |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1875 | |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
1876 | SYS_STAT s; |
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
1877 | if(sys_stat(np.ptr, &s)) { |
65
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1878 | if(errno == ENOENT) { |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1879 | new_path = np.ptr; |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1880 | } |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1881 | break; |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1882 | } |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1883 | free(np.ptr); |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1884 | }; |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1885 | |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1886 | if(!new_path) { |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1887 | fprintf(stderr, "Cannot move file %s to trash.\n", path); |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1888 | return; |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1889 | } |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1890 | |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
1891 | if(sys_rename(path, new_path)) { |
65
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1892 | //printf("errno: %d\n", errno); |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1893 | fprintf( |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1894 | stderr, |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1895 | "Cannot rename file %s to %s\n", |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1896 | path, |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1897 | new_path); |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1898 | } |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1899 | |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1900 | free(new_path); |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1901 | } |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
1902 | |
216
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
1903 | static int res_isconflict(SyncDatabase *db, LocalResource *res) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1904 | return cxMapGet(db->conflict, cx_hash_key_str(res->path)) ? 1 : 0; |
216
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
1905 | } |
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
1906 | |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
1907 | int cmd_push(CmdArgs *a, DavBool outgoing, DavBool archive) { |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1908 | if(a->argc != 1) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1909 | fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few" : "many"); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1910 | return -1; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1911 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1912 | |
403
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
1913 | // if there are syntax errors in the command line, fail asap. |
414
ea50585ec9d9
adds tagfilter scope
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
412
diff
changeset
|
1914 | SyncTagFilter* tagfilter = parse_tagfilter_string( |
ea50585ec9d9
adds tagfilter scope
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
412
diff
changeset
|
1915 | cmd_getoption(a, "tags"), DAV_SYNC_TAGFILTER_SCOPE_RESOURCE); |
403
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
1916 | if (!tagfilter) { |
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
1917 | fprintf(stderr, "Malformed tag filter\n"); |
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
1918 | return -1; |
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
1919 | } |
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
1920 | |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1921 | SyncDirectory *dir = scfg_get_dir(a->argv[0]); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1922 | if(!dir) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1923 | fprintf(stderr, "Unknown sync dir: %s\n", a->argv[0]); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1924 | return -1; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1925 | } |
233
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
1926 | if(scfg_check_dir(dir)) { |
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
1927 | return -1; |
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
1928 | } |
533
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
1929 | if(cmd_getoption(a, "snapshot")) { |
492
7bde663719dc
Adds dav-sync option for enabling versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
1930 | if(dir->versioning) { |
7bde663719dc
Adds dav-sync option for enabling versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
1931 | dir->versioning->always = TRUE; |
7bde663719dc
Adds dav-sync option for enabling versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
1932 | } else { |
7bde663719dc
Adds dav-sync option for enabling versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
1933 | fprintf(stderr, "Error: versioning not configured for the sync directory\nAbort.\n"); |
7bde663719dc
Adds dav-sync option for enabling versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
1934 | return -1; |
7bde663719dc
Adds dav-sync option for enabling versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
1935 | } |
7bde663719dc
Adds dav-sync option for enabling versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
1936 | } |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1937 | |
347
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
1938 | int cmd = archive ? SYNC_CMD_ARCHIVE : SYNC_CMD_PUSH; |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
1939 | if((dir->allow_cmd & cmd) != cmd) { |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
1940 | fprintf(stderr, "Command '%s' is not allowed for this sync dir\n", archive ? "archive" : "push"); |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
1941 | print_allowed_cmds(dir); |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
1942 | return -1; |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
1943 | } |
b6ff6be7aa91
adds config option to disable certain commands for specific syncdirs and fixes authmethod config parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
331
diff
changeset
|
1944 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1945 | Repository *repo = get_repository(cx_str(dir->repository)); |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1946 | if(!repo) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1947 | fprintf(stderr, "Unkown repository %s\n", dir->name); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1948 | return -1; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1949 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1950 | |
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
1951 | SyncDatabase *db = load_db(dir->database); |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1952 | if(!db) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1953 | fprintf(stderr, "Cannot load database file: %s\n", dir->database); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1954 | return -1; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1955 | } |
218
5f1f7602cf77
automatically remove deleted conflict files from the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
217
diff
changeset
|
1956 | remove_deleted_conflicts(dir, db); |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1957 | |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
725
diff
changeset
|
1958 | DavSession *sn = create_session(a, ctx, repo, dir->collection); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1959 | util_regdestr(sn->mp, db, (cx_destructor_func)destroy_db); |
68
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
66
diff
changeset
|
1960 | if (cmd_getoption(a, "verbose")) { |
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
66
diff
changeset
|
1961 | curl_easy_setopt(sn->handle, CURLOPT_VERBOSE, 1L); |
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
66
diff
changeset
|
1962 | curl_easy_setopt(sn->handle, CURLOPT_STDERR, stderr); |
f6d3db6113d3
added verbose option + encryption flag fixes
Mike Becker <universe@uap-core.de>
parents:
66
diff
changeset
|
1963 | } |
630
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
1964 | if(SYNC_STORE_HASH(dir)) { |
556
1a58014260e0
set content-hash property after uploads when syncdir hashing is enabled
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
554
diff
changeset
|
1965 | sn->flags |= DAV_SESSION_STORE_HASH; |
1a58014260e0
set content-hash property after uploads when syncdir hashing is enabled
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
554
diff
changeset
|
1966 | } |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
1967 | |
445
c525f049c8b7
renames dav-sync -D option to -R
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
444
diff
changeset
|
1968 | DavBool restore_removed = cmd_getoption(a, "restore-removed") ? 1 : 0; |
444
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
1969 | DavBool restore_modified = cmd_getoption(a, "restore-modified") ? 1 : 0; |
445
c525f049c8b7
renames dav-sync -D option to -R
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
444
diff
changeset
|
1970 | DavBool restore = restore_removed || restore_modified; |
444
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
1971 | int depth = restore ? -1 : 0; |
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
1972 | |
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
1973 | DavResource *root = dav_query(sn, "select D:getetag,idav:status from / with depth = %d", depth); |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
1974 | if(!root) { |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1975 | print_resource_error(sn, "/"); |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1976 | dav_session_destroy(sn); |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1977 | fprintf(stderr, "Abort\n"); |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1978 | return -1; |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1979 | } |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
1980 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1981 | CxMap *svrres = NULL; |
444
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
1982 | if(restore) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
1983 | svrres = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, 1024); |
444
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
1984 | res2map(root, svrres); |
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
1985 | } |
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
1986 | |
220
f1b3873a6525
added conflict detection to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
1987 | int cdt = cmd_getoption(a, "conflict") ? 0 : 1; // conflict detection |
f1b3873a6525
added conflict detection to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
1988 | |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
1989 | // lock repository |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
1990 | DavBool locked = FALSE; |
296
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
1991 | char *locktokenfile = NULL; |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
1992 | if((dir->lockpush || cmd_getoption(a, "lock")) && !cmd_getoption(a, "nolock") && !outgoing) { |
316
9d0505d80044
adds dav-sync lock timeout config element
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
313
diff
changeset
|
1993 | if(dav_lock_t(root, dir->lock_timeout)) { |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
1994 | print_resource_error(sn, "/"); |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
1995 | dav_session_destroy(sn); |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
1996 | fprintf(stderr, "Abort\n"); |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
1997 | return -1; |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
1998 | } |
233
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
1999 | DavLock *lock = dav_get_lock(sn, "/"); |
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
2000 | if(lock) { |
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
2001 | printf("Lock-Token: %s\n", lock->token); |
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
2002 | } |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
2003 | locked = TRUE; |
296
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
2004 | locktokenfile = create_locktoken_file(dir->name, lock->token); |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
2005 | } |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
2006 | |
403
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
2007 | DavBool remove_file = cmd_getoption(a, "remove") ? 1 : 0; |
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
2008 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2009 | CxMap *db_hashes = NULL; |
630
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
2010 | if(SYNC_HASHING(dir)) { |
550
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2011 | db_hashes = create_hash_index(db); |
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2012 | } |
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2013 | |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
2014 | int sync_success = 0; |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
2015 | int sync_delete = 0; |
561
5e6df4f502d3
harmonizes output of push and pull
Mike Becker <universe@uap-core.de>
parents:
560
diff
changeset
|
2016 | int sync_conflict = 0; |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
2017 | int sync_error = 0; |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
2018 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2019 | CxList *ls_new = cxLinkedListCreate(cxDefaultAllocator, (cx_compare_func)resource_path_cmp, CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2020 | CxList *ls_modified = cxLinkedListCreate(cxDefaultAllocator, (cx_compare_func)resource_path_cmp, CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2021 | CxList *ls_conflict = cxLinkedListCreate(cxDefaultAllocator, (cx_compare_func)resource_path_cmp, CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2022 | CxList *ls_update = cxLinkedListCreate(cxDefaultAllocator, (cx_compare_func)resource_path_cmp, CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2023 | CxList *ls_delete = cxLinkedListCreate(cxDefaultAllocator, (cx_compare_func)resource_path_cmp, CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2024 | CxList *ls_move = cxLinkedListCreate(cxDefaultAllocator, (cx_compare_func)resource_path_cmp, CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2025 | CxList *ls_copy = cxLinkedListCreate(cxDefaultAllocator, (cx_compare_func)resource_path_cmp, CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2026 | CxList *ls_mkcol = cxLinkedListCreate(cxDefaultAllocator, (cx_compare_func)resource_path_cmp, CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2027 | |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2028 | |
51
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
2029 | // upload all changed files |
219
9792cfe63b80
added resolve-conflicts and delete-conflicts to help text and fixed crash with unknown cmd options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
218
diff
changeset
|
2030 | //UcxList *resources = cmd_getoption(a, "read") ? |
9792cfe63b80
added resolve-conflicts and delete-conflicts to help text and fixed crash with unknown cmd options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
218
diff
changeset
|
2031 | // read_changes(dir, db) : local_scan(dir, db); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2032 | CxList *resources = local_scan(dir, db); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2033 | CxMap *resources_map = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, resources->size+16); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2034 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2035 | CxIterator iter = cxListIterator(resources); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2036 | cx_foreach(LocalResource *, local_res, iter) { |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2037 | // ignore all files, that are excluded by a static filter (sync.xml) |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2038 | |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2039 | // static include/exclude filter |
648
fefe4b6f1048
change split config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
646
diff
changeset
|
2040 | if(res_matches_dir_filter(dir, local_res->path+1)) { |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2041 | continue; |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2042 | } |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2043 | // static tag filter |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2044 | if(dir->filter.tags) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2045 | CxIterator tag_iter = cxListIterator(dir->filter.tags); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2046 | cx_foreach(SyncTagFilter *, tf, tag_iter) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2047 | if(!localres_matches_tags(dir, local_res, tf)) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2048 | continue; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2049 | } |
417
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
2050 | } |
f340460a8b5d
disables tagfilter for directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
2051 | } |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2052 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2053 | |
550
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2054 | // we need a fast file lookup map later to detect deleted files |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2055 | cxMapPut(resources_map, cx_hash_key_str(local_res->path), local_res); |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2056 | |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2057 | // dynamic tag filter |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2058 | if(!localres_matches_tags(dir, local_res, tagfilter)) { |
403
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
2059 | if(!remove_file) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2060 | LocalResource *dbres = cxMapGet( |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2061 | db->resources, |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2062 | cx_hash_key_str(local_res->path)); |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2063 | if(dbres) { |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2064 | // this makes sure the file will not be deleted later |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2065 | dbres->keep = TRUE; |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2066 | } |
403
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
2067 | } |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2068 | continue; |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2069 | } |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2070 | |
561
5e6df4f502d3
harmonizes output of push and pull
Mike Becker <universe@uap-core.de>
parents:
560
diff
changeset
|
2071 | // skip conflict backups silently |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2072 | if(res_isconflict(db, local_res)) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2073 | cxListAdd(ls_conflict, local_res); |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2074 | continue; |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2075 | } |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2076 | |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2077 | int is_changed = local_resource_is_changed( |
444
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
2078 | dir, |
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
2079 | db, |
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
2080 | local_res, |
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
2081 | svrres, |
445
c525f049c8b7
renames dav-sync -D option to -R
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
444
diff
changeset
|
2082 | restore_removed, |
444
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
2083 | restore_modified); |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2084 | if(is_changed) { |
585
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2085 | if(local_res->isdirectory) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2086 | cxListAdd(ls_mkcol, local_res); |
585
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2087 | } else if(local_res->isnew) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2088 | cxListAdd(ls_new, local_res); |
550
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2089 | } else { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2090 | cxListAdd(ls_modified, local_res); |
550
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2091 | } |
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
2092 | } else if(local_res->metadata_updated) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2093 | cxListAdd(ls_update, local_res); |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2094 | } |
614
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
2095 | |
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
2096 | if(local_res->isnew) { |
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
2097 | if(local_resource_load_metadata(dir, local_res)) { |
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
2098 | fprintf( |
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
2099 | stderr, |
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
2100 | "Failed to load metadata: %s\n", |
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
2101 | local_resource_path(local_res)); |
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
2102 | } |
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
2103 | } |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2104 | } |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2105 | |
630
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
2106 | if(SYNC_STORE_HASH(dir)) { |
550
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2107 | // calculate hashes of all new files and check if a file |
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2108 | // was moved or is a copy |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2109 | CxMutIterator mut_iter = cxListMutIterator(ls_new); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2110 | cx_foreach(LocalResource *, local, mut_iter) { |
577
f49964cf7228
store link property on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
2111 | if(local->isdirectory || local->link_target) { |
551
99ef8202cd82
add copy/move operation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
2112 | continue; |
99ef8202cd82
add copy/move operation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
2113 | } |
99ef8202cd82
add copy/move operation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
2114 | |
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2115 | char *local_path = util_concat_path(dir->path, local_resource_path(local)); |
550
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2116 | char *hash = util_file_hash(local_path); |
551
99ef8202cd82
add copy/move operation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
2117 | local->hash = hash; |
550
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2118 | // check if a file with this hash already exists |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2119 | LocalResource *origin = cxMapGet(db_hashes, cx_hash_key_str(hash)); |
550
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2120 | if(origin) { |
552
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
2121 | local->origin = local_resource_copy(origin, origin->path); |
550
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2122 | // the file is a copied/moved file |
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2123 | // check if the file is in the resources_map, because then |
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2124 | // it still exists |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2125 | if(cxMapGet(resources_map, cx_hash_key_str(origin->path))) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2126 | cxListAdd(ls_copy, local); |
550
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2127 | } else { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2128 | cxListAdd(ls_move, local); |
550
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2129 | // put file in resources_map to prevent deletion |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2130 | cxMapPut(resources_map, cx_hash_key_str(origin->path), local); |
550
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2131 | } |
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2132 | // remove list elemend from ls_new |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2133 | cxIteratorFlagRemoval(mut_iter); |
550
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2134 | } |
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2135 | |
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2136 | free(local_path); |
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2137 | } |
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2138 | } |
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2139 | |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2140 | // find all deleted files and cleanup the database |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2141 | iter = cxMapIterator(db->resources); |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2142 | LocalResource *local; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2143 | CxList *removed_res = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2144 | cx_foreach(CxMapEntry *, entry, iter) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2145 | LocalResource *local = entry->value; |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2146 | // all filtered files should be removed from the database |
648
fefe4b6f1048
change split config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
646
diff
changeset
|
2147 | if(res_matches_dir_filter(dir, local->path+1)) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2148 | cxMapRemove(db->resources, local->path); |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2149 | continue; |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2150 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2151 | CxIterator tag_iter = cxListIterator(dir->filter.tags); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2152 | cx_foreach(SyncTagFilter *, tf, tag_iter) { |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2153 | if(!localres_matches_tags(dir, local, tf)) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2154 | cxMapRemove(db->resources, local->path); |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2155 | continue; |
58
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
2156 | } |
403
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
2157 | } |
8e1948eebef5
adds tag filters for push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
402
diff
changeset
|
2158 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2159 | if(!cxMapGet(resources_map, *entry->key)) { |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2160 | // The current LocalResource is in the database but doesn't exist |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2161 | // in the filesystem anymore. This means the file was deleted |
550
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
2162 | // and should be deleted on the server |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2163 | if(!archive) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2164 | cxListAdd(ls_delete, local); |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2165 | } else { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2166 | cxListInsert(removed_res, 0, local); |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2167 | } |
57 | 2168 | } |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2169 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2170 | iter = cxListIterator(removed_res); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2171 | cx_foreach(LocalResource *, local, iter) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2172 | cxMapRemove(db->resources, local->path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2173 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2174 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2175 | cxListSort(ls_new); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2176 | cxListSort(ls_modified); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2177 | cxListSort(ls_conflict); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2178 | cxListSort(ls_update); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2179 | cxListSort(ls_delete); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2180 | cxListSort(ls_move); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2181 | cxListSort(ls_copy); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2182 | cxListSort(ls_mkcol); |
724
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2183 | |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2184 | if(outgoing) { |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2185 | print_outgoing( |
724
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2186 | a, |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2187 | ls_new, |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2188 | ls_modified, |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2189 | ls_conflict, |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2190 | ls_update, |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2191 | ls_delete, |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2192 | ls_move, |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2193 | ls_copy, |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2194 | ls_mkcol); |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2195 | return 0; |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2196 | } |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2197 | |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2198 | // |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2199 | // BEGIN PUSH |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2200 | // |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2201 | |
568
a81cad6bb377
fix push operation order (move before put)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
2202 | int ret = 0; |
a81cad6bb377
fix push operation order (move before put)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
2203 | int error = 0; |
a81cad6bb377
fix push operation order (move before put)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
2204 | |
585
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2205 | // create collections |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2206 | iter = cxListIterator(ls_mkcol); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2207 | cx_foreach(LocalResource *, local_res, iter) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2208 | if(sync_shutdown) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2209 | break; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2210 | } |
585
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2211 | |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2212 | DavResource *res = dav_resource_new(sn, local_res->path); |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2213 | if(!res) { |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2214 | print_resource_error(sn, local_res->path); |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2215 | ret = -1; |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2216 | sync_error++; |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2217 | } |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2218 | |
613
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
2219 | int abort = 0; |
585
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2220 | |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2221 | dav_exists(res); |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2222 | if(sn->error == DAV_NOT_FOUND) { |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2223 | // create collection |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2224 | // TODO: show 405 |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2225 | printf("mkcol: %s\n", local_res->path); |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2226 | if(sync_mkdir(dir, res, local_res) && sn->error != DAV_METHOD_NOT_ALLOWED) { |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2227 | print_resource_error(sn, res->path); |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2228 | ret = -1; |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2229 | sync_error++; |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2230 | error = 1; |
613
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
2231 | abort = 1; |
585
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2232 | } |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2233 | } else if(sn->error != DAV_OK) { |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2234 | // dav_exists() failed |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2235 | print_resource_error(sn, local_res->path); |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2236 | ret = -1; |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2237 | sync_error++; |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2238 | error = 1; |
613
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
2239 | abort = 1; |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
2240 | } |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
2241 | |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
2242 | if(!abort) { |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
2243 | // success |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
2244 | if(local_res->metadata_updated) { |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
2245 | sync_update_metadata(dir, sn, res, local_res); |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
2246 | } |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
2247 | |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
2248 | // remove old db entry (if it exists) |
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
2249 | // and add add new entry |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2250 | // TODO: free?? |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2251 | LocalResource *dbres = cxMapGet(db->resources, cx_hash_key_str(local_res->path)); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2252 | cxMapPut(db->resources, cx_hash_key_str(local_res->path), local_res); |
585
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2253 | } |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2254 | |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2255 | dav_resource_free(res); |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2256 | } |
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2257 | |
568
a81cad6bb377
fix push operation order (move before put)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
2258 | // copy/move files |
a81cad6bb377
fix push operation order (move before put)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
2259 | DavBool copy = TRUE; |
a81cad6bb377
fix push operation order (move before put)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
2260 | if(!ls_copy) { |
a81cad6bb377
fix push operation order (move before put)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
2261 | copy = FALSE; |
a81cad6bb377
fix push operation order (move before put)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
2262 | ls_copy = ls_move; |
a81cad6bb377
fix push operation order (move before put)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
2263 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2264 | iter = cxListIterator(ls_copy); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2265 | for(int i=0;i<2;i++) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2266 | cx_foreach(LocalResource*, local, iter) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2267 | if(sync_shutdown) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2268 | break; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2269 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2270 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2271 | int err = 0; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2272 | DavResource *res = dav_resource_new(sn, local->path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2273 | if(dav_exists(res)) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2274 | printf("conflict: %s\n", local->path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2275 | local->last_modified = 0; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2276 | nullfree(local->etag); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2277 | local->etag = NULL; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2278 | nullfree(local->hash); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2279 | local->hash = NULL; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2280 | local->skipped = TRUE; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2281 | sync_conflict++; |
568
a81cad6bb377
fix push operation order (move before put)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
2282 | } else { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2283 | DavResource *origin_res = dav_resource_new(sn, local->origin->path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2284 | int origin_changed = remote_resource_is_changed( |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2285 | sn, |
568
a81cad6bb377
fix push operation order (move before put)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
2286 | dir, |
569
cafdc13b6820
remove dead db entry when files are moved
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
568
diff
changeset
|
2287 | db, |
568
a81cad6bb377
fix push operation order (move before put)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
2288 | origin_res, |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2289 | local->origin, |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2290 | NULL); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2291 | if(origin_changed) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2292 | // upload with put |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2293 | cxListInsert(ls_modified, 0, local); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2294 | } else { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2295 | printf("%s: %s -> %s\n", copy ? "copy":"move", local->origin->path, local->path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2296 | err = sync_move_remote_resource( |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2297 | dir, |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2298 | db, |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2299 | origin_res, |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2300 | local, |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2301 | copy, |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2302 | &sync_success); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2303 | } |
568
a81cad6bb377
fix push operation order (move before put)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
2304 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2305 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2306 | if(err) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2307 | sync_error++; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2308 | print_resource_error(sn, res->path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2309 | ret = -1; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2310 | error = 1; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2311 | } else { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2312 | LocalResource *dbres = cxMapGet(db->resources, cx_hash_key_str(local->path)); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2313 | cxMapPut(db->resources, cx_hash_key_str(local->path), local); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2314 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2315 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2316 | copy = FALSE; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2317 | iter = cxListIterator(ls_move); |
568
a81cad6bb377
fix push operation order (move before put)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
2318 | } |
a81cad6bb377
fix push operation order (move before put)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
2319 | |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2320 | // upload changed files |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2321 | //ls_modified = ucx_list_concat(ls_new, ls_modified); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2322 | iter = cxListIterator(ls_new); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2323 | for(int i=0;i<2;i++) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2324 | cx_foreach(LocalResource*, local_res, iter) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2325 | if(sync_shutdown) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2326 | break; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2327 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2328 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2329 | int err = 0; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2330 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2331 | DavResource *res = dav_resource_new(sn, local_res->path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2332 | if(!res) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2333 | print_resource_error(sn, local_res->path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2334 | ret = -1; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2335 | sync_error++; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2336 | } else { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2337 | DavBool equal = FALSE; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2338 | DavBool res_conflict = FALSE; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2339 | int changed = remote_resource_is_changed(sn, dir, db, res, local_res, &equal); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2340 | if(equal) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2341 | char *etag = dav_get_string_property(res, "D:getetag"); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2342 | if(local_res->metadata_updated) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2343 | cxListInsert(ls_update, 0, local_res); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2344 | } else if(etag) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2345 | // update etag in db |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2346 | if(local_res->etag) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2347 | free(local_res->etag); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2348 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2349 | local_res->etag = strdup(etag); |
650
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
2350 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2351 | } else if(cdt && changed) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2352 | printf("conflict: %s\n", local_res->path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2353 | local_res->last_modified = 0; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2354 | nullfree(local_res->etag); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2355 | local_res->etag = NULL; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2356 | nullfree(local_res->hash); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2357 | local_res->hash = NULL; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2358 | local_res->skipped = TRUE; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2359 | sync_conflict++; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2360 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2361 | if(local_res->link_target) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2362 | free(local_res->link_target); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2363 | local_res->link_target = local_res->link_target_db; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2364 | local_res->link_target_db = NULL; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2365 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2366 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2367 | res_conflict = TRUE; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2368 | } else { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2369 | if(local_res->link_target) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2370 | printf( |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2371 | "link: %s -> %s\n", |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2372 | local_res->path, |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2373 | local_res->link_target); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2374 | } else { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2375 | printf("put: %s\n", local_res->path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2376 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2377 | if(sync_put_resource(dir, res, local_res, &sync_success)) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2378 | sync_error++; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2379 | print_resource_error(sn, res->path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2380 | ret = -1; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2381 | error = 1; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2382 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2383 | err = 1; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2384 | } |
639
928a77ebe0b9
fix that file uploads are tried, when the content on the server is equal to the local file content (with enabled hashing)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
2385 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2386 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2387 | if(!err) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2388 | LocalResource *dbres = cxMapRemoveAndGet(db->resources, cx_hash_key_str(local_res->path)); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2389 | // in case of a conflict, don't store the resource |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2390 | // in the db, if it is new |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2391 | if(!res_conflict || dbres) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2392 | cxMapPut(db->resources, cx_hash_key_str(local_res->path), local_res); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2393 | } |
603
8e7e072c18c1
fix that db entries are updated on errors
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
599
diff
changeset
|
2394 | } |
585
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2395 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2396 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2397 | dav_resource_free(res); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2398 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2399 | iter = cxListIterator(ls_modified); |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2400 | } |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2401 | |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2402 | // metadata updates |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2403 | iter = cxListIterator(ls_update); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2404 | cx_foreach(LocalResource *, local_res, iter) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2405 | if(sync_shutdown) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2406 | break; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2407 | } |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2408 | |
533
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
2409 | DavResource *res = dav_resource_new(sn, local_res->path); |
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
2410 | if(local_res->metadata_updated) { |
585
41368a355222
create collections before doing other stuff on dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
2411 | printf("update: %s\n", local_res->path); |
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
2412 | if(!sync_update_metadata(dir, sn, res, local_res)) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2413 | LocalResource *dbres = cxMapGet(db->resources, cx_hash_key_str(local_res->path)); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2414 | cxMapPut(db->resources, cx_hash_key_str(local_res->path), local_res); |
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
2415 | } |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2416 | } |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2417 | } |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2418 | |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2419 | // delete all removed files |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2420 | cxListSort(ls_delete); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2421 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2422 | CxList *cols = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2423 | CxList *col_list = cols; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2424 | CxList *deletelist = ls_delete; |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2425 | for(int i=0;i<2;i++) { |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2426 | // the first iteration deletes everything from ls_delete except |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2427 | // all collections, which are stored in cols |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2428 | // in the second run all collections will be deleted |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2429 | iter = cxListIterator(deletelist); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2430 | cx_foreach(LocalResource *, local, iter) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2431 | if(sync_shutdown) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2432 | break; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2433 | } |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2434 | if(local->keep) { |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2435 | continue; |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2436 | } |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2437 | if(sync_delete_remote_resource(dir, sn, local, &sync_delete, col_list)) { |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2438 | if(sn->error != DAV_NOT_FOUND) { |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2439 | print_resource_error(sn, local->path); |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2440 | sync_error++; |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2441 | break; |
460
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
2442 | } |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2443 | } else { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2444 | LocalResource *dbres = cxMapRemoveAndGet(db->resources, cx_hash_key_str(local->path)); |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2445 | //local_resource_free(dbres); |
460
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
2446 | } |
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
2447 | } |
501
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2448 | deletelist = cols; |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2449 | col_list = NULL; |
868da3f76267
dav-sync push refactoring: create list of changes before executing sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
497
diff
changeset
|
2450 | } |
51
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
2451 | |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
2452 | // unlock repository |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
2453 | if(locked) { |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
2454 | if(dav_unlock(root)) { |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
2455 | print_resource_error(sn, "/"); |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
2456 | ret = -1; |
296
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
2457 | } else { |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
2458 | locked = FALSE; |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
2459 | } |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
2460 | } |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
2461 | |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2462 | // store db |
521
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
516
diff
changeset
|
2463 | if(store_db(db, dir->database, dir->db_settings)) { |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2464 | fprintf(stderr, "Cannot store sync db\n"); |
223
cbbdf207e67e
fixed some bugs in dav_create() and dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
2465 | ret = -2; |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2466 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2467 | |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
2468 | // cleanup |
296
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
2469 | if(!locked && locktokenfile) { |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
2470 | remove(locktokenfile); |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
2471 | } |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
2472 | |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
2473 | dav_session_destroy(sn); |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
2474 | |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
2475 | // Report |
223
cbbdf207e67e
fixed some bugs in dav_create() and dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
2476 | if(ret != -2) { |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
2477 | char *str_success = sync_success == 1 ? "file" : "files"; |
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
2478 | char *str_delete = sync_delete == 1 ? "file" : "files"; |
561
5e6df4f502d3
harmonizes output of push and pull
Mike Becker <universe@uap-core.de>
parents:
560
diff
changeset
|
2479 | char *str_conflict = sync_conflict == 1 ? "conflict" : "conflicts"; |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
2480 | char *str_error = sync_error == 1 ? "error" : "errors"; |
299
c517502d3e38
adds dav-sync archive command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
2481 | |
c517502d3e38
adds dav-sync archive command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
2482 | printf("Result: %d %s pushed, ", sync_success, str_success); |
c517502d3e38
adds dav-sync archive command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
2483 | if(!archive) { |
c517502d3e38
adds dav-sync archive command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
2484 | printf("%d %s deleted, ", sync_delete, str_delete); |
c517502d3e38
adds dav-sync archive command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
296
diff
changeset
|
2485 | } |
561
5e6df4f502d3
harmonizes output of push and pull
Mike Becker <universe@uap-core.de>
parents:
560
diff
changeset
|
2486 | printf("%d %s, %d %s\n", |
5e6df4f502d3
harmonizes output of push and pull
Mike Becker <universe@uap-core.de>
parents:
560
diff
changeset
|
2487 | sync_conflict, str_conflict, sync_error, str_error); |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
2488 | } |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
2489 | |
221
e22c29b7ee2f
using locks in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
220
diff
changeset
|
2490 | return ret; |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2491 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2492 | |
490
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2493 | static int localres_cmp_path(LocalResource *a, LocalResource *b, void *n) { |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2494 | return strcmp(a->path, b->path); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2495 | } |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2496 | |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2497 | int cmd_restore(CmdArgs *a) { |
527
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2498 | char *syncdir = cmd_getoption(a, "syncdir"); |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2499 | |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2500 | if(!syncdir && a->argc == 0) { |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2501 | fprintf(stderr, "No syncdir or files specified\n"); |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2502 | return -1; |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2503 | } |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2504 | |
533
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
2505 | char *version = cmd_getoption(a, "version"); |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
2506 | if(version) { |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
2507 | if(a->argc != 1) { |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
2508 | fprintf(stderr, "If the -V option is enabled, only one file can be specified\n"); |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
2509 | return -1; |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
2510 | } |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
2511 | } |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
2512 | |
527
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2513 | SyncDirectory *dir = NULL; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2514 | CxMap *files = NULL; |
527
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2515 | if(syncdir) { |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2516 | dir = scfg_get_dir(syncdir); |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2517 | } |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2518 | |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2519 | LocalResource nres; |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2520 | if(a->argc > 0) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2521 | files = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, a->argc+8); |
527
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2522 | // get all specified files and check the syncdir |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2523 | SyncDirectory *sd = NULL; |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2524 | for(int i=0;i<a->argc;i++) { |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2525 | SyncFile f; |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2526 | int err = sync_get_file(a, a->argv[i], &f, FALSE); |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2527 | if(err) { |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2528 | sync_print_get_file_err(a->argv[i], err); |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2529 | return 1; |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2530 | } |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2531 | if(!sd) { |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2532 | sd = f.dir; |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2533 | } else { |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2534 | if(f.dir != sd) { |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2535 | fprintf(stderr, "Not all files are in the same syncdir\n"); |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2536 | return 1; |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2537 | } |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2538 | } |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2539 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2540 | cxMapPut(files, cx_hash_key_str(f.path), &nres); |
527
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2541 | } |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2542 | dir = sd; |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2543 | } |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2544 | |
490
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2545 | if(!dir) { |
527
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2546 | fprintf(stderr, "Unknown sync dir: %s\n", syncdir); |
490
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2547 | return -1; |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2548 | } |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2549 | if(scfg_check_dir(dir)) { |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2550 | return -1; |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2551 | } |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2552 | |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2553 | if((dir->allow_cmd & SYNC_CMD_RESTORE) != SYNC_CMD_RESTORE) { |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2554 | fprintf(stderr, "Command ''restore'' is not allowed for this sync dir\n"); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2555 | print_allowed_cmds(dir); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2556 | return -1; |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2557 | } |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2558 | |
528
4c9c8c017d52
adds -R and -M option to restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
527
diff
changeset
|
2559 | DavBool restore_modified = cmd_getoption(a, "restore-modified") ? 1 : 0; |
4c9c8c017d52
adds -R and -M option to restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
527
diff
changeset
|
2560 | DavBool restore_removed = cmd_getoption(a, "restore-removed") ? 1 : 0; |
4c9c8c017d52
adds -R and -M option to restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
527
diff
changeset
|
2561 | if(!restore_modified && !restore_removed) { |
4c9c8c017d52
adds -R and -M option to restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
527
diff
changeset
|
2562 | restore_modified = 1; |
4c9c8c017d52
adds -R and -M option to restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
527
diff
changeset
|
2563 | restore_removed = 1; |
4c9c8c017d52
adds -R and -M option to restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
527
diff
changeset
|
2564 | } |
4c9c8c017d52
adds -R and -M option to restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
527
diff
changeset
|
2565 | |
490
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2566 | SyncDatabase *db = load_db(dir->database); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2567 | if(!db) { |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2568 | fprintf(stderr, "Cannot load database file: %s\n", dir->database); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2569 | return -1; |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2570 | } |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2571 | remove_deleted_conflicts(dir, db); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2572 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2573 | CxList *modified = cxLinkedListCreate(cxDefaultAllocator, (cx_compare_func)localres_cmp_path, CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2574 | CxList *deleted = cxLinkedListCreate(cxDefaultAllocator, (cx_compare_func)localres_cmp_path, CX_STORE_POINTERS); |
490
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2575 | |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2576 | // iterate over all db resources and check if any resource is |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2577 | // modified or deleted |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2578 | CxIterator i = cxMapIterator(files ? files : db->resources); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2579 | cx_foreach(CxMapEntry *, entry, i) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2580 | LocalResource *resource = entry->value; |
527
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2581 | if(resource == &nres) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2582 | resource = cxMapGet(db->resources, *entry->key); |
532
aeda47714978
fixes dav_copy_node and improves dav-sync restore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
2583 | if(!resource) { |
aeda47714978
fixes dav_copy_node and improves dav-sync restore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
2584 | continue; |
aeda47714978
fixes dav_copy_node and improves dav-sync restore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
2585 | } |
527
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2586 | } |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2587 | |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
2588 | char *file_path = create_local_path(dir, resource->path); |
490
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2589 | SYS_STAT s; |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2590 | if(sys_stat(file_path, &s)) { |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2591 | if(errno == ENOENT) { |
528
4c9c8c017d52
adds -R and -M option to restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
527
diff
changeset
|
2592 | if(restore_removed) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2593 | cxListAdd(deleted, resource); |
528
4c9c8c017d52
adds -R and -M option to restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
527
diff
changeset
|
2594 | } |
490
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2595 | } else { |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2596 | fprintf(stderr, "Cannot stat file: %s\n", file_path); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2597 | perror(""); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2598 | } |
532
aeda47714978
fixes dav_copy_node and improves dav-sync restore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
2599 | } else { |
aeda47714978
fixes dav_copy_node and improves dav-sync restore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
2600 | if(files) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2601 | cxListAdd(modified, resource); |
532
aeda47714978
fixes dav_copy_node and improves dav-sync restore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
2602 | } else if(!resource->isdirectory && !S_ISDIR(s.st_mode)) { |
aeda47714978
fixes dav_copy_node and improves dav-sync restore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
2603 | if(resource->last_modified != s.st_mtime || resource->size != s.st_size) { |
aeda47714978
fixes dav_copy_node and improves dav-sync restore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
2604 | if(restore_modified) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2605 | cxListAdd(modified, resource); |
532
aeda47714978
fixes dav_copy_node and improves dav-sync restore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
2606 | } |
528
4c9c8c017d52
adds -R and -M option to restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
527
diff
changeset
|
2607 | } |
490
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2608 | } |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2609 | } |
527
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2610 | |
490
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2611 | free(file_path); |
527
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2612 | } |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2613 | |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
2614 | if(files) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2615 | cxMapDestroy(files); |
490
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2616 | } |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2617 | |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2618 | int ret = 0; |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2619 | |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2620 | // create DavSession |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2621 | Repository *repo = get_repository(cx_str(dir->repository)); |
490
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2622 | if(!repo) { |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2623 | fprintf(stderr, "Unkown repository %s\n", dir->name); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2624 | return -1; |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2625 | } |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
725
diff
changeset
|
2626 | DavSession *sn = create_session(a, ctx, repo, dir->collection); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2627 | util_regdestr(sn->mp, db, (cx_destructor_func)destroy_db); |
490
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2628 | if (cmd_getoption(a, "verbose")) { |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2629 | curl_easy_setopt(sn->handle, CURLOPT_VERBOSE, 1L); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2630 | curl_easy_setopt(sn->handle, CURLOPT_STDERR, stderr); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2631 | } |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2632 | |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2633 | // lock repository |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2634 | char *locktokenfile = NULL; |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2635 | DavBool locked = FALSE; |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2636 | DavResource *root = dav_resource_new(sn, "/"); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2637 | root->iscollection = TRUE; |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2638 | if((dir->lockpush || cmd_getoption(a, "lock")) && !cmd_getoption(a, "nolock")) { |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2639 | if(dav_lock_t(root, dir->lock_timeout)) { |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2640 | print_resource_error(sn, "/"); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2641 | dav_session_destroy(sn); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2642 | fprintf(stderr, "Abort\n"); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2643 | return -1; |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2644 | } |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2645 | DavLock *lock = dav_get_lock(sn, "/"); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2646 | if(lock) { |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2647 | printf("Lock-Token: %s\n", lock->token); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2648 | } |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2649 | locked = TRUE; |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2650 | locktokenfile = create_locktoken_file(dir->name, lock->token); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2651 | } |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2652 | |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2653 | int sync_success = 0; |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2654 | int sync_error = 0; |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2655 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2656 | // TODO: old code sorted both modified and deleted, is this necessary? |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2657 | //UcxList *resources = ucx_list_concat(modified, deleted); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2658 | //resources = ucx_list_sort(resources, (cmp_func)localres_cmp_path, NULL); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2659 | cxListSort(deleted); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2660 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2661 | CxIterator iter = cxListIterator(modified); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2662 | for(int i=0;i<2;i++) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2663 | cx_foreach(LocalResource *, resource, iter) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2664 | DavResource *res = dav_get(sn, resource->path, "D:getetag,idav:status,idav:version-collection,idav:split,`idav:content-hash`,idavprops:tags,idavprops:finfo,idavprops:xattributes,idavprops:link"); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2665 | if(!res) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2666 | printf("skip: %s\n", resource->path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2667 | continue; |
533
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
2668 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2669 | char *status = dav_get_string_property(res, "idav:status"); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2670 | if(status && !strcmp(status, "broken")) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2671 | fprintf(stderr, "Resource %s broken\n", res->path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2672 | continue; |
533
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
2673 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2674 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2675 | DavResource *vres = NULL; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2676 | DavBool update_local_entry = TRUE; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2677 | if(version) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2678 | if(dir->versioning->type == VERSIONING_SIMPLE) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2679 | vres = versioning_simple_find(res, version); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2680 | } else if(dir->versioning->type == VERSIONING_DELTAV) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2681 | vres = versioning_deltav_find(res, version); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2682 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2683 | if(!vres) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2684 | fprintf(stderr, "Cannot find specified version for resource %s\n", res->path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2685 | ret = 1; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2686 | break; |
532
aeda47714978
fixes dav_copy_node and improves dav-sync restore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
2687 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2688 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2689 | // By restoring an old version of a file, the local dir is not |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2690 | // in sync with the server anymore. Mark this file to change |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2691 | // the metadata later, to make sure, the file will be detected |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2692 | // as locally modified, on the next push/pull |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2693 | update_local_entry = FALSE; |
532
aeda47714978
fixes dav_copy_node and improves dav-sync restore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
2694 | } else { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2695 | vres = res; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2696 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2697 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2698 | // download the resource |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2699 | if(!sync_shutdown) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2700 | if(resource->isdirectory) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2701 | char *local_path = create_local_path(dir, res->path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2702 | if(sys_mkdir(local_path) && errno != EEXIST) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2703 | fprintf(stderr, |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2704 | "Cannot create directory %s: %s", |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2705 | local_path, strerror(errno)); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2706 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2707 | free(local_path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2708 | } else { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2709 | if(sync_get_resource(a, dir, res->path, vres, db, update_local_entry, &sync_success)) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2710 | fprintf(stderr, "sync_get_resource failed for resource: %s\n", res->path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2711 | sync_error++; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2712 | } else if(!update_local_entry) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2713 | LocalResource *lr = cxMapGet(db->resources, cx_hash_key_str(res->path)); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2714 | if(lr) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2715 | lr->last_modified = 0; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2716 | nullfree(lr->hash); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2717 | lr->hash = NULL; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2718 | } // else should not happen |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2719 | } |
532
aeda47714978
fixes dav_copy_node and improves dav-sync restore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
2720 | } |
aeda47714978
fixes dav_copy_node and improves dav-sync restore
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
531
diff
changeset
|
2721 | } |
490
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2722 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2723 | iter = cxListIterator(deleted); |
490
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2724 | } |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2725 | |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2726 | // unlock repository |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2727 | if(locked) { |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2728 | if(dav_unlock(root)) { |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2729 | print_resource_error(sn, "/"); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2730 | ret = -1; |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2731 | } else { |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2732 | locked = FALSE; |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2733 | } |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2734 | } |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2735 | |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2736 | // store db |
521
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
516
diff
changeset
|
2737 | if(store_db(db, dir->database, dir->db_settings)) { |
490
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2738 | fprintf(stderr, "Cannot store sync db\n"); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2739 | ret = -2; |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2740 | } |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2741 | |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2742 | // cleanup |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2743 | dav_session_destroy(sn); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2744 | |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2745 | if(!locked && locktokenfile) { |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2746 | remove(locktokenfile); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2747 | } |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2748 | |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2749 | // Report |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2750 | if(ret != -2) { |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2751 | char *str_success = sync_success == 1 ? "file" : "files"; |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2752 | char *str_error = sync_error == 1 ? "error" : "errors"; |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2753 | printf("Result: %d %s pulled, %d %s\n", |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2754 | sync_success, str_success, |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2755 | sync_error, str_error); |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2756 | } |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2757 | |
533
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
2758 | return ret; |
490
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2759 | } |
d94c4fd35c21
adds dav-sync restore command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
479
diff
changeset
|
2760 | |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2761 | static void print_outgoging_file(LocalResource *res) { |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2762 | char *lastmodified = util_date_str(res->last_modified); |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2763 | char *size = util_size_str(FALSE, res->size); |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2764 | printf(" %-49s %12s %10s\n", res->path+1, lastmodified, size); |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2765 | free(lastmodified); |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2766 | free(size); |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2767 | } |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2768 | |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2769 | void print_outgoing( |
724
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2770 | CmdArgs *args, |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2771 | CxList *ls_new, |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2772 | CxList *ls_modified, |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2773 | CxList *ls_conflict, |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2774 | CxList *ls_update, |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2775 | CxList *ls_delete, |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2776 | CxList *ls_move, |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2777 | CxList *ls_copy, |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2778 | CxList *ls_mkcol) |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2779 | { |
724
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2780 | int64_t total_size = 0; |
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2781 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2782 | size_t len_new = ls_new->size; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2783 | size_t len_mod = ls_modified->size; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2784 | size_t len_cnf = ls_conflict->size; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2785 | size_t len_upd = ls_update->size; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2786 | size_t len_del = ls_delete->size; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2787 | size_t len_mov = ls_move->size; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2788 | size_t len_cpy = ls_copy->size; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2789 | size_t len_mkc = ls_mkcol->size; |
724
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2790 | |
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2791 | size_t total = len_new + len_mod + len_cnf + len_upd + len_del + len_mov + len_cpy + len_mkc; |
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2792 | if(total == 0) { |
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2793 | printf("no changes\n"); |
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2794 | return; |
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2795 | } |
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2796 | |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2797 | printf("%s\n", "File Last Modified Size"); |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2798 | printf("%s\n", "=============================================================================="); |
724
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2799 | |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2800 | if(ls_mkcol) { |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2801 | printf("Directories:\n"); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2802 | CxIterator i = cxListIterator(ls_mkcol); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2803 | cx_foreach(LocalResource *, res, i) { |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2804 | printf(" %-49s\n", res->path+1); |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2805 | total_size += res->size; |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2806 | } |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2807 | } |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2808 | if(ls_new) { |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2809 | printf("New:\n"); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2810 | CxIterator i = cxListIterator(ls_new); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2811 | cx_foreach(LocalResource *, res, i) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2812 | print_outgoging_file(res); |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2813 | total_size += res->size; |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2814 | } |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2815 | } |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2816 | if(ls_modified) { |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2817 | printf("Modified:\n"); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2818 | CxIterator i = cxListIterator(ls_modified); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2819 | cx_foreach(LocalResource *, res, i) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2820 | print_outgoging_file(res); |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2821 | total_size += res->size; |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2822 | } |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2823 | } |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2824 | if(ls_update) { |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2825 | printf("Update:\n"); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2826 | CxIterator i = cxListIterator(ls_update); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2827 | cx_foreach(LocalResource *, res, i) { |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2828 | char *lastmodified = util_date_str(res->last_modified); |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2829 | printf(" %-49s %12s\n", res->path+1, lastmodified); |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2830 | free(lastmodified); |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2831 | } |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2832 | } |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2833 | if(ls_delete) { |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2834 | printf("Delete:\n"); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2835 | CxIterator i = cxListIterator(ls_delete); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2836 | cx_foreach(LocalResource *, res, i) { |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2837 | printf(" %s\n", res->path+1); |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2838 | } |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2839 | } |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2840 | if(ls_copy) { |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2841 | printf("Copy:\n"); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2842 | CxIterator i = cxListIterator(ls_copy); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2843 | cx_foreach(LocalResource *, res, i) { |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2844 | printf("%s -> %s\n", res->origin->path+1, res->path); |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2845 | } |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2846 | } |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2847 | if(ls_move) { |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2848 | printf("Move:\n"); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2849 | CxIterator i = cxListIterator(ls_move); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2850 | cx_foreach(LocalResource *, res, i) { |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2851 | printf("%s -> %s\n", res->origin->path+1, res->path); |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2852 | } |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2853 | } |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2854 | if(ls_conflict) { |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2855 | printf("Conflict\n"); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2856 | CxIterator i = cxListIterator(ls_conflict); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2857 | cx_foreach(LocalResource *, res, i) { |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2858 | printf(" %s\n", res->path+1); |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2859 | } |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2860 | } |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2861 | |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2862 | char *total_size_str = util_size_str(FALSE, total_size); |
724
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2863 | |
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2864 | printf("\n"); |
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2865 | if(len_new > 0) printf("new: %zu, ", len_new); |
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2866 | if(len_mod > 0) printf("modified: %zu, ", len_mod); |
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2867 | if(len_upd > 0) printf("updated: %zu, ", len_upd); |
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2868 | if(len_cpy > 0) printf("copied: %zu, ", len_cpy); |
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2869 | if(len_mov > 0) printf("moved: %zu, ", len_mov); |
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2870 | if(len_del > 0) printf("deleted: %zu, ", len_del); |
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2871 | if(len_cnf > 0) printf("conflicts: %zu, ", len_cnf); |
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2872 | printf("total size: %s\n", total_size_str); |
9c2f0072abed
sort files in outgoing cmd
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
723
diff
changeset
|
2873 | |
723
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2874 | free(total_size_str); |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2875 | } |
5ca174b3247a
add dav-sync outgoing command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
702
diff
changeset
|
2876 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2877 | CxList* local_scan(SyncDirectory *dir, SyncDatabase *db) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2878 | CxList *resources = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2879 | |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2880 | char *path = strdup("/"); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2881 | CxList *stack = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2882 | cxListInsert(stack, 0, path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2883 | while(stack->size > 0) { |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2884 | // get a directory path from the stack and read all entries |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2885 | // if an entry is a directory, put it on the stack |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2886 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2887 | char *p = cxListAt(stack, 0); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2888 | cxListRemove(stack, 0); |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
2889 | char *local_path = create_local_path(dir, p); |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
2890 | SYS_DIR local_dir = sys_opendir(local_path); |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2891 | |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2892 | if(!local_dir) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2893 | fprintf(stderr, "Cannot open directory %s\n", local_path); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2894 | } else { |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
2895 | SysDirEnt *ent; |
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
2896 | while((ent = sys_readdir(local_dir)) != NULL) { |
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
2897 | if(!strcmp(ent->name, ".") || !strcmp(ent->name, "..")) { |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2898 | continue; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2899 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2900 | |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
2901 | char *new_path = util_concat_path(p, ent->name); |
629
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
2902 | DavBool free_new_path = TRUE; |
573
b8f798d240ab
change local_resource_new signature
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
570
diff
changeset
|
2903 | LocalResource *res = local_resource_new(dir, db, new_path); |
629
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
2904 | if(res) { |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
2905 | if(res->isdirectory) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2906 | cxListAdd(resources, res); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2907 | cxListInsert(stack, 0, new_path); |
629
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
2908 | free_new_path = FALSE; |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
2909 | } else { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
2910 | cxListAdd(resources, res); |
629
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
2911 | } |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
2912 | } |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
2913 | if(free_new_path) { |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
2914 | free(new_path); |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2915 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2916 | } |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
2917 | sys_closedir(local_dir); |
55
4cb389452a44
replaced readdir_r with readdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
2918 | |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2919 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2920 | free(local_path); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2921 | free(p); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2922 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2923 | |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2924 | return resources; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2925 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
2926 | |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
2927 | |
573
b8f798d240ab
change local_resource_new signature
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
570
diff
changeset
|
2928 | LocalResource* local_resource_new(SyncDirectory *dir, SyncDatabase *db, char *path) { |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
2929 | char *file_path = create_local_path(dir, path); |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
2930 | SYS_STAT s; |
574
c36eddf167a8
read link on LocalResource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
573
diff
changeset
|
2931 | if(sys_lstat(file_path, &s)) { |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
2932 | fprintf(stderr, "Cannot stat file %s\n", file_path); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
2933 | free(file_path); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
2934 | return NULL; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
2935 | } |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
2936 | |
574
c36eddf167a8
read link on LocalResource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
573
diff
changeset
|
2937 | LocalResource *res = calloc(1, sizeof(LocalResource)); |
c36eddf167a8
read link on LocalResource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
573
diff
changeset
|
2938 | res->mode = s.st_mode & 07777; |
c36eddf167a8
read link on LocalResource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
573
diff
changeset
|
2939 | res->uid = s.st_uid; |
c36eddf167a8
read link on LocalResource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
573
diff
changeset
|
2940 | res->gid = s.st_gid; |
c36eddf167a8
read link on LocalResource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
573
diff
changeset
|
2941 | res->last_modified = s.st_mtime; |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
2942 | if(!S_ISDIR(s.st_mode)) { |
64
112dbf7ba8b0
changed sync behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
2943 | res->path = strdup(path); |
112dbf7ba8b0
changed sync behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
2944 | res->size = s.st_size; |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
2945 | } else { |
190
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
2946 | res->path = util_concat_path(path, "/"); |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
2947 | res->isdirectory = 1; |
574
c36eddf167a8
read link on LocalResource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
573
diff
changeset
|
2948 | } |
c36eddf167a8
read link on LocalResource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
573
diff
changeset
|
2949 | |
629
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
2950 | int skip_file = 0; |
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2951 | if(SYS_ISLINK(file_path, s)) { |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2952 | char *lnkbuf = sys_readlink(file_path, &s); |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2953 | #ifdef SYS_LINK_EXT |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2954 | // on Windows, we interpret .lnk files as links |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2955 | // we dont want resource names with this extension |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2956 | // and possibly sync this to other operating systems |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2957 | // therefore we remove the .lnk extension from the file name |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2958 | // change res->path |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2959 | // we only do this, if there isn't any other file with this name |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2960 | sstr_t fpath = sstr(file_path); |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2961 | sstr_t rpath = sstr(path); |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2962 | // remove last 4 chars (.lnk) |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2963 | sstr_t new_file_path = sstrdup(sstrsubsl(fpath, 0 , fpath.length-4)); |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2964 | // check if a file with this name exists |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2965 | SYS_STAT nfp_s; |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2966 | if(!sys_stat(new_file_path.ptr, &nfp_s)) { |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2967 | // we can't upload the link without the file extension, because |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2968 | // there is another file with this name |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2969 | free(lnkbuf); |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2970 | lnkbuf = NULL; |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2971 | } else { |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2972 | sstr_t new_path = sstrdup(sstrsubsl(rpath, 0, rpath.length-4)); |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2973 | res->local_path = res->path; |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2974 | res->path = new_path.ptr; // remove .lnk ext from resource path |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2975 | } |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2976 | free(new_file_path.ptr); |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2977 | #endif |
574
c36eddf167a8
read link on LocalResource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
573
diff
changeset
|
2978 | |
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2979 | if(lnkbuf) { |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2980 | // readlink successful |
576
62cc92445234
store relative link in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
574
diff
changeset
|
2981 | char *normalized = NULL; |
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2982 | if(!util_path_isabsolut(lnkbuf)) { |
576
62cc92445234
store relative link in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
574
diff
changeset
|
2983 | char *link_parent = util_parent_path(res->path); |
62cc92445234
store relative link in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
574
diff
changeset
|
2984 | char *abs_link_parent = util_concat_path(dir->path, link_parent); |
62cc92445234
store relative link in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
574
diff
changeset
|
2985 | char *link = util_concat_path(abs_link_parent, lnkbuf); |
62cc92445234
store relative link in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
574
diff
changeset
|
2986 | normalized = util_path_normalize(link); |
62cc92445234
store relative link in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
574
diff
changeset
|
2987 | free(abs_link_parent); |
62cc92445234
store relative link in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
574
diff
changeset
|
2988 | free(link_parent); |
62cc92445234
store relative link in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
574
diff
changeset
|
2989 | free(link); |
62cc92445234
store relative link in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
574
diff
changeset
|
2990 | } else { |
62cc92445234
store relative link in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
574
diff
changeset
|
2991 | normalized = util_path_normalize(lnkbuf); |
62cc92445234
store relative link in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
574
diff
changeset
|
2992 | } |
62cc92445234
store relative link in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
574
diff
changeset
|
2993 | |
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
2994 | char *dirpath = util_path_normalize(dir->path); |
629
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
2995 | int isintern = util_path_isrelated(dirpath, normalized); |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
2996 | |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
2997 | |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
2998 | if(SYNC_SYMLINK(dir) && isintern) { |
576
62cc92445234
store relative link in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
574
diff
changeset
|
2999 | // the link points to a file inside the syncdir |
62cc92445234
store relative link in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
574
diff
changeset
|
3000 | char *rel = util_create_relative_path(normalized, file_path); |
62cc92445234
store relative link in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
574
diff
changeset
|
3001 | res->link_target = rel; |
629
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3002 | } else { |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3003 | #ifndef SYS_LINK_EXT // if not windows |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3004 | SYS_STAT targetstat; |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3005 | if(!sys_stat(file_path, &targetstat)) { |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3006 | res->isdirectory = S_ISDIR(targetstat.st_mode); |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3007 | |
644
a38b15061848
refactore symlink config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
643
diff
changeset
|
3008 | int nofollowextern = (dir->symlink & SYNC_SYMLINK_IGNORE_EXTERN) == SYNC_SYMLINK_IGNORE_EXTERN; |
a38b15061848
refactore symlink config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
643
diff
changeset
|
3009 | int nofollowintern = (dir->symlink & SYNC_SYMLINK_IGNORE_INTERN) == SYNC_SYMLINK_IGNORE_INTERN; |
629
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3010 | if(isintern && nofollowintern) { |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3011 | skip_file = TRUE; |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3012 | } else if(!isintern && nofollowextern) { |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3013 | skip_file = TRUE; |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3014 | } |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3015 | } else { |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3016 | // can't access target, therefore we skip this link |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3017 | skip_file = TRUE; |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3018 | } |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3019 | #endif |
576
62cc92445234
store relative link in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
574
diff
changeset
|
3020 | } |
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3021 | free(dirpath); |
576
62cc92445234
store relative link in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
574
diff
changeset
|
3022 | free(normalized); |
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3023 | free(lnkbuf); |
574
c36eddf167a8
read link on LocalResource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
573
diff
changeset
|
3024 | } |
c36eddf167a8
read link on LocalResource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
573
diff
changeset
|
3025 | } |
c36eddf167a8
read link on LocalResource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
573
diff
changeset
|
3026 | |
643
5b8643cf0a2f
implement hash push strategy and add some tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
639
diff
changeset
|
3027 | if(!res->isdirectory && dir->push_strategy == PUSH_STRATEGY_HASH) { |
5b8643cf0a2f
implement hash push strategy and add some tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
639
diff
changeset
|
3028 | res->hash = util_file_hash(file_path); |
5b8643cf0a2f
implement hash push strategy and add some tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
639
diff
changeset
|
3029 | } |
5b8643cf0a2f
implement hash push strategy and add some tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
639
diff
changeset
|
3030 | |
574
c36eddf167a8
read link on LocalResource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
573
diff
changeset
|
3031 | free(file_path); |
c36eddf167a8
read link on LocalResource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
573
diff
changeset
|
3032 | |
629
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3033 | if(skip_file) { |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3034 | local_resource_free(res); |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3035 | res = NULL; |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3036 | } |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3037 | |
574
c36eddf167a8
read link on LocalResource creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
573
diff
changeset
|
3038 | return res; |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
3039 | } |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
3040 | |
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3041 | char* local_resource_path(LocalResource *res) { |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3042 | return res->local_path ? res->local_path : res->path; |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3043 | } |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3044 | |
444
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
3045 | int local_resource_is_changed( |
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
3046 | SyncDirectory *dir, |
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
3047 | SyncDatabase *db, |
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
3048 | LocalResource *res, |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3049 | CxMap *svrres, |
445
c525f049c8b7
renames dav-sync -D option to -R
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
444
diff
changeset
|
3050 | DavBool restore_removed, |
444
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
3051 | DavBool restore_modified) |
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
3052 | { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3053 | LocalResource *db_res = cxMapGet(db->resources, cx_hash_key_str(res->path)); |
366
5228b912c925
adds technical foundation to just push tag updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
363
diff
changeset
|
3054 | res->tags_updated = 0; |
681
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
3055 | if(db_res) { |
630
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3056 | // copy some metadata from db_res, that localscan does not deliver |
366
5228b912c925
adds technical foundation to just push tag updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
363
diff
changeset
|
3057 | res->tags_updated = db_res->tags_updated; |
64
112dbf7ba8b0
changed sync behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
3058 | if(db_res->etag) { |
112dbf7ba8b0
changed sync behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
3059 | res->etag = strdup(db_res->etag); |
112dbf7ba8b0
changed sync behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
3060 | } |
370
ab9c5afdc243
pushing tags should work now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
369
diff
changeset
|
3061 | if(db_res->tags_hash) { |
ab9c5afdc243
pushing tags should work now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
369
diff
changeset
|
3062 | res->tags_hash = strdup(db_res->tags_hash); |
ab9c5afdc243
pushing tags should work now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
369
diff
changeset
|
3063 | } |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3064 | if(db_res->remote_tags_hash) { |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3065 | res->remote_tags_hash = strdup(db_res->remote_tags_hash); |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3066 | } |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3067 | if(db_res->xattr_hash) { |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3068 | res->xattr_hash = strdup(db_res->xattr_hash); |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3069 | } |
638
b3077bdb3d77
fix hash based conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
633
diff
changeset
|
3070 | if(db_res->hash) { |
b3077bdb3d77
fix hash based conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
633
diff
changeset
|
3071 | res->prev_hash = strdup(db_res->hash); |
b3077bdb3d77
fix hash based conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
633
diff
changeset
|
3072 | } |
686
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
3073 | if(db_res->link_target) { |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
3074 | res->link_target_db = db_res->link_target; |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
3075 | } |
692
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3076 | res->versioncontrol = db_res->versioncontrol; |
64
112dbf7ba8b0
changed sync behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
3077 | |
681
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
3078 | // if the resource is splitted, copy the part info to the new |
630
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3079 | // LocalResource obj, because we need it later |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3080 | if(db_res->parts) { |
681
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
3081 | local_resource_copy_parts(db_res, res); |
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
3082 | } |
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
3083 | |
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
3084 | // check if the file must be restored on the server |
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
3085 | if(svrres) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3086 | DavResource *remote = cxMapGet(svrres, cx_hash_key_str(res->path)); |
681
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
3087 | if(restore_removed && !remote) { |
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
3088 | return 1; |
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
3089 | } |
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
3090 | if(!res->isdirectory && restore_modified && remote) { |
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
3091 | char *etag = dav_get_string_property(remote, "D:getetag"); |
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
3092 | if(!etag || (db_res->etag && strcmp(etag, db_res->etag))) { |
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
3093 | res->restore = TRUE; |
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
3094 | return 1; |
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
3095 | } |
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
3096 | } |
630
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3097 | } |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3098 | |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3099 | // check if metadata has changed |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3100 | // metadata are tags, mode, owner, xattr |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3101 | // set res->metadata_updated to 1 in case any metadata has changed |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3102 | |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3103 | // check if tags have changed |
668
6df5ebb00841
fix detection of changed tags
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
3104 | if(db_res->tags_updated) { |
6df5ebb00841
fix detection of changed tags
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
3105 | res->tags_updated = 1; |
6df5ebb00841
fix detection of changed tags
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
3106 | res->metadata_updated = 1; |
6df5ebb00841
fix detection of changed tags
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
3107 | } else if(dir->tagconfig && dir->tagconfig->detect_changes ) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3108 | CxBuffer *tags = sync_get_file_tag_data(dir, res); |
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3109 | if(tags) { |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3110 | if(db_res->tags_hash) { |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3111 | char *hash = dav_create_hash(tags->space, tags->size); |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3112 | if(strcmp(hash, db_res->tags_hash)) { |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3113 | res->tags_updated = 1; |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3114 | } |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3115 | free(hash); |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3116 | } else { |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3117 | res->tags_updated = 1; |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3118 | } |
370
ab9c5afdc243
pushing tags should work now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
369
diff
changeset
|
3119 | } else if(db_res->tags_hash) { |
ab9c5afdc243
pushing tags should work now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
369
diff
changeset
|
3120 | res->tags_updated = 1; // tags removed |
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3121 | } |
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3122 | res->metadata_updated = res->tags_updated; |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3123 | } |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3124 | |
662
ab34fc9ecf1d
fix mtime sync bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
661
diff
changeset
|
3125 | // check if mtime has changed |
ab34fc9ecf1d
fix mtime sync bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
661
diff
changeset
|
3126 | if((dir->metadata & FINFO_MTIME) == FINFO_MTIME) { |
ab34fc9ecf1d
fix mtime sync bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
661
diff
changeset
|
3127 | if(db_res->last_modified != res->last_modified) { |
ab34fc9ecf1d
fix mtime sync bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
661
diff
changeset
|
3128 | res->finfo_updated = 1; |
ab34fc9ecf1d
fix mtime sync bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
661
diff
changeset
|
3129 | res->metadata_updated = 1; |
ab34fc9ecf1d
fix mtime sync bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
661
diff
changeset
|
3130 | } |
ab34fc9ecf1d
fix mtime sync bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
661
diff
changeset
|
3131 | } |
630
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3132 | // check if mode has changed |
539
8deb52292c99
fixes more if statements and some warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
536
diff
changeset
|
3133 | if((dir->metadata & FINFO_MODE) == FINFO_MODE) { |
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3134 | if(db_res->mode != res->mode) { |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3135 | res->finfo_updated = 1; |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3136 | res->metadata_updated = 1; |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3137 | } |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3138 | } |
630
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3139 | // check if owner has changed |
539
8deb52292c99
fixes more if statements and some warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
536
diff
changeset
|
3140 | if((dir->metadata & FINFO_OWNER) == FINFO_OWNER) { |
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3141 | if(db_res->uid != res->uid || db_res->gid != res->gid) { |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3142 | res->finfo_updated = 1; |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3143 | res->metadata_updated = 1; |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3144 | } |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3145 | } |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3146 | |
630
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3147 | // check if xattr have changed |
539
8deb52292c99
fixes more if statements and some warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
536
diff
changeset
|
3148 | if((dir->metadata & FINFO_XATTR) == FINFO_XATTR) { |
614
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
3149 | char *path = create_local_path(dir, local_resource_path(db_res)); |
618
4b34d12cf211
exclude tag xattr from xattribute sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
617
diff
changeset
|
3150 | XAttributes *xattr = file_get_attributes(path, (xattr_filter_func)xattr_filter, dir); |
524
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
3151 | // test if xattr are added, removed or changed |
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3152 | if((db_res->xattr_hash && !xattr) || |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3153 | (!db_res->xattr_hash && xattr) || |
524
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
3154 | (xattr && db_res->xattr_hash && strcmp(xattr->hash, db_res->xattr_hash))) |
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3155 | { |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3156 | res->metadata_updated = 1; |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3157 | res->xattr_updated = 1; |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3158 | res->xattr = xattr; |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3159 | } else if(xattr) { |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3160 | xattributes_free(xattr); |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
3161 | } |
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3162 | } |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3163 | |
630
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3164 | // check if the content of the file was modified |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3165 | // in case of links, just check if the link target has changed |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3166 | // for normal files, check last modified and size |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3167 | // or compare content hashes |
577
f49964cf7228
store link property on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
3168 | if(nullstrcmp(db_res->link_target, res->link_target)) { |
f49964cf7228
store link property on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
3169 | res->link_updated = 1; |
630
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3170 | } else { |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3171 | if(db_res->hash && res->hash) { |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3172 | // we already have hashes |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3173 | if(!strcmp(db_res->hash, res->hash)) { |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3174 | return 0; // hashes equal -> file content unchanged |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3175 | } |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3176 | } else if( |
615
ab669d21f82a
add missing isdirectory tag in db on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
614
diff
changeset
|
3177 | db_res->last_modified == res->last_modified && |
ab669d21f82a
add missing isdirectory tag in db on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
614
diff
changeset
|
3178 | db_res->size == res->size && |
ab669d21f82a
add missing isdirectory tag in db on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
614
diff
changeset
|
3179 | db_res->isdirectory == res->isdirectory) |
630
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3180 | { |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3181 | // mtime and size unchanged, content also likely unchanged |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3182 | return 0; |
650
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
3183 | } else if(SYNC_HASHING(dir)) { |
630
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3184 | // res->hash missing (see above) |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3185 | char *local_path = util_concat_path(dir->path, local_resource_path(res)); |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3186 | res->hash = util_file_hash(local_path); |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3187 | free(local_path); |
650
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
3188 | |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
3189 | // check if the content has really changed |
14e7101d7604
fix some hash based conflict resolution bugs and add tests for it
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
649
diff
changeset
|
3190 | if(res->hash && db_res->hash && !strcmp(res->hash, db_res->hash)) { |
630
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3191 | return 0; |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3192 | } |
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
3193 | } |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3194 | } |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3195 | } else { |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3196 | res->tags_updated = 1; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3197 | res->finfo_updated = 1; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3198 | res->xattr_updated = 1; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3199 | res->metadata_updated = 1; |
550
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
3200 | res->isnew = 1; |
64
112dbf7ba8b0
changed sync behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
3201 | } |
112dbf7ba8b0
changed sync behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
3202 | return 1; |
112dbf7ba8b0
changed sync behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
3203 | } |
112dbf7ba8b0
changed sync behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
3204 | |
220
f1b3873a6525
added conflict detection to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
3205 | int remote_resource_is_changed( |
f1b3873a6525
added conflict detection to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
3206 | DavSession *sn, |
f1b3873a6525
added conflict detection to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
3207 | SyncDirectory *dir, |
f1b3873a6525
added conflict detection to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
3208 | SyncDatabase *db, |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3209 | DavResource *remote, |
639
928a77ebe0b9
fix that file uploads are tried, when the content on the server is equal to the local file content (with enabled hashing)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
3210 | LocalResource *res, |
928a77ebe0b9
fix that file uploads are tried, when the content on the server is equal to the local file content (with enabled hashing)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
3211 | DavBool *equal) |
220
f1b3873a6525
added conflict detection to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
3212 | { |
639
928a77ebe0b9
fix that file uploads are tried, when the content on the server is equal to the local file content (with enabled hashing)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
3213 | if(equal) { |
928a77ebe0b9
fix that file uploads are tried, when the content on the server is equal to the local file content (with enabled hashing)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
3214 | *equal = FALSE; |
928a77ebe0b9
fix that file uploads are tried, when the content on the server is equal to the local file content (with enabled hashing)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
3215 | } |
928a77ebe0b9
fix that file uploads are tried, when the content on the server is equal to the local file content (with enabled hashing)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
3216 | |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3217 | DavPropName properties[] = { |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3218 | {"DAV:", "getetag"}, |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3219 | {DAV_NS, "version-collection"}, |
541
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
539
diff
changeset
|
3220 | {DAV_NS, "content-hash"}, |
577
f49964cf7228
store link property on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
3221 | {DAV_NS, "split" }, |
607
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
3222 | {DAV_PROPS_NS, "tags"}, |
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
3223 | {DAV_PROPS_NS, "link" } |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3224 | }; |
577
f49964cf7228
store link property on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
3225 | int err = dav_load_prop(remote, properties, 6); |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3226 | |
444
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
3227 | if(res->restore) { |
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
3228 | return 0; |
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
3229 | } |
761dc4867208
adds dav-sync options for restoring deleted or modified files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
417
diff
changeset
|
3230 | |
681
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
3231 | if(remote->iscollection && !res->parts) { |
629
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3232 | return 1; |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3233 | } |
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3234 | |
686
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
3235 | char *link = dav_get_string_property_ns(remote, DAV_PROPS_NS, "link"); |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
3236 | |
220
f1b3873a6525
added conflict detection to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
3237 | int ret = 0; |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3238 | if(err == 0) { |
331
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
318
diff
changeset
|
3239 | char *etag = dav_get_string_property(remote, "D:getetag"); |
542
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
3240 | char *hash = sync_get_content_hash(remote); |
639
928a77ebe0b9
fix that file uploads are tried, when the content on the server is equal to the local file content (with enabled hashing)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
3241 | |
686
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
3242 | if(res->link_target_db || link) { |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
3243 | ret = nullstrcmp(res->link_target_db, link); |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
3244 | if(ret && equal) { |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
3245 | *equal = !nullstrcmp(res->link_target, link); |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
3246 | } |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
3247 | return ret; |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
3248 | } |
ab159748055c
add more symlink tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
3249 | |
639
928a77ebe0b9
fix that file uploads are tried, when the content on the server is equal to the local file content (with enabled hashing)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
3250 | if(hash && res->hash && equal) { |
649
0f4c59ac8c74
implement hash based conflict resolution in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
648
diff
changeset
|
3251 | // if requested, check if the local and remote res are equal |
639
928a77ebe0b9
fix that file uploads are tried, when the content on the server is equal to the local file content (with enabled hashing)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
3252 | if(!strcmp(hash, res->hash)) { |
928a77ebe0b9
fix that file uploads are tried, when the content on the server is equal to the local file content (with enabled hashing)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
3253 | *equal = TRUE; |
928a77ebe0b9
fix that file uploads are tried, when the content on the server is equal to the local file content (with enabled hashing)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
3254 | return 0; |
928a77ebe0b9
fix that file uploads are tried, when the content on the server is equal to the local file content (with enabled hashing)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
3255 | } |
928a77ebe0b9
fix that file uploads are tried, when the content on the server is equal to the local file content (with enabled hashing)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
3256 | } |
928a77ebe0b9
fix that file uploads are tried, when the content on the server is equal to the local file content (with enabled hashing)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
3257 | |
638
b3077bdb3d77
fix hash based conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
633
diff
changeset
|
3258 | if(hash && res->prev_hash) { |
b3077bdb3d77
fix hash based conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
633
diff
changeset
|
3259 | if(strcmp(hash, res->prev_hash)) { |
541
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
539
diff
changeset
|
3260 | ret = 1; |
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
539
diff
changeset
|
3261 | } |
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
539
diff
changeset
|
3262 | } else if(!res->etag) { |
318
7e0694423838
dav-sync bugfix: files that are not in the db but on the server should not be pushed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
316
diff
changeset
|
3263 | // the resource is on the server and the client has no etag |
7e0694423838
dav-sync bugfix: files that are not in the db but on the server should not be pushed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
316
diff
changeset
|
3264 | ret = 1; |
7e0694423838
dav-sync bugfix: files that are not in the db but on the server should not be pushed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
316
diff
changeset
|
3265 | } else if(etag) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3266 | cxstring e = cx_str(etag); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3267 | if(cx_strprefix(e, CX_STR("W/"))) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3268 | e = cx_strsubs(e, 2); |
220
f1b3873a6525
added conflict detection to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
3269 | } |
f1b3873a6525
added conflict detection to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
3270 | if(strcmp(e.ptr, res->etag)) { |
f1b3873a6525
added conflict detection to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
3271 | ret = 1; |
f1b3873a6525
added conflict detection to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
3272 | } |
318
7e0694423838
dav-sync bugfix: files that are not in the db but on the server should not be pushed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
316
diff
changeset
|
3273 | } else { |
7e0694423838
dav-sync bugfix: files that are not in the db but on the server should not be pushed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
316
diff
changeset
|
3274 | // something weird is happening, the server must support etags |
7e0694423838
dav-sync bugfix: files that are not in the db but on the server should not be pushed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
316
diff
changeset
|
3275 | fprintf(stderr, "Warning: resource %s has no etag\n", remote->href); |
220
f1b3873a6525
added conflict detection to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
3276 | } |
f1b3873a6525
added conflict detection to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
3277 | } |
f1b3873a6525
added conflict detection to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
3278 | return ret; |
f1b3873a6525
added conflict detection to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
3279 | } |
f1b3873a6525
added conflict detection to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
219
diff
changeset
|
3280 | |
614
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
3281 | int local_resource_load_metadata(SyncDirectory *dir, LocalResource *res) { |
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
3282 | // currently only xattr needed |
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
3283 | if((dir->metadata & FINFO_XATTR) == FINFO_XATTR) { |
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
3284 | char *path = create_local_path(dir, local_resource_path(res)); |
618
4b34d12cf211
exclude tag xattr from xattribute sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
617
diff
changeset
|
3285 | XAttributes *xattr = file_get_attributes(path, (xattr_filter_func)xattr_filter, dir); |
614
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
3286 | res->xattr = xattr; |
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
3287 | free(path); |
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
3288 | } |
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
3289 | |
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
3290 | return 0; |
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
3291 | } |
e72d2b99b0f6
fix xattr not synced for new files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
3292 | |
621
06f9fddc82a1
don't store weak etag in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
619
diff
changeset
|
3293 | void local_resource_set_etag(LocalResource *local, const char *etag) { |
06f9fddc82a1
don't store weak etag in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
619
diff
changeset
|
3294 | // free old etag |
06f9fddc82a1
don't store weak etag in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
619
diff
changeset
|
3295 | if(local->etag) { |
06f9fddc82a1
don't store weak etag in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
619
diff
changeset
|
3296 | free(local->etag); |
06f9fddc82a1
don't store weak etag in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
619
diff
changeset
|
3297 | } |
06f9fddc82a1
don't store weak etag in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
619
diff
changeset
|
3298 | |
06f9fddc82a1
don't store weak etag in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
619
diff
changeset
|
3299 | if(!etag) { |
06f9fddc82a1
don't store weak etag in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
619
diff
changeset
|
3300 | local->etag = NULL; |
06f9fddc82a1
don't store weak etag in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
619
diff
changeset
|
3301 | return; |
06f9fddc82a1
don't store weak etag in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
619
diff
changeset
|
3302 | } |
06f9fddc82a1
don't store weak etag in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
619
diff
changeset
|
3303 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3304 | cxstring e = cx_str(etag); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3305 | if(cx_strprefix(e, CX_STR("W/"))) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3306 | e = cx_strsubs(e, 2); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3307 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3308 | local->etag = cx_strdup(e).ptr; |
621
06f9fddc82a1
don't store weak etag in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
619
diff
changeset
|
3309 | } |
06f9fddc82a1
don't store weak etag in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
619
diff
changeset
|
3310 | |
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3311 | char* resource_local_path(DavResource *res) { |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3312 | #ifdef SYS_LINK_EXT |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3313 | // on Windows, add .lnk extension to links |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3314 | if(dav_get_property_ns(res, DAV_PROPS_NS, "link")) { |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3315 | return ucx_sprintf("%s%s", res->path, SYS_LINK_EXT).ptr; |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3316 | } else { |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3317 | // not a link |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3318 | return strdup(res->path); |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3319 | } |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3320 | #else |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3321 | return strdup(res->path); |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3322 | #endif |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3323 | } |
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3324 | |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3325 | size_t resource_get_blocksize(SyncDirectory *dir, LocalResource *local, DavResource *res, off_t filesize) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3326 | size_t local_blocksize = 0; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3327 | if(local->blocksize < 0) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3328 | // file splitting disabled |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3329 | return 0; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3330 | } else if(local->blocksize > 0) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3331 | local_blocksize = (size_t)local->blocksize; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3332 | } else if(dir->splitconfig) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3333 | CxIterator i = cxListIterator(dir->splitconfig); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3334 | cx_foreach(SplitConfig *, sc, i) { |
648
fefe4b6f1048
change split config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
646
diff
changeset
|
3335 | if(sc->filter) { |
fefe4b6f1048
change split config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
646
diff
changeset
|
3336 | if(res_matches_filter(sc->filter, local->path)) { |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3337 | continue; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3338 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3339 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3340 | |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3341 | if(sc->minsize > 0) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3342 | if(filesize < sc->minsize) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3343 | continue; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3344 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3345 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3346 | |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3347 | local_blocksize = sc->blocksize; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3348 | break; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3349 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3350 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3351 | |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3352 | size_t svr_blocksize = 0; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3353 | char *svr_blocksize_str = dav_get_string_property_ns(res, DAV_NS, "split"); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3354 | if(svr_blocksize_str) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3355 | uint64_t i = 0; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3356 | if(util_strtouint(svr_blocksize_str, &i)) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3357 | svr_blocksize = (size_t)i; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3358 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3359 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3360 | |
681
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
680
diff
changeset
|
3361 | if(local_blocksize > 0 && svr_blocksize > 0 && local_blocksize != svr_blocksize) { |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3362 | fprintf(stderr, "Warning: Blocksize mismatch: %s: local: %zu server: %zu\n", local->path, local_blocksize, svr_blocksize); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3363 | return svr_blocksize; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3364 | } else if(local_blocksize > 0) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3365 | return local_blocksize; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3366 | } else if(svr_blocksize > 0) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3367 | return svr_blocksize; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3368 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3369 | |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3370 | return 0; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3371 | |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3372 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3373 | |
460
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
3374 | int resource_pathlen_cmp(LocalResource *res1, LocalResource *res2, void *n) { |
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
3375 | size_t s1 = strlen(res1->path); |
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
3376 | size_t s2 = strlen(res2->path); |
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
3377 | if(s1 < s2) { |
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
3378 | return 1; |
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
3379 | } else if(s1 > s2) { |
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
3380 | return -1; |
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
3381 | } else { |
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
3382 | return 0; |
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
3383 | } |
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
3384 | } |
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
3385 | |
725
de3b2bb46492
fix outgoing list sort
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
724
diff
changeset
|
3386 | int resource_path_cmp(LocalResource *res1, LocalResource *res2, void *n) { |
de3b2bb46492
fix outgoing list sort
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
724
diff
changeset
|
3387 | return strcmp(res1->path, res2->path); |
de3b2bb46492
fix outgoing list sort
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
724
diff
changeset
|
3388 | } |
de3b2bb46492
fix outgoing list sort
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
724
diff
changeset
|
3389 | |
de3b2bb46492
fix outgoing list sort
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
724
diff
changeset
|
3390 | |
533
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3391 | DavResource *versioning_simple_find(DavResource *res, const char *version) { |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3392 | char *vcol_href = dav_get_string_property_ns(res, DAV_NS, VERSION_PATH_PROPERTY); |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3393 | if(!vcol_href) { |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3394 | return NULL; |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3395 | } |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3396 | DavResource *vcol = dav_resource_new_href(res->session, vcol_href); |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3397 | if(!vcol) { |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3398 | return NULL; |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3399 | } |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3400 | |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3401 | |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3402 | if(dav_load_prop(vcol, defprops, numdefprops)) { |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3403 | print_resource_error(res->session, vcol->path); |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3404 | dav_resource_free(vcol); |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3405 | return NULL; |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3406 | } |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3407 | |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3408 | DavResource *ret = NULL; |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3409 | DavResource *child = vcol->children; |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3410 | while(child) { |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3411 | DavResource *next = child->next; |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3412 | if(!strcmp(child->name, version)) { |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3413 | ret = child; |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3414 | } else { |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3415 | dav_resource_free(child); |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3416 | } |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3417 | child = next; |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3418 | } |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3419 | dav_resource_free(vcol); |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3420 | |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3421 | return ret; |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3422 | } |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3423 | |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3424 | // TODO: remove code dup (main.c: find_version) |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3425 | DavResource* versioning_deltav_find(DavResource *res, const char *version) { |
607
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
3426 | DavResource *list = dav_versiontree(res, "D:getetag,idav:status,idav:split,idavprops:link,idavprops:finfo,idavprops:xattributes,idavprops:tags"); |
533
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3427 | DavResource *ret = NULL; |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3428 | while(list) { |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3429 | DavResource *next = list->next; |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3430 | if(!ret) { |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3431 | char *vname = dav_get_string_property(list, "D:version-name"); |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3432 | if(vname && !strcmp(vname, version)) { |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3433 | ret = list; |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3434 | } |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3435 | } |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3436 | if(list != ret) { |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3437 | dav_resource_free(list); |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3438 | } |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3439 | list = next; |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3440 | } |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3441 | return ret; |
5b9f20aa88c2
adds option to restore previous file versions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
532
diff
changeset
|
3442 | } |
64
112dbf7ba8b0
changed sync behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
3443 | |
144
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
3444 | int sync_set_status(DavResource *res, char *status) { |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
3445 | DavResource *resource = dav_resource_new(res->session, res->path); |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3446 | dav_set_string_property(resource, "idav:status", status); |
144
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
3447 | int ret = dav_store(resource); |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
3448 | dav_resource_free(resource); |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
3449 | return ret; |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
3450 | } |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
3451 | |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
3452 | int sync_remove_status(DavResource *res) { |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
3453 | DavResource *resource = dav_resource_new(res->session, res->path); |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
3454 | dav_remove_property(resource, "idav:status"); |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
3455 | int ret = dav_store(resource); |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
3456 | dav_resource_free(resource); |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
3457 | return ret; |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
3458 | } |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
3459 | |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3460 | int sync_store_metadata(SyncDirectory *dir, const char *path, LocalResource *local, DavResource *res) { |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3461 | int ret = 0; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3462 | |
607
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
3463 | DavXmlNode *fileinfo = dav_get_property_ns(res, DAV_PROPS_NS, "finfo"); |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3464 | if(fileinfo) { |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3465 | FileInfo f; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3466 | finfo_get_values(fileinfo, &f); |
646
37a8bfae995e
change metadata config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
644
diff
changeset
|
3467 | if((dir->metadata & FINFO_MTIME) == FINFO_MTIME && f.date_set) { |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3468 | // set mtime |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3469 | struct utimbuf t; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3470 | t.actime = f.last_modified; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3471 | t.modtime = f.last_modified; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3472 | if(utime(path, &t)) { |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3473 | fprintf(stderr, "utime failed for file: %s : %s\n", path, strerror(errno)); |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3474 | ret = 1; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3475 | } |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3476 | } |
539
8deb52292c99
fixes more if statements and some warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
536
diff
changeset
|
3477 | if((dir->metadata & FINFO_MODE) == FINFO_MODE && f.mode_set) { |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3478 | // set mode |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3479 | if(chmod(path, f.mode)) { |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3480 | fprintf(stderr, "chmod failed for file: %s : %s\n", path, strerror(errno)); |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3481 | ret = 1; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3482 | } |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3483 | } |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3484 | } |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3485 | |
663
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3486 | if((dir->metadata & FINFO_XATTR) == FINFO_XATTR) { |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3487 | DavXmlNode *xattr_prop = dav_get_property_ns(res, DAV_PROPS_NS, "xattributes"); |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3488 | XAttributes *xattr = NULL; |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3489 | if(xattr_prop) { |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3490 | xattr = xml_get_attributes(xattr_prop); |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3491 | } |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3492 | if(!sync_store_xattr(dir, path, xattr)) { |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3493 | if(local->xattr_hash) { |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3494 | free(local->xattr_hash); |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3495 | } |
663
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3496 | local->xattr_hash = xattr ? xattr->hash : NULL; |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3497 | } |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3498 | } |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3499 | |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3500 | if(sync_store_tags(dir, path, local, res)) { |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3501 | ret = 1; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3502 | } |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3503 | |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3504 | return ret; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3505 | } |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3506 | |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3507 | int sync_store_xattr(SyncDirectory *dir, const char *path, XAttributes *xattr) { |
663
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3508 | // create a map of all currently available local attributes |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3509 | ssize_t nelm = 0; |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3510 | char **list = xattr_list(path, &nelm); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3511 | CxMap *current_xattr = NULL; |
663
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3512 | if(nelm > 0) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3513 | current_xattr = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, nelm + 8); |
663
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3514 | for(int i=0;i<nelm;i++) { |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3515 | // use the xattr name as key and store any value |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3516 | cxMapPut(current_xattr, cx_hash_key_str(list[i]), list[i]); |
663
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3517 | } |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3518 | } |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3519 | if(list) { |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3520 | free(list); |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3521 | } |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3522 | |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3523 | // store extended attributes |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3524 | size_t nattr = xattr ? xattr->nattr : 0; |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3525 | for(int i=0;i<nattr;i++) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3526 | cxmutstr value = xattr->values[i]; |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3527 | if(xattr_set(path, xattr->names[i], value.ptr, value.length)) { |
663
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3528 | fprintf(stderr, |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3529 | "Cannot store xattr '%s' for file: %s\n", |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3530 | xattr->names[i], |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3531 | path); |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3532 | } |
663
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3533 | |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3534 | if(current_xattr) { |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3535 | // to detect which xattributes are removed, we remove all new |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3536 | // attributes from the map and all remaining attributes must |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3537 | // be removed with xattr_remove |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3538 | char *value = cxMapRemoveAndGet(current_xattr, cx_hash_key_str(xattr->names[i])); |
663
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3539 | if(value) { |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3540 | free(value); |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3541 | } |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3542 | } |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3543 | } |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3544 | |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3545 | if(current_xattr) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3546 | CxIterator i = cxMapIteratorValues(current_xattr); |
663
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3547 | char *value = NULL; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3548 | cx_foreach(char *, value, i) { |
663
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3549 | (void)xattr_remove(path, value); // don't print error |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3550 | free(value); |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3551 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3552 | cxMapDestroy(current_xattr); |
663
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3553 | } |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3554 | |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3555 | return 0; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3556 | } |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3557 | |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3558 | int sync_store_tags(SyncDirectory *dir, const char *path, LocalResource *local, DavResource *res) { |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3559 | if(!dir->tagconfig) { |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3560 | return 0; |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3561 | } |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3562 | |
667
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
3563 | char *remote_hash = NULL; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3564 | CxList *tags = NULL; |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3565 | if(dir->tagconfig) { |
607
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
3566 | DavXmlNode *tagsprop = dav_get_property_ns(res, DAV_PROPS_NS, "tags"); |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3567 | if(tagsprop) { |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3568 | tags = parse_dav_xml_taglist(tagsprop); |
667
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
3569 | remote_hash = create_tags_hash(tags); |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3570 | } |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3571 | } |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3572 | |
379
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3573 | DavBool store_tags = FALSE; |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3574 | DavBool tags_changed = FALSE; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3575 | CxList *local_tags = sync_get_file_tags(dir, local, &tags_changed, NULL); |
379
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3576 | if(tags_changed) { |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3577 | switch(dir->tagconfig->conflict) { |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3578 | case TAG_NO_CONFLICT: { |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3579 | store_tags = TRUE; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3580 | break; |
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3581 | } |
379
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3582 | case TAG_KEEP_LOCAL: { |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3583 | store_tags = FALSE; |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3584 | break; |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3585 | } |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3586 | case TAG_KEEP_REMOTE: { |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3587 | store_tags = TRUE; |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3588 | local->tags_updated = FALSE; |
527
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
3589 | break; |
368
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3590 | } |
379
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3591 | case TAG_MERGE: { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3592 | CxList *new_tags = merge_tags(local_tags, tags); |
379
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3593 | // TODO: free tags and local_tags |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3594 | tags = new_tags; |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3595 | store_tags = TRUE; |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3596 | // make sure the merged tags will be pushed the next time |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3597 | local->tags_updated = TRUE; |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3598 | break; |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3599 | } |
368
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3600 | } |
379
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3601 | } else { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3602 | if(!compare_taglists(tags, local_tags)) { |
379
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3603 | store_tags = TRUE; |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3604 | } |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3605 | // TODO: free local_tags |
368
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3606 | } |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3607 | |
379
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3608 | if(!store_tags) { |
675
a8117c4feaad
fix sync_store_metadata
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
3609 | nullfree(local->remote_tags_hash); |
a8117c4feaad
fix sync_store_metadata
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
3610 | local->remote_tags_hash = remote_hash; |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3611 | return 0; |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3612 | } |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3613 | |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
3614 | int ret = sync_store_tags_local(dir, local, path, tags); |
667
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
3615 | if(!ret) { |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
3616 | if(local->remote_tags_hash) { |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
3617 | free(local->remote_tags_hash); |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
3618 | } |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
3619 | local->remote_tags_hash = remote_hash; |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
3620 | } |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
3621 | |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
3622 | // TODO: free stuff |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
3623 | |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
3624 | return ret; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
3625 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
3626 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3627 | int sync_store_tags_local(SyncDirectory *dir, LocalResource *local, const char *path, CxList *tags) { |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3628 | int ret = 0; |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3629 | if(dir->tagconfig->store == TAG_STORE_XATTR) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3630 | CxBuffer *data = NULL; |
368
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3631 | if(tags) { |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3632 | switch(dir->tagconfig->local_format) { |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3633 | default: break; |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3634 | case TAG_FORMAT_TEXT: { |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3635 | data = create_text_taglist(tags); |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3636 | break; |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3637 | } |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3638 | case TAG_FORMAT_CSV: { |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3639 | data = create_csv_taglist(tags); |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3640 | break; |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3641 | } |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3642 | case TAG_FORMAT_MACOS: { |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3643 | data = create_macos_taglist(tags); |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3644 | break; |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3645 | } |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3646 | } |
368
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3647 | |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3648 | if(data) { |
369
4322b8953bd5
adds tag conflict detection for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
368
diff
changeset
|
3649 | char *data_hash = dav_create_hash(data->space, data->size); |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
3650 | int update = 1; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
3651 | if(local) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
3652 | if(!local->tags_hash || strcmp(data_hash, local->tags_hash)) { |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3653 | //printf("update: %s\n", local->path); |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
3654 | } else { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
3655 | update = 0; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
3656 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
3657 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
3658 | if(update) { |
369
4322b8953bd5
adds tag conflict detection for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
368
diff
changeset
|
3659 | ret = xattr_set(path, dir->tagconfig->xattr_name, data->space, data->pos); |
379
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3660 | if(local) { |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3661 | if(local->tags_hash) { |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3662 | free(local->tags_hash); |
629
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3663 | local->tags_hash = NULL; |
379
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3664 | } |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3665 | local->tags_hash = data_hash; |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3666 | } |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3667 | } else { |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3668 | free(data_hash); |
369
4322b8953bd5
adds tag conflict detection for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
368
diff
changeset
|
3669 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3670 | cxBufferFree(data); |
368
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3671 | } else { |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3672 | ret = -1; |
363
e9ed8e130ccf
adds support for macos file tags
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
361
diff
changeset
|
3673 | } |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3674 | } else { |
379
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3675 | if(local) { |
526
e3c0440bd599
adds metadata support to dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
3676 | //printf("update: %s\n", local->path); |
379
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3677 | } |
527
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
3678 | // ignore errors on remove |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
3679 | xattr_remove(path, dir->tagconfig->xattr_name); |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3680 | } |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3681 | } |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3682 | |
618
4b34d12cf211
exclude tag xattr from xattribute sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
617
diff
changeset
|
3683 | if(!ret && local) { |
527
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
3684 | local->tags_updated = 0; |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
3685 | } |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
3686 | |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3687 | return ret; |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3688 | } |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3689 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3690 | CxBuffer* sync_get_file_tag_data(SyncDirectory *dir, LocalResource *res) { |
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3691 | if(!dir->tagconfig) { |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3692 | return NULL; |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3693 | } |
369
4322b8953bd5
adds tag conflict detection for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
368
diff
changeset
|
3694 | if(res->cached_tags) { |
4322b8953bd5
adds tag conflict detection for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
368
diff
changeset
|
3695 | return res->cached_tags; |
4322b8953bd5
adds tag conflict detection for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
368
diff
changeset
|
3696 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3697 | CxBuffer *buf = NULL; |
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3698 | if(dir->tagconfig->store == TAG_STORE_XATTR) { |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3699 | ssize_t tag_length = 0; |
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
3700 | char *local_path = create_local_path(dir, local_resource_path(res)); |
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3701 | char* tag_data = xattr_get( |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3702 | local_path, |
368
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3703 | dir->tagconfig->xattr_name, |
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3704 | &tag_length); |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3705 | free(local_path); |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3706 | |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3707 | if(tag_length > 0) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3708 | buf = cxBufferCreate(tag_data, (size_t)tag_length, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS); |
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3709 | buf->size = (size_t)tag_length; |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3710 | } |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3711 | } |
369
4322b8953bd5
adds tag conflict detection for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
368
diff
changeset
|
3712 | res->cached_tags = buf; |
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3713 | return buf; |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3714 | } |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3715 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3716 | CxList* sync_get_file_tags(SyncDirectory *dir, LocalResource *res, DavBool *changed, char **newhash) { |
368
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3717 | if(changed) *changed = FALSE; |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3718 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3719 | CxList *tags = NULL; |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3720 | |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
3721 | if(!res) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
3722 | return NULL; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
3723 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
3724 | |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3725 | if(!dir->tagconfig) { |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3726 | return NULL; |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3727 | } |
379
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3728 | if(changed && res->tags_updated) { |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3729 | *changed = TRUE; |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
3730 | } |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3731 | if(dir->tagconfig->store == TAG_STORE_XATTR) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3732 | CxBuffer *tag_buf = res->cached_tags ? |
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3733 | res->cached_tags : |
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3734 | sync_get_file_tag_data(dir, res); |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3735 | |
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3736 | if(tag_buf) { |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3737 | char *new_hash = dav_create_hash(tag_buf->space, tag_buf->size); |
368
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3738 | if(res->tags_hash) { |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3739 | if(changed && strcmp(res->tags_hash, new_hash)) { |
368
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3740 | *changed = TRUE; |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3741 | } |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3742 | free(res->tags_hash); |
629
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3743 | res->tags_hash = NULL; |
368
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3744 | } else { |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3745 | if(changed) *changed = TRUE; |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3746 | } |
618
4b34d12cf211
exclude tag xattr from xattribute sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
617
diff
changeset
|
3747 | if(newhash) { |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3748 | *newhash = new_hash; |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3749 | } else { |
619
1d20a6cab2e5
fix free in sync_get_file_tags
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
618
diff
changeset
|
3750 | free(new_hash); |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3751 | } |
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3752 | |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3753 | switch(dir->tagconfig->local_format) { |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3754 | default: break; |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3755 | case TAG_FORMAT_TEXT: { |
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3756 | tags = parse_text_taglist(tag_buf->space, tag_buf->size); |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3757 | break; |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3758 | } |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3759 | case TAG_FORMAT_CSV: { |
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3760 | tags = parse_csv_taglist(tag_buf->space, tag_buf->size); |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3761 | break; |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3762 | } |
363
e9ed8e130ccf
adds support for macos file tags
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
361
diff
changeset
|
3763 | case TAG_FORMAT_MACOS: { |
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
3764 | tags = parse_macos_taglist(tag_buf->space, tag_buf->size); |
363
e9ed8e130ccf
adds support for macos file tags
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
361
diff
changeset
|
3765 | break; |
e9ed8e130ccf
adds support for macos file tags
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
361
diff
changeset
|
3766 | } |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3767 | } |
369
4322b8953bd5
adds tag conflict detection for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
368
diff
changeset
|
3768 | res->cached_tags = tag_buf; |
368
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3769 | } else if(res->tags_hash) { |
11797f33bc24
adds more tag config options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
3770 | if(changed) *changed = TRUE; |
361
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3771 | } |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3772 | } |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3773 | |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3774 | return tags; |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3775 | } |
b6f2462ee055
adds xattr lib and tag support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
347
diff
changeset
|
3776 | |
478
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
460
diff
changeset
|
3777 | static int file_seek(FILE *f, curl_off_t offset, int origin) { |
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
460
diff
changeset
|
3778 | int ret = fseek(f, offset, origin); |
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
460
diff
changeset
|
3779 | return ret == 0 ? CURL_SEEKFUNC_OK : CURL_SEEKFUNC_CANTSEEK; |
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
460
diff
changeset
|
3780 | } |
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
460
diff
changeset
|
3781 | |
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
460
diff
changeset
|
3782 | size_t myread(void *ptr, size_t size, size_t nmemb, FILE *f) { |
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
460
diff
changeset
|
3783 | size_t ret = fread(ptr, size, nmemb, f); |
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
460
diff
changeset
|
3784 | return ret; |
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
460
diff
changeset
|
3785 | } |
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
460
diff
changeset
|
3786 | |
491
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3787 | int gen_random_name(char *buf, size_t len) { |
513
893a659768b3
fixes signedness issue in get_random_name()
Mike Becker <universe@uap-core.de>
parents:
510
diff
changeset
|
3788 | unsigned char name_prefix[8]; |
491
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3789 | memset(name_prefix, 0, 8); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3790 | dav_rand_bytes(name_prefix, 8); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3791 | char *pre = util_hexstr(name_prefix, 8); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3792 | int64_t ts = (int64_t)time(NULL); |
516
39f5f17c3bc3
change format of version history resource names
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
514
diff
changeset
|
3793 | int w = snprintf(buf, len, "%"PRId64"-%s", ts, pre); |
491
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3794 | free(pre); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3795 | return w >= len; |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3796 | } |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3797 | |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3798 | #define VBEGIN_ERROR_MKCOL 1 |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3799 | #define VBEGIN_ERROR_MOVE 2 |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3800 | #define VBEGIN_ERROR_PROPPATCH 3 |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3801 | #define VBEGIN_ERROR_CHECKOUT 4 |
692
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3802 | int versioning_begin(SyncDirectory *dir, DavResource *res, int *exists, int *versionized) { |
491
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3803 | int ret = 0; |
692
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3804 | *versionized = 0; |
491
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3805 | |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3806 | if(dir->versioning->type == VERSIONING_SIMPLE && res->exists) { |
491
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3807 | DavResource *history_collection = dav_resource_new( |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3808 | res->session, |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3809 | dir->versioning->collection); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3810 | |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3811 | // get the path to the version history collection for this resource |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3812 | // if propfind fails we just assume that it doesn't exist |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3813 | // better error handling is done later (sync_put_resource) |
510
d6e801f97e7a
more sstr to scstr conversion
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
506
diff
changeset
|
3814 | // if there is no history collection for this resource, we create one |
491
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3815 | |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3816 | char *history_href = NULL; |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3817 | char *vcol_path = dav_get_string_property_ns(res, DAV_NS, VERSION_PATH_PROPERTY); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3818 | if(!vcol_path) { |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3819 | DavResource *history_res = NULL; |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3820 | |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3821 | // create a new collection for version history |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3822 | // the name is a combination of a random prefix and a timestamp |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3823 | while(!history_res) { |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3824 | char history_res_name[128]; |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3825 | gen_random_name(history_res_name, 128); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3826 | |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3827 | history_res = dav_resource_new_child( |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3828 | res->session, |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3829 | history_collection, |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3830 | history_res_name); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3831 | if(dav_exists(history_res)) { |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3832 | dav_resource_free(history_res); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3833 | history_res = NULL; |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3834 | } |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3835 | } |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3836 | |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3837 | history_res->iscollection = TRUE; |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3838 | if(dav_create(history_res)) { |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3839 | dav_resource_free(history_res); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3840 | dav_resource_free(history_collection); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3841 | return VBEGIN_ERROR_MKCOL; |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3842 | } |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3843 | |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3844 | history_href = strdup(history_res->href); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3845 | |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3846 | dav_resource_free(history_res); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3847 | } else { |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3848 | history_href = vcol_path; |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3849 | } |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3850 | |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3851 | // find a free url and move 'res' to this location |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3852 | DavResource *version_res = NULL; |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3853 | while(!version_res) { |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3854 | char version_name[128]; |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3855 | gen_random_name(version_name, 128); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3856 | |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3857 | char *href = util_concat_path(history_href, version_name); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3858 | version_res = dav_resource_new_href(res->session, href); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3859 | free(href); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3860 | |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3861 | char *dest = util_get_url(res->session, version_res->href); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3862 | int err = dav_moveto(res, dest, FALSE); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3863 | free(dest); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3864 | |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3865 | if(err) { |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3866 | dav_resource_free(version_res); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3867 | version_res = NULL; |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3868 | if(res->session->error != DAV_PRECONDITION_FAILED) { |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3869 | ret = VBEGIN_ERROR_MOVE; |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3870 | break; |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3871 | } |
584
7fb81fd429b2
fix that knowledge about resource existence was fucked up by versioning_begin
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
583
diff
changeset
|
3872 | } else { |
7fb81fd429b2
fix that knowledge about resource existence was fucked up by versioning_begin
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
583
diff
changeset
|
3873 | // tell the caller the resource does not exist anymore at |
7fb81fd429b2
fix that knowledge about resource existence was fucked up by versioning_begin
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
583
diff
changeset
|
3874 | // the original location |
7fb81fd429b2
fix that knowledge about resource existence was fucked up by versioning_begin
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
583
diff
changeset
|
3875 | *exists = 0; |
491
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3876 | } |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3877 | } |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3878 | |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3879 | if(!ret) { |
692
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3880 | *versionized = 1; |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3881 | |
491
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3882 | dav_set_string_property_ns(version_res, DAV_NS, "origin", res->href); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3883 | if(dav_store(version_res)) { |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3884 | ret = VBEGIN_ERROR_PROPPATCH; |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3885 | } |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3886 | dav_resource_free(version_res); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3887 | |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3888 | // we can just set the property here and don't need dav_store |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3889 | // because sync_put_resource will call dav_store(res) later |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3890 | dav_set_string_property_ns( |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3891 | res, |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3892 | DAV_NS, |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3893 | VERSION_PATH_PROPERTY, |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3894 | history_href); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3895 | } |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3896 | |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3897 | if(vcol_path != history_href) { |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3898 | free(history_href); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3899 | } |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3900 | |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3901 | dav_resource_free(history_collection); |
692
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3902 | } else if(dir->versioning->type == VERSIONING_DELTAV && res->exists){ |
492
7bde663719dc
Adds dav-sync option for enabling versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
3903 | // DeltaV is so much easier :) |
491
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3904 | if(dav_checkout(res)) { |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3905 | ret = VBEGIN_ERROR_CHECKOUT; |
692
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3906 | } else { |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3907 | *versionized = 1; |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3908 | } |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3909 | } |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3910 | |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3911 | return ret; |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3912 | } |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3913 | |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3914 | int versioning_init(SyncDirectory *dir, LocalResource *local, DavResource *res) { |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3915 | if(local->versioncontrol) { |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3916 | return 0; |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3917 | } |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3918 | int ret = 0; |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3919 | if(dir->versioning->type == VERSIONING_DELTAV) { |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3920 | if(dav_versioncontrol(res)) { |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3921 | ret = 1; |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3922 | } else { |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3923 | local->versioncontrol = 1; |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3924 | } |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3925 | } |
491
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3926 | return ret; |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3927 | } |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3928 | |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3929 | int versioning_end(SyncDirectory *dir, DavResource *res) { |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3930 | if(dir->versioning->type == VERSIONING_DELTAV) { |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3931 | return dav_checkin(res); |
504
bf3695fee719
fix missiong return in versioning_end()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
503
diff
changeset
|
3932 | } else { |
bf3695fee719
fix missiong return in versioning_end()
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
503
diff
changeset
|
3933 | return 0; |
491
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3934 | } |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3935 | } |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
3936 | |
692
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3937 | int versioning_delete_begin(SyncDirectory *dir, DavResource *res, int *exists, int *versionized) { |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3938 | *versionized = 0; |
492
7bde663719dc
Adds dav-sync option for enabling versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
3939 | if(dir->versioning->type == VERSIONING_SIMPLE) { |
692
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
3940 | versioning_begin(dir, res, exists, versionized); |
679
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
3941 | } else { |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
3942 | // versioning delete with DeltaV currently not supported in dav-sync |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
3943 | *exists = 1; |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
3944 | } |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
3945 | return 0; |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
3946 | } |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
3947 | |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
3948 | int versioning_delete_end(SyncDirectory *dir, DavResource *res) { |
522
46f96dcd6eab
adds metadata config element for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
521
diff
changeset
|
3949 | return 0; |
492
7bde663719dc
Adds dav-sync option for enabling versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
3950 | } |
7bde663719dc
Adds dav-sync option for enabling versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
3951 | |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3952 | static void update_metadata_hashes(LocalResource *local, MetadataHashes hashes) { |
663
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3953 | if(hashes.update_tags) { |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3954 | if(local->tags_hash) { |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3955 | free(local->tags_hash); |
629
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
3956 | local->tags_hash = NULL; |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3957 | } |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3958 | local->tags_hash = hashes.tags; |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3959 | } |
663
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3960 | if(hashes.update_tags_remote) { |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3961 | if(local->remote_tags_hash) { |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3962 | free(local->remote_tags_hash); |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3963 | } |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3964 | local->remote_tags_hash = hashes.tags_remote; |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3965 | } |
663
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3966 | if(hashes.update_xattr) { |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3967 | if(local->xattr_hash) { |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3968 | free(local->xattr_hash); |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3969 | } |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3970 | local->xattr_hash = hashes.xattr; |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3971 | } |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3972 | } |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
3973 | |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3974 | // this macro is only a workaround for a netbeans bug |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3975 | #define LOG10 log10 |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3976 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
3977 | static CxList* upload_parts( |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3978 | LocalResource *local, |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3979 | DavResource *res, |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3980 | FILE *in, |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3981 | uint64_t filesize, |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3982 | size_t blocksize, |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3983 | uint64_t *blockcount, |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3984 | int *err) |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3985 | { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3986 | // Make sure the resource is a collection. If it was a normal |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3987 | // resource until now, delete it and recreate it as collection |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3988 | if(res->exists) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3989 | if(!res->iscollection) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3990 | if(dav_delete(res)) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3991 | print_resource_error(res->session, res->path); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3992 | *err = 1; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3993 | return NULL; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3994 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3995 | res->exists = 0; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3996 | return upload_parts(local, res, in, filesize, blocksize, blockcount, err); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3997 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3998 | } else { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
3999 | res->iscollection = 1; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4000 | if(dav_create(res)) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4001 | print_resource_error(res->session, res->path); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4002 | *err = 1; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4003 | return NULL; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4004 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4005 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4006 | res->exists = 1; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4007 | |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4008 | if(!res->href) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4009 | // this should never happen, but just make sure it doesn't crash |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4010 | fprintf(stderr, "href is NULL\n"); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4011 | *err = 1; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4012 | return NULL; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4013 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4014 | |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4015 | char *buffer = malloc(blocksize); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4016 | if(!buffer) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4017 | fprintf(stderr, "Out of memory\n"); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4018 | *err = 1; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4019 | return NULL; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4020 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4021 | |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4022 | // calculate the maximal length of resource names |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4023 | // names should have all the same length and contain the block number |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4024 | int nblocks = filesize / blocksize; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4025 | int digits = LOG10((double)nblocks) + 1; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4026 | if(digits > 127) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4027 | fprintf(stderr, "Too many parts\n"); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4028 | *err = 1; |
659
51206020cfbe
fix: leaking buffer in upload_parts(), when we error out due to too many parts
Mike Becker <universe@uap-core.de>
parents:
650
diff
changeset
|
4029 | free(buffer); |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4030 | return NULL; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4031 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4032 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4033 | CxMap *updated_parts_map = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, (nblocks/2)+64); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4034 | updated_parts_map->simple_destructor = (cx_destructor_func)filepart_free; |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4035 | |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4036 | int blockindex = 0; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4037 | int uploaded_parts = 0; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4038 | size_t r; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4039 | |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4040 | // temporarly disable name encryption, because we don't need it for |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4041 | // part names |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4042 | uint32_t session_flags = res->session->flags; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4043 | res->session->flags ^= DAV_SESSION_ENCRYPT_NAME; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4044 | |
541
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
539
diff
changeset
|
4045 | DAV_SHA_CTX *sha = dav_hash_init(); |
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
539
diff
changeset
|
4046 | |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4047 | while((r = fread(buffer, 1, blocksize, in)) > 0) { |
541
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
539
diff
changeset
|
4048 | dav_hash_update(sha, buffer, r); |
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
539
diff
changeset
|
4049 | |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4050 | int upload_block = 0; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4051 | char *block_hash = dav_create_hash(buffer, r); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4052 | if(blockindex >= local->numparts) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4053 | // we don't have a hash for this block, therefore it must be new |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4054 | upload_block = 1; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4055 | } else { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4056 | FilePart part = local->parts[blockindex]; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4057 | if(!strcmp(part.hash, block_hash)) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4058 | // no change |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4059 | free(block_hash); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4060 | block_hash = NULL; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4061 | } else { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4062 | // block has changed |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4063 | upload_block = 1; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4064 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4065 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4066 | |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4067 | if(upload_block) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4068 | char name[128]; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4069 | snprintf(name, 128, "%0*d", digits, blockindex); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4070 | |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4071 | char *part_href = util_concat_path(res->href, name); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4072 | DavResource *part = dav_resource_new_href(res->session, part_href); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4073 | free(part_href); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4074 | |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4075 | // upload part |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4076 | dav_set_content_data(part, buffer, r); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4077 | if(dav_store(part)) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4078 | *err = 1; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4079 | print_resource_error(res->session, part->path); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4080 | } else { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4081 | // successfully uploaded part |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4082 | |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4083 | // store the FilePart in a map |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4084 | // later we do a propfind and add the etag |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4085 | FilePart *f = calloc(1, sizeof(FilePart)); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4086 | f->block = blockindex; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4087 | f->hash = block_hash; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4088 | cxMapPut(updated_parts_map, cx_hash_key_str(name), f); |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4089 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4090 | dav_resource_free(part); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4091 | uploaded_parts++; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4092 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4093 | if(*err) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4094 | break; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4095 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4096 | blockindex++; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4097 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4098 | *blockcount = blockindex; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4099 | |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4100 | // restore flags |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4101 | res->session->flags = session_flags; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4102 | |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4103 | free(buffer); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4104 | if(*err) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4105 | cxMapDestroy(updated_parts_map); |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4106 | return NULL; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4107 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4108 | |
541
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
539
diff
changeset
|
4109 | // set content-hash |
558
1a9e6a5c1e79
fixes several signedness issues
Mike Becker <universe@uap-core.de>
parents:
557
diff
changeset
|
4110 | unsigned char content_hash[DAV_SHA256_DIGEST_LENGTH]; |
541
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
539
diff
changeset
|
4111 | dav_hash_final(sha, content_hash); |
542
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
4112 | sync_set_content_hash(res, content_hash); |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
4113 | local->hash = util_hexstr(content_hash, DAV_SHA256_DIGEST_LENGTH); |
541
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
539
diff
changeset
|
4114 | |
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
539
diff
changeset
|
4115 | // get etags from uploaded resources |
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
539
diff
changeset
|
4116 | // also delete everything, that is not part of the file |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4117 | CxList *updated_parts = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4118 | DavResource *parts = dav_query(res->session, "select D:getetag from %s order by name", res->path); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4119 | if(!parts) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4120 | print_resource_error(res->session, parts->path); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4121 | *err = 1; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4122 | cxMapDestroy(updated_parts_map); |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4123 | return NULL; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4124 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4125 | DavResource *part = parts->children; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4126 | while(part) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4127 | FilePart *fp = cxMapRemoveAndGet(updated_parts_map, cx_hash_key_str(part->name)); |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4128 | // every part we uploaded is in the map |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4129 | // if we get parts that are not in the map, someone else uploaded it |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4130 | if(fp) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4131 | char *etag = dav_get_string_property(part, "D:getetag"); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4132 | if(etag) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4133 | if(strlen(etag) > 2 && etag[0] == 'W' && etag[1] == '/') { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4134 | etag = etag + 2; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4135 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4136 | |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4137 | fp->etag = strdup(etag); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4138 | cxListAdd(updated_parts, fp); |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4139 | } // else { wtf is wrong with this resource } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4140 | } else { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4141 | uint64_t name_partnum = 0; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4142 | char *res_name = part->name; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4143 | while(res_name[0] == '0' && res_name[1] != '\0') { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4144 | res_name++; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4145 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4146 | DavBool delete_part = 0; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4147 | if(strlen(part->name) != digits) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4148 | delete_part = 1; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4149 | } else if(util_strtouint(res_name, &name_partnum)) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4150 | if(name_partnum >= blockindex) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4151 | delete_part = 1; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4152 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4153 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4154 | |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4155 | if(delete_part) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4156 | if(dav_delete(part)) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4157 | print_resource_error(part->session, part->path); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4158 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4159 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4160 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4161 | part = part->next; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4162 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4163 | dav_resource_free_all(parts); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4164 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4165 | cxMapDestroy(updated_parts_map); |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4166 | |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4167 | *err = 0; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4168 | return updated_parts; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4169 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4170 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4171 | void update_parts(LocalResource *local, CxList *updates, uint64_t numparts) { |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4172 | size_t old_num = local->numparts; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4173 | if(old_num > numparts) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4174 | // free old parts |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4175 | for(size_t i=numparts;i<old_num;i++) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4176 | FilePart p = local->parts[i]; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4177 | if(p.etag) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4178 | free(p.etag); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4179 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4180 | if(p.hash) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4181 | free(p.hash); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4182 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4183 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4184 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4185 | if(numparts != local->numparts) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4186 | local->parts = realloc(local->parts, numparts * sizeof(FilePart)); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4187 | local->numparts = numparts; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4188 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4189 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4190 | if(!updates) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4191 | return; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4192 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4193 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4194 | CxIterator i = cxListIterator(updates); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4195 | cx_foreach(FilePart *, p, i) { |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4196 | if(p->block > numparts) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4197 | // just make sure things don't explode in case some weird stuff |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4198 | // is going on |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4199 | continue; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4200 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4201 | |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4202 | FilePart *old = &local->parts[p->block]; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4203 | if(p->block < old_num) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4204 | // cleanup existing part |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4205 | if(old->hash) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4206 | free(old->hash); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4207 | old->hash = NULL; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4208 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4209 | if(old->etag) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4210 | free(old->etag); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4211 | old->etag = NULL; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4212 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4213 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4214 | old->block = p->block; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4215 | old->hash = p->hash; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4216 | old->etag = p->etag; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4217 | free(p); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4218 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4219 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4220 | |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
4221 | int sync_put_resource( |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
4222 | SyncDirectory *dir, |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
4223 | DavResource *res, |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
4224 | LocalResource *local, |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
4225 | int *counter) |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
4226 | { |
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
608
diff
changeset
|
4227 | char *local_path = create_local_path(dir, local_resource_path(local)); |
144
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4228 | |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
4229 | SYS_STAT s; |
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
4230 | if(sys_stat(local_path, &s)) { |
491
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
4231 | fprintf(stderr, "Cannot stat file: %s\n", local_path); |
144
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4232 | perror(""); |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4233 | free(local_path); |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4234 | return -1; |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4235 | } |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4236 | |
577
f49964cf7228
store link property on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
4237 | DavBool islink = local->link_target ? 1 : 0; |
f49964cf7228
store link property on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
4238 | if(!local->link_target && local->link_updated) { |
607
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
4239 | dav_remove_property_ns(res, DAV_PROPS_NS, "link"); |
577
f49964cf7228
store link property on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
4240 | } |
f49964cf7228
store link property on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
4241 | |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4242 | size_t split_blocksize = resource_get_blocksize(dir, local, res, s.st_size); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4243 | |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
4244 | FILE *in = sys_fopen(local_path, "rb"); |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4245 | if(!in) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4246 | fprintf(stderr, "Cannot open file %s\n", local_path); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4247 | free(local_path); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4248 | return -1; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4249 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4250 | |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4251 | DavBool issplit = split_blocksize == 0 ? FALSE : TRUE; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4252 | int split_err = 0; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4253 | CxList *parts = NULL; |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4254 | uint64_t blockcount = 0; |
577
f49964cf7228
store link property on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
4255 | |
f49964cf7228
store link property on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
4256 | if(islink) { |
607
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
4257 | dav_set_string_property_ns(res, DAV_PROPS_NS, "link", local->link_target); |
577
f49964cf7228
store link property on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
4258 | } else if(issplit) { |
541
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
539
diff
changeset
|
4259 | // set split property |
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
539
diff
changeset
|
4260 | char blocksize_str[32]; |
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
539
diff
changeset
|
4261 | snprintf(blocksize_str, 32, "%zu", split_blocksize); |
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
539
diff
changeset
|
4262 | dav_set_string_property_ns(res, DAV_NS, "split", blocksize_str); |
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
539
diff
changeset
|
4263 | |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4264 | // splitted/partial upload |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4265 | parts = upload_parts( |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4266 | local, |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4267 | res, |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4268 | in, |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4269 | s.st_size, |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4270 | split_blocksize, |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4271 | &blockcount, |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4272 | &split_err); |
577
f49964cf7228
store link property on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
4273 | } else { |
f49964cf7228
store link property on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
4274 | // regular file upload |
f49964cf7228
store link property on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
4275 | dav_set_content(res, in, (dav_read_func)myread, (dav_seek_func)file_seek); |
f49964cf7228
store link property on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
4276 | dav_set_content_length(res, s.st_size); |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4277 | } |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4278 | if(split_err) { |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4279 | free(local_path); |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4280 | return -1; |
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4281 | } |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4282 | |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4283 | MetadataHashes hashes; |
672
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4284 | hashes = sync_set_metadata_properties(dir, res->session, res, local, FALSE); |
491
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
4285 | |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4286 | // before sync_put_resource, remote_resource_is_changed does a propfind |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4287 | // and sets res->exists |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4288 | int exists = res->exists; |
692
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
4289 | int vend_required = 0; |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4290 | if(dir->versioning && dir->versioning->always && !issplit) { |
692
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
4291 | // in case the file exists, we need to put the file under |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
4292 | // versioncontrol (DeltaV only, does nothing with simple versioning) |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
4293 | if(exists && versioning_init(dir, local, res)) { |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
4294 | // init failed |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
4295 | fprintf(stderr, "Cannot activate versioncontrol for resource: %s\n", res->href); |
491
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
4296 | free(local_path); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
4297 | return -1; |
692
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
4298 | } else { |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
4299 | int err = versioning_begin(dir, res, &exists, &vend_required); |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
4300 | if(err) { |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
4301 | fprintf(stderr, "Cannot store version for resource: %s\n", res->href); |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
4302 | free(local_path); |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
4303 | return -1; |
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
4304 | } |
491
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
4305 | } |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
4306 | } |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
4307 | |
739
bba6a6e221b4
use sys_* io functions in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
734
diff
changeset
|
4308 | int ret = -2; |
bba6a6e221b4
use sys_* io functions in dav put
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
734
diff
changeset
|
4309 | dir->max_retry = 2; |
244
47791bdf1725
changed max-retry meaning and filter configuration in sync.xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
243
diff
changeset
|
4310 | for(int i=0;i<=dir->max_retry;i++) { |
491
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
4311 | if(!exists && dav_create(res)) { |
144
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4312 | continue; |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4313 | } |
491
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
4314 | exists = 1; |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4315 | if(dav_store(res)) { |
144
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4316 | continue; |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4317 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4318 | ret = 0; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4319 | break; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4320 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4321 | |
692
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
4322 | if(vend_required) { |
491
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
4323 | if(versioning_end(dir, res)) { |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
4324 | fprintf(stderr, "Cannot checkin resource\n"); |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
4325 | ret = 1; |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
4326 | } |
fdc2fb090cc7
adds versioning support for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
490
diff
changeset
|
4327 | } |
144
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4328 | |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
4329 | if(ret == 0) { |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
4330 | (*counter)++; |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
4331 | |
661
1baec7ff8931
add first metadata sync test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
659
diff
changeset
|
4332 | local->tags_updated = 0; |
1baec7ff8931
add first metadata sync test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
659
diff
changeset
|
4333 | |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4334 | update_metadata_hashes(local, hashes); |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4335 | update_parts(local, parts, blockcount); |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4336 | |
144
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4337 | // check contentlength and get new etag |
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
533
diff
changeset
|
4338 | DavResource *up_res = dav_get(res->session, res->path, "D:getetag,idav:status"); |
48
08d5544c92fb
fixed etag handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
4339 | |
144
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4340 | if(up_res) { |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4341 | // the new content length must be equal or greater than the file size |
577
f49964cf7228
store link property on push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
4342 | if(up_res->contentlength < s.st_size && !issplit && !islink) { |
478
baa63fef5c5c
fixes redirects
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
460
diff
changeset
|
4343 | fprintf(stderr, "Incomplete Upload: %s\n", local_path); |
144
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4344 | ret = -1; |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4345 | // try to set the resource status to 'broken' |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4346 | sync_set_status(res, "broken"); |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4347 | } else { |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4348 | // everything seems fine, we can update the local resource |
331
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
318
diff
changeset
|
4349 | char *etag = dav_get_string_property(up_res, "D:getetag"); |
621
06f9fddc82a1
don't store weak etag in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
619
diff
changeset
|
4350 | local_resource_set_etag(local, etag); |
144
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4351 | |
630
046b869a1c49
use hash to check if a file content was really modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
629
diff
changeset
|
4352 | if(!issplit && SYNC_STORE_HASH(dir)) { |
550
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
4353 | if(local->hash) { |
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
4354 | free(local->hash); |
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
4355 | } |
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
4356 | // TODO: calculate hash on upload |
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
4357 | local->hash = util_file_hash(local_path); |
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
4358 | } |
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
4359 | |
331
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
318
diff
changeset
|
4360 | if(dav_get_string_property(up_res, "idav:status")) { |
227
bf485439222a
fixed locking in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
225
diff
changeset
|
4361 | sync_remove_status(up_res); |
bf485439222a
fixed locking in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
225
diff
changeset
|
4362 | } |
bf485439222a
fixed locking in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
225
diff
changeset
|
4363 | |
bf485439222a
fixed locking in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
225
diff
changeset
|
4364 | dav_resource_free(up_res); |
144
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4365 | } |
64
112dbf7ba8b0
changed sync behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
4366 | } |
144
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4367 | } else { |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4368 | ret = -1; |
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4369 | sync_set_status(res, "broken"); |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4370 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4371 | |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4372 | fclose(in); |
144
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
135
diff
changeset
|
4373 | free(local_path); |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4374 | |
64
112dbf7ba8b0
changed sync behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
61
diff
changeset
|
4375 | return ret; |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4376 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4377 | |
190
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4378 | int sync_mkdir(SyncDirectory *dir, DavResource *res, LocalResource *local) { |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4379 | res->iscollection = 1; |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4380 | int ret = -1; |
244
47791bdf1725
changed max-retry meaning and filter configuration in sync.xml
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
243
diff
changeset
|
4381 | for(int i=0;i<=dir->max_retry;i++) { |
190
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4382 | if(dav_create(res)) { |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4383 | continue; |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4384 | } |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4385 | ret = 0; |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4386 | break; |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4387 | } |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4388 | return ret; |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4389 | } |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4390 | |
552
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4391 | int sync_move_remote_resource( |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4392 | SyncDirectory *dir, |
569
cafdc13b6820
remove dead db entry when files are moved
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
568
diff
changeset
|
4393 | SyncDatabase *db, |
552
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4394 | DavResource *origin, |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4395 | LocalResource *local, |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4396 | DavBool copy, |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4397 | int *counter) |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4398 | { |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4399 | char *local_path = create_local_path(dir, local->path); |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4400 | |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4401 | SYS_STAT s; |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4402 | if(sys_stat(local_path, &s)) { |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4403 | fprintf(stderr, "Cannot stat file: %s\n", local_path); |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4404 | perror(""); |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4405 | free(local_path); |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4406 | return -1; |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4407 | } |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4408 | free(local_path); |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4409 | |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4410 | int result = 0; |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4411 | if(copy) { |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4412 | result = dav_copy_o(origin, local->path, FALSE); |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4413 | } else { |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4414 | result = dav_move_o(origin, local->path, FALSE); |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4415 | } |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4416 | |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4417 | if(result != 0) { |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4418 | return result; |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4419 | } |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4420 | |
569
cafdc13b6820
remove dead db entry when files are moved
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
568
diff
changeset
|
4421 | LocalResource *local_origin = local->origin; |
cafdc13b6820
remove dead db entry when files are moved
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
568
diff
changeset
|
4422 | if(!copy) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4423 | cxMapRemove(db->resources, cx_hash_key_str(local_origin->path)); |
569
cafdc13b6820
remove dead db entry when files are moved
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
568
diff
changeset
|
4424 | } |
672
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4425 | |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4426 | // set resource metadata |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4427 | DavResource *up_res = dav_resource_new(origin->session, local->path); |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4428 | if(!up_res) { |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4429 | return 1; |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4430 | } |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4431 | |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4432 | sync_set_metadata_from_stat(local, &s); |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4433 | MetadataHashes hashes; |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4434 | hashes = sync_set_metadata_properties(dir, up_res->session, up_res, local, TRUE); |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4435 | if(dav_store(up_res)) { |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4436 | fprintf(stderr, "Error: cannot store resource metadata\n"); |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4437 | } |
552
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4438 | |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4439 | // get new etag |
672
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4440 | DavPropName p; |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4441 | p.ns = "DAV:"; |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4442 | p.name = "getetag"; |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4443 | if(!dav_load_prop(up_res, &p, 1)) { |
552
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4444 | (*counter)++; |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4445 | |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4446 | // everything seems fine, we can update the local resource |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4447 | char *etag = dav_get_string_property(up_res, "D:getetag"); |
621
06f9fddc82a1
don't store weak etag in LocalResource
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
619
diff
changeset
|
4448 | local_resource_set_etag(local, etag); |
552
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4449 | |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4450 | local->last_modified = s.st_mtime; |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4451 | } else { |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4452 | result = 1; |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4453 | } |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4454 | |
672
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4455 | dav_resource_free(up_res); |
552
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4456 | return result; |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4457 | } |
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
551
diff
changeset
|
4458 | |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
4459 | int sync_delete_remote_resource( |
492
7bde663719dc
Adds dav-sync option for enabling versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
4460 | SyncDirectory *dir, |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
4461 | DavSession *sn, |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
4462 | LocalResource *local_res, |
460
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
4463 | int *counter, |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4464 | CxList *cols) |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
4465 | { |
570
00b7b8e86c48
fix deletion of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
4466 | DavResource *res = dav_get(sn, local_res->path, "D:getetag,idav:split"); |
65
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
4467 | if(!res) { |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
4468 | return sn->error == DAV_NOT_FOUND ? 0 : 1; |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
4469 | } |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
4470 | |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
4471 | int ret = 0; |
460
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
4472 | sn->error = DAV_OK; |
190
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4473 | if(res->iscollection) { |
570
00b7b8e86c48
fix deletion of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
4474 | DavXmlNode *split = dav_get_property_ns(res, DAV_NS, "split"); |
460
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
4475 | if(cols) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4476 | cxListAdd(cols, local_res); |
570
00b7b8e86c48
fix deletion of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
4477 | } else if(split || !res->children) { |
460
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
4478 | printf("delete: %s\n", res->path); |
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
4479 | if(dav_delete(res)) { |
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
4480 | ret = 1; |
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
4481 | fprintf(stderr, "Cannot delete collection %s\n", res->path); |
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
4482 | } else { |
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
4483 | (*counter)++; |
22522ff52a62
adds check to make sure dav-sync doesn't delete collections when children are modified
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
449
diff
changeset
|
4484 | } |
65
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
4485 | } |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
4486 | } else { |
331
9ca1e4706acc
adds initial support for xml properties in libidav
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
318
diff
changeset
|
4487 | char *etag = dav_get_string_property(res, "D:getetag"); |
190
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4488 | if(etag) { |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4489 | if(strlen(etag) > 2 && etag[0] == 'W' && etag[1] == '/') { |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4490 | etag = etag + 2; |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4491 | } |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4492 | } |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4493 | |
565
26898e00ddff
fix dav-sync push not deleting files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
564
diff
changeset
|
4494 | if(!nullstrcmp(etag, local_res->etag)) { |
190
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4495 | // local resource metadata == remote resource metadata |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4496 | // resource can be deleted |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4497 | printf("delete: %s\n", res->path); |
679
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
4498 | int exists = 1; |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
4499 | int vend_required = 0; |
492
7bde663719dc
Adds dav-sync option for enabling versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
4500 | if(dir->versioning && dir->versioning->always) { |
692
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
4501 | if(versioning_delete_begin(dir, res, &exists, &vend_required)) { |
492
7bde663719dc
Adds dav-sync option for enabling versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
4502 | fprintf( |
7bde663719dc
Adds dav-sync option for enabling versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
4503 | stderr, |
7bde663719dc
Adds dav-sync option for enabling versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
4504 | "Cannot save resource version before deletion\n"); |
7bde663719dc
Adds dav-sync option for enabling versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
4505 | ret = 1; |
7bde663719dc
Adds dav-sync option for enabling versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
4506 | } |
7bde663719dc
Adds dav-sync option for enabling versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
4507 | } |
7bde663719dc
Adds dav-sync option for enabling versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
491
diff
changeset
|
4508 | |
679
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
4509 | if(!ret && dav_delete(res) && exists) { |
190
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4510 | if(sn->error != DAV_NOT_FOUND) { |
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4511 | fprintf(stderr, "Cannot delete resource %s\n", res->path); |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
4512 | ret = 1; |
190
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4513 | } |
192
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
4514 | } else { |
d10194a51304
dav-sync prints a small report after successful sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
191
diff
changeset
|
4515 | (*counter)++; |
190
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4516 | } |
679
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
4517 | |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
4518 | if(vend_required) { |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
4519 | versioning_delete_end(dir, res); |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
4520 | } |
190
a76e43d89f55
dav-sync can create and delete empty directories now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
4521 | } |
565
26898e00ddff
fix dav-sync push not deleting files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
564
diff
changeset
|
4522 | // else TODO: should we inform the user that the file was modified on |
26898e00ddff
fix dav-sync push not deleting files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
564
diff
changeset
|
4523 | // the server and delete was skipped? |
65
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
4524 | } |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
4525 | |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
4526 | // cleanup |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
4527 | dav_resource_free(res); |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
4528 | |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
4529 | return ret; |
d4077e8175f3
added optional trash for deleted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
64
diff
changeset
|
4530 | } |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
4531 | |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4532 | MetadataHashes sync_set_metadata_properties( |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4533 | SyncDirectory *dir, |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4534 | DavSession *sn, |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4535 | DavResource *res, |
672
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4536 | LocalResource *local, |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4537 | DavBool force) |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4538 | { |
672
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4539 | if(force) { |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4540 | local->tags_updated = 1; |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4541 | local->finfo_updated = 1; |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4542 | local->xattr_updated = 1; |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4543 | } |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4544 | |
663
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
4545 | MetadataHashes hashes = {NULL, NULL, NULL, 0, 0, 0}; |
667
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4546 | if(dir->tagconfig) { |
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
4547 | // get local tags |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4548 | DavBool changed = 0; |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4549 | char *tags_hash = NULL; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4550 | CxList *tags = sync_get_file_tags(dir, local, &changed, &tags_hash); |
667
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4551 | char *new_remote_hash = nullstrdup(tags_hash); |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4552 | if(changed || local->tags_updated) { |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4553 | DavBool store_tags = TRUE; |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4554 | |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4555 | // get remote tags |
667
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4556 | DavPropName p; |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4557 | p.ns = DAV_PROPS_NS; |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4558 | p.name = "tags"; |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4559 | if(dav_load_prop(res, &p, 1) && sn->error != DAV_NOT_FOUND) { |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4560 | print_resource_error(sn, res->path); |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4561 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4562 | CxList *remote_tags = NULL; |
607
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
4563 | DavXmlNode *tagsprop = dav_get_property_ns(res, DAV_PROPS_NS, "tags"); |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4564 | if(tagsprop) { |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4565 | remote_tags = parse_dav_xml_taglist(tagsprop); |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4566 | } |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4567 | char *remote_hash = create_tags_hash(remote_tags); |
667
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4568 | |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4569 | if(nullstrcmp(remote_hash, local->remote_tags_hash)) { |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4570 | // the tags have changed on the server |
672
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4571 | int conflict_resolution = force ? TAG_NO_CONFLICT : dir->tagconfig->conflict; |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4572 | switch(conflict_resolution) { |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4573 | case TAG_NO_CONFLICT: break; |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4574 | case TAG_KEEP_LOCAL: break; |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4575 | case TAG_KEEP_REMOTE: { |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4576 | store_tags = FALSE; |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4577 | local->tags_updated = FALSE; |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4578 | break; |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4579 | } |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4580 | case TAG_MERGE: { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4581 | CxList *new_tags = merge_tags(tags, remote_tags); |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4582 | free_taglist(tags); |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4583 | tags = new_tags; |
667
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4584 | |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4585 | nullfree(tags_hash); |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4586 | nullfree(new_remote_hash); |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4587 | tags_hash = create_tags_hash(tags); |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4588 | new_remote_hash = nullstrdup(tags_hash); |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4589 | |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4590 | break; |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4591 | } |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4592 | } |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4593 | } |
667
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4594 | nullfree(remote_hash); |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4595 | |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4596 | if(dir->tagconfig->local_format == TAG_FORMAT_CSV) { |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4597 | // csv tag lists don't have colors, so we have to add |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4598 | // the colors from the remote tag list |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4599 | add_tag_colors(tags, remote_tags); |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4600 | } |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4601 | |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4602 | if(store_tags) { |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4603 | if(tags) { |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4604 | DavXmlNode *tagprop = create_xml_taglist(tags); |
607
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
4605 | dav_set_property_ns(res, DAV_PROPS_NS, "tags", tagprop); |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4606 | } else { |
607
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
4607 | dav_remove_property_ns(res, DAV_PROPS_NS, "tags"); |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4608 | } |
667
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4609 | |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4610 | hashes.tags = tags_hash; |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4611 | hashes.update_tags = 1; |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4612 | hashes.tags_remote = new_remote_hash; |
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
663
diff
changeset
|
4613 | hashes.update_tags_remote = 1; |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4614 | } |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4615 | |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4616 | free_taglist(remote_tags); |
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
4617 | } else { |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4618 | if(tags_hash) { |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4619 | free(tags_hash); |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4620 | } |
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
4621 | } |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4622 | free_taglist(tags); |
369
4322b8953bd5
adds tag conflict detection for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
368
diff
changeset
|
4623 | } |
4322b8953bd5
adds tag conflict detection for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
368
diff
changeset
|
4624 | |
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
4625 | if(local->finfo_updated) { |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
4626 | struct stat s; |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
4627 | s.st_mode = local->mode; |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
4628 | s.st_mtime = local->last_modified; |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
4629 | s.st_uid = local->uid; |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
4630 | s.st_gid = local->gid; |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
4631 | resource_set_finfo_s(&s, res, dir->metadata); |
369
4322b8953bd5
adds tag conflict detection for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
368
diff
changeset
|
4632 | } |
4322b8953bd5
adds tag conflict detection for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
368
diff
changeset
|
4633 | |
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
4634 | if(local->xattr_updated) { |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
4635 | if(local->xattr) { |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
4636 | resource_set_xattr(res, local->xattr); |
663
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
4637 | hashes.xattr = local->xattr ? strdup(local->xattr->hash) : NULL; |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
4638 | hashes.update_xattr = 1; |
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
4639 | } else { |
607
5dc7fe41e8f8
move some properties to new namespace
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
603
diff
changeset
|
4640 | dav_remove_property(res, "idavprops:xattributes"); |
663
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
4641 | if(local->xattr_hash) { |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
4642 | free(local->xattr_hash); |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
4643 | local->xattr_hash = NULL; |
888aa263c0f1
fix some xattr sync bugs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
4644 | } |
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
4645 | } |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
4646 | } |
672
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4647 | |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4648 | local->tags_updated = 0; |
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4649 | |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4650 | return hashes; |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4651 | } |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4652 | |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4653 | int sync_update_metadata( |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4654 | SyncDirectory *dir, |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4655 | DavSession *sn, |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4656 | DavResource *res, |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4657 | LocalResource *local) |
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4658 | { |
672
4bfe452a2665
fix dav-sync copy with enabled metadata sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
4659 | MetadataHashes hashes = sync_set_metadata_properties(dir, sn, res, local, FALSE); |
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
4660 | |
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
4661 | int err = 0; |
370
ab9c5afdc243
pushing tags should work now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
369
diff
changeset
|
4662 | if(dav_store(res)) { |
ab9c5afdc243
pushing tags should work now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
369
diff
changeset
|
4663 | print_resource_error(sn, local->path); |
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
4664 | err = 1; |
370
ab9c5afdc243
pushing tags should work now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
369
diff
changeset
|
4665 | } else { |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4666 | update_metadata_hashes(local, hashes); |
661
1baec7ff8931
add first metadata sync test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
659
diff
changeset
|
4667 | local->tags_updated = 0; |
369
4322b8953bd5
adds tag conflict detection for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
368
diff
changeset
|
4668 | } |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
4669 | |
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
4670 | return err; |
369
4322b8953bd5
adds tag conflict detection for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
368
diff
changeset
|
4671 | } |
4322b8953bd5
adds tag conflict detection for dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
368
diff
changeset
|
4672 | |
218
5f1f7602cf77
automatically remove deleted conflict files from the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
217
diff
changeset
|
4673 | void remove_deleted_conflicts(SyncDirectory *dir, SyncDatabase *db) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4674 | char **dc = calloc(sizeof(void*), db->conflict->size); |
218
5f1f7602cf77
automatically remove deleted conflict files from the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
217
diff
changeset
|
4675 | int numdc = 0; |
5f1f7602cf77
automatically remove deleted conflict files from the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
217
diff
changeset
|
4676 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4677 | CxIterator i = cxMapIteratorValues(db->conflict); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4678 | cx_foreach(LocalResource *, res, i) { |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
4679 | char *path = create_local_path(dir, res->path); |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
4680 | SYS_STAT s; |
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
4681 | if(sys_stat(path, &s)) { |
218
5f1f7602cf77
automatically remove deleted conflict files from the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
217
diff
changeset
|
4682 | if(errno == ENOENT) { |
5f1f7602cf77
automatically remove deleted conflict files from the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
217
diff
changeset
|
4683 | dc[numdc] = res->path; |
5f1f7602cf77
automatically remove deleted conflict files from the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
217
diff
changeset
|
4684 | numdc++; |
5f1f7602cf77
automatically remove deleted conflict files from the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
217
diff
changeset
|
4685 | } else { |
5f1f7602cf77
automatically remove deleted conflict files from the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
217
diff
changeset
|
4686 | fprintf(stderr, "Cannot stat file: %s\n", path); |
5f1f7602cf77
automatically remove deleted conflict files from the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
217
diff
changeset
|
4687 | perror(""); |
5f1f7602cf77
automatically remove deleted conflict files from the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
217
diff
changeset
|
4688 | } |
5f1f7602cf77
automatically remove deleted conflict files from the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
217
diff
changeset
|
4689 | } |
5f1f7602cf77
automatically remove deleted conflict files from the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
217
diff
changeset
|
4690 | free(path); |
5f1f7602cf77
automatically remove deleted conflict files from the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
217
diff
changeset
|
4691 | } |
5f1f7602cf77
automatically remove deleted conflict files from the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
217
diff
changeset
|
4692 | |
5f1f7602cf77
automatically remove deleted conflict files from the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
217
diff
changeset
|
4693 | for(int i=0;i<numdc;i++) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4694 | cxMapRemove(db->conflict, cx_hash_key_str(dc[i])); |
218
5f1f7602cf77
automatically remove deleted conflict files from the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
217
diff
changeset
|
4695 | } |
222
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4696 | |
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4697 | free(dc); |
218
5f1f7602cf77
automatically remove deleted conflict files from the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
217
diff
changeset
|
4698 | } |
5f1f7602cf77
automatically remove deleted conflict files from the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
217
diff
changeset
|
4699 | |
257
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
4700 | static void resolve_skipped(SyncDatabase *db) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4701 | CxIterator i = cxMapIteratorValues(db->resources); |
257
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
4702 | int skipped = 0; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4703 | cx_foreach(LocalResource *, res, i) { |
257
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
4704 | if(res->skipped) { |
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
4705 | skipped++; |
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
4706 | fprintf(stderr, "skipped from push: %s\n", res->path); |
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
4707 | } |
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
4708 | } |
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
4709 | if(skipped > 0) { |
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
4710 | fprintf(stderr, |
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
4711 | " To resolve conflict resources skipped by push run dav-sync pull first\n" |
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
4712 | " before resolve-conflicts or delete-conflicts.\n\n"); |
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
4713 | } |
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
4714 | } |
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
4715 | |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4716 | int cmd_resolve_conflicts(CmdArgs *a) { |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4717 | if(a->argc != 1) { |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4718 | fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few" : "many"); |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4719 | return -1; |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4720 | } |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4721 | |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4722 | SyncDirectory *dir = scfg_get_dir(a->argv[0]); |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4723 | if(!dir) { |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4724 | fprintf(stderr, "Unknown sync dir: %s\n", a->argv[0]); |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4725 | return -1; |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4726 | } |
233
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
4727 | if(scfg_check_dir(dir)) { |
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
4728 | return -1; |
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
4729 | } |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4730 | |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4731 | SyncDatabase *db = load_db(dir->database); |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4732 | if(!db) { |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4733 | fprintf(stderr, "Cannot load database file: %s\n", dir->database); |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4734 | return -1; |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4735 | } |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4736 | |
257
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
4737 | resolve_skipped(db); |
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
4738 | |
222
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4739 | int ret = 0; |
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4740 | |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4741 | // remove conflicts |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4742 | int num_conflict = db->conflict->size; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4743 | //ucx_map_free_content(db->conflict, (ucx_destructor)local_resource_free); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4744 | cxMapClear(db->conflict); |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4745 | |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4746 | // store db |
521
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
516
diff
changeset
|
4747 | if(store_db(db, dir->database, dir->db_settings)) { |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4748 | fprintf(stderr, "Cannot store sync db\n"); |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4749 | fprintf(stderr, "Abort\n"); |
224
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
4750 | ret = -2; |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4751 | } |
224
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
4752 | |
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
4753 | // cleanup |
222
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4754 | destroy_db(db); |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4755 | |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4756 | // Report |
224
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
4757 | if(ret != -2) { |
222
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4758 | char *str_conflict = num_conflict == 1 ? "conflict" : "conflicts"; |
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4759 | printf("Result: %d %s resolved\n", num_conflict, str_conflict); |
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4760 | } |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4761 | |
222
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4762 | return ret; |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4763 | } |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4764 | |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4765 | int cmd_delete_conflicts(CmdArgs *a) { |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4766 | if(a->argc != 1) { |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4767 | fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few" : "many"); |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4768 | return -1; |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4769 | } |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4770 | |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4771 | SyncDirectory *dir = scfg_get_dir(a->argv[0]); |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4772 | if(!dir) { |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4773 | fprintf(stderr, "Unknown sync dir: %s\n", a->argv[0]); |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4774 | return -1; |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4775 | } |
233
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
4776 | if(scfg_check_dir(dir)) { |
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
4777 | return -1; |
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
4778 | } |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4779 | |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4780 | SyncDatabase *db = load_db(dir->database); |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4781 | if(!db) { |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4782 | fprintf(stderr, "Cannot load database file: %s\n", dir->database); |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4783 | return -1; |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4784 | } |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4785 | |
257
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
4786 | resolve_skipped(db); |
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
4787 | |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4788 | int num_del = 0; |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4789 | int num_err = 0; |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4790 | |
222
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4791 | int ret = 0; |
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4792 | |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4793 | // delete all conflict files |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4794 | CxIterator i = cxMapIterator(db->conflict); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4795 | cx_foreach(LocalResource*, res, i) { |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4796 | printf("delete: %s\n", res->path); |
544
9e85e1ec1155
adds semi functional download of splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
543
diff
changeset
|
4797 | char *path = create_local_path(dir, res->path); |
412
dc74f736aea1
adds more fs abstraction
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
4798 | if(sys_unlink(path)) { |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4799 | if(errno != ENOENT) { |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4800 | perror("unlink"); |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4801 | num_err++; |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4802 | } |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4803 | } else { |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4804 | num_del++; |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4805 | } |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4806 | free(path); |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4807 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4808 | //ucx_map_free_content(db->conflict, (ucx_destructor)local_resource_free); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4809 | cxMapClear(db->conflict); |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4810 | |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4811 | // store db |
521
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
516
diff
changeset
|
4812 | if(store_db(db, dir->database, dir->db_settings)) { |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4813 | fprintf(stderr, "Cannot store sync db\n"); |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4814 | fprintf(stderr, "Abort\n"); |
222
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4815 | ret = -1; |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4816 | } |
224
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
4817 | |
4b55f05f4e00
added more cleanup code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
223
diff
changeset
|
4818 | // cleanup |
222
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4819 | destroy_db(db); |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4820 | |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4821 | // Report |
222
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4822 | if(ret == 0) { |
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4823 | char *str_delete = num_del == 1 ? "file" : "files"; |
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4824 | char *str_error = num_err == 1 ? "error" : "errors"; |
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4825 | printf("Result: %d conflict %s deleted, %d %s\n", |
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4826 | num_del, str_delete, |
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4827 | num_err, str_error); |
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4828 | } |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4829 | |
222
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
4830 | return ret; |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4831 | } |
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4832 | |
563
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4833 | int cmd_list_conflicts(CmdArgs *a) { |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4834 | if(a->argc != 1) { |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4835 | fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few" : "many"); |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4836 | return -1; |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4837 | } |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4838 | |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4839 | SyncDirectory *dir = scfg_get_dir(a->argv[0]); |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4840 | if(!dir) { |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4841 | fprintf(stderr, "Unknown sync dir: %s\n", a->argv[0]); |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4842 | return -1; |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4843 | } |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4844 | if(scfg_check_dir(dir)) { |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4845 | return -1; |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4846 | } |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4847 | |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4848 | SyncDatabase *db = load_db(dir->database); |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4849 | if(!db) { |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4850 | fprintf(stderr, "Cannot load database file: %s\n", dir->database); |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4851 | return -1; |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4852 | } |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4853 | |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4854 | remove_deleted_conflicts(dir, db); |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4855 | |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4856 | // get all conflict sources |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4857 | CxIterator i = cxMapIteratorValues(db->conflict); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4858 | CxList* conflict_sources = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4859 | cx_foreach(LocalResource *, res, i) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4860 | cxListAdd(conflict_sources, res->conflict_source); |
563
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4861 | } |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4862 | |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4863 | // print unique conflict sources |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4864 | // TODO: set cmpfunc at map creation |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4865 | conflict_sources->cmpfunc = (cx_compare_func)strcmp; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4866 | cxListSort(conflict_sources); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4867 | i = cxListIterator(conflict_sources); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4868 | char *prev = ""; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4869 | cx_foreach(char *, path, i) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4870 | // TODO: implement verbose print if(cmd_getoption(a, "verbose")) |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4871 | // printf("%s (%d)\n", path, confl_count); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4872 | if(!strcmp(path, prev)) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4873 | continue; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4874 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4875 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4876 | printf("%s\n", path); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4877 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4878 | prev = path; |
563
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4879 | } |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4880 | |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4881 | // cleanup |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4882 | destroy_db(db); |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4883 | |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4884 | return 0; |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4885 | } |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
4886 | |
217
12bad63cf5a8
added resolve-conflicts and delete-conflicts commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
4887 | |
204
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4888 | // TODO: remove code dup (main.c ls_size_str) |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4889 | static char* size_str(uint64_t size) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4890 | char *str = malloc(16); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4891 | |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4892 | if(size < 0x400) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4893 | snprintf(str, 16, "%" PRIu64 " bytes", size); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4894 | } else if(size < 0x100000) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4895 | float s = (float)size/0x400; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4896 | int diff = (s*100 - (int)s*100); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4897 | if(diff > 90) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4898 | diff = 0; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4899 | s += 0.10f; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4900 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4901 | if(size < 0x2800 && diff != 0) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4902 | // size < 10 KiB |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4903 | snprintf(str, 16, "%.1f KiB", s); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4904 | } else { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4905 | snprintf(str, 16, "%.0f KiB", s); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4906 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4907 | } else if(size < 0x40000000) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4908 | float s = (float)size/0x100000; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4909 | int diff = (s*100 - (int)s*100); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4910 | if(diff > 90) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4911 | diff = 0; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4912 | s += 0.10f; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4913 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4914 | if(size < 0xa00000 && diff != 0) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4915 | // size < 10 MiB |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4916 | snprintf(str, 16, "%.1f MiB", s); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4917 | } else { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4918 | size /= 0x100000; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4919 | snprintf(str, 16, "%.0f MiB", s); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4920 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4921 | } else if(size < 0x1000000000ULL) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4922 | float s = (float)size/0x40000000; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4923 | int diff = (s*100 - (int)s*100); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4924 | if(diff > 90) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4925 | diff = 0; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4926 | s += 0.10f; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4927 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4928 | if(size < 0x280000000 && diff != 0) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4929 | // size < 10 GiB |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4930 | snprintf(str, 16, "%.1f GiB", s); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4931 | } else { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4932 | size /= 0x40000000; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4933 | snprintf(str, 16, "%.0f GiB", s); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4934 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4935 | } else { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4936 | size /= 1024; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4937 | float s = (float)size/0x40000000; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4938 | int diff = (s*100 - (int)s*100); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4939 | if(diff > 90) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4940 | diff = 0; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4941 | s += 0.10f; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4942 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4943 | if(size < 0x280000000 && diff != 0) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4944 | // size < 10 TiB |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4945 | snprintf(str, 16, "%.1f TiB", s); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4946 | } else { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4947 | size /= 0x40000000; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4948 | snprintf(str, 16, "%.0f TiB", s); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4949 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4950 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4951 | return str; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4952 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
4953 | |
531
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
4954 | void print_resource_version(DavResource *res, char *name) { |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
4955 | time_t now = res->lastmodified; |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
4956 | struct tm *date = gmtime(&now); |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
4957 | char str[32]; |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
4958 | putenv("LC_TIME=C"); |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
4959 | size_t len = strftime(str, 32, "%a, %d %b %Y %H:%M:%S GMT", date); |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
4960 | |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
4961 | printf("name: %s\n", name); |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
4962 | printf("lastmodified: %s\n", str); |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
4963 | char *server = util_url_base(res->session->base_url); |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
4964 | char *url = util_concat_path(server, res->href); |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
4965 | printf("url: %s\n", url); |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
4966 | free(server); |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
4967 | free(url); |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
4968 | } |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
4969 | |
529
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4970 | int cmd_list_versions(CmdArgs *a) { |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4971 | if(a->argc != 1) { |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4972 | fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few" : "many"); |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4973 | return -1; |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4974 | } |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4975 | |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4976 | SyncFile file; |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4977 | int ret = 0; |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4978 | char *path = a->argv[0]; |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4979 | |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4980 | int err = sync_get_file(a, path, &file, TRUE); |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4981 | if(err) { |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4982 | sync_print_get_file_err(path, err); |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4983 | return 1; |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4984 | } |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4985 | SyncDirectory *dir = file.dir; |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4986 | |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4987 | if(!dir->versioning) { |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4988 | fprintf(stderr, "No versioning configured for syncdir %s\n", dir->name); |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4989 | } |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4990 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
4991 | Repository *repo = get_repository(cx_str(dir->repository)); |
529
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4992 | if(!repo) { |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4993 | fprintf(stderr, "Unknown repository %s\n", dir->repository); |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4994 | return -1; |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4995 | } |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4996 | |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4997 | SyncDatabase *db = load_db(dir->database); |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4998 | if(!db) { |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
4999 | fprintf(stderr, "Cannot load database file: %s\n", dir->database); |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5000 | return -1; |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5001 | } |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5002 | remove_deleted_conflicts(dir, db); |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5003 | |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
725
diff
changeset
|
5004 | DavSession *sn = create_session(a, ctx, repo, dir->collection); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5005 | util_regdestr(sn->mp, db, (cx_destructor_func)destroy_db); |
529
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5006 | if (cmd_getoption(a, "verbose")) { |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5007 | curl_easy_setopt(sn->handle, CURLOPT_VERBOSE, 1L); |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5008 | curl_easy_setopt(sn->handle, CURLOPT_STDERR, stderr); |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5009 | } |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5010 | |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5011 | DavResource *res = dav_resource_new(sn, file.path); |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5012 | if(dir->versioning->type == VERSIONING_SIMPLE) { |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5013 | do { |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5014 | DavPropName p; |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5015 | p.ns = DAV_NS; |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5016 | p.name = VERSION_PATH_PROPERTY; |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5017 | if(dav_load_prop(res, &p, 1)) { |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5018 | print_resource_error(sn, file.path); |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5019 | ret = 1; |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5020 | break; |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5021 | } |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5022 | char *vcol_href = dav_get_string_property_ns(res, DAV_NS, VERSION_PATH_PROPERTY); |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5023 | if(!vcol_href) { |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5024 | ret = 1; |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5025 | break; |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5026 | } |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5027 | |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5028 | DavResource *vcol = dav_resource_new_href(sn, vcol_href); |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5029 | if(!vcol) { |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5030 | ret = 1; |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5031 | break; |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5032 | } |
530
29e660161b73
changes list-versions output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
529
diff
changeset
|
5033 | |
529
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5034 | if(dav_load_prop(vcol, NULL, 0)) { |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5035 | print_resource_error(sn, vcol->path); |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5036 | ret = 1; |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5037 | break; |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5038 | } |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5039 | |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5040 | DavResource *child = vcol->children; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5041 | CxList *children = cxLinkedListCreate(cxDefaultAllocator, (cx_compare_func)strcmp, CX_STORE_POINTERS); |
529
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5042 | while(child) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5043 | cxListAdd(children, child); |
530
29e660161b73
changes list-versions output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
529
diff
changeset
|
5044 | child = child->next; |
29e660161b73
changes list-versions output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
529
diff
changeset
|
5045 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5046 | cxListSort(children); |
530
29e660161b73
changes list-versions output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
529
diff
changeset
|
5047 | |
29e660161b73
changes list-versions output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
529
diff
changeset
|
5048 | DavBool first = 1; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5049 | CxIterator i = cxListIterator(children); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5050 | cx_foreach(DavResource *, c, i) { |
530
29e660161b73
changes list-versions output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
529
diff
changeset
|
5051 | if(!first) { |
29e660161b73
changes list-versions output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
529
diff
changeset
|
5052 | putchar('\n'); |
29e660161b73
changes list-versions output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
529
diff
changeset
|
5053 | } |
531
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5054 | print_resource_version(c, c->name); |
530
29e660161b73
changes list-versions output
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
529
diff
changeset
|
5055 | first = 0; |
529
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5056 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5057 | cxListDestroy(children); |
529
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5058 | } while(0); |
531
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5059 | } else if(dir->versioning->type == VERSIONING_DELTAV) { |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5060 | DavResource *versions = dav_versiontree(res, NULL); |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5061 | DavResource *v = versions; |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5062 | DavBool first = 1; |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5063 | while(v) { |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5064 | if(!first) { |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5065 | putchar('\n'); |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5066 | } |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5067 | char *vname = dav_get_string_property(v, "D:version-name"); |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5068 | print_resource_version(v, vname); |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5069 | first = 0; |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5070 | v = v->next; |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5071 | } |
529
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5072 | } |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5073 | |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5074 | free(file.path); |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5075 | dav_session_destroy(sn); |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5076 | |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5077 | return ret; |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5078 | } |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5079 | |
dc3f82b04733
adds list-versions command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
528
diff
changeset
|
5080 | |
204
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5081 | int cmd_trash_info(CmdArgs *a) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5082 | if(a->argc != 1) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5083 | fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few" : "many"); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5084 | return -1; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5085 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5086 | |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5087 | SyncDirectory *syncdir = scfg_get_dir(a->argv[0]); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5088 | if(!syncdir) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5089 | fprintf(stderr, "Unknown sync dir: %s\n", a->argv[0]); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5090 | return -1; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5091 | } |
233
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
5092 | if(scfg_check_dir(syncdir)) { |
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
5093 | return -1; |
d8042cede66c
improved dav-sync error handling on startup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
228
diff
changeset
|
5094 | } |
204
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5095 | |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5096 | if(!syncdir->trash) { |
205
bf756f6c3581
fixed some warnings and wrong usage of curl_easy_getinfo
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
204
diff
changeset
|
5097 | printf("trash not configured for %s\n", syncdir->name); |
204
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5098 | return 0; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5099 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5100 | |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
5101 | SYS_DIR dir = sys_opendir(syncdir->trash); |
204
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5102 | if(!dir) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5103 | fprintf(stderr, "cannot open trash directory: %s\n", syncdir->trash); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5104 | perror("opendir"); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5105 | return -1; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5106 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5107 | |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5108 | uint64_t trashsize = 0; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5109 | int count = 0; |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
5110 | SysDirEnt *ent; |
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
5111 | while((ent = sys_readdir(dir)) != NULL) { |
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
5112 | if(!strcmp(ent->name, ".") || !strcmp(ent->name, "..")) { |
204
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5113 | continue; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5114 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5115 | |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
5116 | char *path = util_concat_path(syncdir->trash, ent->name); |
204
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5117 | |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
5118 | SYS_STAT s; |
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
5119 | if(sys_stat(path, &s)) { |
204
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5120 | perror("stat"); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5121 | } else { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5122 | trashsize += s.st_size; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5123 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5124 | count++; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5125 | |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5126 | free(path); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5127 | } |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
5128 | sys_closedir(dir); |
204
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5129 | |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5130 | printf("path: %s\n", syncdir->trash); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5131 | printf("%d %s\n", count, count == 1 ? "file" : "files"); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5132 | char *sizestr = size_str(trashsize); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5133 | printf("%s\n", sizestr); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5134 | free(sizestr); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5135 | |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5136 | return 0; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5137 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5138 | |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5139 | |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5140 | int cmd_empty_trash(CmdArgs *a) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5141 | if(a->argc != 1) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5142 | fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few" : "many"); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5143 | return -1; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5144 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5145 | |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5146 | SyncDirectory *syncdir = scfg_get_dir(a->argv[0]); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5147 | if(!syncdir) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5148 | fprintf(stderr, "Unknown sync dir: %s\n", a->argv[0]); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5149 | return -1; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5150 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5151 | |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5152 | if(!syncdir->trash) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5153 | fprintf(stderr, "trash not configured for %s\n", syncdir->name); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5154 | return -1; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5155 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5156 | |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
5157 | SYS_DIR dir = sys_opendir(syncdir->trash); |
204
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5158 | if(!dir) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5159 | fprintf(stderr, "cannot open trash directory: %s\n", syncdir->trash); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5160 | perror("opendir"); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5161 | return -1; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5162 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5163 | |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
5164 | SysDirEnt *ent; |
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
5165 | while((ent = sys_readdir(dir)) != NULL) { |
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
5166 | if(!strcmp(ent->name, ".") || !strcmp(ent->name, "..")) { |
204
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5167 | continue; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5168 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5169 | |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
5170 | char *path = util_concat_path(syncdir->trash, ent->name); |
204
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5171 | printf("delete: %s\n", path); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5172 | |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
5173 | SYS_STAT s; |
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
5174 | if(sys_stat(path, &s)) { |
204
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5175 | perror("stat"); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5176 | free(path); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5177 | continue; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5178 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5179 | if(S_ISDIR(s.st_mode)) { |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5180 | if(rmdir(path)) { |
274
5577d3eae04c
dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
272
diff
changeset
|
5181 | perror("rmdir"); |
204
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5182 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5183 | } else { |
412
dc74f736aea1
adds more fs abstraction
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
411
diff
changeset
|
5184 | if(sys_unlink(path)) { |
204
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5185 | perror("unlink"); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5186 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5187 | } |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5188 | |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5189 | free(path); |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5190 | } |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
5191 | sys_closedir(dir); |
204
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5192 | |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5193 | return 0; |
4f0207044837
added trash-info and empty-trash commands
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
200
diff
changeset
|
5194 | } |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
5195 | |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5196 | #define CMD_TAG_ADD 0 |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5197 | #define CMD_TAG_REMOVE 1 |
380
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
5198 | #define CMD_TAG_SET 2 |
377
d6d7c16dd066
adds list-tags command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
374
diff
changeset
|
5199 | #define CMD_TAG_LIST 3 |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5200 | int cmd_add_tag(CmdArgs *args) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5201 | if(args->argc != 2) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5202 | fprintf(stderr, "Too %s arguments\n", args->argc <= 1 ? "few" : "many"); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5203 | return -1; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5204 | } |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
5205 | return cmd_tagop(args, CMD_TAG_ADD); |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5206 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5207 | |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5208 | int cmd_remove_tag(CmdArgs *args) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5209 | if(args->argc != 2) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5210 | fprintf(stderr, "Too %s arguments\n", args->argc <= 1 ? "few" : "many"); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5211 | return -1; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5212 | } |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
5213 | return cmd_tagop(args, CMD_TAG_REMOVE); |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5214 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5215 | |
380
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
5216 | int cmd_set_tags(CmdArgs *args) { |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5217 | if(args->argc < 1 || args->argc > 2) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5218 | fprintf(stderr, "Too %s arguments\n", args->argc < 1 ? "few" : "many"); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5219 | return -1; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5220 | } |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
5221 | return cmd_tagop(args, CMD_TAG_SET); |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5222 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5223 | |
377
d6d7c16dd066
adds list-tags command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
374
diff
changeset
|
5224 | int cmd_list_tags(CmdArgs *args) { |
d6d7c16dd066
adds list-tags command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
374
diff
changeset
|
5225 | if(args->argc != 1) { |
d6d7c16dd066
adds list-tags command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
374
diff
changeset
|
5226 | fprintf(stderr, "Too %s arguments\n", args->argc <= 1 ? "few" : "many"); |
d6d7c16dd066
adds list-tags command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
374
diff
changeset
|
5227 | return -1; |
d6d7c16dd066
adds list-tags command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
374
diff
changeset
|
5228 | } |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
5229 | return cmd_tagop(args, CMD_TAG_LIST); |
377
d6d7c16dd066
adds list-tags command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
374
diff
changeset
|
5230 | } |
d6d7c16dd066
adds list-tags command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
374
diff
changeset
|
5231 | |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
5232 | int cmd_tagop(CmdArgs *args, int cmd) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5233 | // TODO: port to ucx 3 |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5234 | return 1; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5235 | #if 0 |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5236 | |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5237 | SyncFile file; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5238 | int ret = 0; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5239 | char *path = args->argv[0]; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5240 | |
527
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
5241 | int err = sync_get_file(args, path, &file, TRUE); |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5242 | if(err) { |
527
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
5243 | sync_print_get_file_err(path, err); |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5244 | return -1; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5245 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5246 | |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5247 | if(!file.dir->tagconfig) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5248 | fprintf(stderr, "Tags are not supported for this sync directory\n"); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5249 | return -1; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5250 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5251 | |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5252 | SyncDatabase *db = load_db(file.dir->database); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5253 | if(!db) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5254 | fprintf(stderr, "Cannot load sync directory database\n"); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5255 | return -1; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5256 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5257 | |
669
152101df336d
fix dav-sync add-tag in case a file is not in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
5258 | LocalResource *newres = NULL; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5259 | LocalResource *localres = cxMapGet(db->resources, cx_hash_key_str(file.path)); |
669
152101df336d
fix dav-sync add-tag in case a file is not in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
5260 | if(!localres) { |
152101df336d
fix dav-sync add-tag in case a file is not in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
5261 | newres = calloc(1, sizeof(LocalResource)); |
152101df336d
fix dav-sync add-tag in case a file is not in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
5262 | newres->path = strdup(file.path); |
152101df336d
fix dav-sync add-tag in case a file is not in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
5263 | localres = newres; |
152101df336d
fix dav-sync add-tag in case a file is not in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
5264 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5265 | CxList *tags = NULL; |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5266 | DavBool store_tags = FALSE; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5267 | |
380
8a0c727aa409
adds tag filter for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
5268 | if(cmd != CMD_TAG_SET) { |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5269 | char *tag = args->argv[1]; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5270 | char *tagcolor = NULL; // TODO: get color |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5271 | |
525
26a1d5b9d9d2
improves metadata support in dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
524
diff
changeset
|
5272 | tags = sync_get_file_tags(file.dir, localres, NULL, NULL); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5273 | CxList *x = NULL; |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5274 | UCX_FOREACH(elm, tags) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5275 | DavTag *t = elm->data; |
377
d6d7c16dd066
adds list-tags command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
374
diff
changeset
|
5276 | if(cmd == CMD_TAG_LIST) { |
d6d7c16dd066
adds list-tags command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
374
diff
changeset
|
5277 | printf("%s\n", t->name); |
d6d7c16dd066
adds list-tags command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
374
diff
changeset
|
5278 | } else if(!strcmp(t->name, tag)) { |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5279 | x = elm; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5280 | break; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5281 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5282 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5283 | |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5284 | if(cmd == CMD_TAG_ADD) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5285 | if(!x) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5286 | DavTag *newtag = malloc(sizeof(DavTag)); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5287 | newtag->name = tag; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5288 | newtag->color = tagcolor; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5289 | tags = ucx_list_append(tags, newtag); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5290 | store_tags = TRUE; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5291 | } |
377
d6d7c16dd066
adds list-tags command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
374
diff
changeset
|
5292 | } else if(cmd == CMD_TAG_REMOVE) { |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5293 | if(tags) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5294 | tags = ucx_list_remove(tags, x); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5295 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5296 | store_tags = TRUE; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5297 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5298 | } else { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5299 | if(args->argc == 2) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5300 | char *tags_str = args->argv[1]; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5301 | tags = parse_csv_taglist(tags_str, strlen(tags_str)); |
378
d64ecd8d6969
fixes dav-sync update-tags
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
377
diff
changeset
|
5302 | store_tags = TRUE; |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5303 | // TODO: read from stdin if tags_str is "-" |
381
17ccf828a2f2
fixes dav-sync set-tags without tag string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
380
diff
changeset
|
5304 | } else if (args->argc == 1) { |
17ccf828a2f2
fixes dav-sync set-tags without tag string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
380
diff
changeset
|
5305 | store_tags = TRUE; |
17ccf828a2f2
fixes dav-sync set-tags without tag string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
380
diff
changeset
|
5306 | } else { |
17ccf828a2f2
fixes dav-sync set-tags without tag string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
380
diff
changeset
|
5307 | fprintf(stderr, "Too many arguments\n"); |
17ccf828a2f2
fixes dav-sync set-tags without tag string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
380
diff
changeset
|
5308 | ret = -1; |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5309 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5310 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5311 | |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5312 | if(store_tags) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5313 | if(sync_store_tags_local(file.dir, NULL, path, tags)) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5314 | fprintf(stderr, "Cannot store tags\n"); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5315 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5316 | if(localres) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5317 | localres->tags_updated = TRUE; |
379
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
5318 | if(!tags) { |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
5319 | if(localres->tags_hash) { |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
5320 | free(localres->tags_hash); |
629
bc2cdbf5e68f
handle symlinks according to config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
626
diff
changeset
|
5321 | localres->tags_hash = NULL; |
379
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
5322 | } |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
5323 | localres->tags_hash = NULL; |
cdaf5a3d3a50
fixes tag syncing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
378
diff
changeset
|
5324 | } |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5325 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5326 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5327 | |
669
152101df336d
fix dav-sync add-tag in case a file is not in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
5328 | if(newres) { |
152101df336d
fix dav-sync add-tag in case a file is not in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
5329 | local_resource_free(newres); |
152101df336d
fix dav-sync add-tag in case a file is not in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
5330 | } |
152101df336d
fix dav-sync add-tag in case a file is not in the db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
5331 | |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5332 | // store db |
521
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
516
diff
changeset
|
5333 | if(store_db(db, file.dir->database, file.dir->db_settings)) { |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5334 | fprintf(stderr, "Cannot store sync db\n"); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5335 | ret = -2; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5336 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5337 | |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5338 | free(file.path); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5339 | return ret; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5340 | #endif |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5341 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5342 | |
527
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
5343 | int isfileindir(SyncDirectory *dir, const char *path, SyncFile *f) { |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5344 | char *fullpath; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5345 | if(path[0] != '/') { |
386
99193580aa9d
fixes realloc problem and memory leak in isfileindir() in sync.c
Mike Becker <universe@uap-core.de>
parents:
381
diff
changeset
|
5346 | size_t wdlen = 256; |
99193580aa9d
fixes realloc problem and memory leak in isfileindir() in sync.c
Mike Becker <universe@uap-core.de>
parents:
381
diff
changeset
|
5347 | char *wd = malloc(wdlen); |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5348 | while(!getcwd(wd, wdlen)) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5349 | if(errno == ERANGE) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5350 | wdlen *= 2; |
386
99193580aa9d
fixes realloc problem and memory leak in isfileindir() in sync.c
Mike Becker <universe@uap-core.de>
parents:
381
diff
changeset
|
5351 | char *newbuf = realloc(wd, wdlen); |
99193580aa9d
fixes realloc problem and memory leak in isfileindir() in sync.c
Mike Becker <universe@uap-core.de>
parents:
381
diff
changeset
|
5352 | if (newbuf) { |
99193580aa9d
fixes realloc problem and memory leak in isfileindir() in sync.c
Mike Becker <universe@uap-core.de>
parents:
381
diff
changeset
|
5353 | wd = newbuf; |
99193580aa9d
fixes realloc problem and memory leak in isfileindir() in sync.c
Mike Becker <universe@uap-core.de>
parents:
381
diff
changeset
|
5354 | } else { |
99193580aa9d
fixes realloc problem and memory leak in isfileindir() in sync.c
Mike Becker <universe@uap-core.de>
parents:
381
diff
changeset
|
5355 | free(wd); |
99193580aa9d
fixes realloc problem and memory leak in isfileindir() in sync.c
Mike Becker <universe@uap-core.de>
parents:
381
diff
changeset
|
5356 | return 0; |
99193580aa9d
fixes realloc problem and memory leak in isfileindir() in sync.c
Mike Becker <universe@uap-core.de>
parents:
381
diff
changeset
|
5357 | } |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5358 | } else { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5359 | free(wd); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5360 | return 0; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5361 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5362 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5363 | |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5364 | fullpath = util_concat_path(wd, path); |
386
99193580aa9d
fixes realloc problem and memory leak in isfileindir() in sync.c
Mike Becker <universe@uap-core.de>
parents:
381
diff
changeset
|
5365 | free(wd); |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5366 | } else { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5367 | fullpath = strdup(path); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5368 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5369 | |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5370 | // TODO: normalize path |
531
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5371 | DavBool not_in_dir = 0; |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5372 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5373 | cxstring fp = cx_str(fullpath); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5374 | cxstring dp = cx_str(dir->path); |
531
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5375 | if(fp.length == dp.length) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5376 | if(cx_strcmp(fp, dp)) { |
531
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5377 | not_in_dir = 1; |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5378 | } |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5379 | } else if(fp.length < dp.length) { |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5380 | not_in_dir = 1; |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5381 | } else { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5382 | if(!cx_strprefix(fp, dp)) { |
531
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5383 | not_in_dir = 1; |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5384 | } else { |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5385 | if(dp.ptr[dp.length-1] == '/') { |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5386 | dp.length--; |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5387 | } |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5388 | if(fp.ptr[dp.length] != '/') { |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5389 | not_in_dir = 1; |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5390 | } |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5391 | } |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5392 | } |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5393 | |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5394 | if(not_in_dir) { |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5395 | free(fullpath); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5396 | return 0; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5397 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5398 | |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5399 | // TODO: check filter |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5400 | |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5401 | f->dir = dir; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5402 | f->path = util_concat_path("/", fullpath + strlen(dir->path)); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5403 | |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5404 | free(fullpath); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5405 | return 1; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5406 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5407 | |
527
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
5408 | int sync_get_file(CmdArgs *args, const char *path, SyncFile *f, DavBool dostat) { |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
5409 | if(dostat) { |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
5410 | SYS_STAT s; |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
5411 | if(sys_stat(path, &s)) { |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
5412 | switch(errno) { |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
5413 | case EACCES: return 2; |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
5414 | case ENOENT: return 1; |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
5415 | default: return 3; |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
5416 | } |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5417 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5418 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5419 | |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5420 | char *sdir = cmd_getoption(args, "syncdir"); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5421 | |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5422 | if(sdir) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5423 | SyncDirectory *dir = scfg_get_dir(sdir); |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5424 | if(!dir) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5425 | return 6; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5426 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5427 | if(!isfileindir(dir, path, f)) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5428 | return 4; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5429 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5430 | } else { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5431 | SyncDirectory *target = NULL; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5432 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5433 | CxIterator i = scfg_directory_iterator(); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5434 | cx_foreach(SyncDirectory *, dir, i) { |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5435 | if(isfileindir(dir, path, f)) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5436 | if(target) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5437 | return 5; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5438 | } else { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5439 | target = dir; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5440 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5441 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5442 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5443 | |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5444 | if(!target) { |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5445 | return 4; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5446 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5447 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5448 | |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5449 | return 0; |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5450 | } |
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5451 | |
527
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
5452 | void sync_print_get_file_err(const char *path, int err) { |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
5453 | switch(err) { |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
5454 | case 1: fprintf(stderr, "File %s: not found\n", path); break; |
539
8deb52292c99
fixes more if statements and some warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
536
diff
changeset
|
5455 | case 2: fprintf(stderr, "File %s: permission denied\n", path); break; |
527
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
5456 | case 3: fprintf(stderr, "File %s: stat failed: %s\n", path, strerror(errno)); break; |
531
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5457 | case 4: fprintf(stderr, "File %s is not in any syncdir\n", path); break; |
fa54e3a1250a
implements list-versions for deltav syncdirs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
530
diff
changeset
|
5458 | case 5: fprintf(stderr, "File %s is in multiple syncdirs\n", path); break; |
527
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
5459 | case 6: fprintf(stderr, "Syncdir not found\n"); break; |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
5460 | } |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
5461 | } |
d0e37224eba1
adds possibility to restore specific files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
526
diff
changeset
|
5462 | |
372
2e15ff88a0ab
adds tag management commands to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
370
diff
changeset
|
5463 | |
200
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5464 | int cmd_add_directory(CmdArgs *args) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5465 | /* |
294
dd5c0ebdf54f
fixes dav startup without .dav dir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
5466 | if(!get_repositories()) { |
dd5c0ebdf54f
fixes dav startup without .dav dir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
5467 | fprintf(stderr, "No repositories available. Run 'dav add-repository' first.\n"); |
dd5c0ebdf54f
fixes dav startup without .dav dir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
5468 | fprintf(stderr, "Abort\n"); |
dd5c0ebdf54f
fixes dav startup without .dav dir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
5469 | return -1; |
dd5c0ebdf54f
fixes dav startup without .dav dir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
5470 | } |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5471 | */ |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5472 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5473 | // TODO: port to ucx 3 |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5474 | return 1; |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5475 | #if 0 |
294
dd5c0ebdf54f
fixes dav startup without .dav dir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
288
diff
changeset
|
5476 | |
200
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5477 | printf("Each sync directory must have an unique name.\n"); |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5478 | char *name = assistant_getcfg("name"); |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5479 | if(!name) { |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5480 | fprintf(stderr, "Abort\n"); |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5481 | return -1; |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5482 | } |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5483 | if(scfg_get_dir(name)) { |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5484 | fprintf(stderr, "Directory %s already exists.\nAbort\n", name); |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5485 | return -1; |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5486 | } |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5487 | |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5488 | printf("Enter local directory path.\n"); |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5489 | char *path = assistant_getcfg("path"); |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5490 | if(!path) { |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5491 | fprintf(stderr, "Abort\n"); |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5492 | return -1; |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5493 | } |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5494 | |
215
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5495 | printf("Specify webdav repository.\n"); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5496 | CxIterator repos = get_repositories(); |
215
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5497 | int i = 0; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5498 | cx_foreach(Repository *, r, repos) { |
215
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5499 | printf("%d) %s\n", i, r->name); |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5500 | i++; |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5501 | } |
200
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5502 | char *repository = assistant_getcfg("repository"); |
215
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5503 | char *reponame = NULL; |
200
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5504 | if(!repository) { |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5505 | fprintf(stderr, "Abort\n"); |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5506 | return -1; |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5507 | } |
215
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5508 | int64_t reponum = 0; |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5509 | if(util_strtoint(repository, &reponum)) { |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5510 | if(reponum < 0) { |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5511 | fprintf(stderr, "Wrong input.\nAbort\n"); |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5512 | return -1; |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5513 | } |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5514 | UcxList *elm = ucx_list_get(repos, reponum); |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5515 | if(elm) { |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5516 | Repository *r = elm->data; |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5517 | reponame = r->name; |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5518 | } else { |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5519 | fprintf(stderr, "Wrong input.\nAbort\n"); |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5520 | return -1; |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5521 | } |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5522 | } else { |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5523 | if(get_repository(sstr(repository))) { |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5524 | reponame = repository; |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5525 | } else { |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5526 | fprintf(stderr, "Repository %s doesn't exist.\nAbort\n", repository); |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5527 | return -1; |
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5528 | } |
200
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5529 | } |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5530 | |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5531 | printf("Enter collection relative to the repository base url.\n"); |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5532 | char *collection = assistant_getdefcfg("collection", "/"); |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5533 | |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5534 | char *db = generate_db_name(name); |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5535 | |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5536 | SyncDirectory dir; |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5537 | memset(&dir, 0, sizeof(SyncDirectory)); |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5538 | dir.name = name; |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5539 | dir.path = path; |
215
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
214
diff
changeset
|
5540 | dir.repository = reponame; |
200
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5541 | dir.collection = collection; |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5542 | dir.trash = ".trash"; |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5543 | dir.database = db; |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5544 | |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5545 | int ret = 0; |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5546 | if(add_directory(&dir)) { |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5547 | fprintf(stderr, "Cannot write sync.xml\n"); |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5548 | ret = -1; |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5549 | } else { |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5550 | printf("\nAdded directory: %s (%s)\n", name, path); |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5551 | } |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5552 | |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5553 | free(name); |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5554 | free(path); |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5555 | free(repository); |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5556 | free(collection); |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5557 | free(db); |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5558 | |
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5559 | return ret; |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5560 | #endif |
200
cc474cf2c2f5
added add-directory command to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
199
diff
changeset
|
5561 | } |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
5562 | |
256
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5563 | int cmd_list_dirs() { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5564 | CxIterator iter = scfg_directory_iterator(); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5565 | cx_foreach(SyncDirectory *, dir, iter) { |
256
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5566 | printf("%s\n", dir->name); |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5567 | } |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5568 | return 0; |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5569 | } |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5570 | |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
725
diff
changeset
|
5571 | int cmd_check_repositories(CmdArgs *a) { |
256
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5572 | int ret = EXIT_SUCCESS; |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5573 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5574 | CxList *reponames = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
256
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5575 | { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5576 | CxIterator iter = scfg_directory_iterator(); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5577 | cx_foreach(SyncDirectory *, dir, iter) { |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5578 | cxListAdd(reponames, dir->repository); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5579 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5580 | } |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5581 | |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5582 | CxIterator iter = cxListIterator(reponames); |
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5583 | cx_foreach(char *, reponame, iter) { |
256
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5584 | printf("Checking %s... ", reponame); |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5585 | Repository* repo = get_repository(cx_str(reponame)); |
256
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5586 | if (!repo) { |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5587 | printf(" not found in config.xml!\n"); |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5588 | ret = EXIT_FAILURE; |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5589 | } else { |
734
b2cd82149116
add support for the secret store to dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
725
diff
changeset
|
5590 | DavSession *sn = create_session(a, ctx, repo, repo->url); |
256
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5591 | if (sn) { |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5592 | DavResource *res = dav_query(sn, |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5593 | "select - from / with depth = 0"); |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5594 | if (res) { |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5595 | printf("OK.\n"); |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5596 | dav_resource_free(res); |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5597 | } else { |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5598 | printf("unavailable!\n"); |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5599 | ret = EXIT_FAILURE; |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5600 | } |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5601 | dav_session_destroy(sn); |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5602 | } else { |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5603 | printf("cannot create session!\n"); |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5604 | ret = EXIT_FAILURE; |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5605 | } |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5606 | } |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5607 | } |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5608 | |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5609 | cxListDestroy(reponames); |
256
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5610 | |
54433cb371df
implements check-repositories command for dav-sync
Mike Becker <universe@uap-core.de>
parents:
254
diff
changeset
|
5611 | return ret; |
252
6b8e287269fc
improves config error reporting and adds check (check-config) command + dav-sync no longer aborts on missing sync.xml
Mike Becker <universe@uap-core.de>
parents:
244
diff
changeset
|
5612 | } |
296
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
5613 | |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
5614 | char* create_locktoken_file(const char *syncdirname, const char *locktoken) { |
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
739
diff
changeset
|
5615 | cxmutstr fname = cx_asprintf("locktoken-%s.txt", syncdirname); |
296
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
5616 | char *path = config_file_path(fname.ptr); |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
5617 | free(fname.ptr); |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
5618 | |
411
a182e503617b
using new io abstraction in dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
405
diff
changeset
|
5619 | FILE *file = sys_fopen(path, "w"); |
313
d721250984d0
fixes possible UAF for locktocken paths, if file could not be opened
Mike Becker <universe@uap-core.de>
parents:
302
diff
changeset
|
5620 | if(file) { |
d721250984d0
fixes possible UAF for locktocken paths, if file could not be opened
Mike Becker <universe@uap-core.de>
parents:
302
diff
changeset
|
5621 | fprintf(file, "%s\n", locktoken); |
d721250984d0
fixes possible UAF for locktocken paths, if file could not be opened
Mike Becker <universe@uap-core.de>
parents:
302
diff
changeset
|
5622 | fclose(file); |
d721250984d0
fixes possible UAF for locktocken paths, if file could not be opened
Mike Becker <universe@uap-core.de>
parents:
302
diff
changeset
|
5623 | return path; |
d721250984d0
fixes possible UAF for locktocken paths, if file could not be opened
Mike Becker <universe@uap-core.de>
parents:
302
diff
changeset
|
5624 | } else { |
296
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
5625 | perror("Cannot create locktoken file"); |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
5626 | free(path); |
313
d721250984d0
fixes possible UAF for locktocken paths, if file could not be opened
Mike Becker <universe@uap-core.de>
parents:
302
diff
changeset
|
5627 | return NULL; |
296
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
5628 | } |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
5629 | } |
bb49953b1cf8
dav-sync writes the locktoken to a file now
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
294
diff
changeset
|
5630 | |
542
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5631 | char* sync_get_content_hash(DavResource *res) { |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5632 | uint32_t flags = res->session->flags; |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5633 | if((flags & DAV_SESSION_ENCRYPT_CONTENT) == DAV_SESSION_ENCRYPT_CONTENT) { |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5634 | char *enc_hash = dav_get_string_property_ns(res, DAV_NS, "crypto-hash"); |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5635 | char *keyname = dav_get_string_property_ns(res, DAV_NS, "crypto-key"); |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5636 | if(enc_hash && keyname) { |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5637 | DavKey *key = dav_context_get_key(res->session->context, keyname); |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5638 | if(!key) { |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5639 | return NULL; |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5640 | } |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5641 | |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5642 | size_t len = 0; |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5643 | char *dec_hash = aes_decrypt(enc_hash, &len, key); |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5644 | if(!dec_hash) { |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5645 | return NULL; |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5646 | } |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5647 | |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5648 | char *hex_hash = util_hexstr((unsigned char*)dec_hash, len); |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5649 | free(dec_hash); |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5650 | return hex_hash; |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5651 | } |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5652 | } else { |
679
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
5653 | char *hash = dav_get_string_property_ns(res, DAV_NS, "content-hash"); |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
5654 | if(hash) { |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
5655 | return strdup(hash); |
0d352b79363a
fix some versioning related bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
675
diff
changeset
|
5656 | } |
542
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5657 | } |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5658 | return NULL; |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5659 | } |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5660 | |
558
1a9e6a5c1e79
fixes several signedness issues
Mike Becker <universe@uap-core.de>
parents:
557
diff
changeset
|
5661 | void sync_set_content_hash(DavResource *res, const unsigned char *hashdata) { |
542
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5662 | uint32_t flags = res->session->flags; |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5663 | if((flags & DAV_SESSION_ENCRYPT_CONTENT) == DAV_SESSION_ENCRYPT_CONTENT) { |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5664 | if(res->session->key) { |
558
1a9e6a5c1e79
fixes several signedness issues
Mike Becker <universe@uap-core.de>
parents:
557
diff
changeset
|
5665 | char *enc_hash = aes_encrypt((const char*)hashdata, DAV_SHA256_DIGEST_LENGTH, res->session->key); |
542
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5666 | if(enc_hash) { |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5667 | dav_set_string_property_ns(res, DAV_NS, "crypto-hash", enc_hash); |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5668 | free(enc_hash); |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5669 | } |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5670 | } |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5671 | } else { |
558
1a9e6a5c1e79
fixes several signedness issues
Mike Becker <universe@uap-core.de>
parents:
557
diff
changeset
|
5672 | char *hex_hash = util_hexstr(hashdata, DAV_SHA256_DIGEST_LENGTH); |
542
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5673 | dav_set_string_property_ns(res, DAV_NS, "content-hash", hex_hash); |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5674 | free(hex_hash); |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5675 | } |
060a8cda7f62
adds wrapper functions for setting/getting the content hash
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
5676 | } |