read more options from opiestorage.cf

1 files changed, 12 insertions, 7 deletions

diff --git a/library/global.cpp b/library/global.cpp
index 6c0a66a..6182de8 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -770,19 +770,24 @@ void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter)
         // this is a candidate look at the cf and see if we should search on it
         QString path = (*it)->path();
         if( !checkStorage((*it)->path() + "/.opiestorage.cf" ) )
           continue;
         Config conf((*it)->path() + "/.opiestorage.cf", Config::File );
         conf.setGroup("subdirs");
-        QStringList subDirs = conf.readListEntry("subdirs",':');
-        if (subDirs.isEmpty()) {
-            subDirs.append("Documents");
-        }
-        for (unsigned c = 0; c < subDirs.count();++c) {
-            DocLnkSet ide( path+"/"+subDirs[c], mimefilter );
-            folder->appendFrom(ide);        
+        if (conf.readBoolEntry("wholemedia",true)) {
+            DocLnkSet ide( path,mimefilter);
+            folder->appendFrom(ide);
+        } else {
+            QStringList subDirs = conf.readListEntry("subdirs",':');
+            if (subDirs.isEmpty()) {
+                subDirs.append("Documents");
+            }
+            for (unsigned c = 0; c < subDirs.count();++c) {
+                DocLnkSet ide( path+"/"+subDirs[c], mimefilter );
+                folder->appendFrom(ide);
+            }
         }
       } else if ( (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ) {
 	QString path = (*it)->path() + "/Documents";
 	DocLnkSet ide( path, mimefilter );
 	folder->appendFrom(ide);
       }