Klaas Freitag
a52fd99a95
Removed database writing code.
...
All this is now done in the Qt based propagator class.
2013-10-23 17:51:16 +02:00
Olivier Goffart
f9ce534687
Merge branch 'dav' into ocsync
...
Conflicts:
src/csync.c
2013-10-15 16:55:22 +02:00
Klaas Freitag
df3020ee91
Remove resetting of the internal csync error state.
...
Resetting this in trivial helper functions leads to the fact that
error conditions happening in functions calling these helpers get
lost which should not happen.
2013-10-11 10:27:04 +02:00
Klaas Freitag
f3755bb708
Remove resetting of the internal csync error state.
...
Resetting this in trivial helper functions leads to the fact that
error conditions happening in functions calling these helpers get
lost which should not happen.
2013-10-11 10:21:59 +02:00
Olivier Goffart
9b31ef0ca8
Do not write to the db if we did not do csync_propagate
2013-10-03 18:37:13 +02:00
Olivier Goffart
83cdece0b4
Merge remote-tracking branch 'owncloud/ocsync' into ocsync
2013-09-04 15:53:47 +02:00
Klaas Freitag
4cc1ef3624
Merge remote-tracking branch 'freitag/dav' into ocsync
...
Conflicts:
src/csync_propagate.c
src/csync_statedb.c
2013-09-04 15:51:38 +02:00
Olivier Goffart
ef1a47a5a2
Save the database with the new propagator
2013-08-21 15:42:03 +02:00
Olivier Goffart
3a57eb1b54
Add the size in the TREE_WALK_FILE structur
2013-08-21 13:24:49 +02:00
Klaas Freitag
4dbee1015f
Some minor compile fixes.
2013-08-19 17:00:56 +02:00
Olivier Goffart
835813a86f
Fix the tests after merge
2013-08-18 20:13:27 +02:00
Olivier Goffart
56d5359f5b
Fix compilation after merge
...
Still untetested
2013-08-18 18:55:32 +02:00
Olivier Goffart
d098a12321
leak fix
2013-08-18 18:18:05 +02:00
Olivier Goffart
4e04a2ccb0
Addapt to new error codes
2013-08-18 17:29:23 +02:00
Olivier Goffart
b5ed352aa3
Merge remote-tracking branch 'origin/master' into ocsync
...
Only confluct resolution, do not compile or works
Conflicts:
CMakeLists.txt
CPackConfig.cmake
ConfigureChecks.cmake
client/csync_client.c
cmake/Modules/DefineCompilerFlags.cmake
cmake/Modules/DefineInstallationPaths.cmake
cmake/Modules/FindIconv.cmake
cmake/Modules/FindIniparser.cmake
cmake/Modules/FindNeon.cmake
config.h.cmake
config/CMakeLists.txt
config/ocsync.conf
doc/CMakeLists.txt
modules/csync_owncloud.c
modules/csync_sftp2.c
src/CMakeLists.txt
src/csync.c
src/csync.h
src/csync_config.c
src/csync_exclude.c
src/csync_lock.c
src/csync_macros.h
src/csync_misc.c
src/csync_misc.h
src/csync_private.h
src/csync_propagate.c
src/csync_statedb.c
src/csync_statedb.h
src/csync_update.c
src/csync_util.c
src/csync_util.h
src/std/c_dir.c
src/std/c_file.c
src/std/c_private.h
src/std/c_string.c
src/std/c_string.h
src/std/c_time.c
src/vio/csync_vio.c
src/vio/csync_vio.h
src/vio/csync_vio_file_stat.h
src/vio/csync_vio_local.c
src/vio/csync_vio_method.h
tests/CMakeLists.txt
tests/csync_tests/check_csync_statedb_load.c
tests/csync_tests/check_csync_statedb_query.c
tests/csync_tests/check_csync_treewalk.c
tests/csync_tests/check_csync_update.c
tests/ownCloud/HTTP/DAV.pm
tests/ownCloud/ownCloud/Test.pm
tests/std_tests/check_std_c_str.c
tests/vio_tests/check_vio.c
2013-08-18 16:21:18 +02:00
Klaas Freitag
d88a5e1b11
Rename progress init function to reasonable name.
2013-08-06 15:42:02 +02:00
Olivier Goffart
6ad2920809
Load the statedb in csync_update rather than in csync_init.
...
This also allow to reduce duplicate code in csync_commit, and ease the
error reporting of csync_commit
csync_commit is supposed to be done after the previous sync, it is
better to open the statedb before the sync
2013-08-06 12:12:52 +02:00
Klaas Freitag
a42d942a35
Finalize progress before error handling.
2013-08-06 12:12:52 +02:00
Daniel Molkentin
8c9799cede
Ignore false-positive compiler warnings
2013-08-02 15:19:41 +02:00
Olivier Goffart
af7e36422e
Add ignore files that need cleanup
...
Add the possibility to ignore files but specify they should be deleted
if the directory is deleted.
2013-07-29 15:03:25 +02:00
Andreas Schneider
d80da2a088
LICENSE: Change license of libcsync from GPL to LGPL.
...
All contributors have agreed to change the license of libcsync to LGPL.
2013-07-29 14:04:37 +02:00
Andreas Schneider
314664a1fd
csync: Use new config parser.
2013-07-29 09:56:19 +02:00
Klaas Freitag
0a15f0e7ad
New progress API: Consolidate to one progress Callback having all info.
...
Before there were two callbacks, one for the individual file and one for
for the overall progress. Now its more easy and clean.
2013-07-25 15:36:46 +02:00
Klaas Freitag
db6b5131cc
propagate: Base overall progress data on both trees rather than one.
...
The overall sum of files to transmit has to be calculated over both
trees. Therefore a utility function was written which is called from
the csync_propagate_files main function.
Moreover, the current file number counter in overall progress now ranges
from 1..n rather than 0..n-1.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-07-23 07:52:27 +02:00
Klaas Freitag
4be88b68cc
csync: Fix possible null pointer dereferences in tree walkers.
...
CID: 1032801
CID: 1032804
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-07-22 15:38:55 +02:00
Klaas Freitag
917cc7faab
Base overall progress data on both trees not just one
2013-07-22 12:55:24 +02:00
Klaas Freitag
45cdcb7502
Add a progress callback for overall and individual file up and download
...
progress.
2013-07-19 12:26:48 +02:00
Daniel Molkentin
6882880ba7
Add csync_clear_exclude_list
...
This requires the introduction of c_strlist_clear(),
which does not destroy, but only clear a string list.
2013-07-15 14:37:18 +02:00
Klaas Freitag
38f19a6ada
CID 1032814: Don't deref a NULL pointer in _csync_walk_tree().
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-07-12 12:08:03 +02:00
Andreas Schneider
c1e02db882
BUG 16: Correctly include iconv headers.
2013-07-12 11:32:15 +02:00
Olivier Goffart
73ef2c1b6f
Do RENAMES before any PUT
...
In order to fix mirall issue #731
where one rename a file then re-create the original
2013-07-09 16:29:03 +02:00
Klaas Freitag
82569559cc
Added function to retrieve the progress callback.
2013-07-05 18:41:41 +02:00
Andreas Schneider
8953ed544c
statedb: Remove context where it isn't needed.
2013-07-04 10:29:48 +02:00
Andreas Schneider
d05b077851
statedb: Always pass down the db pointer.
2013-07-04 10:29:19 +02:00
Olivier Goffart
1c9fa48d60
Create a function to free a csync_file_stat
2013-07-02 18:25:17 +02:00
Olivier Goffart
015eeb1e05
Clean the progress database on csync_commit
...
It was cleaned twice in csync_destroy because of the conflict resolution
https://github.com/owncloud/mirall/issues/667
2013-06-11 10:24:34 +02:00
Olivier Goffart
78937b09b8
Clean the rename datastructure in csync_commit
...
Fixes the crash in mirall issue 670
https://github.com/owncloud/mirall/issues/670
2013-06-10 10:11:13 +02:00
Olivier Goffart
bb03664bfd
Let csync_update report the right error.
...
The problem is that the call to csync_memstat_check will try to open a
file, that will fail on windows and override the errno
2013-06-06 10:44:52 +02:00
Klaas Freitag
4f47aba1e2
Allow user aborting in chunked uploads
2013-05-16 17:37:30 +02:00
Olivier Goffart
6735b82326
Fix leak
2013-05-14 15:30:56 +02:00
Klaas Freitag
1a648a612e
Merge remote-tracking branch 'ogoffart/rename_folders_merged' into dav
2013-05-13 16:28:31 +02:00
Olivier Goffart
8f3e260ede
fix typo
...
This broke the new propagator
2013-05-10 13:13:02 +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
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
12b57124a4
Add a progress callback for overall and individual file up and download
...
progress.
2013-05-06 17:14:17 +02:00
Klaas Freitag
c61035f767
Put the lock file into the sync dir.
2013-05-04 16:10:11 +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
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