Klaas Freitag
b7c03e92da
Temporary disable cached propfind.
2013-05-10 09:55:44 +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
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
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
Markus Goetz
980c176073
Recursive PROPFIND cache for ownCloud module
2013-05-08 11:58:17 +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
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
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
Klaas Freitag
c61035f767
Put the lock file into the sync dir.
2013-05-04 16:10:11 +02:00
Klaas Freitag
54ed522bbe
Check for null argument.
2013-05-04 16:08:49 +02:00
Klaas Freitag
84a28fa8f7
Merge remote-tracking branch 'ogoffart/dav' into dav
2013-05-04 13:24:21 +02:00
Klaas Freitag
cca965e288
get etag header out of PUT reply.
2013-05-04 13:23:05 +02:00
Klaas Freitag
8a80a55aec
Remove unused varialbe.
2013-05-04 12:17:22 +02:00
Klaas Freitag
1561032973
Handle http error code correctly, even if neon reports success.
2013-05-04 12:16:35 +02:00
Olivier Goffart
8c0dbb03e1
Install httpbf and make it possible to include the header in C++ code
2013-05-03 19:23:26 +02:00
Olivier Goffart
10443fc1e3
in walk tree, we can now change the md5
...
Also also in commit always assume that the propagate is done. it might
have been done by someone else
2013-05-03 19:23:26 +02:00
Olivier Goffart
546fdeed6c
Add a way for mirall to access the dav session
2013-05-03 19:23:25 +02:00
Olivier Goffart
b1fc9b2a64
Don't reset the md5 if the mtime change locally.
...
Consider this case when one creates a file with an invalid filename (for
the server) in a directory in the local side.
say: foo/bar/%invalid%.txt
The following would happen:
- in the update for the local parent folder foo/bar/, the md5 is 0
because the mtime has changed
- During the reconcile, we try to send %invalid%, but there will be an
error and nothing will be changed on the server, the etags stay the
same
- We do not do any PROPFIND at the end so we do not fetch the etag
anymore. The md5 is still 0 and will be saved like that in the DB
- Next run, since the etags have not changed on the server, we read
from the DB. But a md5 of 0 in the DB means the folder was removed on
the server. That would remove the local folder (BAD!)
So we load the md5 from the db even if the local mtime change.
That means we need to compare the mtime in the local case rather than
the md5 to see if something has changed.
2013-05-03 19:21:21 +02:00
Olivier Goffart
b49aaaabfc
Fix too many PROPFIND when starting a sync
...
csync would not update the etag (md5) for directoru in the database if
the etag has changed, but none of the files within that directory
actually changed
2013-05-03 19:21:21 +02:00
Olivier Goffart
cf23799e78
Only mark a folder as modified if files within it are modified.
2013-05-03 19:21:21 +02:00
Olivier Goffart
0b648dc669
Do not fetch folder id after propagation.
...
Delay that for the next sync.
2013-05-03 19:21:21 +02:00
Klaas Freitag
4f396c4562
Testfile added.
2013-04-26 17:41:55 +02:00
Klaas Freitag
8ac8701c10
Fix httpbf upload of zero size files, incl. test for that case.
2013-04-26 17:40:24 +02:00
Klaas Freitag
ab17e2aa8b
Revert "Don't include csync_version.h from csync.h"
...
This reverts commit 5cda5d523c
.
2013-04-26 10:45:14 +02:00
Klaas Freitag
5cda5d523c
Don't include csync_version.h from csync.h
2013-04-26 10:37:45 +02:00
Klaas Freitag
a1271a1db2
Rather store a ptr to the ptr to st for propagation_cleanup
2013-04-26 10:31:41 +02:00
Daniel Molkentin
776d5dfe37
Generate csync version from CMake variables
2013-04-25 12:32:01 +02:00
Olivier Goffart
959c987749
Fix storing the error of renames
2013-04-24 14:53:31 +02:00
Olivier Goffart
844c2bbafa
Avoid double free
2013-04-24 14:53:31 +02:00
Andreas Schneider
9409d1c96e
If there is no vio commit function don't fail.
2013-04-24 14:35:19 +02:00
Klaas Freitag
b09093a496
Make csync_commit and csync_destroy more readable.
2013-04-24 14:22:54 +02:00
Klaas Freitag
3b6d1cab91
Test for csync_commit
2013-04-24 14:21:51 +02:00