Olivier Goffart
ce09e11011
Revert "Do not dereference the _engine member variable without check."
...
bubbleUpSyncResult is only called from slotSyncFinished, so if _engine
is invalid there, it is also invalid in slotSyncFinished
This reverts commit aee7515d42
2014-05-07 16:13:43 +02:00
Olivier Goffart
f034bcb9ae
only increment the progressbar for files when the file has been fully transfered
2014-05-07 12:35:02 +02:00
Klaas Freitag
a50c39cd0c
Maintain the original inode value for renamed files.
...
In case two renames are done on the same file/folder very quickly we
lost the information that the second operation was also a rename. That
was because we tried to get the inode value from a stat on the file once
the first rename was finished. But at that point, the file was already
gone because of the second rename.
Now the original inode is kept and written to db in case the file can
not be stat'ed.
This fixes bug #1737
2014-05-06 12:55:54 +02:00
Klaas Freitag
370dd99e47
Super useful source comment.
2014-05-06 09:30:50 +02:00
Olivier Goffart
1631cfdaf1
Fix not blacklisting error 5xx
2014-05-02 17:26:28 +02:00
Olivier Goffart
2e76fe87c2
Fix reporting the right error in a GET
...
We always reported the lack of e-tag instead of the real error
2014-05-02 17:26:28 +02:00
Markus Goetz
6c44f53645
Set network timeout to 300 sec
...
As per previously used values (see source and changelog)
2014-05-02 15:35:40 +02:00
Olivier Goffart
988c162d2f
Have only one place where we read the timeout
2014-05-02 13:04:53 +02:00
Olivier Goffart
88cb047197
Add a timeout when using the QNAM propagation
2014-04-30 18:17:49 +02:00
Klaas Freitag
7f7154ed40
Auto generate the Export header.
...
This should fix oem builds.
2014-04-30 13:55:40 +02:00
Klaas Freitag
a8c1ffc2f4
Add a header file for owncloudcmd.cpp to avoid (auto)moc problems.
2014-04-30 13:55:40 +02:00
Klaas Freitag
df8b5b1ea6
Removed unused Q_OBJECT
2014-04-30 13:55:40 +02:00
Olivier Goffart
ce50cdecf1
Add one byte per files in the computation of the progress bar
...
So it feels like the progress bar is moving when operating of file
that are empty or when deleting or renaming files
2014-04-30 13:20:20 +02:00
Olivier Goffart
77c7439329
Don't include the directory size in the overall progress
...
We don't include them in the total amout of files so it should
not be included in the progress either.
Also, for some reasons directories seems to be 16kB on windows
2014-04-30 12:57:30 +02:00
Markus Goetz
925c6485e6
Propagator: Dont show silly string for non-error
2014-04-30 11:36:57 +02:00
Olivier Goffart
d62deabf9b
Fix updating mtime
...
Fixup commit 9193286fc1
2014-04-30 10:24:17 +02:00
Markus Goetz
876de8fd69
Networkjobs: Remove stray include
2014-04-29 17:55:26 +02:00
Olivier Goffart
983f9c5dde
The job restore job need to be run with QMetaObject::invoke
...
Because the job might be in a different thread.
2014-04-29 16:58:24 +02:00
Olivier Goffart
9193286fc1
Support old server which do not have the x-oc-mtime support
...
Owncloud 4.5
Or owncloud 5 with chunking
Fixes https://github.com/owncloud/core/issues/8392
2014-04-29 16:58:24 +02:00
Olivier Goffart
1b8d11182b
Add missing include
...
This was required so the compiler sees the declaration of
CredentialsFactory::create which should be exported
2014-04-29 16:04:24 +02:00
Olivier Goffart
dcc5c105eb
fix forward declaration of CredentialsFactory::create
2014-04-29 15:50:19 +02:00
Klaas Freitag
64b42333b0
Fix typo.
2014-04-29 15:36:13 +02:00
Olivier Goffart
3ee729bc4a
Add export macro to all classes that need to be exported
2014-04-29 15:31:14 +02:00
Daniel Molkentin
a268b03990
Try to not have windows stay-on-top
2014-04-29 15:31:03 +02:00
Olivier Goffart
9f0848ba15
Merge remote-tracking branch 'origin/libowncloudsync_noqtgui'
2014-04-29 12:23:15 +02:00
Olivier Goffart
f159b028b4
Add a compile option to not blacklist error code 5xx
2014-04-29 11:39:46 +02:00
Olivier Goffart
7e702778a1
Add missing line break
2014-04-29 11:27:31 +02:00
Eran
35b3ddd61f
Made the estimated time only appear in the systray when the sync has actual size.
2014-04-29 02:43:35 +03:00
Eran
a892b79dba
Seperated the systray estimation text to a seperate action, fixed an integer rounding bug
2014-04-29 02:31:27 +03:00
Eran
cd22a1846f
Fixed Indentation and multiple concurrent files syncing case ...
...
..Also increased the height of folder progress bar alittle in order to accommodate the added estimation data
2014-04-28 18:49:27 +03:00
Markus Goetz
4489a56c65
Csync: Set error at correct place
2014-04-28 17:25:18 +02:00
Markus Goetz
7f752c7e93
Csync: Plug code for csync_file_locked_or_open
2014-04-28 16:57:56 +02:00
Daniel Molkentin
2d3ea59755
Limit the mac workaround to the Mac OS X platform
2014-04-28 10:13:53 +02:00
Eran
eadcdab8e7
Issue-#142 : Added support for current file completion estimation.
...
Changed the account settings estimation to display both current file and overwhole estimation.
Decresed the progress font size to fit the added information
2014-04-27 00:48:12 +03:00
Olivier Goffart
9da261acd8
Do not read from the database when upgrading from 1.5
...
We need to make sure that the file id are updated (if the user
had upgraded from owncloud 5 to owncloud 6 while using owncloud 1.5)
2014-04-25 13:31:44 +02:00
Eran
46ffd1c29a
Issue-142 : added time estimation and bandwidth indicator to the systry and active download
2014-04-25 01:08:25 +03:00
Olivier Goffart
642c16b09b
Missing EXPORT
2014-04-24 23:57:42 +02:00
Olivier Goffart
5c92c190f0
Add EXPORT macro to owncloudsync library
...
Not all the class are exported currently, only the one that seems to be used
by the command line tools
2014-04-24 23:45:20 +02:00
hefee
9b7a3d00ee
Using QFile::decodeName instead of QLatin1String
2014-04-23 18:59:40 +02:00
Sandro Knauß
1d862b77af
merged 1.5 into master
2014-04-23 18:54:49 +02:00
Olivier Goffart
f2519e9d87
Fix function signature: pass argument by const reference
2014-04-22 19:52:09 +02:00
Markus Goetz
197d180cb9
Propagator: Add support for CSYNC_CONFLICT_FILE_USERNAME
2014-04-22 16:17:49 +02:00
Markus Goetz
4be20db670
Propagator: Add makeConflictFileName function
2014-04-22 16:07:18 +02:00
Olivier Goffart
46d6191bc2
Also list folder for which the alias starts with '.'
...
Fixes #1695
2014-04-22 14:26:08 +02:00
Olivier Goffart
ee22f377af
Start the folder watcher when new folder are added
...
Before, we would only set up a file system watcher when we read the
config at startup. But we also need to do it in the other case when
the user configure new folder to watch
2014-04-22 14:15:43 +02:00
Olivier Goffart
44a04227f1
Update dynamically the error message in the account settings
...
This let the error be shown when the conneciton is missing at startup
And also remove the red background when there is no longer an error
2014-04-22 14:08:37 +02:00
Olivier Goffart
707c6fcc5d
An abort on the reply is not usually a password error.
...
Copy the code from HTTPCredidentials
2014-04-22 12:52:13 +02:00
Olivier Goffart
edb1f61241
Fix compilation without the BUILD_ONLY_LIBRARIES mode
2014-04-22 12:44:01 +02:00
Olivier Goffart
3fac5f91c8
In case of error, report the right error instead of missing etag
...
also, missing etag is not a fatal error
2014-04-22 12:43:38 +02:00
Olivier Goffart
1338c08622
Fix compilation on linux with BUILD_LIBRARIES_ONLY
2014-04-22 11:33:38 +02:00
