summaryrefslogtreecommitdiff
authoralwin <alwin>2004-02-21 23:05:04 (UTC)
committer alwin <alwin>2004-02-21 23:05:04 (UTC)
commit4cfad0d1331a5e3adc8bc2599783750875e6fd2b (patch) (side-by-side diff)
treefda9d83c9cdf75a1340f3465460b5fe86009ac02
parent51c51fef13a91b263acba430faaa3332bf145343 (diff)
downloadopie-4cfad0d1331a5e3adc8bc2599783750875e6fd2b.zip
opie-4cfad0d1331a5e3adc8bc2599783750875e6fd2b.tar.gz
opie-4cfad0d1331a5e3adc8bc2599783750875e6fd2b.tar.bz2
on removable medias take a look into .opiestorage.cf and read the list
of subdirs of the media where to search for documents. If this value isn't set, it will reduce search to FS+"/Documents" so not the whole media is searched. ToDo: Work on mediummount so users can set this values.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--library/global.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/library/global.cpp b/library/global.cpp
index 05d23ac..6c0a66a 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -23,12 +23,13 @@
#include <qpe/qdawg.h>
#include <qpe/qpeapplication.h>
#include <qpe/resource.h>
#include <qpe/storage.h>
#include <qpe/applnk.h>
#include <qpe/qcopenvelope_qws.h>
+#include <qpe/config.h>
#include <qfile.h>
#include <qlabel.h>
#include <qtimer.h>
#include <qmap.h>
#include <qdict.h>
@@ -767,14 +768,22 @@ void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter)
for ( ; it.current(); ++it ) {
if ( (*it)->isRemovable() ) { // let's find out if we should search on it
// 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;
- DocLnkSet ide( path, mimefilter );
+ 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);
+ }
} else if ( (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ) {
QString path = (*it)->path() + "/Documents";
DocLnkSet ide( path, mimefilter );
folder->appendFrom(ide);
}
}