[Pkg-owncloud-commits] [owncloud-client] 59/333: Merge remote-tracking branch 'origin/master'

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 1be322579cf3f12e4d6747a9652a1e4226dfd4c3
Merge: d4bd327 b7c7c9f
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Feb 19 11:19:56 2014 +0100

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	src/owncloudcmd/owncloudcmd.cpp

 src/CMakeLists.txt                |  1 +
 src/mirall/accountsettings.cpp    |  6 ++++++
 src/mirall/csyncthread.cpp        | 20 +++++++++++---------
 src/mirall/progressdispatcher.cpp | 10 ++++++++++
 src/mirall/progressdispatcher.h   |  6 +++++-
 src/owncloudcmd/owncloudcmd.cpp   | 33 ++++++++++++++++++++++++++++++++-
 6 files changed, 65 insertions(+), 11 deletions(-)

diff --cc src/owncloudcmd/owncloudcmd.cpp
index 6bf02a8,8e8ff2e..d1e668a
--- a/src/owncloudcmd/owncloudcmd.cpp
+++ b/src/owncloudcmd/owncloudcmd.cpp
@@@ -32,8 -30,30 +32,30 @@@
  
  using namespace Mirall;
  
+ class OwncloudCmd : public QObject {
+     Q_OBJECT
+ public:
+     OwncloudCmd() : QObject() { }
+ public slots:
+     void transmissionProgressSlot(Progress::Info pI) {
+         static QElapsedTimer localTimer;
+         static QElapsedTimer remoteTimer;
+         if (pI.kind == Progress::StartLocalUpdate) {
+             localTimer.start();
+         } else if (pI.kind == Progress::EndLocalUpdate) {
+             // There is also localTimer.nsecsElapsed()
+             qDebug() << "Local Update took" << localTimer.elapsed() << "msec";
+         } else if (pI.kind == Progress::StartRemoteUpdate) {
+             remoteTimer.start();
+         } else if (pI.kind == Progress::EndRemoteUpdate) {
+             qDebug() << "Remote Update took" << remoteTimer.elapsed() << "msec";
+         }
+     }
+ };
+ #include "owncloudcmd/moc_owncloudcmd.cpp"
+ 
  
 -int getauth(const char* prompt, char* buf, size_t len, int echo, int verify, void*)
 +int getauth(const char* prompt, char* buf, size_t len, int, int, void*)
  {
      std::cout << "** Authentication required: \n" << prompt << std::endl;
      std::string s;
@@@ -192,9 -203,12 +220,12 @@@ int main(int argc, char **argv) 
          clientProxy.setCSyncProxy(QUrl(url), _csync_ctx);
      }
  
+     OwncloudCmd owncloudCmd;
+ 
      SyncJournalDb db(options.source_dir);
 -    CSyncThread csyncthread(_csync_ctx, options.source_dir, QUrl(options.target_url).path(), &db);
 +    CSyncThread csyncthread(_csync_ctx, options.source_dir, QUrl(options.target_url).path(), folder, &db);
      QObject::connect(&csyncthread, SIGNAL(finished()), &app, SLOT(quit()));
+     QObject::connect(&csyncthread, SIGNAL(transmissionProgress(Progress::Info)), &owncloudCmd, SLOT(transmissionProgressSlot(Progress::Info)));
      csyncthread.startSync();
  
      app.exec();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git