[Pkg-owncloud-commits] [owncloud-client] 169/211: SocketAPI: Less verbose

[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 55dd149a036e798d74e0639accb18bf17c315df9
Author: Markus Goetz <markus at woboq.com>
Date:   Wed Oct 22 14:43:23 2014 +0200

    SocketAPI: Less verbose
---
 src/mirall/folder.cpp    | 4 +---
 src/mirall/socketapi.cpp | 5 ++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp
index b7215c0..041cda1 100644
--- a/src/mirall/folder.cpp
+++ b/src/mirall/folder.cpp
@@ -539,19 +539,17 @@ void Folder::slotAboutToPropagate(const SyncFileItemVector& items)
 bool Folder::estimateState(QString fn, csync_ftw_type_e t, SyncFileStatus* s)
 {
     if (t == CSYNC_FTW_TYPE_DIR) {
-        qDebug() << Q_FUNC_INFO << "ASKING ERROR FOLDERS" << fn;
         if (Utility::doesSetContainPrefix(_stateLastSyncItemsWithError, fn)) {
+            qDebug() << Q_FUNC_INFO << "Folder has error" << fn;
             s->set(SyncFileStatus::STATUS_ERROR);
             return true;
         }
         // If sync is running, check _syncedItems, possibly give it STATUS_EVAL (=syncing down)
         if (!_engine.isNull()) {
-            qDebug() << Q_FUNC_INFO << "SYNC IS RUNNING, asking SyncEngine" << fn;
             if (_engine->estimateState(fn, t, s)) {
                 return true;
             }
         }
-        qDebug() << Q_FUNC_INFO << "ASKING TAINTED FOLDERS" << fn;
         if (Utility::doesSetContainPrefix(_stateTaintedFolders, fn)) {
             qDebug() << Q_FUNC_INFO << "Folder is tainted, EVAL!" << fn;
             s->set(SyncFileStatus::STATUS_EVAL);
diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp
index 1c16ccb..6a72591 100644
--- a/src/mirall/socketapi.cpp
+++ b/src/mirall/socketapi.cpp
@@ -354,7 +354,7 @@ void SocketApi::command_RETRIEVE_FOLDER_STATUS(const QString& argument, SocketTy
 {
     // This command is the same as RETRIEVE_FILE_STATUS
 
-    qDebug() << Q_FUNC_INFO << argument;
+    //qDebug() << Q_FUNC_INFO << argument;
     command_RETRIEVE_FILE_STATUS(argument, socket);
 }
 
@@ -504,6 +504,7 @@ SyncFileStatus SocketApi::fileStatus(Folder *folder, const QString& systemFileNa
     // '\' is ignored, so convert to unix path before passing the path in.
     QString unixFileName = QDir::fromNativeSeparators(fileName);
 
+    // Is it excluded?
     CSYNC_EXCLUDE_TYPE excl = csync_excluded_no_ctx(excludes, unixFileName.toUtf8(), type);
     if( excl != CSYNC_NOT_EXCLUDED ) {
         return SyncFileStatus(SyncFileStatus::STATUS_IGNORE);
@@ -556,6 +557,7 @@ SyncFileStatus SocketApi::fileStatus(Folder *folder, const QString& systemFileNa
                status.setSharedWithMe(true);
             }
         } else {
+            qDebug() << Q_FUNC_INFO << "Could not determine state for folder" << fileName << "will set STATUS_EVAL";
             status.set(SyncFileStatus::STATUS_EVAL);
         }
     } else if (type == CSYNC_FTW_TYPE_FILE) {
@@ -575,6 +577,7 @@ SyncFileStatus SocketApi::fileStatus(Folder *folder, const QString& systemFileNa
                 return status;
             }
         }
+        qDebug() << Q_FUNC_INFO << "Could not determine state for file" << fileName << "will set STATUS_NEW";
         status.set(SyncFileStatus::STATUS_NEW);
         return status;
     }

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