thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Committing the set of patches #1814434, thanks to jvprat. They improve the documentation and parameter naming of the lookFile methods inside Common::FS.

Browse source 
svn-id: r29228
This commit is contained in:
David Corrales 2007-10-16 20:24:39 +00:00
parent 6bf925cb6e
commit ec38b85a44
3 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/saves/default/default-saves.cpp
View file

@ -119,7 +119,7 @@ Common::StringList DefaultSaveFileManager::listSavefiles(const char *regex) {
Common::StringList results; Common::StringList results;
Common::String search(regex); Common::String search(regex);
if (savePath.lookupFile(savefiles, savePath, search, false, true)) { if (savePath.lookupFile(savefiles, search, false, true)) {
for (FSList::const_iterator file = savefiles.begin(); file != savefiles.end(); file++) { for (FSList::const_iterator file = savefiles.begin(); file != savefiles.end(); file++) {
results.push_back(file->getPath()); results.push_back(file->getPath());
} }

20
common/fs.cpp
View file

@ -171,36 +171,38 @@ bool FilesystemNode::isWritable() const {
return _realNode->isWritable(); return _realNode->isWritable();
} }
bool FilesystemNode::lookupFile(FSList &results, FSList &fslist, Common::String &filename, bool hidden, bool exhaustive) const bool FilesystemNode::lookupFile(FSList &results, FSList &fslist, Common::String &pattern, bool hidden, bool exhaustive) const
{ {
int matches = 0; int matches = 0;
for (FSList::iterator entry = fslist.begin(); entry != fslist.end(); ++entry) { for (FSList::iterator entry = fslist.begin(); entry != fslist.end(); ++entry) {
if (entry->isDirectory()) { if (entry->isDirectory()) {
matches += lookupFileRec(results, *entry, filename, hidden, exhaustive); matches += lookupFileRec(results, *entry, pattern, hidden, exhaustive);
} }
} }
return ((matches > 0) ? true : false); return ((matches > 0) ? true : false);
} }
bool FilesystemNode::lookupFile(FSList &results, FilesystemNode &dir, Common::String &filename, bool hidden, bool exhaustive) const bool FilesystemNode::lookupFile(FSList &results, Common::String &pattern, bool hidden, bool exhaustive) const
{ {
int matches; int matches;
if (!dir.isDirectory()) if (!isDirectory())
return false; return false;
matches = lookupFileRec(results, dir, filename, hidden, exhaustive); FilesystemNode dir = *this;
matches = lookupFileRec(results, dir, pattern, hidden, exhaustive);
return ((matches > 0) ? true : false); return ((matches > 0) ? true : false);
} }
int FilesystemNode::lookupFileRec(FSList &results, FilesystemNode &dir, Common::String &filename, bool hidden, bool exhaustive) const int FilesystemNode::lookupFileRec(FSList &results, FilesystemNode &dir, Common::String &pattern, bool hidden, bool exhaustive) const
{ {
FSList entries; FSList entries;
FSList children; FSList children;
int matches = 0; int matches = 0;
pattern.toUppercase();
dir.getChildren(entries, FilesystemNode::kListAll, hidden); dir.getChildren(entries, FilesystemNode::kListAll, hidden);
//Breadth search (entries in the same level) //Breadth search (entries in the same level)
@ -208,7 +210,9 @@ int FilesystemNode::lookupFileRec(FSList &results, FilesystemNode &dir, Common::
if (entry->isDirectory()) { if (entry->isDirectory()) {
children.push_back(*entry); children.push_back(*entry);
} else { } else {
if (Common::matchString(entry->getName().c_str(), filename.c_str())) { Common::String filename = entry->getName();
filename.toUppercase();
if (Common::matchString(filename.c_str(), pattern.c_str())) {
results.push_back(*entry); results.push_back(*entry);
matches++; matches++;
@ -220,7 +224,7 @@ int FilesystemNode::lookupFileRec(FSList &results, FilesystemNode &dir, Common::
//Depth search (entries in lower levels) //Depth search (entries in lower levels)
for (FSList::iterator child = children.begin(); child != children.end(); ++child) { for (FSList::iterator child = children.begin(); child != children.end(); ++child) {
matches += lookupFileRec(results, *child, filename, hidden, exhaustive); matches += lookupFileRec(results, *child, pattern, hidden, exhaustive);
} }
return matches; return matches;

17
common/fs.h
View file

@ -225,29 +225,28 @@ public:
* *
* @param results List to put the matches in. * @param results List to put the matches in.
* @param fslist List of directories to search within. * @param fslist List of directories to search within.
* @param filename Name of the file to look for. * @param pattern Pattern of the files to look for.
* @param hidden Whether to search hidden files or not. * @param hidden Whether to search hidden files or not.
* @param exhaustive Whether to continue searching after one match has been found. * @param exhaustive Whether to continue searching after one match has been found.
* *
* @return true if matches could be found, false otherwise. * @return true if matches could be found, false otherwise.
*/ */
virtual bool lookupFile(FSList &results, FSList &fslist, Common::String &filename, bool hidden, bool exhaustive) const; virtual bool lookupFile(FSList &results, FSList &fslist, Common::String &pattern, bool hidden, bool exhaustive) const;
/** /**
* Searches recursively for a filename inside the given directory. * Searches recursively for a filename inside this directory.
* *
* The search is performed breadth-first, that is, the current directory entries * The search is performed breadth-first, that is, the current directory entries
* are scanned before going into subdirectories. * are scanned before going into subdirectories.
* *
* @param results List to put the matches in. * @param results List to put the matches in.
* @param FilesystemNode Directory to search within. * @param pattern Pattern of the files to look for.
* @param filename Name of the file to look for.
* @param hidden Whether to search hidden files or not. * @param hidden Whether to search hidden files or not.
* @param exhaustive Whether to continue searching after one match has been found. * @param exhaustive Whether to continue searching after one match has been found.
* *
* @return true if matches could be found, false otherwise. * @return true if matches could be found, false otherwise.
*/ */
virtual bool lookupFile(FSList &results, FilesystemNode &dir, Common::String &filename, bool hidden, bool exhaustive) const; virtual bool lookupFile(FSList &results, Common::String &pattern, bool hidden, bool exhaustive) const;
protected: protected:
/** /**
@ -263,14 +262,14 @@ protected:
* are scanned before going into subdirectories. * are scanned before going into subdirectories.
* *
* @param results List to put the matches in. * @param results List to put the matches in.
* @param FilesystemNode Directory to search within. * @param dir Directory to search within.
* @param filename Name of the file to look for. * @param pattern Pattern of the files to look for.
* @param hidden Whether to search hidden files or not. * @param hidden Whether to search hidden files or not.
* @param exhaustive Whether to continue searching after one match has been found. * @param exhaustive Whether to continue searching after one match has been found.
* *
* @return The number of matches found. * @return The number of matches found.
*/ */
int lookupFileRec(FSList &results, FilesystemNode &dir, Common::String &filename, bool hidden, bool exhaustive) const; int lookupFileRec(FSList &results, FilesystemNode &dir, Common::String &pattern, bool hidden, bool exhaustive) const;
}; };
//} // End of namespace Common //} // End of namespace Common