[Pkg-owncloud-commits] [owncloud-client] 24/120: SocketAPI: Show excluded hidden files as ignored #2086

[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 85f5424a135cd17ab6203482cb3bba51c63f9d63
Author: Christian Kamm <mail at ckamm.de>
Date:   Mon Aug 10 13:41:19 2015 +0200

    SocketAPI: Show excluded hidden files as ignored #2086
---
 src/gui/socketapi.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/gui/socketapi.cpp b/src/gui/socketapi.cpp
index c63e0ac..a9000f8 100644
--- a/src/gui/socketapi.cpp
+++ b/src/gui/socketapi.cpp
@@ -59,7 +59,8 @@ enum csync_exclude_type_e {
   CSYNC_FILE_EXCLUDE_AND_REMOVE,
   CSYNC_FILE_EXCLUDE_LIST,
   CSYNC_FILE_EXCLUDE_INVALID_CHAR,
-  CSYNC_FILE_EXCLUDE_LONG_FILENAME
+  CSYNC_FILE_EXCLUDE_LONG_FILENAME,
+  CSYNC_FILE_EXCLUDE_HIDDEN
 };
 typedef enum csync_exclude_type_e CSYNC_EXCLUDE_TYPE;
 
@@ -579,6 +580,11 @@ SyncFileStatus SocketApi::fileStatus(Folder *folder, const QString& systemFileNa
 
     // Is it excluded?
     CSYNC_EXCLUDE_TYPE excl = csync_excluded_no_ctx(excludes, fileName.toUtf8(), type);
+    if( folder->ignoreHiddenFiles()
+            && (fi.isHidden()
+                || fi.fileName().startsWith(QLatin1Char('.'))) ) {
+        excl = CSYNC_FILE_EXCLUDE_HIDDEN;
+    }
     if( excl != CSYNC_NOT_EXCLUDED ) {
         return SyncFileStatus(SyncFileStatus::STATUS_IGNORE);
     }

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