Olivier Goffart
8f3e260ede
fix typo
...
This broke the new propagator
2013-05-10 13:13:02 +02:00
Olivier Goffart
41a56b19b7
t1.pl: let configure csync command
2013-05-10 12:45:51 +02:00
Olivier Goffart
98cbb599b8
Fix handling of conflicting directories
...
We can safely ignore them in the propagator
2013-05-10 12:35:10 +02:00
Klaas Freitag
b7c03e92da
Temporary disable cached propfind.
2013-05-10 09:55:44 +02:00
Daniel Molkentin
302fdeb1f9
Use UTF-8 for basic auth
...
Slightly off-specs, and fails for non UTF-8 setups,
but the ownCloud server itself expects UTF-8 encoding.
2013-05-09 22:01:39 +02:00
Daniel Molkentin
eea8542fc0
Quit app/abort sync gracefully.
2013-05-09 21:55:28 +02:00
Klaas Freitag
276ccd3fb6
Fix setting of csync error code in updater.
2013-05-09 14:12:26 +02:00
Klaas Freitag
9d84c19b69
Reworked integration test: File assert traversal fixed.
2013-05-09 13:26:28 +02:00
Klaas Freitag
b1f62b51bf
Add owncloud module files to build.
2013-05-09 13:26:28 +02:00
Daniel Molkentin
a75376e6a7
Rename csync_abort -> async_request_abort. Add csync_resume.
2013-05-08 17:33:50 +02:00
Daniel Molkentin
ee5aaf76c5
Introduce csync_abort()
...
If called, it will set a bool in the context,
which will be respected by all expensive visitors.
2013-05-08 16:57:12 +02:00
Olivier Goffart
ecd314cef5
Give the tmp file a proper hidden and excluded name
2013-05-08 14:31:52 +02:00
Markus Goetz
952290890c
Merge remote-tracking branch 'origin/dav' into dav_recursive_update_squashed
...
Conflicts:
modules/csync_owncloud.c
2013-05-08 14:31:24 +02:00
Markus Goetz
9b4eb40216
Remove timedelta stuff
2013-05-08 14:27:59 +02:00
Markus Goetz
639f1127b7
Move stuff to _util.c
2013-05-08 13:59:07 +02:00
Olivier Goffart
0b1ecd0ac6
propagator-ng: Abort on fatal error
2013-05-08 13:30:30 +02:00
Markus Goetz
9c2f223093
Add module property to disable recursive PROPFIND
2013-05-08 13:26:59 +02:00
Markus Goetz
927ccf5d08
Use C-style comments instead of modern //
2013-05-08 13:20:42 +02:00
Markus Goetz
52e2775292
Make PROPFIND cache external unit
...
and introduce a csync_owncloud.h
2013-05-08 13:12:01 +02:00
Olivier Goffart
852e30ef07
owncloudcmd: don't abort on unknown argument
2013-05-08 12:11:23 +02:00
Markus Goetz
980c176073
Recursive PROPFIND cache for ownCloud module
2013-05-08 11:58:17 +02:00
Olivier Goffart
2193da0ab5
Fix a few FIXME
2013-05-07 17:47:29 +02:00
Olivier Goffart
7cd12e7dc5
remove some FIXME
2013-05-07 17:16:11 +02:00
Olivier Goffart
3c87cd71d7
Merge branch 'rename_folders' into dav
...
Conflicts:
modules/csync_owncloud.c
src/csync.c
src/csync.h
src/csync_propagate.c
src/csync_propagate.h
src/csync_statedb.c
src/csync_statedb.h
src/csync_util.c
src/std/c_path.h
2013-05-07 15:24:12 +02:00
Klaas Freitag
52d9a9fb0a
Merge remote-tracking branch 'ogoffart/dav' into dav
2013-05-07 12:28:35 +02:00
Klaas Freitag
c8fdf1d4fb
Minor reformatting.
2013-05-07 12:27:40 +02:00
Olivier Goffart
247f4d948c
don't ajust the time anymore with the difference from client to server
2013-05-07 11:45:02 +02:00
Olivier Goffart
79818924b3
Fix httpbf when resuming uploads
2013-05-07 11:45:02 +02:00
Olivier Goffart
b1ac67ce8b
Always consider that the conflict should happen on the locale
...
Don't take in account which file is newer, the conflict file will always
be on the locale side.
This patch also consider that INSTRUCTION_NEW and INSTRUCTION_EVAL means
the same.
2013-05-07 10:48:44 +02:00
Olivier Goffart
685bf395be
propagator-ng: resume uploads
...
Currently i think it corrupt the files
2013-05-06 18:41:56 +02:00
Klaas Freitag
b0fbabc1bf
Show progress in csync client with commandline switch -v
2013-05-06 17:27:20 +02:00
Klaas Freitag
12b57124a4
Add a progress callback for overall and individual file up and download
...
progress.
2013-05-06 17:14:17 +02:00
Olivier Goffart
0636ae6f28
propagator-ng: be able to resume download
2013-05-06 16:59:11 +02:00
Klaas Freitag
599e435443
Use the new logging framework for ownCloud module.
2013-05-06 16:58:14 +02:00
Klaas Freitag
36ec7aa5b6
Added set_property method for the ownCloud module.
2013-05-06 16:56:45 +02:00
Klaas Freitag
25948ef708
Add the file level progress callback.
2013-05-06 16:52:08 +02:00
Klaas Freitag
4ce67e38d1
Fix printf operator to interpret phash correctly for sqlite3.
2013-05-06 16:27:11 +02:00
Olivier Goffart
698edcc1c0
Revert "Fix httpbf test."
...
This reverts commit 460c5b067d
.
We need to use %u for unsigned in otder to avoid the '-' to many to
appear in the transferid
2013-05-06 16:13:58 +02:00
Olivier Goffart
7f8eba3700
propagator-ng: set the modtime on downloaded files
2013-05-06 12:09:21 +02:00
Olivier Goffart
02957aba45
propagator-ng: Emit the fileReceived signal
2013-05-05 12:46:40 +02:00
Klaas Freitag
946258ca59
Created a test file for ownCloudPropagator. Not much in yet.
2013-05-05 12:36:42 +02:00
Klaas Freitag
2e53e2e4e0
Really return true in case of error.
2013-05-05 12:34:38 +02:00
Klaas Freitag
721a8f79ab
Improve error handling, add error string to each individual file item.
2013-05-05 11:47:19 +02:00
Olivier Goffart
ecaf66db5d
style: use _ in front of member variable
2013-05-05 11:32:12 +02:00
Olivier Goffart
0c775aba6d
propagator-ng: get the etag also in the GET request
2013-05-05 11:32:12 +02:00
Olivier Goffart
71b238031f
Fix compilation after previous rebase
2013-05-05 11:32:12 +02:00
Olivier Goffart
662bd4e5fe
propagator-ng: handle conflict
...
Always download the file from the server.
And if they are equals, ignore the conflict
2013-05-05 11:17:42 +02:00
Olivier Goffart
5118054fa3
Enable the backup of conflicts files in owncloudcmd
2013-05-05 11:17:07 +02:00
Klaas Freitag
c956d11183
More error handling of propagator, some cleanups.
2013-05-04 17:14:47 +02:00
Klaas Freitag
7df23a1b19
Proper error reporting of propagator - WIP
2013-05-04 17:14:47 +02:00