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

COMMON: Add ignoreClashes flag to SearchSet and FSDirectory

Browse source 
This lets engine mute warnings about name clashes when there are useless
for its case. This will be used by Versailles as the tree has
directories with the same name at various places.
Files are duplicated too in different directories but are identical.
This commit is contained in:
Le Philousophe 2019-10-20 17:37:18 +02:00 • committed by Eugene Sandulenko
parent b6132fec03
commit d62bb15d71
4 changed files with 57 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

42
common/fs.cpp
View file

@ -168,22 +168,24 @@ bool FSNode::createDirectory() const {
return _realNode->createDirectory();
}
FSDirectory::FSDirectory(const FSNode &node, int depth, bool flat)
: _node(node), _cached(false), _depth(depth), _flat(flat) {
FSDirectory::FSDirectory(const FSNode &node, int depth, bool flat, bool ignoreClashes)
: _node(node), _cached(false), _depth(depth), _flat(flat), _ignoreClashes(ignoreClashes) {
}
FSDirectory::FSDirectory(const String &prefix, const FSNode &node, int depth, bool flat)
: _node(node), _cached(false), _depth(depth), _flat(flat) {
FSDirectory::FSDirectory(const String &prefix, const FSNode &node, int depth, bool flat,
bool ignoreClashes)
: _node(node), _cached(false), _depth(depth), _flat(flat), _ignoreClashes(ignoreClashes) {
setPrefix(prefix);
}
FSDirectory::FSDirectory(const String &name, int depth, bool flat)
: _node(name), _cached(false), _depth(depth), _flat(flat) {
FSDirectory::FSDirectory(const String &name, int depth, bool flat, bool ignoreClashes)
: _node(name), _cached(false), _depth(depth), _flat(flat), _ignoreClashes(ignoreClashes) {
}
FSDirectory::FSDirectory(const String &prefix, const String &name, int depth, bool flat)
: _node(name), _cached(false), _depth(depth), _flat(flat) {
FSDirectory::FSDirectory(const String &prefix, const String &name, int depth, bool flat,
bool ignoreClashes)
: _node(name), _cached(false), _depth(depth), _flat(flat), _ignoreClashes(ignoreClashes) {
setPrefix(prefix);
}
@ -253,11 +255,12 @@ SeekableReadStream *FSDirectory::createReadStreamForMember(const String &name) c
return stream;
}
FSDirectory *FSDirectory::getSubDirectory(const String &name, int depth, bool flat) {
return getSubDirectory(String(), name, depth, flat);
FSDirectory *FSDirectory::getSubDirectory(const String &name, int depth, bool flat, bool ignoreClashes) {
return getSubDirectory(String(), name, depth, flat, ignoreClashes);
}
FSDirectory *FSDirectory::getSubDirectory(const String &prefix, const String &name, int depth, bool flat) {
FSDirectory *FSDirectory::getSubDirectory(const String &prefix, const String &name, int depth,
bool flat, bool ignoreClashes) {
if (name.empty() || !_node.isDirectory())
return nullptr;
@ -265,7 +268,7 @@ FSDirectory *FSDirectory::getSubDirectory(const String &prefix, const String &na
if (!node)
return nullptr;
return new FSDirectory(prefix, *node, depth, flat);
return new FSDirectory(prefix, *node, depth, flat, ignoreClashes);
}
void FSDirectory::cacheDirectoryRecursive(FSNode node, int depth, const String& prefix) const {
@ -286,17 +289,26 @@ void FSDirectory::cacheDirectoryRecursive(FSNode node, int depth, const String&
// since the hashmap is case insensitive, we need to check for clashes when caching
if (it->isDirectory()) {
if (!_flat && _subDirCache.contains(lowercaseName)) {
warning("FSDirectory::cacheDirectory: name clash when building cache, ignoring sub-directory '%s'", name.c_str());
// Always warn in this case as it's when there are 2 directories at the same place with different case
// That means a problem in user installation as lookups are always done case insensitive
warning("FSDirectory::cacheDirectory: name clash when building cache, ignoring sub-directory '%s'",
name.c_str());
} else {
if (_subDirCache.contains(lowercaseName)) {
warning("FSDirectory::cacheDirectory: name clash when building subDirCache with subdirectory '%s'", name.c_str());
if (!_ignoreClashes) {
warning("FSDirectory::cacheDirectory: name clash when building subDirCache with subdirectory '%s'",
name.c_str());
}
}
cacheDirectoryRecursive(*it, depth - 1, _flat ? prefix : lowercaseName + "/");
_subDirCache[lowercaseName] = *it;
}
} else {
if (_fileCache.contains(lowercaseName)) {
warning("FSDirectory::cacheDirectory: name clash when building cache, ignoring file '%s'", name.c_str());
if (!_ignoreClashes) {
warning("FSDirectory::cacheDirectory: name clash when building cache, ignoring file '%s'",
name.c_str());
}
} else {
_fileCache[lowercaseName] = *it;
}