author | alwin <alwin> | 2004-02-21 21:43:40 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-02-21 21:43:40 (UTC) |
commit | 1a89ecd8e2d11d48a8e80b2fd8b1e95b738a286c (patch) (side-by-side diff) | |
tree | 2c0aaf8487c87c23855dd06599b51c22fa8d6478 | |
parent | c7e563cbb26c20807e66dd4284d1ce9cbf8e1419 (diff) | |
download | opie-1a89ecd8e2d11d48a8e80b2fd8b1e95b738a286c.zip opie-1a89ecd8e2d11d48a8e80b2fd8b1e95b738a286c.tar.gz opie-1a89ecd8e2d11d48a8e80b2fd8b1e95b738a286c.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 that users can set this values.
Implement same stuff in global.cpp of libqpe.
-rw-r--r-- | core/launcher/documentlist.cpp | 37 |
1 files changed, 33 insertions, 4 deletions
diff --git a/core/launcher/documentlist.cpp b/core/launcher/documentlist.cpp index 440bf1e..fdba687 100644 --- a/core/launcher/documentlist.cpp +++ b/core/launcher/documentlist.cpp @@ -58,16 +58,18 @@ public: ~DocumentListPrivate(); void initialize(); const QString nextFile(); const DocLnk *iterate(); bool store( DocLnk* dl ); void estimatedPercentScanned(); + void appendDocpath(FileSystem*); + DocLnkSet dls; QDict<void> reference; QDictIterator<void> *dit; enum { Find, RemoveKnownFiles, MakeUnknownFiles, Done } state; QStringList docPaths; unsigned int docPathsSearched; @@ -422,37 +424,64 @@ DocumentListPrivate::DocumentListPrivate( ServerInterface *gui ) listDirs[i] = 0; lists[i] = 0; listPositions[i] = 0; } initialize(); tid = 0; } +void DocumentListPrivate::appendDocpath(FileSystem*fs) +{ + QDir defPath(fs->path()+"/Documents"); + QFileInfo f(fs->path()+"/.opiestorage.cf"); + if (!f.exists()) { + if (defPath.exists()) { + docPaths+=defPath.path(); + } + return; + } + Config conf(f.filePath(), Config::File ); + conf.setGroup("subdirs"); + QStringList subDirs = conf.readListEntry("subdirs",':'); + if (subDirs.isEmpty()) { + if (defPath.exists()) { + docPaths+=defPath.path(); + } + return; + } + for (unsigned c = 0; c < subDirs.count();++c) { + QDir docDir(QString(fs->path()+"/"+subDirs[c])); + if (docDir.exists()) { + docPaths+=docDir.path(); + } + } +} void DocumentListPrivate::initialize() { // Reset dls.clear(); docPaths.clear(); reference.clear(); QDir docDir( QPEApplication::documentDir() ); if ( docDir.exists() ) docPaths += QPEApplication::documentDir(); int i = 1; const QList<FileSystem> &fs = storage->fileSystems(); QListIterator<FileSystem> it( fs ); - for ( ; it.current(); ++it ) + for ( ; it.current(); ++it ) { if ( (*it)->isRemovable() ) { - docPaths += (*it)->path(); - i++; + appendDocpath((*it)); + ++i; + } } - for ( int i = 0; i < MAX_SEARCH_DEPTH; i++ ) { + for ( int i = 0; i < MAX_SEARCH_DEPTH; ++i ) { if ( listDirs[i] ) { delete listDirs[i]; listDirs[i] = 0; } lists[i] = 0; listPositions[i] = 0; } |