Jocelyn Turcotte
ea5e6d367b
Connect the SocketApi directly to the SyncFileStatusTracker
...
Don't go through the Folder->ProgressDispatcher->SocketApi route and
keep the path logic in SyncFileStatusTracker.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
da7b9916e5
Move the SocketApi business logic to a libsync SyncFileStatusTracker class
...
This will allow testing this code and avoid going through too many
layers to get notified and a file status changed.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
a4e0899af4
Remove the mutex from ExcludedFiles
...
It's always accessed from the main thread.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
2d2c7bc9b8
Move the SyncEngine construction to the Folder constructor
...
The SyncEngine is now created only once, at construction of the
Folder, instead of being reconstructed on each sync.
2016-03-28 13:26:38 +02:00
Jocelyn Turcotte
df386b64ba
Make the AccountState a construction argument of the Folder
...
This will help moving the SyncEngine construction in the constructor
and allow moving functionalities from Folder to SyncEngine or its
delegated objects.
2016-03-28 13:07:28 +02:00
Daniel Molkentin
7730e826b0
Merge pull request #4580 from owncloud/implement_ep_1136
...
Implement EP 1136
2016-03-24 14:58:09 +01:00
Daniel Molkentin
2d24585a8f
Implement enforcing a static URL postfix.
...
Second part of EP 1136
2016-03-24 14:18:52 +01:00
Daniel Molkentin
fb75adcd57
Wizard: Implement alternative forms of inquiring about the userID
...
Settable in the theme.
2016-03-21 23:50:48 +01:00
Jocelyn Turcotte
c55ac504a3
Merge pull request #4584 from lultimouomo/fix-destruction-order
...
Fix crash due to destruction order
2016-03-18 18:58:23 +01:00
Luca Niccoli
6735126c09
Fix crash due to destruction order
2016-03-18 16:41:48 +01:00
Klaas Freitag
0e1b9a346d
Fix plural translation handling, remove the superflous arg()
2016-03-18 15:28:00 +01:00
Christian Kamm
0febe9b0df
Revert "Utility: Make sure to use UTC timestamp to compare in timeAgoInWords"
...
This reverts commit 41b43bf961
.
Using now in UTC should make no difference, but that assert might
trigger...
2016-03-18 13:15:35 +01:00
Klaas Freitag
f04895a407
Utility: Fix plural translation.
2016-03-18 08:31:13 +01:00
Klaas Freitag
41b43bf961
Utility: Make sure to use UTC timestamp to compare in timeAgoInWords
...
This should help to fix the problems we see in #4521
2016-03-18 08:31:03 +01:00
Christian Kamm
4b19cdeca0
Propfind: Treat broken XML response as failure #4575
...
Soldiering on with a broken or incomplete response could lead to
incorrect sync behavior.
Since discovery uses LsCol jobs which already handle errors
correctly, this should not have a significant impact.
2016-03-17 11:32:19 +01:00
Christian Kamm
7bd4f95b8c
SqlQuery: Write NULL when intended #4548
...
In SQLite bindings are not cleared by sqlite3_reset() calls, so
skipping a sqlite3_bind call to create a NULL value doesn't work,
instead the previous value will be written.
To fix this, I clear all bindings in SqlQuery::reset and make sure
to explicitly bind NULL when desired in SqlQuery::bind.
To make sure there's no confusion about SqlQuery::reset and
sqlite3_reset, I rename our method to reset_and_clear_bindings().
2016-03-15 14:38:31 +01:00
ckamm
25baa995ec
Merge pull request #4532 from ckamm/content-checksum
...
Enable content checksums #4375
2016-03-14 09:49:31 +01:00
Markus Goetz
6c07f08175
Proxies: Enable ownBrander to force system proxy usage #4458
2016-03-11 16:21:40 +01:00
Markus Goetz
a14b495864
Old servers: Don't nag if version still undetected #4523
2016-03-09 15:57:45 +01:00
Markus Goetz
2843214d09
Merge pull request #4531 from ckamm/old-server
...
Add warnings for old server versions #4523
2016-03-09 15:16:48 +01:00
Olivier Goffart
54612455e6
Merge pull request #4513 from owncloud/csyncContextToSyncEngine
...
Move the csync_context creation in SyncEngine
2016-03-08 18:12:31 +01:00
Jocelyn Turcotte
e91a5c85ff
Move the Logger reference back into src/gui
2016-03-03 20:26:48 +01:00
Jocelyn Turcotte
7561f5c717
Add comment and cleanup the csync exclude list code
...
Removed the csync_add_exclude_list function that isn't use anywhere
anymore.
2016-03-03 20:26:48 +01:00
Christian Kamm
c554f5383c
Downloads: Preserve group ownership #4330
2016-03-03 12:02:06 +01:00
Christian Kamm
4f48c888ef
Don't use QVector::removeOne, added in Qt 5.4
...
A QList makes sense there and makes the rest of the code
work with earlier Qt versions.
2016-03-03 10:03:41 +01:00
Markus Goetz
266508b691
Merge pull request #4529 from owncloud/dynamic_parallelism_scaling
...
Propagator: Pump in more requests if we think current ones are quick
2016-03-02 15:23:58 +01:00
Markus Goetz
d78c3679e7
Propagator: Pump in more requests if we think current ones are quick
...
Helps with small file sync #331
When I benchmarked this, it went up to 6 parallelism and
was about 1/3 faster than the previous fixed 3 parallelism.
Doing more than 6 is dangerous because QNAM limits to 6 TCP
connections and also the server might become a bottleneck.
Should also help for #4081
2016-03-02 15:22:21 +01:00
Christian Kamm
d6d3502960
Checksums: Compute content checksum on download #4375
2016-03-02 14:28:41 +01:00
Christian Kamm
7ed7512f27
Checksums: Content checksums for all uploads #4375
2016-03-02 14:28:20 +01:00
ckamm
ffa78b99d9
Merge pull request #4512 from owncloud/add-checksum-to-database
...
Checksums: keep the transfer checksum in the database as the content …
2016-03-02 14:04:37 +01:00
Christian Kamm
f66c28900a
Add warnings for old server versions #4523
...
* A tray message on every start up
* Red message in account settings
* Folders are paused when the server version switches to
an unsupported one
2016-03-02 12:54:22 +01:00
ckamm
6e9019120f
Merge pull request #4527 from ckamm/account-pause
...
Account pausing #3829
2016-03-02 10:35:40 +01:00
Christian Kamm
d521232587
AccountState: Allow storing state in settings
...
This will be useful if we ever want to store account-level gui state.
I built this originally because I thought a paused account would be
this kind of state.
2016-03-01 16:08:23 +01:00
Roeland Douma
f24fa46789
Merge pull request #4496 from owncloud/fix_4325
...
Add theming options control sharing operations
2016-03-01 15:33:04 +01:00
Christian Kamm
a9b00a7489
Don't make files read-only when server is too old #4450
2016-03-01 10:11:20 +01:00
Jocelyn Turcotte
b8227afcaa
Move the csync_context creation in SyncEngine
...
The creation doesn't need to be separated from the SyncEngine anymore.
This allows the SyncEngine to be created in fewer steps if we want to
use it in tests.
This moves most of the direct csync code from Folder into the SyncEngine.
The exclude file logic for the context has been wrapped using the
existing ExcludedFiles class as well.
2016-02-25 20:53:13 +01:00
Olivier Goffart
e6f81d3965
Checksums: keep the transfer checksum in the database as the content checksum
...
Currently, we only use this for .eml files. But we can just store this checksum
in the database if it was computed anyway.
Issue #4487
2016-02-25 17:17:14 +01:00
Olivier Goffart
60c101d90b
PropagatorDownload: fix possible crash
...
Backtrace seen from the crash reporter where reply() is null.
2016-02-24 19:52:14 +01:00
Olivier Goffart
b685f6b6b6
Chunking: change the default chunk size to 10MB
...
As discussed with Klaas, this seems to be a better compromise.
10MB * 3 prarralel jobs = 30MB in memory, and to retry in case of
disconnection. Which is still reasonable. And might make the upload
almost twice as fast on fast network where the amount of chunk is the
bottleneck (because of more server processing)
Relates to issue #4354
2016-02-24 16:25:45 +01:00
Markus Goetz
fe7630954e
Propagator: Remove 100msec delay between jobs
2016-02-23 14:27:35 +01:00
Olivier Goffart
b3d57f3c7c
Cleanup syncengine after the new option not to ask confirmation when everything is removed
...
Cleanup after pull reuqest #4389
Do not make the SyncEngine depends on the ConfigFile
2016-02-22 16:14:22 +01:00
Markus Goetz
a76ba06817
Merge pull request #4389 from Bottswana/deleteprompt
...
Add option to disable the delete all files prompt
2016-02-22 15:44:50 +01:00
Roeland Jago Douma
99b3b752e3
Add theming options control sharing operations
...
Fixes #4325
2016-02-22 13:53:45 +01:00
Markus Goetz
5d7aa792e7
SyncEngine: Improve error message for ignored files/folders #4143
2016-02-22 11:13:29 +01:00
Hefee
28b694b170
Merge branch '2.1'
2016-02-20 10:34:34 +01:00
Klaas Freitag
7f18d087e6
Utility: Make the timeAgoInWords method a bit more verbose
2016-02-15 17:59:24 +01:00
Olivier Goffart
dd89ab59e4
Use oc:size instead of quota-used-bytes to get the sizes of folder ( #4459 )
2016-02-11 15:09:47 +01:00
Olivier Goffart
cd83772112
SyncJounral: add an index on the error blacklist table
...
https://github.com/owncloud/enterprise/issues/1035
2016-02-11 14:38:38 +01:00
Olivier Goffart
c93ecfbfb5
Merge branch restore_backup
2016-02-10 17:47:06 +01:00
Olivier Goffart
893e22691d
ConnectionValidator: Make sure we intercept propfind error
...
If the PROPFIND return an invalid code (like 200) then we would
not recieve the error signal and we would never sync again.
Found while investigating https://github.com/owncloud/enterprise/issues/1068
2016-02-10 15:38:21 +01:00