Commit graph

508 commits

Author SHA1 Message Date
Markus Goetz
6110a99afc SyncEngine: Fix previous cherry-pick 2015-08-11 11:35:12 +02:00
Olivier Goffart
9dcce01e54 csync: ignore files/folder for which stat fails
instead of pretending it suicceed and not recursing in it.

This fixes a bug in which a folder with a too long name would be properly
created, then removed on the server in the next sync.

(cherry picked from commit 4bbf7669091cde7ec726b1708d8c54427b68f016)

Conflicts:
	csync/src/csync.h
	csync/src/csync_exclude.h
	csync/src/csync_update.c
2015-08-11 11:17:20 +02:00
Christian Kamm
e0cf5c3920 Progress: Robust against bad 'completed' values #3579
Increasing the 'total' for bogus values of 'completed' is a bad idea.
2015-08-11 10:44:27 +02:00
Christian Kamm
3ab49143e1 Progress: Guard against decreasing progress #3579
Ensure that progress going backwards won't lead to outrageous
transfer speeds.
2015-08-11 10:38:04 +02:00
Lukas Reschke
9bbf9b86b7 Use HTTPS links
No need to have an additional redirect
2015-08-10 12:30:33 +02:00
Daniel Molkentin
b906c70a86 ownSql: Do not use sqlite3 method not present in older version
Was only used for debug output anyway and broke RHEL/CentOS6
2015-08-07 11:14:14 +02:00
Markus Goetz
7c52e925b9 Propagator: Use fetchAndAddAcquire to get parallelism 2015-08-06 18:13:48 +02:00
Daniel Molkentin
6a20ea5e73 Merge pull request #3472 from owncloud/linux_restart_on_new_version
On Linux restart if new version is found on disk
2015-08-06 17:47:10 +02:00
Markus Goetz
2d49f4c844 AbstractNetworkJob: Make sure to print URL on timeout 2015-08-06 17:33:33 +02:00
Markus Goetz
049d49eba8 OwnSql: Show potential error on close #3421 2015-08-06 15:47:38 +02:00
Markus Goetz
593aa003d6 Propagator: Re-order statement of previous commit
The user should be allowed to override.
For issue #3382
Will also help for #3095
2015-08-06 15:28:50 +02:00
Olivier Goffart
29d7903c22 Propagator: do not use parallelism when we have bandwidth limit
When user wants to limit the bandwidth, he does not care about speed
anymore. And parallelism on slow network might cause problems.

For issue #3382
Will also help for #3095

(cherry picked from commit b20f29f22797367c7aa92bd74389c99b10c852a4)
2015-08-06 15:27:18 +02:00
Olivier Goffart
2cf29352b8 SyncJournalDB: clear all the prepared query when closing the database
Not closing it may keep the file open (issue #3421)
2015-08-06 14:28:02 +02:00
Daniel Molkentin
72b2c52e15 Merge branch 'master' into linux_restart_on_new_version
Conflicts:
	src/gui/application.cpp
	src/gui/owncloudsetupwizard.cpp
2015-08-06 11:11:52 +02:00
Markus Goetz
7985c0d7f1 Merge pull request #3531 from jturcotte/master
Remove need for UPDATE_VIEW to refetch the status #2340
2015-08-06 11:03:28 +02:00
Jocelyn Turcotte
a9858d4ed2 Revert "Use dynamic library loading for detecting the correct path for links" 2015-08-06 10:41:33 +02:00
Olivier Goffart
8ec4d0f19b Utility: use SI units for the sizes in bytes 2015-08-05 16:22:09 +02:00
Olivier Goffart
952c249039 Selective sync: on the first sync, do not ask confirmation for every folders
Since we already confirmed a previous selective sync dialog
2015-08-05 16:11:59 +02:00
Olivier Goffart
0e3262b181 Theme: add a settings for configuring the default of newBigFolderSizeLimit 2015-08-05 15:33:51 +02:00
Markus Goetz
9a9cefbcc5 SslButton: Improve reliability and usefulness #3534 #3536 2015-08-05 13:04:30 +02:00
Markus Goetz
f6cd2c79d5 CSync: Proper error for invalid filenames #2777 #3128 #2240 2015-08-04 22:13:38 +02:00
Phil Davis
8216727553 Notify of big folders that are greater than or equal to the limit
This should allow for the case when a user has set the limit to 0 and a new empty folder appears on the server. The folder will have size 0 (no files in it). Doing the >= test here will mean that the user will be prompted about the new folder, which I think is the behaviour they would expect.
The side-effect of this change is that if the user has a limit of, for example, 10,000,000 and a new folder comes along with exactly 10,000,000 of content then they will now be prompted about it. Before the change such a new folder would have been auto-synced without prompting the user. I do not think this is a big deal - I cannot believe that users will be counting exact bytes for this limit, they are just setting a rough number of MB at the UI.
Should fix https://github.com/owncloud/client/issues/3542
2015-08-04 19:28:23 +05:45
Jocelyn Turcotte
48624fe033 SocketApi: Force fowarding an OK STATUS for all parent directories
This fixes a few issues with the new FinderSync integration on OSX which
can't easily clear its status cache when receiving an UPDATE_VIEW message
except by unregistering the folder, but which causes flickering.

This fix should also make the regeneration of the cache unnecessary on other
platforms through possibly expensive RETRIEVE_FILE_STATUS commands.
2015-07-31 21:59:58 +02:00
Jocelyn Turcotte
78b63c34cb Do not add all remote directories to the SyncItemVector
To allow forwarding all OK states of sync jobs to the socket API
we need to make sure that the vector doesn't contain unneeded items.

This initially was intended to force updating the metadata for parent
folders, but since then the should_update_metadata flag check was
added both here and in PropagateDirectory::finalize where the metadata
is actually updated for parent folders. We can safely remove the inclusion
of all remote directory items.
2015-07-31 21:59:58 +02:00
Jocelyn Turcotte
26d137cac6 SocketApi: Remove an unneeded emit syncItemDiscovered
The signal is emitted in this case if the instruction is NONE
but in the only ultimately connected slot to this signal,
SocketApi::slotSyncItemDiscovered, we return early according
to the same condition.

The emission of the same signal at the end of treewalkFile remains
and take care of the normal cases.
2015-07-31 21:59:58 +02:00
Markus Goetz
eafc45d83c CheckServerJob: Only show SSL ticket warning when actually suceeded 2015-07-30 18:16:37 +02:00
Markus Goetz
fd5330b469 Propagator: Log chunk transferid 2015-07-30 17:47:06 +02:00
Klaas Freitag
817a165da7 utility: Put the config include to top of includes. 2015-07-30 16:38:30 +02:00
Markus Goetz
7fc7925d17 Propagator: Don't corrupt file with broken webserver #3373 2015-07-30 14:40:24 +02:00
Markus Goetz
f01b7bb5db Propagator: More debug output for downloads/uploads 2015-07-30 14:40:24 +02:00
Klaas Freitag
527fd1ac47 Capabilities: Add macro to make win compile again. 2015-07-30 11:04:49 +02:00
Olivier Goffart
07ddf18b3b Account Capabilities: style fixup
- Remove the copy constructor. The default constructor is fine. Having
   a user defined copy constructor inhibit the move constructor.
 - Pass QVariantMap arguments via const references
 - Do not return a pointer to Capabilities from the account. It is a
   value type and should not be used by pointer.
2015-07-29 12:07:57 +02:00
Markus Goetz
dccaba98af Merge pull request #3439 from rullzer/use_caps
Use server capabilities for share dialog
2015-07-29 11:50:35 +02:00
Olivier Goffart
22013eb528 ConfigFile: remove some unused functions 2015-07-28 12:05:34 +02:00
Roeland Jago Douma
6c8ff7c61a Added capabilities class 2015-07-28 12:04:24 +02:00
Olivier Goffart
45b598cacb Confirm feature: default to 500MB
Issue #3148
2015-07-27 10:04:53 +02:00
Olivier Goffart
0ccaae9a22 Confirm feature: Confirm for any folder, not only shared ones
issue #3148
2015-07-27 09:54:20 +02:00
Klaas Freitag
316427c801 Merge branch 'regular_update_check'
Conflicts:
	src/gui/application.cpp
	src/gui/application.h
	src/gui/updater/ocupdater.h
2015-07-23 11:34:12 +02:00
Klaas Freitag
21f7cea609 ConfigFile: Let updateCheckInterval return int instead of quint64.
QTimer wants that in setInterval()
2015-07-22 13:42:54 +02:00
Klaas Freitag
681466213f ConfigFile: Return proper type for update check interval. 2015-07-20 12:10:30 +02:00
Klaas Freitag
cb4bfd8060 ConfigFile: Fix spelling. 2015-07-20 12:10:00 +02:00
Christian Kamm
5d9e752c71 HttpCreds: Add keychain failure hint. #3268 2015-07-17 14:39:43 +02:00
Christian Kamm
2124098f84 System proxy: Ask for credentials if needed.
The proxyAuthenticationRequired() signal now goes to the
ProxyAuthHandler class. That class will try to read the proxy settings
from the keychain or ask the user about them.

We won't ask the user for credentials for explicitly configured proxies.
It also does not change how the credentials for explicitly configured
proxies are stored. (see #261)
2015-07-17 11:54:46 +02:00
Olivier Goffart
944564258c Fix the Utility Test
1 should be printed as "1" and not as "1.00"
2015-07-17 10:27:03 +02:00
Olivier Goffart
0a6aa88d72 Merge remote-tracking branch 'origin/hidden_file_handling' 2015-07-17 09:32:29 +02:00
Klaas Freitag
2f2ae09190 Utility: Added function versionOfInstalledBinary()
It calls the binary with param --version and returns the first line of
the output. For owncloud, that is the version string.
2015-07-16 18:16:16 +02:00
Olivier Goffart
b59fc39d13 Fix warnings about unused parametters 2015-07-16 18:15:07 +02:00
Olivier Goffart
bdf5029d47 HTTP cred: properly forget the password when signing out #3462
QNAM do not sign out by itself, it keeps the password in cache.

Qt5 has a function to clear the cache. On Qt4 we reset the QNAM
2015-07-16 17:00:14 +02:00
Klaas Freitag
4ad9b7d72d Change default check frequency to every ten hours. 2015-07-16 14:19:02 +02:00
Klaas Freitag
3a5f66e976 SyncEngine: Remove bogus logging. 2015-07-15 15:54:41 +02:00