Tue, 05 Aug 2014 14:00:35 +0200
added include / exclude patterns
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 | * |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
4 | * Copyright 2013 Olaf Wintermann. All rights reserved. |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | * |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | * |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | * |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | * |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
29 | #include <stdio.h> |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
30 | #include <stdlib.h> |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
31 | #include <string.h> |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
32 | #include <errno.h> |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
33 | #include <unistd.h> |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
34 | #include <time.h> |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
35 | #include <libxml/xmlerror.h> |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
36 | #include <sys/types.h> |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
37 | #include <ucx/string.h> |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
38 | #include <ucx/utils.h> |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
39 | #include <dirent.h> |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
40 | |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
41 | #include <libidav/webdav.h> |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
42 | #include <libidav/utils.h> |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
43 | |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
44 | #include "config.h" |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
45 | #include "scfg.h" |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
46 | #include "sopt.h" |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
47 | #include "db.h" |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
48 | |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
49 | #include "sync.h" |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
50 | #include "ucx/properties.h" |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
51 | |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
52 | static DavContext *ctx; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
53 | |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
54 | static void xmlerrorfnc(void * c, const char * msg, ... ) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
55 | // nothing |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
56 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
57 | |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
58 | int main(int argc, char **argv) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
59 | if(argc < 2) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
60 | fprintf(stderr, "Missing command\n"); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
61 | print_usage(argv[0]); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
62 | return -1; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
63 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
64 | |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
65 | char *cmd = argv[1]; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
66 | CmdArgs *args = cmd_parse_args(argc - 2, argv + 2); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
67 | if(!args) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
68 | print_usage(argv[0]); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
69 | return -1; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
70 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
71 | |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
72 | xmlGenericErrorFunc fnc = xmlerrorfnc; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
73 | initGenericErrorDefaultFunc(&fnc); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
74 | ctx = dav_context_new(); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
75 | load_config(ctx); |
54 | 76 | |
77 | // copy proxy config | |
78 | memcpy(ctx->http_proxy, get_http_proxy(), sizeof(Proxy)); | |
79 | memcpy(ctx->https_proxy, get_https_proxy(), sizeof(Proxy)); | |
80 | ||
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
81 | if(load_sync_config()) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
82 | return EXIT_FAILURE; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
83 | } |
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 | int ret = EXIT_FAILURE; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
86 | if(!strcmp(cmd, "pull")) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
87 | ret = cmd_pull(args); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
88 | } else if(!strcmp(cmd, "push")) { |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
89 | ret = cmd_push(args); |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
90 | } else if(!strcmp(cmd, "sync")) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
91 | ret = cmd_sync(args); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
92 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
93 | |
58
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
94 | // TODO: cleanup sync config (don't forget to call regfree for regex) |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
95 | |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
96 | return ret; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
97 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
98 | |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
99 | void print_usage(char *cmd) { |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
100 | fprintf(stderr, "Usage: %s command [options] arguments...\n\n", cmd); |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
101 | |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
102 | fprintf(stderr, "Commands:\n"); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
103 | fprintf(stderr, " pull [-c] <directory>\n"); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
104 | fprintf(stderr, " push [-r] <directory>\n\n"); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
105 | |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
106 | fprintf(stderr, "Options:\n"); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
107 | fprintf(stderr, " -c Disable conflict detection\n"); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
108 | fprintf(stderr, " -r Read changes from stdin\n\n"); |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
109 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
110 | |
58
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
111 | static int res_matches_filter(SyncDirectory *dir, char *res_path) { |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
112 | |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
113 | UCX_FOREACH(inc, dir->include) { |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
114 | regex_t* pattern = (regex_t*) inc->data; |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
115 | if (regexec(pattern, res_path, 0, NULL, 0)) { |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
116 | return 1; |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
117 | } |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
118 | } |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
119 | |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
120 | UCX_FOREACH(exc, dir->exclude) { |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
121 | regex_t* pattern = (regex_t*) exc->data; |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
122 | if (!regexec(pattern, res_path, 0, NULL, 0)) { |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
123 | return 1; |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
124 | } |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
125 | } |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
126 | |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
127 | return 0; |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
128 | } |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
129 | |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
130 | int cmd_pull(CmdArgs *a) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
131 | if(a->argc != 1) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
132 | fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few" : "many"); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
133 | return -1; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
134 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
135 | |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
136 | SyncDirectory *dir = scfg_get_dir(a->argv[0]); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
137 | if(!dir) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
138 | fprintf(stderr, "Unknown sync dir: %s\n", a->argv[0]); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
139 | return -1; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
140 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
141 | |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
142 | Repository *repo = get_repository(sstr(dir->repository)); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
143 | if(!repo) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
144 | fprintf(stderr, "Unkown repository %s\n", dir->name); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
145 | return -1; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
146 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
147 | |
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
148 | SyncDatabase *db = load_db(dir->database); |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
149 | if(!db) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
150 | fprintf(stderr, "Cannot load database file: %s\n", dir->database); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
151 | return -1; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
152 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
153 | |
56
99f7816fcf01
added collection config for sync directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
55
diff
changeset
|
154 | char *new_url = NULL; |
99f7816fcf01
added collection config for sync directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
55
diff
changeset
|
155 | if(dir->collection) { |
99f7816fcf01
added collection config for sync directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
55
diff
changeset
|
156 | new_url = util_concat_path(repo->url, dir->collection); |
99f7816fcf01
added collection config for sync directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
55
diff
changeset
|
157 | } |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
158 | DavSession *sn = dav_session_new_auth( |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
159 | ctx, |
56
99f7816fcf01
added collection config for sync directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
55
diff
changeset
|
160 | new_url ? new_url : repo->url, |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
161 | repo->user, |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
162 | repo->password); |
56
99f7816fcf01
added collection config for sync directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
55
diff
changeset
|
163 | if(new_url) { |
99f7816fcf01
added collection config for sync directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
55
diff
changeset
|
164 | free(new_url); |
99f7816fcf01
added collection config for sync directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
55
diff
changeset
|
165 | } |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
166 | dav_session_set_flags(sn, get_repository_flags(repo)); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
167 | sn->key = dav_context_get_key(ctx, repo->default_key); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
168 | |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
169 | DavResource *ls = dav_query(sn, "get D:getetag from / where lastmodified > 0 with depth -1"); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
170 | if(!ls) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
171 | fprintf(stderr, "Error\n"); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
172 | // TODO: free |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
173 | return -1; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
174 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
175 | |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
176 | if(!ls->children) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
177 | // TODO: free |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
178 | return 0; // empty repository |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
179 | } |
50
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
180 | |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
181 | UcxMap *svrres = ucx_map_new(db->resources->count); |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
182 | |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
183 | UcxList *stack = ucx_list_prepend(NULL, ls->children); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
184 | while(stack) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
185 | DavResource *res = stack->data; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
186 | stack = ucx_list_remove(stack, stack); |
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
187 | |
58
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
188 | while(res) { |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
189 | if (res_matches_filter(dir, res->path)) { |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
190 | res = res->next; |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
191 | continue; |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
192 | } |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
193 | |
50
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
194 | // download the resource |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
195 | if(sync_get_resource(a, dir, res, db)) { |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
196 | fprintf(stderr, "sync_get_resource failed for resource: %s\n", res->path); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
197 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
198 | |
50
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
199 | LocalResource *local = ucx_map_cstr_get(db->resources, res->path); |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
200 | ucx_map_cstr_put(svrres, res->path, local); |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
201 | ucx_map_cstr_remove(db->resources, res->path); |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
202 | |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
203 | if(res->children) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
204 | stack = ucx_list_prepend(stack, res->children); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
205 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
206 | res = res->next; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
207 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
208 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
209 | |
50
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
210 | UcxMapIterator i = ucx_map_iterator(db->resources); |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
211 | LocalResource *local; |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
212 | UCX_MAP_FOREACH(key, local, i) { |
58
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
213 | if (res_matches_filter(dir, local->path)) { |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
214 | continue; |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
215 | } |
50
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
216 | sync_remove_resource(dir, local); |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
217 | } |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
218 | ucx_map_free(db->resources); |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
219 | db->resources = svrres; |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
220 | |
58
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
221 | // TODO: cleanup - BUT DONT CLEANUP SYNC CONFIG (do this in main!) |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
222 | |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
223 | // store db |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
224 | if(store_db(db, dir->database)) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
225 | fprintf(stderr, "Cannot store sync db\n"); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
226 | return -1; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
227 | } |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
228 | |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
229 | return 0; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
230 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
231 | |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
232 | int sync_get_resource(CmdArgs *a, SyncDirectory *dir, DavResource *res, SyncDatabase *db) { |
51
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
233 | LocalResource *removed = ucx_map_cstr_get(db->remove, res->path); |
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
234 | if(removed) { |
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
235 | return 0; |
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
236 | } |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
237 | int cdt = cmd_getoption(a, "conflict") ? 0 : 1; |
51
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
238 | |
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
239 | LocalResource *local = ucx_map_cstr_get(db->resources, res->path); |
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
240 | char *local_path = util_concat_path(dir->path, res->path); |
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
241 | |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
242 | char *etag = dav_get_property(res, "D:getetag"); |
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
243 | struct stat s; |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
244 | if(local) { |
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
245 | if(stat(local_path, &s)) { |
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
246 | if(errno == ENOENT) { |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
247 | printf("removed: %s\n", res->path); |
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
248 | // the file is in the database, but doesn't exists |
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
249 | // mark the file as removed to delete it on next push |
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
250 | ucx_map_cstr_remove(db->resources, local->path); |
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
251 | ucx_map_cstr_put(db->remove, local->path, local); |
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
252 | return 0; |
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
253 | } else { |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
254 | fprintf(stderr, "Cannot stat file: %s\n", local_path); |
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
255 | free(local_path); |
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
256 | return -1; |
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
257 | } |
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
258 | } |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
259 | |
48
08d5544c92fb
fixed etag handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
260 | if(local->etag) { |
08d5544c92fb
fixed etag handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
261 | sstr_t e = sstr(etag); |
08d5544c92fb
fixed etag handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
262 | if(sstrprefix(e, S("W/"))) { |
08d5544c92fb
fixed etag handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
263 | e = sstrsubs(e, 2); |
08d5544c92fb
fixed etag handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
264 | } |
08d5544c92fb
fixed etag handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
265 | if(!strcmp(e.ptr, local->etag)) { |
08d5544c92fb
fixed etag handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
266 | // resource is already up-to-date on the client |
08d5544c92fb
fixed etag handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
267 | return 0; |
08d5544c92fb
fixed etag handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
268 | } |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
269 | } |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
270 | |
54 | 271 | if(cdt && s.st_mtime != local->last_modified) { |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
272 | // file modified on the server and on the client |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
273 | rename_local_file(dir, db, local->path); |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
274 | } |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
275 | } else { |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
276 | if(stat(local_path, &s)) { |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
277 | if(errno != ENOENT) { |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
278 | fprintf(stderr, "Cannot stat file: %s\n", local_path); |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
279 | } |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
280 | } else if(cdt && !S_ISDIR(s.st_mode)) { |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
281 | rename_local_file(dir, db, res->path); |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
282 | } |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
283 | } |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
284 | |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
285 | int ret = 0; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
286 | if(res->iscollection) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
287 | mode_t mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
288 | if(util_mkdir(local_path, mode) && errno != EEXIST) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
289 | ret = -1; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
290 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
291 | } else { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
292 | FILE *out = fopen(local_path, "w"); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
293 | if(!out) { |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
294 | fprintf(stderr, "Cannot open output file: %s\n", local_path); |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
295 | free(local_path); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
296 | return -1; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
297 | } |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
298 | printf("get: %s\n", res->path); |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
299 | if(dav_get_content(res, out, (dav_write_func)fwrite)) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
300 | ret = -1; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
301 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
302 | fclose(out); |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
303 | |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
304 | if(stat(local_path, &s)) { |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
305 | fprintf(stderr, "Cannot stat file: %s\n", local_path); |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
306 | } |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
307 | |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
308 | if(ret == 0) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
309 | if(!local) { |
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
310 | // new local resource |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
311 | local = calloc(1, sizeof(LocalResource)); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
312 | local->path = strdup(res->path); |
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
313 | ucx_map_cstr_put(db->resources, local->path, local); |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
314 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
315 | |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
316 | if(local->etag) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
317 | free(local->etag); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
318 | } |
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
319 | // set metadata from stat |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
320 | local->etag = etag; |
54 | 321 | local->last_modified = s.st_mtime; |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
322 | local->size = s.st_size; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
323 | } |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
324 | } |
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 | free(local_path); |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
327 | return ret; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
328 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
329 | |
50
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
330 | void sync_remove_resource(SyncDirectory *dir, LocalResource *res) { |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
331 | char *local_path = util_concat_path(dir->path, res->path); |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
332 | struct stat s; |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
333 | if(stat(local_path, &s)) { |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
334 | free(local_path); |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
335 | return; |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
336 | } |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
337 | |
54 | 338 | if(s.st_mtime != res->last_modified) { |
50
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
339 | free(local_path); |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
340 | return; |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
341 | } |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
342 | |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
343 | printf("delete: %s\n", res->path); |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
344 | if(unlink(local_path)) { |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
345 | fprintf(stderr, "Cannot remove file %s\n", local_path); |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
346 | } |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
347 | free(local_path); |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
348 | } |
9c486ea25161
dav-sync detects remote removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
349 | |
52
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
350 | void rename_local_file(SyncDirectory *dir, SyncDatabase *db, char *path) { |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
351 | char *local_path = util_concat_path(dir->path, path); |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
352 | char *parent = util_parent_path(local_path); |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
353 | |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
354 | int rev = 0; |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
355 | struct stat s; |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
356 | int loop = 1; |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
357 | do { |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
358 | sstr_t new_path = ucx_asprintf( |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
359 | ucx_default_allocator(), |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
360 | "%sorig.%d.%s", |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
361 | parent, |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
362 | rev, |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
363 | util_resource_name(path)); |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
364 | |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
365 | |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
366 | if(stat(new_path.ptr, &s)) { |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
367 | if(errno == ENOENT) { |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
368 | loop = 0; |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
369 | printf("conflict: %s\n", local_path); |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
370 | if(rename(local_path, new_path.ptr)) { |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
371 | printf("errno: %d\n", errno); |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
372 | fprintf( |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
373 | stderr, |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
374 | "Cannot rename file %s to %s\n", |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
375 | local_path, |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
376 | new_path.ptr); |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
377 | } |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
378 | } |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
379 | } |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
380 | rev++; |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
381 | free(new_path.ptr); |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
382 | } while(loop); |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
383 | free(parent); |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
384 | } |
91517b874a86
added conflict detection
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
51
diff
changeset
|
385 | |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
386 | int cmd_push(CmdArgs *a) { |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
387 | if(a->argc != 1) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
388 | fprintf(stderr, "Too %s arguments\n", a->argc < 1 ? "few" : "many"); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
389 | return -1; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
390 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
391 | |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
392 | SyncDirectory *dir = scfg_get_dir(a->argv[0]); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
393 | if(!dir) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
394 | fprintf(stderr, "Unknown sync dir: %s\n", a->argv[0]); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
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 | |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
398 | Repository *repo = get_repository(sstr(dir->repository)); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
399 | if(!repo) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
400 | fprintf(stderr, "Unkown repository %s\n", dir->name); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
401 | return -1; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
402 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
403 | |
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
404 | SyncDatabase *db = load_db(dir->database); |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
405 | if(!db) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
406 | fprintf(stderr, "Cannot load database file: %s\n", dir->database); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
407 | return -1; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
408 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
409 | |
56
99f7816fcf01
added collection config for sync directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
55
diff
changeset
|
410 | char *new_url = NULL; |
99f7816fcf01
added collection config for sync directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
55
diff
changeset
|
411 | if(dir->collection) { |
99f7816fcf01
added collection config for sync directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
55
diff
changeset
|
412 | new_url = util_concat_path(repo->url, dir->collection); |
99f7816fcf01
added collection config for sync directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
55
diff
changeset
|
413 | } |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
414 | DavSession *sn = dav_session_new_auth( |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
415 | ctx, |
56
99f7816fcf01
added collection config for sync directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
55
diff
changeset
|
416 | new_url ? new_url : repo->url, |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
417 | repo->user, |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
418 | repo->password); |
56
99f7816fcf01
added collection config for sync directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
55
diff
changeset
|
419 | if(new_url) { |
99f7816fcf01
added collection config for sync directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
55
diff
changeset
|
420 | free(new_url); |
99f7816fcf01
added collection config for sync directories
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
55
diff
changeset
|
421 | } |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
422 | dav_session_set_flags(sn, get_repository_flags(repo)); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
423 | sn->key = dav_context_get_key(ctx, repo->default_key); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
424 | |
51
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
425 | // upload all changed files |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
426 | UcxList *resources = cmd_getoption(a, "read") ? |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
427 | read_changes(dir, db) : local_scan(dir, db); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
428 | |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
429 | UCX_FOREACH(elm, resources) { |
57 | 430 | LocalResource *local_res = elm->data; |
58
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
431 | if (!res_matches_filter(dir, local_res->path+1)) { |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
432 | printf("put: %s\n", local_res->path); |
57 | 433 | ucx_map_cstr_put(db->resources, local_res->path, local_res); |
58
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
434 | DavResource *res = dav_resource_new(sn, local_res->path); |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
435 | if(sync_put_resource(dir, res, db)) { |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
436 | ucx_map_cstr_remove(db->resources, local_res->path); |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
437 | } |
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
438 | dav_resource_free(res); |
57 | 439 | } |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
440 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
441 | ucx_list_free(resources); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
442 | |
51
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
443 | // delete all removed files |
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
444 | UcxMapIterator i = ucx_map_iterator(db->remove); |
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
445 | LocalResource *local; |
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
446 | UCX_MAP_FOREACH(key, local, i) { |
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
447 | DavResource *res = dav_resource_new(sn, local->path); |
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
448 | printf("delete: %s\n", res->path); |
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
449 | if(dav_delete(res)) { |
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
450 | if(sn->error != DAV_NOT_FOUND) { |
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
451 | fprintf(stderr, "Cannot delete resource %s\n", res->path); |
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
452 | } |
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
453 | } |
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
454 | dav_resource_free(res); |
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
455 | // TODO: free local resource |
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
456 | ucx_map_remove(db->remove, key); |
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
457 | } |
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
458 | |
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
459 | // TODO: free res |
e94bf8530d56
dav-sync deletes removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
50
diff
changeset
|
460 | |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
461 | // store db |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
462 | if(store_db(db, dir->database)) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
463 | fprintf(stderr, "Cannot store sync db\n"); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
464 | return -1; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
465 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
466 | |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
467 | return 0; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
468 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
469 | |
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
470 | UcxList* local_scan(SyncDirectory *dir, SyncDatabase *db) { |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
471 | UcxList *resources = NULL; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
472 | |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
473 | char *path = strdup("/"); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
474 | UcxList *stack = ucx_list_prepend(NULL, path); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
475 | while(stack) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
476 | // get a directory path from the stack and read all entries |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
477 | // if an entry is a directory, put it on the stack |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
478 | // otherwise compare the metadata with the db content |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
479 | |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
480 | char *p = stack->data; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
481 | stack = ucx_list_remove(stack, stack); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
482 | char *local_path = util_concat_path(dir->path, p); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
483 | DIR *local_dir = opendir(local_path); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
484 | |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
485 | if(!local_dir) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
486 | fprintf(stderr, "Cannot open directory %s\n", local_path); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
487 | } else { |
55
4cb389452a44
replaced readdir_r with readdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
488 | struct dirent *ent; |
4cb389452a44
replaced readdir_r with readdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
489 | while((ent = readdir(local_dir)) != NULL) { |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
490 | if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
491 | continue; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
492 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
493 | |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
494 | char *new_path = util_concat_path(p, ent->d_name); |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
495 | int isdir; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
496 | LocalResource *res = path_to_local_resource(dir, db, new_path, &isdir); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
497 | if(isdir) { |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
498 | stack = ucx_list_prepend(stack, new_path); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
499 | } else if(res) { |
57 | 500 | resources = ucx_list_append(resources, res); |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
501 | free(new_path); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
502 | } else { |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
503 | free(new_path); |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
504 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
505 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
506 | closedir(local_dir); |
55
4cb389452a44
replaced readdir_r with readdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
507 | |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
508 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
509 | free(local_path); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
510 | free(p); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
511 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
512 | |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
513 | return resources; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
514 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
515 | |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
516 | UcxList* read_changes(SyncDirectory *dir, SyncDatabase *db) { |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
517 | UcxProperties *parser = ucx_properties_new(); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
518 | parser->delimiter = ':'; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
519 | |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
520 | UcxList *resources = NULL; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
521 | sstr_t name; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
522 | sstr_t value; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
523 | |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
524 | char buf[STDIN_BUF_SIZE]; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
525 | size_t r; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
526 | while(!feof(stdin)) { |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
527 | r = fread(buf, 1, STDIN_BUF_SIZE, stdin); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
528 | ucx_properties_fill(parser, buf, r); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
529 | while(ucx_properties_next(parser, &name, &value)) { |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
530 | if(value.length == 0) { |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
531 | fprintf(stderr, "Wrong input\n"); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
532 | continue; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
533 | } |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
534 | if(value.ptr[0] == '"' |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
535 | && value.length > 2 |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
536 | && value.ptr[value.length - 1] == '"') |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
537 | { |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
538 | value.ptr[value.length - 1] = '\0'; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
539 | value.ptr++; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
540 | value.length -= 2; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
541 | } |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
542 | value = sstrdup(value); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
543 | |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
544 | if(!sstrcmp(name, S("put"))) { |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
545 | int isdir; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
546 | LocalResource *res = path_to_local_resource(dir, db, value.ptr, &isdir); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
547 | if(res) { |
57 | 548 | resources = ucx_list_append(resources, res); |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
549 | } |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
550 | } else if(!sstrcmp(name, S("remove"))) { |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
551 | LocalResource *res = calloc(1, sizeof(LocalResource)); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
552 | res->path = sstrdup(value).ptr; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
553 | if(res) { |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
554 | ucx_map_sstr_put(db->remove, value, res); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
555 | ucx_map_sstr_remove(db->resources, value); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
556 | } |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
557 | |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
558 | } |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
559 | |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
560 | free(value.ptr); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
561 | } |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
562 | } |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
563 | ucx_properties_free(parser); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
564 | |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
565 | return resources; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
566 | } |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
567 | |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
568 | LocalResource* path_to_local_resource(SyncDirectory *dir, SyncDatabase *db, char *path, int *isdir) { |
58
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
569 | |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
570 | char *file_path = util_concat_path(dir->path, path); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
571 | struct stat s; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
572 | if(stat(file_path, &s)) { |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
573 | fprintf(stderr, "Cannot stat file %s\n", file_path); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
574 | free(file_path); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
575 | return NULL; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
576 | } |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
577 | free(file_path); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
578 | |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
579 | if(!S_ISDIR(s.st_mode)) { |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
580 | *isdir = 0; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
581 | LocalResource *res = ucx_map_cstr_get(db->resources, path); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
582 | if(res) { |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
583 | // the file is already in the database |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
584 | // compare length and lastmodified date |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
585 | |
54 | 586 | if(res->last_modified == s.st_mtime |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
587 | && res->size == s.st_size) |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
588 | { |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
589 | // file unchanged |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
590 | return NULL; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
591 | } else { |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
592 | // update db entries |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
593 | res->size = s.st_size; |
54 | 594 | res->last_modified = s.st_mtime; |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
595 | |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
596 | return res; |
58
1708cba82ca3
added include / exclude patterns
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
597 | } |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
598 | } else { |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
599 | LocalResource *res = calloc(1, sizeof(LocalResource)); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
600 | res->path = strdup(path); |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
601 | res->etag = NULL; |
54 | 602 | res->last_modified = s.st_mtime; |
53
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
603 | res->size = s.st_size; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
604 | return res; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
605 | } |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
606 | } else { |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
607 | *isdir = 1; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
608 | } |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
609 | return NULL; |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
610 | } |
ddc4efc9b0f8
added usage info and some options
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
52
diff
changeset
|
611 | |
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
612 | int sync_put_resource(SyncDirectory *dir, DavResource *res, SyncDatabase *db) { |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
613 | char *local_path = util_concat_path(dir->path, res->path); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
614 | FILE *in = fopen(local_path, "r"); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
615 | if(!in) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
616 | fprintf(stderr, "Cannot open file %s\n", local_path); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
617 | free(local_path); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
618 | return -1; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
619 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
620 | free(local_path); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
621 | |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
622 | dav_set_content(res, in, (dav_read_func)fread); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
623 | |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
624 | int ret = -1; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
625 | for(;;) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
626 | if(dav_create(res)) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
627 | break; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
628 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
629 | if(dav_store(res)) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
630 | break; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
631 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
632 | ret = 0; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
633 | break; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
634 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
635 | |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
636 | if(ret == 0) { |
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
637 | LocalResource *local_res = ucx_map_cstr_get(db->resources, res->path); |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
638 | if(local_res->etag) { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
639 | free(local_res->etag); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
640 | } |
48
08d5544c92fb
fixed etag handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
641 | |
08d5544c92fb
fixed etag handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
642 | DavResource *up_res = dav_get(res->session, res->path, "D:getetag"); |
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
643 | char *etag = dav_get_property(up_res, "D:getetag"); |
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
644 | if(etag) { |
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
645 | if(strlen(etag) > 2 && etag[0] == 'W' && etag[1] == '/') { |
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
646 | etag = etag + 2; |
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
647 | } |
48
08d5544c92fb
fixed etag handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
648 | } |
08d5544c92fb
fixed etag handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
649 | |
08d5544c92fb
fixed etag handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
650 | |
49
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
651 | if(etag) { |
c5759ac76c1b
dav-sync detects locally removed files
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
48
diff
changeset
|
652 | local_res->etag = strdup(etag); |
47
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
653 | } else { |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
654 | local_res->etag = NULL; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
655 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
656 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
657 | |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
658 | fclose(in); |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
659 | |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
660 | return 0; |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
661 | } |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
662 | |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
663 | |
fbbbeed4ba8f
added push command for dav-sync
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
46
diff
changeset
|
664 | |
46
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
665 | int cmd_sync(CmdArgs *a) { |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
666 | return 0; |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
667 | } |
0542668d0f26
added new sync tool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
668 |