Sun, 31 Aug 2025 14:32:55 +0200
replace a linked list in the process_parts function with a low level array
|
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 | * |
|
364
3769ba002fd1
updates copyright date
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
300
diff
changeset
|
4 | * Copyright 2018 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> |
|
521
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
32 | #include <errno.h> |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
33 | |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
34 | #include "db.h" |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
35 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
36 | #include <cx/utils.h> |
|
875
3b9ac2dd757d
replace a linked list in the process_parts function with a low level array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
854
diff
changeset
|
37 | #include <cx/array_list.h> |
|
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
38 | |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
39 | #include <libidav/utils.h> |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
40 | |
|
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
41 | #include <libxml/encoding.h> |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
42 | #include <libxml/xmlwriter.h> |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
43 | |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
44 | |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
45 | #define xstreq(a,b) xmlStrEqual(BAD_CAST a, BAD_CAST b) |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
46 | |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
47 | #ifdef _WIN32 |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
48 | #define ENV_HOME getenv("USERPROFILE") |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
49 | #else |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
50 | #define ENV_HOME getenv("HOME") |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
51 | #endif /* _WIN32 */ |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
52 | |
|
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
53 | SyncDatabase* load_db(char *name) { |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
54 | char *dav_dir = util_concat_path(ENV_HOME, ".dav"); |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
55 | char *db_file = util_concat_path(dav_dir, name); |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
56 | free(dav_dir); |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
57 | |
|
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
58 | SyncDatabase *db = malloc(sizeof(SyncDatabase)); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
59 | db->resources = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, 2048); |
|
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
60 | db->conflict = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, 16); |
|
816
839fefbdedc7
compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents:
747
diff
changeset
|
61 | |
|
839fefbdedc7
compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents:
747
diff
changeset
|
62 | cxDefineDestructor(db->resources, local_resource_free); |
|
839fefbdedc7
compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents:
747
diff
changeset
|
63 | cxDefineDestructor(db->conflict, local_resource_free); |
|
248
99574ca1c253
refactored load_db function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
243
diff
changeset
|
64 | |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
65 | xmlTextReaderPtr reader = xmlReaderForFile(db_file, NULL, 0); |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
66 | if(!reader) { |
|
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
67 | xmlDoc *doc = doc = xmlNewDoc(BAD_CAST "1.0"); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
68 | xmlNode *root = xmlNewNode(NULL, BAD_CAST "directory"); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
69 | xmlDocSetRootElement(doc, root); |
|
251
7534cb97b9ab
adds first libidav tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
250
diff
changeset
|
70 | if(xmlSaveFormatFileEnc(db_file, doc, "UTF-8", 1) == -1) { |
|
248
99574ca1c253
refactored load_db function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
243
diff
changeset
|
71 | destroy_db(db); |
|
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
72 | db = NULL; |
|
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
73 | } |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
74 | xmlFreeDoc(doc); |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
75 | free(db_file); |
|
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
76 | return db; |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
77 | } |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
78 | free(db_file); |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
79 | |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
80 | int error = 0; |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
81 | while(xmlTextReaderRead(reader)) { |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
82 | int type = xmlTextReaderNodeType(reader); |
|
816
839fefbdedc7
compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents:
747
diff
changeset
|
83 | const xmlChar *xmlName = xmlTextReaderConstName(reader); |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
84 | |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
85 | if(type == XML_READER_TYPE_ELEMENT) { |
|
816
839fefbdedc7
compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents:
747
diff
changeset
|
86 | if(xstreq(xmlName, "resource")) { |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
87 | LocalResource *res = process_resource(reader); |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
88 | if(res) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
89 | cxMapPut(db->resources, cx_hash_key_str(res->path), res); |
|
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
90 | } else { |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
91 | error = 1; |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
92 | break; |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
93 | } |
|
816
839fefbdedc7
compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents:
747
diff
changeset
|
94 | } else if(xstreq(xmlName, "conflict")) { |
|
216
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
95 | LocalResource *res = process_conflict(reader); |
|
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
96 | if(res) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
97 | cxMapPut(db->conflict, cx_hash_key_str(res->path), res); |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
98 | } else { |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
99 | error = 1; |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
100 | break; |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
101 | } |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
102 | } |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
103 | } |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
104 | } |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
105 | |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
106 | xmlFreeTextReader(reader); |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
107 | if(error) { |
|
248
99574ca1c253
refactored load_db function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
243
diff
changeset
|
108 | destroy_db(db); |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
109 | return NULL; |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
110 | } else { |
|
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
111 | return db; |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
112 | } |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
113 | } |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
114 | |
|
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
115 | void process_parts(xmlTextReaderPtr reader, LocalResource *res) { |
|
875
3b9ac2dd757d
replace a linked list in the process_parts function with a low level array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
854
diff
changeset
|
116 | size_t parts_alloc = 32; |
|
3b9ac2dd757d
replace a linked list in the process_parts function with a low level array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
854
diff
changeset
|
117 | size_t parts_size = 0; |
|
3b9ac2dd757d
replace a linked list in the process_parts function with a low level array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
854
diff
changeset
|
118 | FilePart *parts = calloc(parts_alloc, sizeof(FilePart)); |
|
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
119 | |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
120 | FilePart *current_part = NULL; |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
121 | |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
122 | int field = -1; |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
123 | int err = 0; |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
124 | while(xmlTextReaderRead(reader)) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
125 | int type = xmlTextReaderNodeType(reader); |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
126 | const xmlChar *name = xmlTextReaderConstName(reader); |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
127 | int depth = xmlTextReaderDepth(reader); |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
128 | |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
129 | if(type == XML_READER_TYPE_ELEMENT) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
130 | if(depth == 3 && xstreq(name, "part")) { |
|
875
3b9ac2dd757d
replace a linked list in the process_parts function with a low level array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
854
diff
changeset
|
131 | FilePart newpart = { 0 }; |
|
3b9ac2dd757d
replace a linked list in the process_parts function with a low level array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
854
diff
changeset
|
132 | cx_array_add(&parts, &parts_size, &parts_alloc, sizeof(FilePart), &newpart, cx_array_default_reallocator); |
|
3b9ac2dd757d
replace a linked list in the process_parts function with a low level array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
854
diff
changeset
|
133 | |
|
3b9ac2dd757d
replace a linked list in the process_parts function with a low level array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
854
diff
changeset
|
134 | current_part = &parts[parts_size-1]; |
|
3b9ac2dd757d
replace a linked list in the process_parts function with a low level array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
854
diff
changeset
|
135 | current_part->block = parts_size; |
|
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
136 | } else if(depth == 4) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
137 | if(xstreq(name, "hash")) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
138 | field = 0; |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
139 | } else if(xstreq(name, "etag")) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
140 | field = 1; |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
141 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
142 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
143 | } else if(type == XML_READER_TYPE_END_ELEMENT) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
144 | if(depth == 2) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
145 | // </parts> |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
146 | break; |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
147 | } else if(depth == 3) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
148 | if(current_part) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
149 | if(!current_part->hash || !current_part->etag) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
150 | err = 1; |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
151 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
152 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
153 | // </part> |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
154 | current_part = NULL; |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
155 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
156 | field = -1; |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
157 | } else if(type == XML_READER_TYPE_TEXT && depth == 5 && current_part) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
158 | const char *text = (const char*)xmlTextReaderConstValue(reader); |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
159 | if(field == 0) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
160 | current_part->hash = strdup(text); |
|
537
abfc943f09ed
some db.c fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
536
diff
changeset
|
161 | } else if(field == 1) { |
|
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
162 | current_part->etag = strdup(text); |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
163 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
164 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
165 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
166 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
167 | if(!err) { |
|
875
3b9ac2dd757d
replace a linked list in the process_parts function with a low level array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
854
diff
changeset
|
168 | res->parts = parts; |
|
3b9ac2dd757d
replace a linked list in the process_parts function with a low level array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
854
diff
changeset
|
169 | res->numparts = parts_size; |
|
3b9ac2dd757d
replace a linked list in the process_parts function with a low level array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
854
diff
changeset
|
170 | } else { |
|
3b9ac2dd757d
replace a linked list in the process_parts function with a low level array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
854
diff
changeset
|
171 | for(int i=0;i<parts_size;i++) { |
|
3b9ac2dd757d
replace a linked list in the process_parts function with a low level array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
854
diff
changeset
|
172 | free(parts[i].etag); |
|
3b9ac2dd757d
replace a linked list in the process_parts function with a low level array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
854
diff
changeset
|
173 | free(parts[i].hash); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
174 | } |
|
875
3b9ac2dd757d
replace a linked list in the process_parts function with a low level array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
854
diff
changeset
|
175 | free(parts); |
|
3b9ac2dd757d
replace a linked list in the process_parts function with a low level array
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
854
diff
changeset
|
176 | } |
|
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
177 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
178 | |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
179 | LocalResource* process_resource(xmlTextReaderPtr reader) { |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
180 | LocalResource *res = calloc(1, sizeof(LocalResource)); |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
181 | |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
182 | int field = -1; |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
183 | while(xmlTextReaderRead(reader)) { |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
184 | int type = xmlTextReaderNodeType(reader); |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
185 | const xmlChar *name = xmlTextReaderConstName(reader); |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
186 | |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
187 | if(type == XML_READER_TYPE_ELEMENT) { |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
188 | if(xstreq(name, "path")) { |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
189 | field = 0; |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
190 | } else if(xstreq(name, "etag")) { |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
191 | field = 1; |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
192 | } else if(xstreq(name, "lastmodified")) { |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
193 | field = 2; |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
194 | } else if(xstreq(name, "size")) { |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
195 | field = 3; |
|
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
196 | } else if(xstreq(name, "tags-hash")) { |
|
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
197 | field = 4; |
|
521
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
198 | } else if(xstreq(name, "mode")) { |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
199 | field = 5; |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
200 | } else if(xstreq(name, "uid")) { |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
201 | field = 6; |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
202 | } else if(xstreq(name, "gid")) { |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
203 | field = 7; |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
204 | } else if(xstreq(name, "xattr-hash")) { |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
205 | field = 8; |
|
524
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
206 | } else if(xstreq(name, "remote-tags-hash")) { |
|
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
207 | field = 9; |
|
535
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
208 | } else if(xstreq(name, "blocksize")) { |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
209 | field = 10; |
|
541
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
537
diff
changeset
|
210 | } else if(xstreq(name, "hash")) { |
|
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
537
diff
changeset
|
211 | field = 11; |
|
572
1eac93fcef77
add link target to sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
212 | } else if(xstreq(name, "link")) { |
|
1eac93fcef77
add link target to sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
213 | field = 12; |
|
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
572
diff
changeset
|
214 | } else if(xstreq(name, "localpath")) { |
|
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
572
diff
changeset
|
215 | field = 13; |
|
692
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
216 | } else if(xstreq(name, "versioncontrol")) { |
|
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
217 | field = 14; |
|
257
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
251
diff
changeset
|
218 | } else if(xstreq(name, "skipped")) { |
|
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
251
diff
changeset
|
219 | res->skipped = TRUE; |
|
366
5228b912c925
adds technical foundation to just push tag updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
364
diff
changeset
|
220 | } else if(xstreq(name, "tags-updated")) { |
|
5228b912c925
adds technical foundation to just push tag updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
364
diff
changeset
|
221 | res->tags_updated = TRUE; |
|
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
222 | } else if(xstreq(name, "parts")) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
223 | process_parts(reader, res); |
|
613
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
224 | } else if(xstreq(name, "isdirectory")) { |
|
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
225 | res->isdirectory = 1; |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
226 | } |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
227 | } else if(type == XML_READER_TYPE_TEXT) { |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
228 | const xmlChar *value = xmlTextReaderConstValue(reader); |
|
144
c2c02c9b3be4
dav-sync detects broken uploads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
75
diff
changeset
|
229 | //int b = 0; |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
230 | switch(field) { |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
231 | case 0: { |
|
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
232 | res->path = strdup((char*)value); |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
233 | break; |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
234 | } |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
235 | case 1: { |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
236 | res->etag = strdup((char*)value); |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
237 | break; |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
238 | } |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
239 | case 2: { |
|
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
240 | //res->last_modified = util_parse_lastmodified((char*)value); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
241 | //res->last_modified = atoi((char*)value); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
242 | char *endptr = (char*)value; |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
243 | time_t t = strtoll((char*)value, &endptr, 10); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
244 | if(endptr == (char*)value) { |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
245 | fprintf( |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
246 | stderr, |
|
215
781aee172901
dav-sync add-directory shows list of repositories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
185
diff
changeset
|
247 | "lastmodified does not contain a number: %s\n", value); |
|
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
248 | } else { |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
249 | res->last_modified = t; |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
250 | } |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
251 | break; |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
252 | } |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
253 | case 3: { |
|
300
4e3769d4e782
bug fix: file size > 2gb not loaded correctly from database
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
254 | res->size = 0; |
|
4e3769d4e782
bug fix: file size > 2gb not loaded correctly from database
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
255 | int64_t filelen = 0; |
|
4e3769d4e782
bug fix: file size > 2gb not loaded correctly from database
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
256 | if(util_strtoint((char*)value, &filelen)) { |
|
4e3769d4e782
bug fix: file size > 2gb not loaded correctly from database
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
257 | if(filelen > 0) { |
|
4e3769d4e782
bug fix: file size > 2gb not loaded correctly from database
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
258 | res->size = (size_t)filelen; |
|
4e3769d4e782
bug fix: file size > 2gb not loaded correctly from database
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
259 | } |
|
4e3769d4e782
bug fix: file size > 2gb not loaded correctly from database
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
261
diff
changeset
|
260 | } |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
261 | break; |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
262 | } |
|
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
263 | case 4: { |
|
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
264 | res->tags_hash = strdup((char*)value); |
|
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
265 | break; |
|
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
266 | } |
|
521
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
267 | case 5: { |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
268 | char *end; |
|
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
269 | errno = 0; |
|
521
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
270 | long int mode = strtol((char*)value, &end, 8); |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
271 | if(errno == 0) { |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
272 | res->mode = (mode_t)mode; |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
273 | } |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
274 | break; |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
275 | } |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
276 | case 6: { |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
277 | uint64_t uid = 0; |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
278 | if(util_strtouint((char*)value, &uid)) { |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
279 | res->uid = (uid_t)uid; |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
280 | } |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
281 | break; |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
282 | } |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
283 | case 7: { |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
284 | uint64_t gid = 0; |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
285 | if(util_strtouint((char*)value, &gid)) { |
|
523
923a4528a2ae
adds support for pushing metadata updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
522
diff
changeset
|
286 | res->gid = (gid_t)gid; |
|
521
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
287 | } |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
288 | break; |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
289 | } |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
290 | case 8: { |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
291 | res->xattr_hash = strdup((char*)value); |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
292 | break; |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
293 | } |
|
524
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
294 | case 9: { |
|
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
295 | res->remote_tags_hash = strdup((char*)value); |
|
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
296 | break; |
|
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
297 | } |
|
535
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
298 | case 10: { |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
299 | int64_t blsz = 0; |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
300 | if(util_strtoint((char*)value, &blsz)) { |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
301 | if(blsz < -1) { |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
302 | blsz = -1; |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
303 | } |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
304 | if(blsz > 0 && blsz < 16) { |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
305 | blsz = 0; |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
306 | } |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
307 | res->blocksize = blsz; |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
308 | } |
|
541
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
537
diff
changeset
|
309 | break; |
|
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
537
diff
changeset
|
310 | } |
|
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
537
diff
changeset
|
311 | case 11: { |
|
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
537
diff
changeset
|
312 | res->hash = strdup((char*)value); |
|
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
537
diff
changeset
|
313 | break; |
|
535
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
314 | } |
|
572
1eac93fcef77
add link target to sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
315 | case 12: { |
|
1eac93fcef77
add link target to sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
316 | res->link_target = strdup((char*)value); |
|
1eac93fcef77
add link target to sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
317 | break; |
|
1eac93fcef77
add link target to sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
318 | } |
|
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
572
diff
changeset
|
319 | case 13: { |
|
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
572
diff
changeset
|
320 | res->local_path = strdup((char*)value); |
|
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
572
diff
changeset
|
321 | } |
|
692
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
322 | case 14: { |
|
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
323 | res->versioncontrol = util_getboolean((char*)value); |
|
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
324 | } |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
325 | } |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
326 | } else if(XML_READER_TYPE_END_ELEMENT) { |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
327 | if(xstreq(name, "resource")) { |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
328 | break; |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
329 | } else { |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
330 | field = -1; |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
331 | } |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
332 | } |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
333 | } |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
334 | |
|
243
f5921d151c29
fixed SyncDatabase initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
222
diff
changeset
|
335 | if(!res->path) { |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
336 | // TODO: free res |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
337 | return NULL; |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
338 | } else { |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
339 | return res; |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
340 | } |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
341 | } |
|
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
342 | |
|
216
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
343 | LocalResource* process_conflict(xmlTextReaderPtr reader) { |
|
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
344 | LocalResource *res = calloc(1, sizeof(LocalResource)); |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
345 | |
|
560
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
346 | int field = 0; |
|
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
347 | while(xmlTextReaderRead(reader)) { |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
348 | int type = xmlTextReaderNodeType(reader); |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
349 | const xmlChar *name = xmlTextReaderConstName(reader); |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
350 | |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
351 | if(type == XML_READER_TYPE_ELEMENT) { |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
352 | if(xstreq(name, "path")) { |
|
560
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
353 | field = 1; |
|
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
354 | } else if(xstreq(name, "source")) { |
|
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
355 | field = 2; |
|
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
356 | } |
|
560
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
357 | } else if(type == XML_READER_TYPE_TEXT) { |
|
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
358 | const xmlChar *value = xmlTextReaderConstValue(reader); |
|
560
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
359 | switch(field) { |
|
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
360 | case 1: { |
|
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
361 | res->path = strdup((const char*)value); |
|
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
362 | break; |
|
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
363 | } |
|
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
364 | case 2: { |
|
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
365 | res->conflict_source = strdup((const char*)value); |
|
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
366 | break; |
|
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
367 | } |
|
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
368 | } |
|
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
369 | } else if(XML_READER_TYPE_END_ELEMENT) { |
|
216
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
370 | if(xstreq(name, "conflict")) { |
|
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
371 | break; |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
372 | } else { |
|
560
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
373 | field = 0; |
|
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
374 | } |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
375 | } |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
376 | } |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
377 | |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
378 | if(!res->path) { |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
379 | // TODO: free res |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
380 | return NULL; |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
381 | } else { |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
382 | return res; |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
383 | } |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
384 | } |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
385 | |
|
521
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
386 | int store_db(SyncDatabase *db, char *name, uint32_t settings) { |
|
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
387 | // open writer |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
388 | char *dav_dir = util_concat_path(ENV_HOME, ".dav"); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
389 | char *db_file = util_concat_path(dav_dir, name); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
390 | free(dav_dir); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
391 | xmlTextWriterPtr writer = xmlNewTextWriterFilename(db_file, 0); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
392 | if(!writer) { |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
393 | fprintf(stderr, "Cannot write db file: %s\n", db_file); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
394 | free(db_file); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
395 | return -1; |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
396 | } |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
397 | free(db_file); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
398 | |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
399 | // start document |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
400 | int r = 0; |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
401 | r = xmlTextWriterStartDocument(writer, NULL, "UTF-8", NULL); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
402 | if(r < 0) { |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
403 | xmlFreeTextWriter(writer); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
404 | return -1; |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
405 | } |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
406 | xmlTextWriterStartElement(writer, BAD_CAST "directory"); |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
407 | |
|
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
408 | // write all resource entries |
|
854
1c8401ece69e
update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
852
diff
changeset
|
409 | CxMapIterator iter = cxMapIteratorValues(db->resources); |
|
816
839fefbdedc7
compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents:
747
diff
changeset
|
410 | cx_foreach(LocalResource*, res, iter) { |
|
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
411 | // <resource> |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
412 | xmlTextWriterStartElement(writer, BAD_CAST "resource"); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
413 | |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
414 | r = xmlTextWriterWriteElement( |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
415 | writer, |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
416 | BAD_CAST "path", |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
417 | BAD_CAST res->path); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
418 | if(r < 0) { |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
419 | fprintf(stderr, "Cannot write path: %s\n", res->path); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
420 | xmlFreeTextWriter(writer); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
421 | return -1; |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
422 | } |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
423 | |
|
613
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
424 | if(res->isdirectory) { |
|
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
425 | r = xmlTextWriterStartElement(writer, BAD_CAST "isdirectory"); |
|
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
426 | r += xmlTextWriterEndElement(writer); |
|
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
427 | if(r < 0) { |
|
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
428 | fprintf(stderr, "Cannot write isdirectory\n"); |
|
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
429 | xmlFreeTextWriter(writer); |
|
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
430 | return -1; |
|
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
431 | } |
|
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
432 | } |
|
f6072141f5ee
fix directories not stored in db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
611
diff
changeset
|
433 | |
|
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
434 | if(res->etag) { |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
435 | r = xmlTextWriterWriteElement( |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
436 | writer, |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
437 | BAD_CAST "etag", |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
438 | BAD_CAST res->etag); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
439 | if(r < 0) { |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
440 | fprintf(stderr, "Cannot write etag: %s\n", res->etag); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
441 | xmlFreeTextWriter(writer); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
442 | return -1; |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
443 | } |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
444 | } |
|
541
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
537
diff
changeset
|
445 | |
|
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
537
diff
changeset
|
446 | if(res->hash) { |
|
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
537
diff
changeset
|
447 | r = xmlTextWriterWriteElement( |
|
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
537
diff
changeset
|
448 | writer, |
|
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
537
diff
changeset
|
449 | BAD_CAST "hash", |
|
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
537
diff
changeset
|
450 | BAD_CAST res->hash); |
|
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
537
diff
changeset
|
451 | if(r < 0) { |
|
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
537
diff
changeset
|
452 | fprintf(stderr, "Cannot write hash: %s\n", res->hash); |
|
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
537
diff
changeset
|
453 | xmlFreeTextWriter(writer); |
|
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
537
diff
changeset
|
454 | return -1; |
|
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
537
diff
changeset
|
455 | } |
|
e59a989d890d
adds content hash for splitted files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
537
diff
changeset
|
456 | } |
|
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
457 | |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
458 | r = xmlTextWriterWriteFormatElement( |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
459 | writer, |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
460 | BAD_CAST "lastmodified", |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
461 | "%" PRId64, |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
462 | (int64_t)res->last_modified); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
463 | if(r < 0) { |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
464 | fprintf(stderr, "Cannot write lastmodified\n"); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
465 | xmlFreeTextWriter(writer); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
466 | return -1; |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
467 | } |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
468 | |
|
535
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
469 | if(res->blocksize != 0) { |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
470 | r = xmlTextWriterWriteFormatElement( |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
471 | writer, |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
472 | BAD_CAST "mode", |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
473 | "%" PRId64, |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
474 | res->blocksize); |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
475 | if(r < 0) { |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
476 | fprintf(stderr, "Cannot write blocksize\n"); |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
477 | xmlFreeTextWriter(writer); |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
478 | return -1; |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
479 | } |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
480 | } |
|
d814ee31c04f
adds blocksize also to the sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
525
diff
changeset
|
481 | |
|
537
abfc943f09ed
some db.c fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
536
diff
changeset
|
482 | if((settings & DB_STORE_MODE) == DB_STORE_MODE) { |
|
521
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
483 | r = xmlTextWriterWriteFormatElement( |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
484 | writer, |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
485 | BAD_CAST "mode", |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
486 | "%o", |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
487 | (int)res->mode); |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
488 | if(r < 0) { |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
489 | fprintf(stderr, "Cannot write mode\n"); |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
490 | xmlFreeTextWriter(writer); |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
491 | return -1; |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
492 | } |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
493 | } |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
494 | |
|
537
abfc943f09ed
some db.c fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
536
diff
changeset
|
495 | if((settings & DB_STORE_OWNER) == DB_STORE_OWNER) { |
|
521
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
496 | r = xmlTextWriterWriteFormatElement( |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
497 | writer, |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
498 | BAD_CAST "uid", |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
499 | "%u", |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
500 | (unsigned int)res->uid); |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
501 | if(r < 0) { |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
502 | fprintf(stderr, "Cannot write uid\n"); |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
503 | xmlFreeTextWriter(writer); |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
504 | return -1; |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
505 | } |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
506 | r = xmlTextWriterWriteFormatElement( |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
507 | writer, |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
508 | BAD_CAST "gid", |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
509 | "%u", |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
510 | (unsigned int)res->gid); |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
511 | if(r < 0) { |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
512 | fprintf(stderr, "Cannot write gid\n"); |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
513 | xmlFreeTextWriter(writer); |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
514 | return -1; |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
515 | } |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
516 | } |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
517 | |
|
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
518 | r = xmlTextWriterWriteFormatElement( |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
519 | writer, |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
520 | BAD_CAST "size", |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
521 | "%" PRId64, |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
522 | (int64_t)res->size); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
523 | if(r < 0) { |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
524 | fprintf(stderr, "Cannot write size\n"); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
525 | xmlFreeTextWriter(writer); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
526 | return -1; |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
527 | } |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
528 | |
|
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
529 | if(res->tags_hash) { |
|
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
530 | r = xmlTextWriterWriteElement( |
|
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
531 | writer, |
|
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
532 | BAD_CAST "tags-hash", |
|
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
533 | BAD_CAST res->tags_hash); |
|
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
534 | if(r < 0) { |
|
524
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
535 | fprintf(stderr, "Cannot write tags-hash: %s\n", res->tags_hash); |
|
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
536 | xmlFreeTextWriter(writer); |
|
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
537 | return -1; |
|
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
538 | } |
|
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
539 | } |
|
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
540 | |
|
667
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
541 | if(res->remote_tags_hash) { |
|
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
542 | r = xmlTextWriterWriteElement( |
|
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
543 | writer, |
|
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
544 | BAD_CAST "remote-tags-hash", |
|
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
545 | BAD_CAST res->remote_tags_hash); |
|
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
546 | if(r < 0) { |
|
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
547 | fprintf(stderr, "Cannot write remote-tags-hash: %s\n", res->remote_tags_hash); |
|
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
548 | xmlFreeTextWriter(writer); |
|
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
549 | return -1; |
|
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
550 | } |
|
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
551 | } |
|
6cdcd3e4e368
finish basic metadata sync tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
638
diff
changeset
|
552 | |
|
572
1eac93fcef77
add link target to sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
553 | if(res->link_target) { |
|
1eac93fcef77
add link target to sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
554 | r = xmlTextWriterWriteElement( |
|
1eac93fcef77
add link target to sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
555 | writer, |
|
1eac93fcef77
add link target to sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
556 | BAD_CAST "link", |
|
1eac93fcef77
add link target to sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
557 | BAD_CAST res->link_target); |
|
1eac93fcef77
add link target to sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
558 | if(r < 0) { |
|
1eac93fcef77
add link target to sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
559 | fprintf(stderr, "Cannot write link: %s\n", res->link_target); |
|
1eac93fcef77
add link target to sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
560 | xmlFreeTextWriter(writer); |
|
1eac93fcef77
add link target to sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
561 | return -1; |
|
1eac93fcef77
add link target to sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
562 | } |
|
1eac93fcef77
add link target to sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
563 | } |
|
1eac93fcef77
add link target to sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
567
diff
changeset
|
564 | |
|
611
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
572
diff
changeset
|
565 | if(res->local_path) { |
|
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
572
diff
changeset
|
566 | r = xmlTextWriterWriteElement( |
|
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
572
diff
changeset
|
567 | writer, |
|
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
572
diff
changeset
|
568 | BAD_CAST "localpath", |
|
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
572
diff
changeset
|
569 | BAD_CAST res->local_path); |
|
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
572
diff
changeset
|
570 | if(r < 0) { |
|
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
572
diff
changeset
|
571 | fprintf(stderr, "Cannot write localpath: %s\n", res->local_path); |
|
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
572
diff
changeset
|
572 | xmlFreeTextWriter(writer); |
|
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
572
diff
changeset
|
573 | return -1; |
|
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
572
diff
changeset
|
574 | } |
|
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
572
diff
changeset
|
575 | } |
|
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
572
diff
changeset
|
576 | |
|
a7c48e0dca88
implement links on Windows (shelllink)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
572
diff
changeset
|
577 | |
|
521
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
578 | if(res->xattr_hash) { |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
579 | r = xmlTextWriterWriteElement( |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
580 | writer, |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
581 | BAD_CAST "xattr-hash", |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
582 | BAD_CAST res->xattr_hash); |
|
c5bbae4b3cca
extends sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
367
diff
changeset
|
583 | if(r < 0) { |
|
524
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
584 | fprintf(stderr, "Cannot write xattr-hash: %s\n", res->xattr_hash); |
|
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
585 | xmlFreeTextWriter(writer); |
|
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
586 | return -1; |
|
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
587 | } |
|
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
588 | } |
|
d53fd1006485
store hash of remote xattr and tags in sync db
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
523
diff
changeset
|
589 | |
|
257
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
251
diff
changeset
|
590 | if(res->skipped) { |
|
261
f60d742a62a0
fixes build with ancient openssl
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
259
diff
changeset
|
591 | r = xmlTextWriterStartElement(writer, BAD_CAST "skipped"); |
|
257
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
251
diff
changeset
|
592 | r += xmlTextWriterEndElement(writer); |
|
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
251
diff
changeset
|
593 | if(r < 0) { |
|
259
6c8d5f8a1d6f
fixes make install
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
257
diff
changeset
|
594 | fprintf(stderr, "Cannot write skipped\n"); |
|
257
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
251
diff
changeset
|
595 | xmlFreeTextWriter(writer); |
|
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
251
diff
changeset
|
596 | return -1; |
|
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
251
diff
changeset
|
597 | } |
|
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
251
diff
changeset
|
598 | } |
|
49f3c58cc06c
fixes conflict detection in push command
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
251
diff
changeset
|
599 | |
|
366
5228b912c925
adds technical foundation to just push tag updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
364
diff
changeset
|
600 | if(res->tags_updated) { |
|
5228b912c925
adds technical foundation to just push tag updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
364
diff
changeset
|
601 | r = xmlTextWriterStartElement(writer, BAD_CAST "tags-updated"); |
|
5228b912c925
adds technical foundation to just push tag updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
364
diff
changeset
|
602 | r += xmlTextWriterEndElement(writer); |
|
5228b912c925
adds technical foundation to just push tag updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
364
diff
changeset
|
603 | if(r < 0) { |
|
5228b912c925
adds technical foundation to just push tag updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
364
diff
changeset
|
604 | fprintf(stderr, "Cannot write tags-updated\n"); |
|
5228b912c925
adds technical foundation to just push tag updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
364
diff
changeset
|
605 | xmlFreeTextWriter(writer); |
|
5228b912c925
adds technical foundation to just push tag updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
364
diff
changeset
|
606 | return -1; |
|
5228b912c925
adds technical foundation to just push tag updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
364
diff
changeset
|
607 | } |
|
5228b912c925
adds technical foundation to just push tag updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
364
diff
changeset
|
608 | } |
|
5228b912c925
adds technical foundation to just push tag updates
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
364
diff
changeset
|
609 | |
|
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
610 | if(res->numparts > 0) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
611 | r = xmlTextWriterStartElement(writer, BAD_CAST "parts"); |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
612 | if(r < 0) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
613 | xmlFreeTextWriter(writer); |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
614 | return -1; |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
615 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
616 | for(size_t i=0;i<res->numparts;i++) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
617 | FilePart p = res->parts[i]; |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
618 | r = xmlTextWriterStartElement(writer, BAD_CAST "part"); |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
619 | if(r < 0) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
620 | xmlFreeTextWriter(writer); |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
621 | return -1; |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
622 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
623 | |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
624 | if(p.hash) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
625 | r = xmlTextWriterWriteElement(writer, BAD_CAST "hash", BAD_CAST p.hash); |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
626 | if(r < 0) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
627 | xmlFreeTextWriter(writer); |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
628 | return -1; |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
629 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
630 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
631 | if(p.etag) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
632 | r = xmlTextWriterWriteElement(writer, BAD_CAST "etag", BAD_CAST p.etag); |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
633 | if(r < 0) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
634 | xmlFreeTextWriter(writer); |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
635 | return -1; |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
636 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
637 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
638 | r = xmlTextWriterEndElement(writer); |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
639 | if(r < 0) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
640 | xmlFreeTextWriter(writer); |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
641 | return -1; |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
642 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
643 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
644 | r = xmlTextWriterEndElement(writer); |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
645 | if(r < 0) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
646 | xmlFreeTextWriter(writer); |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
647 | return -1; |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
648 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
649 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
650 | |
|
692
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
651 | if(res->versioncontrol) { |
|
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
652 | r = xmlTextWriterWriteElement( |
|
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
653 | writer, |
|
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
654 | BAD_CAST "versioncontrol", |
|
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
655 | BAD_CAST "true"); |
|
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
656 | if(r < 0) { |
|
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
657 | fprintf(stderr, "Cannot write versioncontrol\n"); |
|
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
658 | xmlFreeTextWriter(writer); |
|
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
659 | return -1; |
|
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
660 | } |
|
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
661 | } |
|
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
662 | |
|
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
663 | // </resource> |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
664 | xmlTextWriterEndElement(writer); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
665 | } |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
666 | |
|
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
667 | // write all remove entries |
|
216
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
668 | /* |
|
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
669 | i = ucx_map_iterator(db->remove); |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
670 | UCX_MAP_FOREACH(key, res, i) { |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
671 | // <remove> |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
672 | xmlTextWriterStartElement(writer, BAD_CAST "remove"); |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
673 | |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
674 | xmlTextWriterWriteElement( |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
675 | writer, |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
676 | BAD_CAST "path", |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
677 | BAD_CAST res->path); |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
678 | |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
679 | // </remove> |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
680 | xmlTextWriterEndElement(writer); |
|
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
681 | } |
|
216
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
682 | */ |
|
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
683 | |
|
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
684 | // write all conflict entries |
|
816
839fefbdedc7
compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents:
747
diff
changeset
|
685 | iter = cxMapIteratorValues(db->conflict); |
|
839fefbdedc7
compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents:
747
diff
changeset
|
686 | cx_foreach(LocalResource*, res, iter) { |
|
216
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
687 | // <conflict> |
|
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
688 | xmlTextWriterStartElement(writer, BAD_CAST "conflict"); |
|
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
689 | |
|
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
690 | xmlTextWriterWriteElement( |
|
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
691 | writer, |
|
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
692 | BAD_CAST "path", |
|
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
693 | BAD_CAST res->path); |
|
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
694 | |
|
560
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
695 | if(res->conflict_source) { |
|
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
696 | xmlTextWriterWriteElement( |
|
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
697 | writer, |
|
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
698 | BAD_CAST "source", |
|
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
699 | BAD_CAST res->conflict_source); |
|
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
700 | } |
|
a816e805e5db
store origin of file conflicts
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
552
diff
changeset
|
701 | |
|
216
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
702 | // </conflict> |
|
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
703 | xmlTextWriterEndElement(writer); |
|
16d6b97fbf33
dav-sync push ignores conflict files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
215
diff
changeset
|
704 | } |
|
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
705 | |
|
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
706 | // end |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
707 | xmlTextWriterEndElement(writer); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
708 | r = xmlTextWriterEndDocument(writer); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
709 | if(r < 0) { |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
710 | xmlFreeTextWriter(writer); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
711 | return -1; |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
712 | } |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
713 | xmlFreeTextWriter(writer); |
|
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
714 | return 0; |
|
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
715 | } |
|
222
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
716 | |
|
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
717 | void destroy_db(SyncDatabase *db) { |
| 852 | 718 | cxMapFree(db->resources); |
| 719 | cxMapFree(db->conflict); | |
|
222
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
720 | free(db); |
|
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
721 | } |
|
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
722 | |
|
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
723 | void local_resource_free(LocalResource *res) { |
|
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
724 | if(!res) { |
|
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
725 | return; |
|
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
726 | } |
|
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
727 | if(res->name) { |
|
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
728 | free(res->name); |
|
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
729 | } |
|
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
730 | if(res->path) { |
|
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
731 | free(res->path); |
|
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
732 | } |
|
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
733 | if(res->etag) { |
|
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
734 | free(res->etag); |
|
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
735 | } |
|
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
736 | if(res->cached_tags) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
737 | cxBufferFree(res->cached_tags); |
|
367
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
738 | } |
|
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
739 | if(res->tags_hash) { |
|
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
740 | free(res->tags_hash); |
|
4a6a59f89f9f
adds dav-sync config for autodetecting tag changes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
366
diff
changeset
|
741 | } |
|
638
b3077bdb3d77
fix hash based conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
742 | if(res->prev_hash) { |
|
b3077bdb3d77
fix hash based conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
743 | free(res->prev_hash); |
|
b3077bdb3d77
fix hash based conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
613
diff
changeset
|
744 | } |
|
222
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
745 | free(res); |
|
7b73058d782e
fixed some memory leaks in dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
216
diff
changeset
|
746 | } |
|
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
747 | |
|
567
b0ce8b27978b
implement copy/move for dav-sync pull
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
560
diff
changeset
|
748 | static char* nullstrdup(const char *s) { |
|
552
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
749 | return s ? strdup(s) : NULL; |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
750 | } |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
751 | |
|
681
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
752 | void local_resource_copy_parts(LocalResource *from, LocalResource *to) { |
|
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
753 | if(from->parts) { |
|
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
754 | to->numparts = from->numparts; |
|
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
755 | to->parts = calloc(from->numparts, sizeof(FilePart)); |
|
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
756 | for(int i=0;i<to->numparts;i++) { |
|
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
757 | FilePart s = from->parts[i]; |
|
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
758 | FilePart p; |
|
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
759 | p.block = s.block; |
|
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
760 | p.hash = nullstrdup(s.hash); |
|
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
761 | p.etag = nullstrdup(s.etag); |
|
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
762 | to->parts[i] = p; |
|
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
763 | } |
|
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
764 | } |
|
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
765 | } |
|
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
766 | |
|
552
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
767 | LocalResource* local_resource_copy(LocalResource *src, const char *new_path) { |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
768 | LocalResource *newres = calloc(1, sizeof(LocalResource)); |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
769 | newres->path = strdup(new_path); |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
770 | newres->etag = nullstrdup(src->etag); |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
771 | newres->hash = nullstrdup(src->hash); |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
772 | newres->last_modified = src->last_modified; |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
773 | newres->mode = src->mode; |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
774 | newres->uid = src->uid; |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
775 | newres->gid = src->gid; |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
776 | newres->size = src->size; |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
777 | newres->isdirectory = src->isdirectory; |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
778 | newres->skipped = src->skipped; |
|
692
56b66fe2b4f5
fix dav-sync deltav versioning
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
681
diff
changeset
|
779 | newres->versioncontrol = src->versioncontrol; |
|
552
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
780 | |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
781 | if(src->xattr) { |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
782 | XAttributes *xattr = calloc(1, sizeof(XAttributes)); |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
783 | xattr->hash = nullstrdup(src->xattr->hash); |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
784 | xattr->nattr = src->xattr->nattr; |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
785 | xattr->names = calloc(xattr->nattr, sizeof(char*)); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
786 | xattr->values = calloc(xattr->nattr, sizeof(cxmutstr)); |
|
552
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
787 | for(int i=0;i<xattr->nattr;i++) { |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
788 | xattr->names[i] = strdup(src->xattr->names[i]); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
789 | xattr->values[i] = cx_strdup(cx_strcast(src->xattr->values[i])); |
|
552
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
790 | } |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
791 | newres->xattr = xattr; |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
792 | } |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
793 | |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
794 | newres->tags_hash = nullstrdup(src->tags_hash); |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
795 | newres->xattr_hash = nullstrdup(src->xattr_hash); |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
796 | newres->remote_tags_hash = nullstrdup(src->remote_tags_hash); |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
797 | |
|
681
3320429502cf
fix some split bugs and add tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
667
diff
changeset
|
798 | local_resource_copy_parts(src, newres); |
|
552
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
799 | |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
800 | newres->blocksize = src->blocksize; |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
801 | |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
802 | newres->tags_updated = src->tags_updated; |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
803 | newres->finfo_updated = src->finfo_updated; |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
804 | newres->xattr_updated = src->xattr_updated; |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
805 | newres->metadata_updated = src->metadata_updated; |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
806 | |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
807 | return newres; |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
808 | |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
809 | } |
|
e1a12762bf0a
improve copy/move stability and db update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
550
diff
changeset
|
810 | |
|
536
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
811 | void filepart_free(FilePart *part) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
812 | if(part->etag) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
813 | free(part->etag); |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
814 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
815 | if(part->hash) { |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
816 | free(part->hash); |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
817 | } |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
818 | free(part); |
|
877f7c4a203b
adds file splitting feature to dav-sync push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
535
diff
changeset
|
819 | } |
|
550
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
820 | |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
821 | CxMap* create_hash_index(SyncDatabase *db) { |
|
816
839fefbdedc7
compatibility with UCX 3.1 plus several minor code fixes
Mike Becker <universe@uap-core.de>
parents:
747
diff
changeset
|
822 | CxMap *hmap = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, cxMapSize(db->resources) + 64); |
|
550
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
823 | |
|
854
1c8401ece69e
update ucx to version 3.1
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
852
diff
changeset
|
824 | CxMapIterator i = cxMapIteratorValues(db->resources); |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
825 | cx_foreach(LocalResource*, res, i) { |
|
550
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
826 | if(res->hash) { |
|
747
efbd59642577
ucx 3 update, basic dav commands work, most stuff is still broken
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
827 | cxMapPut(hmap, cx_hash_key_str(res->hash), res); |
|
550
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
828 | } |
|
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
829 | } |
|
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
830 | |
|
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
831 | return hmap; |
|
8c700eae3eb8
add copy/move detection to push
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
832 | } |