Merge branch 'KDE/4.11' into KDE/4.12

[dolphin.git] / src / search / dolphinsearchinformation.cpp

diff --git a/src/search/dolphinsearchinformation.cpp b/src/search/dolphinsearchinformation.cpp
index fde45f38e8c10e7a0b047cfdba9cfac2cb38a897..b723f1ec00a4547b99760ede1a6fe8919f6895b6 100644 (file)
--- a/src/search/dolphinsearchinformation.cpp
+++ b/src/search/dolphinsearchinformation.cpp
@@ -23,11 +23,13 @@
 #ifdef HAVE_NEPOMUK
     #include <KConfig>
     #include <KConfigGroup>
-    #include <Nepomuk/ResourceManager>
+    #include <Nepomuk2/ResourceManager>
 #endif
 
 #include <KGlobal>
 #include <KUrl>
+#include <QFileInfo>
+#include <QDir>
 
 struct DolphinSearchInformationSingleton
 {
@@ -50,12 +52,35 @@ bool DolphinSearchInformation::isIndexingEnabled() const
     return m_indexingEnabled;
 }
 
+namespace {
+    /// recursively check if a folder is hidden
+    bool isDirHidden( QDir& dir ) {
+        if (QFileInfo(dir.path()).isHidden()) {
+            return true;
+        } else if (dir.cdUp()) {
+            return isDirHidden(dir);
+        } else {
+            return false;
+        }
+    }
+
+    bool isDirHidden(const QString& path) {
+        QDir dir(path);
+        return isDirHidden(dir);
+    }
+}
+
 bool DolphinSearchInformation::isPathIndexed(const KUrl& url) const
 {
 #ifdef HAVE_NEPOMUK
     const KConfig strigiConfig("nepomukstrigirc");
     const QStringList indexedFolders = strigiConfig.group("General").readPathEntry("folders", QStringList());
 
+    // Nepomuk does not index hidden folders
+    if (isDirHidden(url.toLocalFile())) {
+        return false;
+    }
+
     // Check whether the path is part of an indexed folder
     bool isIndexed = false;
     foreach (const QString& indexedFolder, indexedFolders) {
@@ -90,9 +115,9 @@ DolphinSearchInformation::DolphinSearchInformation() :
     m_indexingEnabled(false)
 {
 #ifdef HAVE_NEPOMUK
-    if (Nepomuk::ResourceManager::instance()->init() == 0) {
+    if (Nepomuk2::ResourceManager::instance()->initialized()) {
         KConfig config("nepomukserverrc");
-        m_indexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", false);
+        m_indexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", true);
     }
 #endif
 }