functionObjectList::list: Support recursion when listing functionObject configuration files

This commit is contained in:
Henry Weller
2016-06-16 13:02:17 +01:00
parent 64aa9925e4
commit 787122c9c8
3 changed files with 36 additions and 68 deletions

View File

@ -72,6 +72,35 @@ Foam::functionObject* Foam::functionObjectList::remove
}
void Foam::functionObjectList::listDir
(
const fileName& dir,
HashSet<word>& foMap
)
{
// Search specified directory for functionObject configuration files
{
fileNameList foFiles(readDir(dir));
forAll(foFiles, f)
{
if (foFiles[f].ext().empty())
{
foMap.insert(foFiles[f]);
}
}
}
// Recurse into sub-directories
{
fileNameList foDirs(readDir(dir, fileName::DIRECTORY));
forAll(foDirs, fd)
{
listDir(dir/foDirs[fd], foMap);
}
}
}
void Foam::functionObjectList::list()
{
HashSet<word> foMap;
@ -80,20 +109,7 @@ void Foam::functionObjectList::list()
forAll(etcDirs, ed)
{
fileNameList foDirs(readDir(etcDirs[ed], fileName::DIRECTORY));
forAll(foDirs, fd)
{
fileNameList foFiles(readDir(etcDirs[ed]/foDirs[fd]));
{
forAll(foFiles, f)
{
if (foFiles[f].ext().empty())
{
foMap.insert(foFiles[f]);
}
}
}
}
listDir(etcDirs[ed], foMap);
}
Info<< nl