When there are no new objects to pull from the server, skip the import
routine instead of sending a query that requests zero items.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Instead of performing two synchronization steps (push/pull), split the
synchronization protocol into four steps:
1. Retrieve new objects from the server.
2. Delete local objects that no longer exist on the server.
3. Push new objects to the server.
4. Delete remote objects that no longer exist locally.
Each of the steps is performed by a separate function.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
When a string is passed to HTTPConnection.request(), it is automatically
ISO 8859-1 encoded. Therefore, since we already specify UTF-8 as
character set in the headers, we need to UTF-8 encode the request body
manually.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
In commit 3eae7ce (Add --list-imported command line option, 2016-01-12),
we added an option to print the hashes of imported items to stdout.
Extend this command line option such that it dumps the items using the
specified formatting strings. With the new behavior it is, for example,
easier to check items for import errors.
Also, rename the option from --list-imported to --dump-imported (it is
not part of any official release yet so we do not need to care about
backwards compatibility).
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Add a new Makefile to build and install calcurse-caldav and include it
in the top-level build process.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
The post-save and post-sync hooks now automatically detect whether the
data directory contains a .git/ directory and skip the commit creation
process if it does not.
The post-save hook and the new pre-load hook now also run
calcurse-caldav in the background if that script is available and the
data directory contains a caldav/ directory.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Introduce pre-sync and post-sync hooks which need to be located under
~/.calcurse/caldav/hooks/ and are executed before/after synchronization
with a CalDAV server.
Also, add an example post-sync hook and change the example post-save
hook such that it does not create tiny commits during synchronization.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Instead of reimplementing the code to generate object hashes in the
synchronization script, use format strings to print the hashes in grep
mode.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
In addition to storing ETag-hash tuples in the synchronization database,
also store the URI of each object. This makes the synchronization
process a bit more robust as we do not need to depend on ETags being
globally unique. It also allows us to detect conflicts which occur when
an object is modified locally and on the server at the same time.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Since commit 41389ab (args.c: Revise help/usage/version output,
2016-01-28), the version string starts with "calcurse" (lowercase).
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Some CalDAV servers do not support calendar-query with a UID filter. Use
a calendar-multiget request to obtain the ETag of submitted objects
instead.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Fix a TypeError that occurred during string formatting by putting
parentheses around the multi-line string.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This was partly fixed by 475c341 (calcurse-caldav: Fix late retrieval of
ETag, 2016-01-25). However, the case where the server does not return
ETag after creating a new item still wasn't handled properly. This patch
hopefully addresses this and also makes sure that the ETag header is
matched case-insensitively.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
In die_atnode(), we currently print a full dump of the XML node if
verbose mode is enabled. Change this behavior such that a dump is only
created in debug mode.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Add support for specifying additional HTTP headers, such as the
User-Agent, in the configuration file.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Specify application/xml in the Content-Type of requests except for PUT,
where we actually submit calendar data.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Make sure we print the headers and the body of a HTTP response in debug
mode, even if the HTTP status code indicates failure.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Python versions prior to 3.4 do not check certificates by default and
thus do not support ssl._create_unverified_context(). Add a workaround.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Introduce calcurse-caldav, a Python script that can be used to
synchronize calcurse instances with CalDAV servers.
The script was tested with an instance of the Radicale CalDAV server but
it is still alpha software. Make backups before giving it a try!
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
