mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-15 18:21:35 +03:00
Code Issues Projects Releases Packages Wiki Activity
1534 commits 481 branches 257 tags 451 MiB
Commit graph

74 commits

Author SHA1 Message Date
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
Olivier Goffart
53ad4a910f Progress database: 
Remember about errors, and don't retry if there is more than 3 errors

Conflicts:
	src/csync_propagate.c
 2013-03-02 15:01:40 +01:00
Olivier Goffart
b6a37064e9 Allow to configure the timeout in the config 2013-02-13 18:25:28 +01:00
Klaas Freitag
ecf09c4077 Added error_string handling with modules 2012-12-14 16:49:03 +01:00
Daniel Molkentin
49d2fd685b iconv support 
This allows for files on mac to automatically be converted to UNC
 2012-12-07 13:03:01 +01:00
Olivier Goffart
0eb1855345 Revert "Only refresh the folder id for remote replica" 
This reverts commit ce94beb068.

This broke because the tree are not merged yet.
If a file was added on the remote, it is not yet in the remote tree, and
still we need to query the ETag
 2012-12-06 16:36:13 +01:00
Olivier Goffart
ce94beb068 Only refresh the folder id for remote replica 
Also don't remove trailing slash, there is no trailing slashes in the
path
 2012-12-05 18:18:45 +01:00
Olivier Goffart
c4dc285ff0 Move the errno codes to another header 
We can't include csync_private.h from the modules
 2012-12-05 14:43:37 +01:00
Olivier Goffart
f18f58ace0 Add progress callback 2012-12-04 17:26:23 +01:00
Klaas Freitag
ca30b99cea More accurate setting of errno with custom values. 2012-12-04 17:03:00 +01:00
Olivier Goffart
95edd6a9de Merge remote-tracking branch 'origin/master' into dav 
Conflicts:
	config/ocsync_log.conf
	src/csync.c
	src/csync.h
	src/csync_config.c
	src/csync_log.h
	src/csync_private.h
	src/csync_statedb.c
	tests/csync_tests/check_csync_config.c
 2012-12-03 17:32:08 +01:00
Andreas Schneider
95b367dd23 csync: Add option to set and get log verbosity. 2012-10-30 11:27:20 +01:00
Andreas Schneider
890df87d00 csync: Add support for a log callback. 2012-10-30 11:27:20 +01:00
Klaas Freitag
2bb52ef6f9 Merge branch 'master' into dav - get cmocka tests and database move. 
Conflicts:
	CMakeLists.txt
	cmake/Modules/FindCMocka.cmake
	src/csync.c
	src/csync_exclude.c
	src/csync_reconcile.c
	src/csync_statedb.c
	src/csync_update.c
	src/csync_util.c
	src/vio/csync_vio.c
	tests/CMakeLists.txt
	tests/csync_tests/check_csync_exclude.c
	tests/csync_tests/check_csync_statedb_load.c
	tests/csync_tests/check_csync_statedb_query.c
	tests/csync_tests/check_csync_update.c
	tests/std_tests/check_std_c_path.c
 2012-10-27 19:27:14 +02:00
Andreas Schneider
805621540a csync: Move auth callback to a common struct. 2012-10-27 15:29:00 +02:00
Klaas Freitag
0db9427377 Add name of rename target to treewalk data structure. 2012-10-26 20:01:25 +02:00
Benjamin Legrand
cb8a501241 Fix a typeo and rename REPLCIA to REPLICA. 
BUG #8

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2012-10-19 15:59:51 +02:00
Klaas Freitag
ef64756334 Merge branch 'md5' of ssh://milliways.cryptomilk.org/users/freitag/csync into fastsync 
Conflicts:
	modules/csync_owncloud.c
	src/csync_private.h
	src/csync_propagate.c
	src/csync_reconcile.c
	src/csync_statedb.c
 2012-08-23 18:04:32 +03:00
Klaas Freitag
e349df9f4c Added flag to indicate to read the remote filetree from db. 2012-08-23 17:49:18 +03:00
Klaas Freitag
9bd9949d68 Fixed merge conflict, only one md5 needed. 2012-08-23 17:43:21 +03:00
Klaas Freitag
d8967a2bd1 try to propagate EVAL status up by detecting changes in underlying 
directories. That does not work as the reconciler runs through the
directoires in the wrong order, ie. the outermost first.
 2012-08-23 17:41:53 +03:00
Klaas Freitag
943e960bc0 Fixed merge conflict. 2012-08-23 17:34:02 +03:00
Klaas Freitag
7dcb9ffdeb Added id lists to context type and removed change counter. 2012-08-17 16:45:12 +03:00
Klaas Freitag
0147063090 try to propagate EVAL status up by detecting changes in underlying 
directories. That does not work as the reconciler runs through the
directoires in the wrong order, ie. the outermost first.
 2012-08-15 16:32:10 +03:00
Klaas Freitag
cf24513879 Merge branch 'dav' of ssh://milliways.cryptomilk.org/users/freitag/csync into md5 
Conflicts:
	modules/csync_owncloud.c
	src/csync_private.h
	src/csync_reconcile.c
	src/vio/csync_vio.c
 2012-08-13 15:24:15 +03:00
Klaas Freitag
3ae996c688 Fixed rename support for Win32. Need to use unit64 instead of ino_t. 2012-08-03 18:48:44 +03:00
Klaas Freitag
253605758e Use remote rename if local rename is detected. 2012-08-02 16:58:54 +03:00
Klaas Freitag
1352f6bc39 MD5 Support WIP 2012-07-24 09:36:06 +02:00
Klaas Freitag
8ba2f483bf Add a vio capabilites function to let a module define its capabilities. 2012-07-04 13:56:24 +02:00
Klaas Freitag
357b5cd5f3 Ability to push to remote without using a tempfile to copy to. 
Modules such as ownCloud make sure anyway that the upload to a
remote resource happens atomar. This patch allows to switch off
the default behaviour of first copying to a temp file in the
same directory. Use csync_set_remote_push_atomar function to
switch off.
 2012-06-22 15:32:04 +02:00
Klaas Freitag
6f51876b45 Moved error_code to context for thread savety. 2012-04-17 12:31:27 +02:00
Klaas Freitag
2ac172f4fe update: Add new exported file tree traverse functions. 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2012-04-17 10:45:04 +02:00
Klaas Freitag
871dde4911 Added ability to limit the csync run to the local tree only. 
That gives apps the chance to use the efficient treewalk of csync
to get information on the tree.

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2012-04-17 10:40:21 +02:00
Klaas Freitag
254045780a Add new exported file tree traverse functions. 2012-04-14 03:13:27 +02:00
Klaas Freitag
1a329539ec Added ability to limit the csync run to the local tree only. 
That gives apps the chance to use the efficient treewalk of csync
to get information on the tree.
 2012-04-14 03:13:26 +02:00
Dominik Schmidt
ee6c631f28 windows: add missing status codes, types and return-values 2012-03-02 17:04:02 +01:00
Andreas Schneider
4e5b29257e include: Fix packed attribute for file structure. 2012-02-04 12:23:54 +01:00
Andreas Schneider
1c52b90fa4 Pack the csync_file_stat structure. 2012-02-04 12:15:48 +01:00
Christian Jann
e4d8e793f6 added new conflict resolution to libcsync 
- use the latest version of the two files under its original filename
  in both destinations (same as currently implemented)
- additionally, create a copy of the older file under a different name
  using the same file extension with appended marker (e.g. "conflict")
  and timestamp in both destinations
  (e.g. textfile.odt -> textfile_conflict-20100222-105000.odt)
- At the Moment 'textfile_conflict-20100222-105000.odt' is only created
  on the side where the conflict has occurred and gets synced to the other side
  on the second sync.
 2011-04-06 16:57:24 +02:00
Andreas Schneider
fdea54edc5 Fix the vim modlines. 2009-05-13 10:12:07 +02:00
Andreas Schneider
3c618a3d7d Add possibility to pass userdata to the auth function. 2009-03-26 11:09:46 +01:00
Andreas Schneider
20048b238d Cosmetic change for a define. 2009-03-26 10:27:04 +01:00
Andreas Schneider
dd23c4ecbf Add some comments. 2009-01-23 14:10:08 +01:00
Andreas Schneider
c5104e8da3 Rename variable to unix_extensions. 2009-01-19 11:32:58 +01:00
Andreas Schneider
e0807cba1b Add a check if we are operating remote on a unix filesystem. 
This extends the exclude function. Maybe we should do this for the local
too.
 2009-01-13 15:50:44 +01:00
Andreas Schneider
0681db0efe Reduce system calls of getuid and geteuid. 2008-11-13 14:08:26 +01:00
Andreas Schneider
e5286c7c8a Rename journal functions to statedb. 2008-07-09 10:10:00 +02:00
Andreas Schneider
8aed1cef83 Disable journal completely instead of writing and removing it. 2008-06-24 13:36:47 +02:00
Andreas Schneider
d7309c4ff9 Rename the callback function. 2008-06-24 13:36:27 +02:00