mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-11 10:14:59 +03:00
Code Issues Projects Releases Packages Wiki Activity
2018 commits 483 branches 256 tags 439 MiB
Commit graph

221 commits

Author SHA1 Message Date
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
56d5359f5b Fix compilation after merge 
Still untetested
 2013-08-18 18:55:32 +02:00
Klaas Freitag
e0d121d370 More minor cleanups. 2013-08-18 18:18:05 +02:00
Klaas Freitag
a5de9994ec Set a proper error message on in-between-changes. 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
Klaas Freitag
d910a3af8b Notify sync start and end always. 2013-08-06 12:12:52 +02:00
Klaas Freitag
721443feea deliver file size with the progress callback in propagate. 2013-08-06 12:12:52 +02:00
Klaas Freitag
c89a55984b Emit start- and end delete progress. 2013-08-06 12:12:52 +02:00
Daniel Molkentin
8c9799cede Ignore false-positive compiler warnings 2013-08-02 15:19:41 +02:00
Klaas Freitag
ed4877c27c Use strerror_r outside of log functions to avoid warnings. 
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
 2013-08-01 16:48:44 +02:00
Daniel Molkentin
d9b34121ae Fix OS X build with -Werror 2013-07-31 14:50:44 +02:00
Daniel Molkentin
8d99364d63 Eliminate all warnings 
- use proper casts
- use aproproate types
- offer to build with -Werror
- make printf attribute hinting gnu format style
- remove unused helper methods
- begin to use inttyes.h macros where suitable
- move var declarations to the beginning of the method
- properly use _FILE_OFFSET_BITS
- silence variables unused depending on the define
 2013-07-31 13:12:10 +02:00
Klaas Freitag
2fcfe883eb Proper error reporting for HBF PUT fails. 2013-07-30 08:56:53 +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
Klaas Freitag
2cc5bbe187 ownCloud: Some fixes to promote the correct progress. 2013-07-26 13:43:02 +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
05a62bb41f csync: Add userdata parameter to the overall progress callback. 
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
 2013-07-23 07:45:17 +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
a12782dccf Add callback parameter and call overall progress bar for initialization. 2013-07-19 17:04:31 +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
Olivier Goffart
db7e8560cf Mark parent directory as error if a file fails to download 
The result is that we do not save the parent directory in the db
(recursively) so on the next sync, we don't read this directory from the
db as there might be missing entries since download error are not saved
in the db.
 2013-07-16 13:34:47 +02:00
Olivier Goffart
6beb96293f Do not save for resume if there is an error from the server 
errors (such as 500) may mean the the server do not suport
resuming
 2013-07-16 13:34:22 +02:00
Markus Goetz
1263ca990d Fix download resuming on OS X 2013-07-16 13:33:55 +02:00
Olivier Goffart
68a427d7e4 Make sure the directory after a rename has a md5 
If not when we do a read from db later, the updater will beleive the
directory is no longer on the server
 2013-07-09 16:29:21 +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
c1a73564f5 Fix for coverity CID 1029795 2013-07-08 12:26:44 +02:00
Klaas Freitag
12bca2789a propagate: Use get/put methods for file up- and download. 2013-07-04 11:30:54 +02:00
Klaas Freitag
7eb3f901a6 Experimental: Fix the mv and recreate case as described in mirall#731. 
Please note that this needs review and test and probably does not fully
fix it. It just makes sure that renames are handled before PUTs.
 2013-07-03 22:38:45 +02:00
Olivier Goffart
0dbecb129e Log the fact that csync was aborted 2013-06-19 18:41:30 +02:00
Olivier Goffart
3d2c3b321c Disable the blacklist by default 
The blacklist might hide errors and reduce the ability to do proper
diagnostics.

Note that in _csync_push_file, we kept csync_statedb_get_progressinfo
because it is also used for the resume feature

Also added output when a file has been blacklisted.
 2013-06-18 19:19:28 +02:00
Andreas Schneider
d864899ff1 src: Fix a build warning. 2013-06-10 16:17:33 +02:00
Olivier Goffart
882e027e40 Remove dead condition 
rc==123 was a magic value set to mean not to save the error. But after
some refactoring, it is not done like that anymore
 2013-06-07 16:43:48 +02:00
Daniel Molkentin
5a2d7e9c9f Do not corrupt ctx->replica value if push_file fails 2013-06-07 14:58:38 +02:00
Klaas Freitag
d9ef991448 Removed unused progress info allocation. 2013-06-07 09:18:27 +02:00
Klaas Freitag
02f93ec4d5 Free allocted memory of local and remote list. 2013-05-22 12:33:09 +02:00
Klaas Freitag
dd8ceacf75 Avoid compile warning due to non-top variable declaration. 2013-05-22 12:33:09 +02:00
Klaas Freitag
4f47aba1e2 Allow user aborting in chunked uploads 2013-05-16 17:37:30 +02:00
Klaas Freitag
1a648a612e Merge remote-tracking branch 'ogoffart/rename_folders_merged' into dav 2013-05-13 16:28:31 +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
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
a1271a1db2 Rather store a ptr to the ptr to st for propagation_cleanup 2013-04-26 10:31:41 +02:00
Olivier Goffart
844c2bbafa Avoid double free 2013-04-24 14:53:31 +02:00
Klaas Freitag
374d9b0a8c Merge from feature branch csync_commit. 2013-04-22 15:39:43 +02:00
Klaas Freitag
64927899af Use pointer to stat struct for id_list. 2013-04-22 10:22:20 +02:00