Christian Kamm
9bd7ffe952
blacklist: Fix stale blacklist removal. #2247
...
Use the right check to determine whether a file has a blacklist entry,
SyncFileItem::FileIgnored was incorrect because that denotes files from
the ignore list or blacklisted files with no retries left.
The blacklistedInDb flag does the right thing. Rename it to
hasBlacklistEntry to be more explicit.
2014-10-08 09:17:40 +02:00
Markus Goetz
8febd90f2a
Propagator: Be less verbose
2014-10-08 09:07:29 +02:00
Daniel Molkentin
1579c23ff1
Fix order in which credentials are getting fetched
2014-10-07 18:21:22 +02:00
Markus Goetz
bf18ecae13
Propagator: Fix bw limiting bug, be less verbose in logging
2014-10-07 17:42:50 +02:00
Markus Goetz
89971925ca
Propagator: Be more verbose about propagator choice
2014-10-07 14:55:30 +02:00
Markus Goetz
d1cc3c34c9
Propagator: Relative download limit
2014-10-07 14:46:55 +02:00
Markus Goetz
de79f9338a
Propagator: Bandwidth limiting for new propagator
2014-10-07 14:46:55 +02:00
Olivier Goffart
5471bfd5a8
No need to update mtime and etag after a move
...
The server keeps the mtime and etag anyway.
And changing the mtime also changes the etag and so make other clients re-download
the file instead of detecting the move
2014-10-07 09:13:13 +02:00
Daniel Molkentin
961df010cb
Propagator: Fix typo in Win32-only code
2014-10-06 15:39:49 +02:00
Klaas Freitag
12b09fab67
CaseClash: more defensive logging on Windows.
2014-10-03 11:54:32 +02:00
Klaas Freitag
41fa562dce
blacklisting: disable broken remove stale entries function for now.
2014-10-03 11:35:18 +02:00
Klaas Freitag
81d3ce8257
cmake: Commented setting of the INSTALL_PREFIX var on Mac
2014-10-01 20:55:39 +02:00
Daniel Molkentin
bcc06af904
fix last commit
2014-10-01 17:46:29 +02:00
Daniel Molkentin
a98242a2b8
fix install target for macdeployqt
2014-10-01 17:32:17 +02:00
Olivier Goffart
0d303f1d1f
SelectiveSync: sort the item instead of using the order from the server
...
Task #2259
2014-10-01 13:47:24 +02:00
Daniel Molkentin
dafd9c308f
More removal of obsolete CMake code
2014-10-01 12:51:38 +02:00
Olivier Goffart
147fa60f81
Merge branch 'socketapi_localsocket' into 1.7
2014-10-01 12:34:22 +02:00
Olivier Goffart
a1b9405e2e
Windows has not been ported back to QLocalSocket
2014-10-01 12:33:54 +02:00
Olivier Goffart
db02d44c6a
No need to update mtime and etag after a move
...
The server keeps the mtime and etag anyway.
And changing the mtime also changes the etag and so make other clients re-download
the file instead of detecting the move
2014-10-01 11:22:00 +02:00
Klaas Freitag
dff1f77dfa
SocketAPI: remove nonsense FIXME's.
2014-09-30 17:12:07 +02:00
Daniel Molkentin
1a2fff8ed8
OS X: Use a python script to fix for bundle fixup...
...
...rather than relying on cmake magic
2014-09-30 17:09:16 +02:00
Markus Goetz
52c12b33c3
OS X: CMD+H should hide the dialog
2014-09-30 15:21:55 +02:00
Klaas Freitag
479b340d75
Folderman: Check if socketApi member is non zero, no crashes.
2014-09-30 12:33:51 +02:00
Klaas Freitag
06c48f58cc
SyncEngine: Use proper start indicator, max unit64.
...
This avoids a warning.
2014-09-30 12:29:24 +02:00
Klaas Freitag
0ee81a2865
SocketAPI: Set permission of the socket Directory.
...
Set that to be accessible by the owner only.
2014-09-30 11:23:49 +02:00
Klaas Freitag
e78c251832
SocketAPI: Split up for specific linux and mac implementation.
2014-09-30 11:23:49 +02:00
Markus Goetz
f8b73eb9d9
SocketApi: Port OS X to use local sockets
2014-09-30 07:36:20 +02:00
Olivier Goffart
a587148c73
SocketApi: Save the socket in $XDG_RUNTIME/<appname>/socket
2014-09-29 13:54:13 +02:00
Olivier Goffart
9acd3a58ee
SocketApi: Use QLocalSocket after all for windows and linux
...
Relates issue #2189
2014-09-29 12:19:33 +02:00
Olivier Goffart
10989d13e4
Folder: Remove slotTerminateAndPauseSync
...
This make no sens to just set the pause config flag here. It make selective sync to mark
the folder as posed on restart
2014-09-26 12:43:54 +02:00
Olivier Goffart
b4071cec01
DiscoveryPhase: fix the name of a function
...
It was renamed from white list to black list long ago
2014-09-26 12:35:56 +02:00
Klaas Freitag
b1c842373d
Add OWNCLOUDSYNC_EXPORT to make building on windows.
2014-09-26 10:07:50 +02:00
Olivier Goffart
a3d70b3cf6
Attempt to fix a crash
...
The reply might be null at the point we are timing out.
Issue #2246
2014-09-26 10:04:36 +02:00
Klaas Freitag
98d9f7924d
SocketAPI: Before reporting something new check for parent permissions.
...
In case it is not allowed to create files or dirs because of missing
permissions in shares, the socket API has to report an error state
rather than the NEW state.
As discussed in mirall issue #1931
2014-09-25 21:52:20 +02:00
Klaas Freitag
172295289e
Permissions: If a top level shared dir is removed, do not restore files in it
...
A top level shared dir can always be removed on the client, even if it is
read only shared. In that case, the removal means "unsharing". Fixed the
permission check accordingly.
See bug #1918 for more information.
2014-09-25 15:39:14 +02:00
Klaas Freitag
8ba08d7e87
Activity View: honor error string even if no warning
...
that allows to specify a more specific user message to be displayed.
2014-09-25 15:03:54 +02:00
Klaas Freitag
8915f94931
Mac Overlays: handle filenames with slashes properly.
...
There are filenames with slashes on MacOSX, they can be created
in Finder. Internally they are converted to colons.
2014-09-25 12:24:32 +02:00
Markus Goetz
1543899795
Upload Chunking: Fix progress DB values
2014-09-25 11:32:54 +02:00
Klaas Freitag
31bf844452
DownloadJob: Refresh the FileInfo after renaming the target file.
...
Otherwise the activity view reports file size 0.
2014-09-25 10:59:08 +02:00
Olivier Goffart
dad8c1c27c
propagator: Do not check for case clash when renaming
...
Issue #1385
When renaming, we would normaly already have an error if the file already exist.
And we want to allow the renaming to chang ethe case (Eg. "hello" -> "HELLO"
2014-09-24 16:43:01 +02:00
Klaas Freitag
2c67a7ca71
progress: Set a clear start indication in the progress.
...
Before, 0 was used to indicate the sync start which wipes the activity
window. However, if there _are_ no synced items but only ignored items
the overall counter stays zero which wipes the list all the time.
This fixes bug #2171
2014-09-23 15:58:06 +02:00
Klaas Freitag
5b10a9f3a7
Minor: Remove unused definition
2014-09-22 13:47:45 +02:00
Klaas Freitag
d0fb1acebb
Win32: Define HANDLE variable, make win compile again.
2014-09-22 13:47:17 +02:00
Christian Kamm
fa881ba1c7
Notifications: Don't emit one per error. #1777
2014-09-19 15:59:03 +02:00
Olivier Goffart
9ae4d45243
Restart the sync when we detect we need to redo a sync
...
Fixes #1968
Relates #2038
(cherry picked from commit a84b7dc27e
)
Conflicts:
src/mirall/owncloudpropagator.h
src/mirall/propagator_qnam.cpp
src/mirall/syncengine.h
2014-09-19 11:51:17 +02:00
Christian Kamm
2eec85a97c
NetworkJobs: Propagator jobs keep others from expiring. #2155
...
In some owncloud server setups multiple concurrent connections for the
same session are not supported: owncloud/core#11153
This causes issues with multiple uploads and downloads. A usual symptom
is the quota job failing and the sync aborting.
This workaround lets activity on the propagator's GET and PUT jobs
reset the timeout of all network jobs. That way, queries like the quota
job would not time out while a large up/download is in progress.
2014-09-19 11:22:57 +02:00
Olivier Goffart
1cd5681967
permissions: Remember the permissions for the root folder
2014-09-19 10:58:52 +02:00
Olivier Goffart
50e718b1e7
Merge branch '1.7'
...
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/folder.cpp
src/gui/socketapi.cpp
translations/mirall_ca.ts
translations/mirall_cs.ts
translations/mirall_de.ts
translations/mirall_el.ts
translations/mirall_en.ts
translations/mirall_es.ts
translations/mirall_es_AR.ts
translations/mirall_et.ts
translations/mirall_eu.ts
translations/mirall_fa.ts
translations/mirall_fi.ts
translations/mirall_fr.ts
translations/mirall_gl.ts
translations/mirall_hu.ts
translations/mirall_it.ts
translations/mirall_ja.ts
translations/mirall_nl.ts
translations/mirall_pl.ts
translations/mirall_pt.ts
translations/mirall_pt_BR.ts
translations/mirall_ru.ts
translations/mirall_sk.ts
translations/mirall_sl.ts
translations/mirall_sv.ts
translations/mirall_th.ts
translations/mirall_tr.ts
translations/mirall_uk.ts
translations/mirall_zh_CN.ts
translations/mirall_zh_TW.ts
2014-09-18 17:10:21 +02:00
Olivier Goffart
7c36e5c0e6
parallel chunk upload: allow "true" for the value of OWNCLOUD_PARALLEL_CHUNK
2014-09-18 14:29:38 +02:00
Olivier Goffart
1b62ed1e7e
Parallel chunk upload: Fix progress
2014-09-18 12:36:30 +02:00