Olivier Goffart
7740150576
Selective Sync widget: add a "Loading..." label
...
Task #2088
2014-10-22 13:48:05 +02:00
Olivier Goffart
4f367faf4d
SocketAPI: Show an error for files inside the selective sync folders
...
Task #2283
2014-10-22 13:31:20 +02:00
Olivier Goffart
3840186dd8
Utility: fix function signature
2014-10-22 13:31:20 +02:00
Christian Kamm
d77fcea365
Csync tests: Don't use sqlite3_close_v2.
2014-10-22 12:44:33 +02:00
Daniel Molkentin
ed51a45187
Add title to selective sync dialog
2014-10-22 06:29:22 -04:00
Christian Kamm
ba86988101
Csync tests: Fix broken tests.
...
It is no longer ok to call csync_statedb_load() on a non-existant
database since it opens readonly only.
2014-10-22 12:22:13 +02:00
Olivier Goffart
6073e3f345
SocketAPI: do not show a progress icon in case of errors
2014-10-22 12:19:57 +02:00
Olivier Goffart
d31ccacf57
SocketAPI: show an ignored icon for paused folders
2014-10-22 12:19:57 +02:00
Christian Kamm
de48e65091
Csync tests: Fix compile.
2014-10-22 11:45:48 +02:00
Klaas Freitag
3243365210
JournalDb: Do not longer always have a write operation on version table.
...
Rather read the value from the table and if it is what we expect do not
write it.
2014-10-22 10:59:58 +02:00
Jenkins for ownCloud
8dc3f2146a
[tx-robot] updated from transifex
2014-10-22 01:25:37 -04:00
Markus Goetz
a993496ab4
SyncJournalDB/SyncEngine: Properly detect 1.5 upgrade
...
Else we end up never reading file data from the DB.
2014-10-21 20:25:15 +02:00
Markus Goetz
61e72ef50b
CSync: statedb sanity check changes
2014-10-21 18:09:23 +02:00
Markus Goetz
d7ac878efd
SyncJournalDB: Fix deleteBatch
2014-10-21 16:37:51 +02:00
Markus Goetz
e5a0db8782
SyncJournalDB: Fix version table filling up
2014-10-21 16:37:39 +02:00
Markus Goetz
24d4840c93
SyncJournalDB: Set WAL files to hidden
2014-10-21 15:58:56 +02:00
Markus Goetz
fa70798fb5
SyncJournalDB: WAL checkpoint at end of sync
2014-10-21 15:41:11 +02:00
Markus Goetz
1af480ea3b
CMake: Fix RPATH
2014-10-21 15:39:31 +02:00
Olivier Goffart
a76fc0ee5a
SocketAPI: send the change of the parent folder in the broatcast
...
Also do not compute the status if there is nno listeners
2014-10-21 15:26:51 +02:00
Olivier Goffart
80e86d6c1b
ownsql: fix warning with clang
...
warning: equality comparison with extraneous parentheses [-Wparentheses-equality]
2014-10-21 14:59:42 +02:00
Olivier Goffart
dc13e39bb1
SocketAPI: do not have a special case for UPDATE_VIEW on windows
...
This is a relique on the old times when there was no persistant connection
in the windows plugin
2014-10-21 14:57:50 +02:00
Olivier Goffart
98c5871d38
Windows shell integration: Add SHCNF_FLUSHNOWAIT to SHChangeNotify
...
(TortoiseSVN have this flag)
Also do not call SHChangeNotify if there was no change
2014-10-21 14:51:18 +02:00
Olivier Goffart
5a109d9293
Fix t3.pl
...
The fix in commit 86d8079
made the detection of changes inside
a directory more robust.
As a result, changes are detected inside a directory, even if the
files that are changed were moved away on the other remote, the algorithm
won't let the directory be removed and the directory will be re-created
2014-10-21 12:10:12 +02:00
Olivier Goffart
56316bc980
csync_reconcile: remove useless debug output
2014-10-21 11:47:18 +02:00
Klaas Freitag
21c8e65d13
csync tests: Fix test after db changes.
2014-10-21 11:26:04 +02:00
Olivier Goffart
86d8079739
Reconcile: Make sure not to loose new files added in a directory removed on the server
...
Found while investigating #2296
The problem is that we should not remove a directory locally if it contains
modified files.
But the modification time of the directory is not necessarily chaning (so
the instruction of the directory may still be NONE)
We have to move the child_modified test a bit down to be recursive
2014-10-21 10:38:21 +02:00
Jenkins for ownCloud
d2be45bce1
[tx-robot] updated from transifex
2014-10-21 01:25:34 -04:00
Markus Goetz
5d048c18bc
Sqlite3: Switch to WAL
...
This is faster.
2014-10-20 23:09:28 +02:00
Markus Goetz
0fb779d363
SyncEngine: De-initialize recursive PROPFIND value correctly
2014-10-20 22:24:28 +02:00
Daniel Molkentin
d0ed82a686
We need SqlDatabase and SqlQuery to be exported
...
Required due to 53b3e5af1b
2014-10-20 19:58:10 +02:00
Markus Goetz
d33b68ccc9
CSync: Error out if DB error
2014-10-20 19:32:06 +02:00
Klaas Freitag
26f068bcab
SocketApi: Properly manage the database connections.
...
Removed the fishy closeDb() method of SqlQuery again.
2014-10-20 17:31:33 +02:00
Markus Goetz
f0dc3725e8
ownSql: Still also use sqlite3 busy handler
2014-10-20 17:26:25 +02:00
Markus Goetz
2de22b408b
SyncEngine: Avoid transaction warning
2014-10-20 17:20:58 +02:00
Klaas Freitag
04b62b139d
Fix compile error and add warning.
2014-10-20 17:10:34 +02:00
Klaas Freitag
2f20f3c65d
SocketApi: Instanziate Object to call QFileInfo::exists
...
QFileInfo on Qt4 does not have static members.
2014-10-20 17:05:14 +02:00
Klaas Freitag
53b3e5af1b
SocketAPI: Use new class SqlQuery to cache the sql queries.
...
This results in better handling of the BUSY condition through SqlQuery.
2014-10-20 16:55:37 +02:00
Markus Goetz
7dbb98c2e5
SyncEngine/SyncJournalDB: Don't keep transactions open
2014-10-20 16:50:55 +02:00
Markus Goetz
8b35cda4c6
SyncEngine: Refactor startSync() code
2014-10-20 15:51:50 +02:00
Markus Goetz
cb36a37779
SyncEngine/SyncJournalDB: Fix creation of .csync_journal
2014-10-20 14:27:00 +02:00
Markus Goetz
704c5f2de7
NetworkJobs: Higher timeout for pre-oC7
...
Pre-oc7 has PHP session locking for PROPFIND (by recursive PROPFIND in csync_update),
the oc7 doesn't.
2014-10-20 13:34:09 +02:00
Klaas Freitag
3fcb0d2d6b
SocketAPI: Properly release precompiled statements. Use sqlite3_close
...
rather than its v2 equivalent. That should make it compile on older
linux platforms.
2014-10-20 10:51:03 +02:00
Klaas Freitag
2dfe0ed42e
Remove unused variable, fixes compile warning.
2014-10-20 10:51:03 +02:00
Daniel Molkentin
ac48fbae9c
1.7.0 beta4
2014-10-20 10:28:47 +02:00
Daniel Molkentin
6048a7143a
Revert "Remove references to qsqlite3"
...
QtWebkit needs it
This reverts commit b1c10c8454
.
2014-10-20 10:27:34 +02:00
Jenkins for ownCloud
7c24db07c2
[tx-robot] updated from transifex
2014-10-20 01:25:25 -04:00
Daniel Molkentin
271cdac474
Really use internal SQLite on Windows
2014-10-19 08:51:01 +02:00
Jenkins for ownCloud
79e2c132cc
[tx-robot] updated from transifex
2014-10-19 01:25:24 -04:00
Klaas Freitag
b5736fb5a7
Sql: Handle SQLITE_BUSY properly for sqlite3_step and sqlite3_prepare.
...
Repeat the statements a couple of times and sleep in between.
2014-10-18 16:16:29 +02:00
Klaas Freitag
7822a6b000
csync_statedb: Finalize the precompiled statements after discovery.
...
As described in http://www.sqlite.org/cvstrac/wiki?p=MultiThreading precompiled
statements should not be used across thread borders. However, the reconcile
phase would reuse the statements if defined (it calls statedb function from
a different thread) so it is saver to finalize them at the end of the
update run.
2014-10-18 14:18:11 +02:00