libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-04 15:51:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: More fixes for partial filename matching

Browse Source 
For Macintosh, it is possible to have filenames with a "/" in them.
Dumper Companion will punyencode this and any other non-ASCII characters
when extracting from a Macintosh filesystem. As such, when checking
components of a filename, we should attempt to match against the punydecoded
name, but always return the "real" name (i.e. the name of the file in
the local filesystem, possibly punyencoded).

In addition, it is possible for a movie A/B/C.DIR to go to a movie
"E/F.DIR", where the actual path is A/E/F.DIR. To make the partial matching
work, first we try removing each component from the start of the target
path, then retry all combinations again after removing a component from
the end of the source directory, etc.

Fixes several movie switches in The Seven Colors.
This commit is contained in:
Scott Percival 2023-07-08 00:56:31 +08:00 committed by Eugene Sandulenko
parent 70ffd87c62
commit aa32a51c47
2 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/fs.h
View File

@ -79,7 +79,6 @@ private:
*/
FSNode(AbstractFSNode *realNode);
String getRealName() const;
public:
/**
* Flag to tell listDir() which kind of files to list.
@ -169,6 +168,16 @@ public:
*/
virtual String getName() const;
/**
* Return a string representation of the name of the file, without any
* Punycode transformation. This can be used e.g. by detection code that
* relies on matching the name of a given file. However, it is *not*
* suitable for use with fopen / File::open, nor should it be archived.
*
* @return The file name.
*/
virtual String getRealName() const;
/**
* Return a string representation of the file that is suitable for
* archiving (i.e. writing to the config file). This will usually be a

29
engines/director/util.cpp
View File

@ -593,8 +593,7 @@ Common::Path resolveFSPath(Common::String &path, Common::Path &base, bool direct
Common::FSList fslist;
bool exists = false;
while (!directory_list.empty()) {
Common::String token = directory_list.nextToken();
Common::String decodedToken = punycode_decodefilename(token);
Common::String token = punycode_decodefilename(directory_list.nextToken());
fslist.clear();
Common::FSNode::ListMode mode = Common::FSNode::kListDirectoriesOnly;
if (directory_list.empty() && !directory) {
@ -608,14 +607,15 @@ Common::Path resolveFSPath(Common::String &path, Common::Path &base, bool direct
for (auto &i : fslist) {
// for each element in the path, choose the first FSNode
// with a case-insensitive matching name
if (i.getName().equalsIgnoreCase(decodedToken)) {
Common::String decodedName = i.getName();
if (decodedName.equalsIgnoreCase(token)) {
// If this the final path component, check if we're allowed to match with a directory
if (directory_list.empty() && (directory != i.isDirectory())) {
continue;
}
exists = true;
newPath.appendInPlace(i.getName());
newPath.appendInPlace(i.getRealName());
if (!directory_list.empty() && !newPath.empty())
newPath.appendInPlace(Common::String(g_director->_dirSeparator), g_director->_dirSeparator);
@ -688,7 +688,7 @@ Common::Path resolvePath(Common::String &path, Common::Path &base, bool director
continue;
}
bool match = true;
for (int i = 0; i < srcComponents.size(); i++) {
for (size_t i = 0; i < srcComponents.size(); i++) {
Common::String component = Common::punycode_decodefilename(destComponents[i]);
if (!component.equalsIgnoreCase(srcComponents[i])) {
match = false;
@ -711,9 +711,16 @@ Common::Path resolvePath(Common::String &path, Common::Path &base, bool director
Common::Path resolvePartialPath(Common::String &path, Common::Path &base, bool directory, const char **exts) {
path = convertPath(path);
Common::Path result;
Common::StringArray baseTokens = base.splitComponents();
bool basesLeft = true;
while (basesLeft) {
Common::Path testBase = Common::Path::joinComponents(baseTokens);
// Try removing leading components of the target path
Common::StringArray tokens = Common::StringTokenizer(path, Common::String(g_director->_dirSeparator)).split();
Common::Path result;
while (tokens.size()) {
Common::String subpath;
for (uint i = 0; i < tokens.size(); i++) {
@ -722,12 +729,20 @@ Common::Path resolvePartialPath(Common::String &path, Common::Path &base, bool d
subpath += g_director->_dirSeparator;
}
}
result = resolvePath(subpath, base, directory, exts);
result = resolvePath(subpath, testBase, directory, exts);
if (!result.empty()) {
break;
}
tokens.remove_at(0);
}
if (!result.empty())
break;
if (!baseTokens.size()) {
basesLeft = false;
} else {
baseTokens.pop_back();
}
}
return result;
}