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

COMMON: Allow unzip to flatten tree structure

Browse source 
It's easier to some games to ignore directories
This commit is contained in:
Vladimir Serbinenko 2023-01-15 00:48:19 +01:00 • committed by Eugene Sandulenko
parent 30717496ce
commit 600f33bccf
2 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
common/compression/unzip.cpp
View file

@ -429,7 +429,7 @@ static uLong unzlocal_SearchCentralDir(Common::SeekableReadStream &fin) {
Else, the return value is a unzFile Handle, usable with other function Else, the return value is a unzFile Handle, usable with other function
of this unzip package. of this unzip package.
*/ */
unzFile unzOpen(Common::SeekableReadStream *stream) { unzFile unzOpen(Common::SeekableReadStream *stream, bool flattenTree) {
if (!stream) if (!stream)
return nullptr; return nullptr;
@ -523,7 +523,14 @@ unzFile unzOpen(Common::SeekableReadStream *stream) {
fe.cur_file_info = us->cur_file_info; fe.cur_file_info = us->cur_file_info;
fe.cur_file_info_internal = us->cur_file_info_internal; fe.cur_file_info_internal = us->cur_file_info_internal;
us->_hash[Common::String(szCurrentFileName)] = fe; const char *name = szCurrentFileName;
if (flattenTree)
for (const char *p = szCurrentFileName; *p; p++)
if (*p == '\\' || *p == '/')
name = p + 1;
us->_hash[Common::String(name)] = fe;
// Move to the next file // Move to the next file
err = unzGoToNextFile((unzFile)us); err = unzGoToNextFile((unzFile)us);
@ -964,9 +971,10 @@ namespace Common {
class ZipArchive : public MemcachingCaseInsensitiveArchive { class ZipArchive : public MemcachingCaseInsensitiveArchive {
unzFile _zipFile; unzFile _zipFile;
Common::CRC32 _crc; Common::CRC32 _crc;
bool _flattenTree;
public: public:
ZipArchive(unzFile zipFile); ZipArchive(unzFile zipFile, bool flattenTree);
~ZipArchive(); ~ZipArchive();
@ -976,7 +984,7 @@ public:
const ArchiveMemberPtr getMember(const Path &path) const override; const ArchiveMemberPtr getMember(const Path &path) const override;
Common::SharedArchiveContents readContentsForPath(const Common::String& translated) const override; Common::SharedArchiveContents readContentsForPath(const Common::String& translated) const override;
Common::String translatePath(const Common::Path &path) const override { Common::String translatePath(const Common::Path &path) const override {
return path.toString(); return _flattenTree ? path.getLastComponent().toString() : path.toString();
} }
}; };
@ -998,7 +1006,7 @@ public:
}; };
*/ */
ZipArchive::ZipArchive(unzFile zipFile) : _zipFile(zipFile), _crc() { ZipArchive::ZipArchive(unzFile zipFile, bool flattenTree) : _zipFile(zipFile), _crc(), _flattenTree(flattenTree) {
assert(_zipFile); assert(_zipFile);
} }
@ -1039,24 +1047,24 @@ Common::SharedArchiveContents ZipArchive::readContentsForPath(const Common::Stri
return unzOpenCurrentFile(_zipFile, _crc); return unzOpenCurrentFile(_zipFile, _crc);
} }
Archive *makeZipArchive(const String &name) { Archive *makeZipArchive(const String &name, bool flattenTree) {
return makeZipArchive(SearchMan.createReadStreamForMember(name)); return makeZipArchive(SearchMan.createReadStreamForMember(name), flattenTree);
} }
Archive *makeZipArchive(const FSNode &node) { Archive *makeZipArchive(const FSNode &node, bool flattenTree) {
return makeZipArchive(node.createReadStream()); return makeZipArchive(node.createReadStream(), flattenTree);
} }
Archive *makeZipArchive(SeekableReadStream *stream) { Archive *makeZipArchive(SeekableReadStream *stream, bool flattenTree) {
if (!stream) if (!stream)
return nullptr; return nullptr;
unzFile zipFile = unzOpen(stream); unzFile zipFile = unzOpen(stream, flattenTree);
if (!zipFile) { if (!zipFile) {
// stream gets deleted by unzOpen() call if something // stream gets deleted by unzOpen() call if something
// goes wrong. // goes wrong.
return nullptr; return nullptr;
} }
return new ZipArchive(zipFile); return new ZipArchive(zipFile, flattenTree);
} }
} // End of namespace Common } // End of namespace Common

6
common/compression/unzip.h
View file

@ -45,7 +45,7 @@ class SeekableReadStream;
* *
* May return 0 in case of a failure. * May return 0 in case of a failure.
*/ */
Archive *makeZipArchive(const String &name); Archive *makeZipArchive(const String &name, bool flattenTree = false);
/** /**
* This factory method creates an Archive instance corresponding to the content * This factory method creates an Archive instance corresponding to the content
@ -53,7 +53,7 @@ Archive *makeZipArchive(const String &name);
* *
* May return 0 in case of a failure. * May return 0 in case of a failure.
*/ */
Archive *makeZipArchive(const FSNode &node); Archive *makeZipArchive(const FSNode &node, bool flattenTree = false);
/** /**
* This factory method creates an Archive instance corresponding to the content * This factory method creates an Archive instance corresponding to the content
@ -63,7 +63,7 @@ Archive *makeZipArchive(const FSNode &node);
* *
* May return 0 in case of a failure. In this case stream will still be deleted. * May return 0 in case of a failure. In this case stream will still be deleted.
*/ */
Archive *makeZipArchive(SeekableReadStream *stream); Archive *makeZipArchive(SeekableReadStream *stream, bool flattenTree = false);
/** @} */ /** @} */