Commit graph

143 commits

Author SHA1 Message Date
Olivier Goffart
541239c17b Make the message box more explicit when all files have been removed
Also clean the db if the user wish to keep the files
2013-06-10 15:58:02 +02:00
Olivier Goffart
d2579a7754 Warn if we detect that all fles are about to be removed. 2013-06-08 15:41:53 +02:00
Olivier Goffart
07ce6cfa79 don't use member variable of the propagator 2013-05-16 14:50:36 +02:00
Olivier Goffart
9ce47c9675 make the propagator asynchronous 2013-05-16 13:54:22 +02:00
Olivier Goffart
40255d643c propagator-ng: adapt to the merge of rename_folders branch 2013-05-15 15:22:20 +02:00
Olivier Goffart
0b1ecd0ac6 propagator-ng: Abort on fatal error 2013-05-08 13:30:30 +02:00
Olivier Goffart
2193da0ab5 Fix a few FIXME 2013-05-07 17:47:29 +02:00
Olivier Goffart
0636ae6f28 propagator-ng: be able to resume download 2013-05-06 16:59:11 +02:00
Olivier Goffart
02957aba45 propagator-ng: Emit the fileReceived signal 2013-05-05 12:46:40 +02:00
Klaas Freitag
721a8f79ab Improve error handling, add error string to each individual file item. 2013-05-05 11:47:19 +02:00
Klaas Freitag
c956d11183 More error handling of propagator, some cleanups. 2013-05-04 17:14:47 +02:00
Olivier Goffart
c041076c95 Handle renames 2013-05-04 15:32:11 +02:00
Olivier Goffart
e1e8842548 New owncloud propagator that skip the vio abstraction layer
The vio abstraction layer within csync is inneficient for the owncloud
use case because not all calls maps well to the POSIX interface. We can
be much more efficient by doing exactly what we need.

Also, this will allow us to scedule better the calls and possibly to use
threads.
2013-05-04 11:02:30 +02:00
Klaas Freitag
8928c87fc3 Removed silly configDir hack from thread. 2013-04-22 15:06:28 +02:00
Klaas Freitag
9f0348979b Simplify csyncthread with keeping csync ctx intact 2013-04-20 13:15:27 +03:00
Klaas Freitag
a4be3f304d Set log verbosity before calling csync_init. 2013-04-17 15:29:44 +02:00
Daniel Molkentin
acdb624713 safer approach for detecting duplicate sync runs 2013-04-15 15:55:54 +02:00
Daniel Molkentin
3cae8e7124 Remove debugging code 2013-04-15 14:32:23 +02:00
Klaas Freitag
aa6160ab62 Fixed some valgrind warnings. 2013-04-08 14:50:47 +02:00
Daniel Molkentin
f74aa1e9a6 terminate if more than one thread is being started. 2013-04-04 17:25:53 +02:00
Klaas Freitag
ae558a5889 Add a appNameGUI method to the theming. 2013-02-21 12:21:42 +01:00
Klaas Freitag
55a4fd752d Fix commit fd83bf - add treewalk success check. 2013-02-20 17:26:07 +01:00
Klaas Freitag
fd83bf2089 Remove unused variable doTreeWalk. 2013-02-20 10:06:45 +01:00
Daniel Molkentin
5954fb280c Centralize error handling for csync steps
...as a preparation for offline handling.
As a side-effect, removed the last instance
of goto in mirall.
2013-02-15 19:29:27 +01:00
Daniel Molkentin
1c70fb3ba4 Set csync config dir in mirall properly
Otherwise canceling the sync cannot remove the lock file
2013-02-14 17:36:11 +01:00
Daniel Molkentin
8dd97a358a Introduce SyncPrepare state
SyncPrepare is when the folder class prepares the actual syncing,
i.e. does treewalks and runs the reconceiler in case of mirall. The actual
SyncRunning state will only be entered if there is actually anything to
sync.

Fixes #289
2013-02-14 17:36:11 +01:00
Daniel Molkentin
7794480da0 csync: Put up the QNAM key chain for comparison
Comparing with the CA certs will not help with
intermediates, and other cases.
2013-01-21 13:33:33 +01:00
Daniel Molkentin
0171b8b998 Make hash formatting static
no need for class instanciation.
2013-01-21 13:33:33 +01:00
Daniel Molkentin
f678629734 Fix proxy auth
- The port was not set correctly
- The password was read base64 encoded, but not read stored as such
2013-01-16 17:50:26 +01:00
Daniel Molkentin
45c82a2746 Go offline when server is in maintenance. 2013-01-16 14:41:12 +01:00
Klaas Freitag
bc3938daa7 A new sync file protocol dialog. 2013-01-15 20:42:09 +01:00
Klaas Freitag
07034daffe Take valid caList from QSslSocket::defaultCA. 2013-01-14 12:13:51 +01:00
Klaas Freitag
dca8ecb929 Remove bogus spaces. 2013-01-14 12:13:50 +01:00
Klaas Freitag
f4019f5a5a Show backend error messages to user. 2012-12-20 20:51:43 +01:00
Klaas Freitag
c3f6153f94 Fixed QString -> const char* conversions to handle UTF8 correctly. 2012-12-20 16:49:29 +01:00
Klaas Freitag
87aa3d7c60 More detailed error handling. 2012-12-20 16:49:29 +01:00
Klaas Freitag
144a2832b9 Loop over all certificates to match the approved one. 2012-12-20 16:49:29 +01:00
Klaas Freitag
30494eee75 Added utility class with format fingerprint method.
Removed other obsolete formatting method.
2012-12-13 21:36:44 +01:00
Klaas Freitag
c6edde1365 Fix merging. 2012-12-13 19:52:07 +01:00
Daniel Molkentin
6e3b5e075a Fix crash 2012-12-12 20:06:59 +01:00
Daniel Molkentin
3cb2e74d12 Notify user about new files.
Let's see if its too annoying,
we can still add a timer later
2012-12-12 15:00:38 +01:00
Daniel Molkentin
41082c5e81 Fix proxy error
This was caused by an incorrect translation to a string type.
2012-12-12 15:00:38 +01:00
Klaas Freitag
1eabdee253 Enable logging through new csync logging api 2012-12-07 09:03:24 +01:00
Klaas Freitag
029535bcea Removed another scary thing: qstrdup for proxy type. 2012-12-06 19:05:25 +01:00
Klaas Freitag
8af257a4cd Start fs watching with a delay of 2 seconds to don't catch the journal changes. 2012-12-06 18:38:45 +01:00
Klaas Freitag
fbae2d7330 Further cleanups that were possible by new change notification. 2012-12-06 18:35:02 +01:00
Klaas Freitag
f296fad4bb Set csync context as module parameter 2012-12-06 17:57:00 +01:00
Daniel Molkentin
e2d8105f0d Remove debug 2012-12-06 17:54:44 +01:00
Daniel Molkentin
287c073f00 Remove code for local sync runs
Rely entirely on folderwatcher. Local
sync runs can be implemented in terms
of a dummy folderwatcher if we want
to support systems without fs monitoring
again..
2012-12-06 17:53:04 +01:00
Daniel Molkentin
6678beadab Hack: Sleep 2 secs after sync run
This avoids that we get notified by the system
about writing of the csync db (IO has latency).
2012-12-06 17:53:04 +01:00
Daniel Molkentin
f20db6bbc1 Implement folder watching for OS X using FSEvents 2012-12-06 17:53:04 +01:00
Daniel Molkentin
b65fd11a36 Remove superfluous include 2012-12-05 16:46:27 +01:00
Daniel Molkentin
36c9a29a7b Move Logger into its own file, move it to libsync.
This fixes a linker error.
2012-12-05 16:45:28 +01:00
Klaas Freitag
6ba098d26d Make use of the new csync_set_module_properties and remove stuff from
before.
2012-12-05 12:30:28 +01:00
Klaas Freitag
22128781be Use new logging api of csync. 2012-12-04 17:24:46 +01:00
Klaas Freitag
9e66de07f9 Better error message for propagate fail. 2012-11-16 12:32:07 +01:00
Klaas Freitag
78c1bc6b22 Cleanup of sync result treewalk, build up journal in owncloudfolder. 2012-10-29 12:24:20 +01:00
Daniel Molkentin
3db60b4fe7 Massive simplification of proxy support.
Purposefully separated from last commit, but
associated with it: No more need for special
cases after libocsync got fixed do adhere properly.
2012-10-09 02:35:08 +02:00
Klaas Freitag
b41d8c3c12 Removed app name from strings even more and replaced by theme string. 2012-09-27 17:22:08 +02:00
Klaas Freitag
180b99c02e Change the csync config dir to the users app path, not longer .csync. 2012-09-27 12:27:40 +02:00
Daniel Molkentin
2de9cc9590 Use the themes appName() instead of "ownCloud".
This turns the Theme class into a singleton.
2012-09-24 17:57:20 +02:00
Klaas Freitag
8f40b2a276 Use delete[] to free mem from qstrdup, thanks valgrind. 2012-09-19 13:51:27 +03:00
Klaas Freitag
824bd1e087 Fix memory allocation for proxy struct in thread. 2012-08-30 18:50:42 +03:00
Klaas Freitag
fd7cb38c16 Use qthread more correct, see
http://labs.qt.nokia.com/2006/12/04/threading-without-the-headache/
2012-08-26 11:47:45 +02:00
Klaas Freitag
d733aac0e8 Fix QLatin1String issues. 2012-08-17 18:13:17 +03:00
Klaas Freitag
74c6c4e7c9 cleanups and improved error messaging on proxy problems. 2012-08-09 15:13:20 +03:00
Klaas Freitag
9e30fe4ea5 Do not stop syncing if local directories are write protected. 2012-08-09 12:12:54 +03:00
Klaas Freitag
80f2699c80 handle proxy port correctly. 2012-08-06 17:44:23 +03:00
Klaas Freitag
d3bb223898 Proceed proxy settings to csync thread. 2012-08-02 11:17:15 +03:00
Klaas Freitag
973c2c1786 remove the push atomar method call for csync. 2012-07-10 16:21:51 +02:00
Klaas Freitag
928ef731c9 Better protection against remote folder delete. 2012-06-25 14:18:13 +02:00
Klaas Freitag
6ad89d98a9 - Add csync push atomar switch
- Fix a wording if the directory does not exist.
2012-06-22 15:35:22 +02:00
Klaas Freitag
ce50043524 Improved some grammar based on Matts proposals. 2012-06-15 10:51:51 +02:00
Klaas Freitag
36ad4fdc83 More encoding fixes to make win32 with special chars work. 2012-06-13 17:34:20 +02:00
Klaas Freitag
2dcbb54095 Use UTF8 to read password and username rather than local8bit. 2012-06-13 11:29:38 +02:00
Klaas Freitag
06b3a50e84 Wipe the csync statedb after a sync definition is removed. 2012-06-11 10:10:07 +02:00
Klaas Freitag
8b38131b4b Provide proper return value for getauth 2012-06-05 18:37:48 +02:00
Klaas Freitag
6f7165f9f0 A lot of krazy2 (codechecker) fixes. 2012-05-21 16:48:49 +02:00
Klaas Freitag
9c4613e5d2 Allow to interrupt running sync task, incl. some cleanups. 2012-04-30 08:56:56 +02:00
Klaas Freitag
603151fe08 Add proper error message if the owncloud module could not be loaded. 2012-04-23 10:58:21 +02:00
Klaas Freitag
b92c22b6df use thread save implementation of error codes in csync. 2012-04-17 12:34:19 +02:00
Klaas Freitag
77fff8e1bf Caught additional error messages 2012-04-15 16:49:11 +02:00
Klaas Freitag
3fede657b9 SSL Connection Warning dialog working. 2012-04-12 11:37:48 +02:00
Klaas Freitag
903c8ca220 Provide better error messages in owncloud for csync bugs. 2012-03-30 15:34:56 +02:00
Klaas Freitag
84ffebe26c Let folderwatcher use the exclude list file.
simplified naming in mirallconfigfile class.
2012-03-28 12:23:34 +02:00
Klaas Freitag
47f5c51a87 Let csync load the exclude list file 2012-03-28 11:26:51 +02:00
Klaas Freitag
9dcc948b3b Disabled some logging 2012-03-26 14:38:48 +02:00
Klaas Freitag
bdbb85f245 Big changes: queue sync requests of folders and do in one thread
only to avoid thread clottering. Improve error reporting from the
csync thread.
2012-03-22 16:22:08 +01:00
Klaas Freitag
c6a9fb02d0 A more secure csync thread implementation (part1) 2012-03-21 18:03:49 +01:00
Klaas Freitag
ba13437fce Remove user and passwd from ownCloud url and implement a callback.
Added static data to CSyncThread to hold user and passwd, which is
asked for in the callback.
2012-03-13 17:37:43 +01:00
Klaas Freitag
949b33a6d1 Set a variable poll timer interval, useful for multiple folders.
Start polltimer again after folder add.
2012-03-08 11:39:31 +01:00
Klaas Freitag
f6846a2107 Added local polling to owncloud folder, based on csync. 2012-02-28 16:49:13 +01:00
Klaas Freitag
0c46382b6b moved CsyncThread class to its own file 2012-02-15 09:30:37 +01:00