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

SWORD25: Fix extracted files support and update ZipArchive handling to process directories

Browse Source
This commit is contained in:
elasota 2023-09-03 12:29:20 -04:00 committed by Eugene Sandulenko
parent 63b01f5e85
commit e0b8e6685e
1 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
engines/sword25/package/packagemanager.cpp
View File

@ -272,36 +272,17 @@ int PackageManager::doSearch(Common::ArchiveMemberList &list, const Common::Stri
// Create a list of the matching names // Create a list of the matching names
for (Common::ArchiveMemberList::iterator it = memberList.begin(); it != memberList.end(); ++it) { for (Common::ArchiveMemberList::iterator it = memberList.begin(); it != memberList.end(); ++it) {
Common::String name; Common::Path name = (*it)->getPathInArchive();
bool matchType; bool isDirectory = (*it)->isDirectory();
bool matchType = (((typeFilter & PackageManager::FT_DIRECTORY) && isDirectory) ||
// FSNode->getName() returns only name of the file, without the directory ((typeFilter & PackageManager::FT_FILE) && !isDirectory));
// getPath() returns full path in the FS. Thus, we're getting it and
// removing the root from it.
if (_extractedFiles) {
Common::FSNode *node = (Common::FSNode *)(it->get());
name = node->getPath().substr(_directoryName.size());
for (uint c = 0; c < name.size(); c++) {
if (name[c] == '\\')
name.replace(c, 1, "/");
}
matchType = (((typeFilter & PackageManager::FT_DIRECTORY) && node->isDirectory()) ||
((typeFilter & PackageManager::FT_FILE) && !node->isDirectory()));
} else {
name = (*it)->getName();
matchType = ((typeFilter & PackageManager::FT_DIRECTORY) && name.hasSuffix("/")) ||
((typeFilter & PackageManager::FT_FILE) && !name.hasSuffix("/"));
}
if (matchType) { if (matchType) {
// Do not add duplicate files // Do not add duplicate files
bool found = false; bool found = false;
for (Common::ArchiveMemberList::iterator it1 = list.begin(); it1 != list.end(); ++it1) { for (Common::ArchiveMemberList::iterator it1 = list.begin(); it1 != list.end(); ++it1) {
if ((*it1)->getName() == name) { if ((*it1)->getPathInArchive() == name) {
found = true; found = true;
break; break;
} }
@ -309,7 +290,7 @@ int PackageManager::doSearch(Common::ArchiveMemberList &list, const Common::Stri
if (!found) { if (!found) {
list.push_back(Common::ArchiveMemberList::value_type(new Common::GenericArchiveMember(name, *(*i)->archive))); list.push_back(Common::ArchiveMemberList::value_type(new Common::GenericArchiveMember(name, *(*i)->archive)));
debug(9, "> %s", name.c_str()); debug(9, "> %s", name.toString().c_str());
} }
num++; num++;
} }