Olivier Goffart
6073e3f345
SocketAPI: do not show a progress icon in case of errors
2014-10-22 12:19:57 +02:00
Markus Goetz
f1ce0a1cf3
SocketAPI: Use non-recursive (heuristic) computation of icons
2014-10-13 17:29:26 +02:00
Klaas Freitag
9bb89dced5
Less offensive logging, only use error if there was one.
2014-10-10 10:16:59 +02:00
Christian Kamm
886f9d82f2
Sync scheduling: Improve logging. #2275
2014-10-09 09:01:35 +02:00
Christian Kamm
285cb78962
Sync scheduling: Don't always force-sync. #2268
...
If lastEtag was null, a force sync was triggered. Force syncs
don't update the etag. The etag retrieval job would only run if
lastEtag was not null. So it could never become non-null.
2014-10-08 10:51:32 +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
Klaas Freitag
5b10a9f3a7
Minor: Remove unused definition
2014-09-22 13:47:45 +02:00
Christian Kamm
fa881ba1c7
Notifications: Don't emit one per error. #1777
2014-09-19 15:59:03 +02:00
Christian Kamm
99aa2cdf2a
Log: Print client version on sync start. #2178
2014-09-17 09:39:04 +02:00
Olivier Goffart
a84b7dc27e
Restart the sync when we detect we need to redo a sync
...
Fixes #1968
Relates #2038
2014-09-10 17:27:33 +02:00
ckamm
3a59dd24f3
Merge pull request #2162 from ckamm/error-missing-exclude
...
Don't do a broken sync when the system exclude file is missing
2014-09-04 14:14:07 +02:00
Christian Kamm
1cf1f6edcb
Fix style issues.
2014-09-04 13:27:11 +02:00
Christian Kamm
da94533647
Folders: Signout should not switch folders to paused state. #2112
...
On signout, syncs that are running in folders are aborted. That used to
also switch the state of these folders to 'paused'. To fix that, aborts
that are caused by user actions no longer change the folder paused
state.
Aborts due to errors should still pause folders! Otherwise we'd try
resyncing them even though there was an error.
2014-09-04 11:21:28 +02:00
Christian Kamm
cf881aa6dc
SyncEngine: Fix invalid slot name in sync error condition.
2014-09-03 14:52:55 +02:00
Christian Kamm
a48bf3142c
SyncEngine: Abort sync with error if system exclude file is missing.
...
Syncing without the system exclude file would cause lots of trouble.
For instance we would try uploading the temporary files we store
partially completed downloads in.
2014-09-03 14:52:46 +02:00
Daniel Molkentin
c0131695c5
Return from Folder::slotPollTimerTimeout() if the account object is 0
...
Right now, we crash instead. This can happen if a folder is created
when an account object is not (anymore/yet) created.
Fixes #2142
2014-09-02 14:51:33 +02:00
Markus Goetz
2f34b046d0
Overlay Icons: Improve OS X version, improve general feedback
...
Now the update phase of the syncing algorithm pushes stuff the notification socket too.
2014-08-27 19:15:43 +02:00
Olivier Goffart
2356601bb3
folder: Make sure not to pol the server if the account is disconnected
...
Fixes #2108
2014-08-26 16:23:19 +02:00
Klaas Freitag
988fe70771
Merge pull request #2075 from owncloud/use_folder_paused
...
Rework of the status icons in FolderMan and Folder objects.
2014-08-20 10:50:28 +02:00
Klaas Freitag
924d9b985f
Some minor cleanups.
2014-08-19 14:21:51 +02:00
Klaas Freitag
1245ed6f06
Status Icons: Let FolderMan only write the folder config files.
...
Remove the setSyncEnabled() call to individual folders which mistakenly
set the folders to pause. Let the folders keep their pause state on their
own.
If FolderMan is set to be enabled emit a general refresh signal rather
than one for each folder.
2014-08-19 14:21:51 +02:00
Klaas Freitag
01b0ee49de
Status Icons: Rename the syncEnable method to isPaused.
...
Previously, in folder and folderman there have been the syncEnabled
properties, but they confused the semantics: While in FolderMan the
syncEnabled flag represents the network connection and stuff, in
Folder it represented if the user paused or resumed the folder.
This resulted in mixed use of both, which lead to wrong icon states.
This patch renames the folder methods and properties to isPaused to
make more clear about what it is.
2014-08-19 14:21:42 +02:00
Olivier Goffart
936252765a
Merge branch 'master' into selective_sync
...
Conflicts:
src/mirall/syncengine.cpp
src/mirall/syncengine.h
2014-08-18 14:44:43 +02:00
Markus Goetz
ce2741cebc
SyncEngine & UI: Progress notifications for update phase
...
For each directory (local and remote, we have UI update throtting code)
a signal is emitted.
It is used by the settings dialog and the tray menu.
2014-08-15 15:28:35 +02:00
Daniel Molkentin
4c67a8812a
Show folder icon a offline when account is offline
...
Fixes #1959
2014-08-15 15:01:01 +02:00
Olivier Goffart
c1831f4946
Selective sync: use a black list instead of a white list
2014-08-15 12:29:10 +02:00
Olivier Goffart
4b2c1bacd1
Merge remote-tracking branch 'origin/master' into selective_sync
2014-08-15 10:28:50 +02:00
Olivier Goffart
4ff0e7e0a2
Silent some warnings
2014-08-12 14:03:04 +02:00
Olivier Goffart
7e009667a2
Selective sync: ignore the files that are not in the selective sync white list
2014-08-11 18:42:24 +02:00
Olivier Goffart
2fdb3cfdfb
Merge branch 'il'
...
Conflicts:
src/mirall/folder.cpp
src/mirall/propagator_qnam.cpp
2014-07-16 10:49:16 +02:00
Olivier Goffart
8961e61f60
Merge branch '1.6' into il
...
Conflicts:
VERSION.cmake
src/mirall/syncengine.cpp
src/mirall/syncengine.h
2014-07-16 09:57:40 +02:00
Olivier Goffart
d697969f36
Use another way to detect that the server was reconfigured
...
Before, we would only detect it if all the files were removed, and no
file where added or changed. This may not be enough because there might
be a welcome.txt file. Now, we check that none of the file stays the same,
and some files are removed.
Relates issue #1948
2014-07-15 18:09:08 +02:00
Klaas Freitag
c6deb392fd
SocketAPI: Enhance SyncFileStatus to have share information.
...
Added a new class SyncFileStatus to reflect that properly.
2014-07-10 16:28:40 +02:00
Olivier Goffart
e0c2e8ed86
folder: remove TOKEN_AUTH_ONLY
...
Folder is no longer in the libowncloudsync
2014-07-09 22:44:08 +02:00
Olivier Goffart
26e17f58ef
Engine: Do not reset the csync log callback in the engine
...
It is already set in Folder and we don't want to use the Logger
in command line clients
2014-07-09 22:44:08 +02:00
Olivier Goffart
8aacb3f7ec
Remove undeeded include
2014-07-09 22:44:08 +02:00
Olivier Goffart
da0bd14bf3
Socket API: move the code that gets the status out of the folder
...
Move the code in socketapi.cpp where it belongs
2014-06-19 14:08:30 +02:00
Olivier Goffart
21e22a50c5
Merge remote-tracking branch 'origin/il' into master
2014-06-16 16:43:48 +02:00
Olivier Goffart
46b8260693
network limits: Do not read them from the config file in the engine
...
Do that from the folder, because the engine can be used in app where
the MirallConfigFile is not accessible
2014-06-07 12:09:22 +02:00
Olivier Goffart
abf0f90a13
SocketAPI: broadcast change when an item is done
2014-06-06 15:52:55 +02:00
Markus Goetz
fd4642d827
Folder: Don't add ignored files on startup
...
Before each sync is enough.
(We could do it at startup only, but so far it is good to have
it at each sync so we can easier see stuff in the log)
2014-06-05 17:50:18 +02:00
Markus Goetz
233450d850
CSync: Remove config dir setting
2014-06-04 10:56:56 +02:00
Olivier Goffart
582a8fe7fd
Merge branch '1.6'
2014-06-03 17:27:12 +02:00
Olivier Goffart
24616bead4
Fix syncing a folder with '#' in the name
...
Or an url with '#'
Fixes #1838
The problem is a bug fixed in Qt5 now breaks.
In Qt4, QUrl::setPath() did not properly handle path with '#' in them
and QUrl::toString would restitute the '#'.
But csync will blindly do "uri + path" before passing the path to
VIO. because csync_update has no idea that the VIO plugin need special
encoding, the encoding cannot be done there. But csync_owncloud then
encodes the full path. So if the uri contains '#', it must not be already
encoded or there will be two encoding.
2014-06-03 15:45:10 +02:00
Klaas Freitag
2911c0e1c4
Add a recursiveFolderStatus method
2014-06-03 09:50:09 +02:00
Klaas Freitag
e275ad3866
Emit the sync finished signal a bit delayed.
...
This allows folder watcher events comnig in before the sync is marked
finished. This avoids "endless syncing" as described in bug #1808
2014-05-27 11:35:07 +02:00
Olivier Goffart
f9263da3de
Fix crash when the account config is gone and there are still folder
...
In rare case (due to a bug in QSettings) the account config may disapear
We should not crash in that case
2014-05-26 11:08:32 +02:00
Olivier Goffart
e1f8eb5aa5
Another way to force a sync when choosing 'Keep files'
2014-05-15 19:36:01 +02:00
Olivier Goffart
f40a054cb7
Revert "Re-sync immediatly after "Keep files" when all files were removed"
...
This causes infinite sync loops
This reverts commit 8b469d3992
2014-05-15 19:29:40 +02:00
Olivier Goffart
8b469d3992
Re-sync immediatly after "Keep files" when all files were removed
...
Fixes #1710
2014-05-15 11:48:01 +02:00
