Thu, 17 Mar 2016 21:11:19 +0100
added resolve-conflicts and delete-conflicts commands
resolve-conflicts just removes the conflicts from the db and the next push would upload these files
delete-conflicts removes the conflics from the db and deletes the local files
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2016 Olaf Wintermann. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #ifndef METHODS_H #define METHODS_H #include "webdav.h" #include "resource.h" #include <ucx/list.h> #ifdef __cplusplus extern "C" { #endif typedef struct PropfindParser PropfindParser; typedef struct ResponseTag ResponseTag; typedef struct LockDiscovery LockDiscovery; struct PropfindParser { xmlDoc *document; xmlNode *current; }; struct ResponseTag { char *href; int iscollection; UcxList *properties; char *crypto_name; char *crypto_key; }; struct LockDiscovery { char *timeout; char *locktoken; }; CURLcode do_propfind_request( CURL *handle, UcxBuffer *request, UcxBuffer *response); CURLcode do_proppatch_request( CURL *handle, char *lock, UcxBuffer *request, UcxBuffer *response); CURLcode do_put_request( CURL *handle, char *lock, void *data, dav_read_func read_func, size_t length); UcxBuffer* create_allprop_propfind_request(); UcxBuffer* create_propfind_request(DavSession *sn, UcxList *properties); UcxBuffer* create_basic_propfind_request(); PropfindParser* create_propfind_parser(UcxBuffer *response, char *url); void destroy_propfind_parser(PropfindParser *parser); int get_propfind_response(PropfindParser *parser, ResponseTag *result); void cleanup_response(ResponseTag *result); int hrefeq(DavSession *sn, char *href1, char *href2); DavResource* response2resource(DavSession *sn, ResponseTag *response, char *parent_path); void add_properties(DavResource *res, ResponseTag *response); DavResource* parse_propfind_response(DavSession *sn, DavResource *root, UcxBuffer *response); int parse_response_tag(DavResource *resource, xmlNode *node); void set_davprops(DavResource *res); UcxBuffer* create_proppatch_request(DavResourceData *data); UcxBuffer* create_crypto_proppatch_request(DavSession *sn, DavKey *key, char *name, char *hash); CURLcode do_delete_request(CURL *handle, char *lock, UcxBuffer *response); CURLcode do_mkcol_request(CURL *handle, char *lock); CURLcode do_head_request(CURL *handle); CURLcode do_copy_move_request(CURL *handle, char *dest, _Bool copy, _Bool override); UcxBuffer* create_lock_request(); int parse_lock_response(DavSession *sn, UcxBuffer *response, LockDiscovery *lock); CURLcode do_lock_request(CURL *handle, UcxBuffer *request, UcxBuffer *response); CURLcode do_unlock_request(CURL *handle, char *locktoken); #ifdef __cplusplus } #endif #endif /* METHODS_H */