Klaas Freitag
dc29046d61
Add new progressProblem signal and slots.
...
Now the sync problems are handled differently than the sync progress
to ease error message handling and stuff.
2013-11-25 16:18:07 +01:00
Klaas Freitag
1964e60eb0
Do not show an error message if user aborted. Also CSYNC_STATUS fixes.
2013-11-24 22:21:29 +01:00
Klaas Freitag
ecb2444923
Handle changing source file in upload correctly.
...
Delete the file on the server if the source file is new, but
the source did not arrive completely within a timespan.
2013-11-22 19:45:26 +01:00
Klaas Freitag
8d2950f66c
Enable the overall file count in progress again.
2013-11-21 11:37:47 +01:00
Klaas Freitag
55e82ee4c1
Made transaction management a bit more transparent. Some fixes.
2013-11-21 11:13:58 +01:00
Klaas Freitag
5900b1ad25
Add blacklisting for files with error conditions.
2013-11-20 14:27:44 +01:00
Klaas Freitag
aff2dd9f44
The IGNORE statement is handled further down the code.
2013-11-20 14:27:44 +01:00
Klaas Freitag
69269f8f75
Use transactions to speed up database access.
2013-11-18 10:02:32 +01:00
Klaas Freitag
e73730cb94
Close database after retrieval of file record count.
...
As the csync updater opens the database itself, it is cleaner to close
the db before and open it again after csync has finished.
Added a close method to the journal class.
2013-11-18 10:02:32 +01:00
Olivier Goffart
c15a1eedd1
Only update the db for ETAG if the etag has changed for directories
2013-11-15 13:53:18 +01:00
Olivier Goffart
52e01b39d6
Adapt to csync 'md5'->'etag' change
2013-11-13 14:28:41 +01:00
Daniel Molkentin
ca79d3b437
Merge remote-tracking branch 'origin/master' into account_refactoring
2013-11-13 13:55:58 +01:00
Klaas Freitag
e0a50d4bb9
PostSyncCleanup added: Remove superfluous entries from database after
...
sync.
2013-11-11 16:45:40 +01:00
Klaas Freitag
fe4c1cc35a
Remove straycat code from mirall.
2013-11-06 14:20:44 +01:00
Klaas Freitag
ee4cbf52dc
Remove straycats collected in the reconcile phase from journal.
2013-11-05 17:53:01 +01:00
Klaas Freitag
3a21edca2b
Keep originalFile member as QString rather than C string.
...
This avoids encoding problems with interesting file names.
2013-11-05 17:48:51 +01:00
Daniel Molkentin
86af2848dd
Merge remote-tracking branch 'origin/master' into account_refactoring
...
Conflicts:
src/mirall/accountsettings.cpp
2013-10-30 16:37:49 +01:00
Daniel Molkentin
14c2ff44f3
More porting to Account class
...
- Finish port of owncloud setup wizard to Account
- Deprive MirallConfigFile of the customHandle
2013-10-30 16:31:47 +01:00
Olivier Goffart
4ad9f34807
Save the UPDATED files in the database
...
Those are files that were detected as "resolved conflict".
They should have been a conflict because they both were new, or both
had their local mtime or remote etag modified, but the size and mtime
is the same on the server. This typically happen when the database is removed.
Nothing will be done for those file, but we still need to update the database.
2013-10-29 12:13:30 +01:00
Olivier Goffart
84a40dcb59
Refactor the new propagator in jobs
...
This makes the code (IMHO) more easy to understand, and will allow
even more easy parallelism
2013-10-28 15:58:35 +01:00
Klaas Freitag
7a68961b25
Add handling for the file_id data to the sync items.
2013-10-25 13:31:00 +02:00
Daniel Molkentin
29c846a764
WIP: Dissolve owncloudinfo class
2013-10-21 21:42:52 +02:00
Olivier Goffart
0efbfb10aa
Fix MOVE of directory.
...
Remove the right entry from the database (i.e: the original file name)
Fetch the etags of the sub entries
2013-10-17 13:06:39 +02:00
Olivier Goffart
cb8006b89f
Fix comments of the propagation step.
...
Also, don't mark item as removed if the instruction is not REMOVE
2013-10-17 12:09:44 +02:00
Olivier Goffart
313832de8d
Put the progress database within the journal
2013-10-16 12:01:14 +02:00
Klaas Freitag
89cfa387cd
Remove bogus html formatting tag.
2013-10-14 11:46:02 +02:00
Klaas Freitag
1ed8afba09
Minor changes.
2013-10-09 14:27:28 +02:00
Olivier Goffart
7c6fcf688c
Fix the fact that some success was reported as error
2013-10-04 15:55:59 +02:00
Olivier Goffart
127055dd70
Refactor a bit the error reporting from the propagator
...
Add different classes of error failures.
Fatal error means the sync should be stopped.
SoftErrors are not to be displayed to the user.
We still need to make a classification of the errors.
2013-10-04 15:55:59 +02:00
Markus Goetz
f4929e849e
CsyncThread: Activate recursive PROPFIND
2013-10-04 15:42:40 +02:00
Olivier Goffart
baa9ba089c
Save the database after each operation.
2013-10-03 22:41:12 +02:00
Olivier Goffart
3495b822a5
TMP
2013-10-03 20:01:07 +02:00
Olivier Goffart
79ea7c3eed
Abort the sync asynchroniously
...
Don't block the GUI when clicking on pause
Mirall issue #968
2013-10-03 14:36:32 +02:00
Olivier Goffart
b18810f381
Implement abort with the new propagator
...
abort was implemented in csync after the new propagator was written,
so it was not working with the new propagator
2013-10-03 14:35:56 +02:00
Olivier Goffart
e2a2b882bb
Remove the unused errorDetails
...
It was not displayed to the user. Only use errorString instead.
Also report neon error to the user
2013-10-02 15:57:49 +02:00
Klaas Freitag
5cf13dfa32
Make logging work again.
2013-09-24 15:56:03 +02:00
Olivier Goffart
177114f8d9
Initialize the size of the SyncItem
2013-09-11 08:49:09 +02:00
Olivier Goffart
6bfdfd1af0
Fix progress with new propagator
2013-09-11 08:42:29 +02:00
Klaas Freitag
8fe102662d
Merge branch 'propagator-ng': Fixes to work with new LGPL ocsync.
...
Conflicts:
src/mirall/csyncthread.cpp
2013-09-04 16:33:06 +02:00
Klaas Freitag
edcdcb945a
Show the reason why a file was ignored.
2013-09-02 17:25:23 +02:00
Daniel Molkentin
f6d45b68ef
More clear error messages
2013-08-26 20:20:10 +02:00
Olivier Goffart
3c2bb1e2bc
Compile after the merge
2013-08-21 15:29:04 +02:00
Olivier Goffart
24af9f38f4
Merge branch 'csync_lgpl' into propagator-ng
...
Conflicts:
src/mirall/csyncthread.cpp
src/mirall/csyncthread.h
src/mirall/folder.cpp
src/mirall/progressdispatcher.h
src/mirall/syncfileitem.h
2013-08-21 13:19:02 +02:00
Klaas Freitag
98efab83a1
Compile against ocsync based on csync 0.50
2013-08-20 13:26:03 +02:00
Klaas Freitag
192212c682
Handle quota exceeding as error.
2013-08-15 08:15:43 +02:00
Olivier Goffart
e4128cd5d8
progress with new propagator
2013-08-14 19:59:16 +02:00
Olivier Goffart
f8e6326880
Default to not cancel
...
So that the owncloudcmd client is not blocked
2013-08-14 15:44:30 +02:00
Olivier Goffart
67c5f513aa
Fix compilation after merge
2013-08-14 15:36:34 +02:00
Olivier Goffart
0589bfc51b
Merge branch 'master' into propagator-ng
...
This just fix the conflict.
Do not compile or work yet
Conflicts:
src/CMakeLists.txt
src/mirall/csyncthread.cpp
src/mirall/csyncthread.h
src/mirall/owncloudfolder.cpp
src/mirall/syncfileitem.h
test/CMakeLists.txt
2013-08-14 15:19:21 +02:00
Olivier Goffart
c2cc9e62a7
Fix the brandwith limit
...
The unit in mirall are in kbytes/s, but csync expect byte/s
2013-08-14 14:57:56 +02:00