Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-01 00:09:18 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Try next archive type if file not found, not just on open error

Browse Source
This commit is contained in:
Vas Crabb 2016-03-25 16:09:14 +11:00
parent 54279dbf11
commit db10880ee0
1 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
src/emu/fileio.cpp
View File

@ -626,76 +626,76 @@ bool emu_file::part_of_mediapath(std::string path)
osd_file::error emu_file::attempt_zipped() osd_file::error emu_file::attempt_zipped()
{ {
typedef util::archive_file::error (*open_func)(const std::string &filename, util::archive_file::ptr &result);
char const *const suffixes[] = { ".zip", ".7z" };
open_func const open_funcs[ARRAY_LENGTH(suffixes)] = { &util::archive_file::open_zip, &util::archive_file::open_7z };
// loop over archive types
std::string const savepath(m_fullpath);
std::string filename; std::string filename;
for (unsigned i = 0; i < ARRAY_LENGTH(suffixes); i++, m_fullpath = savepath, filename.clear())
// loop over directory parts up to the start of filename
while (1)
{ {
// find the final path separator // loop over directory parts up to the start of filename
auto const dirsep = m_fullpath.find_last_of(PATH_SEPARATOR[0]); while (1)
if (dirsep == std::string::npos)
return osd_file::error::NOT_FOUND;
if (restrict_to_mediapath() && !part_of_mediapath(m_fullpath))
return osd_file::error::NOT_FOUND;
// insert the part from the right of the separator into the head of the filename
if (filename.length() > 0)
filename.insert(0, "/");
filename.insert(0, m_fullpath.substr(dirsep + 1, -1));
// remove this part of the filename and append a .zip extension
m_fullpath = m_fullpath.substr(0, dirsep).append(".zip");
// attempt to open the ZIP file
util::archive_file::ptr zip;
util::archive_file::error ziperr = util::archive_file::open_zip(m_fullpath, zip);
if (ziperr != util::archive_file::error::NONE)
{ {
// remove this part of the filename and append a .7z extension // find the final path separator
m_fullpath = m_fullpath.substr(0, dirsep).append(".7z"); auto const dirsep = m_fullpath.find_last_of(PATH_SEPARATOR[0]);
if (dirsep == std::string::npos)
break;
// attempt to open the 7zip file if (restrict_to_mediapath() && !part_of_mediapath(m_fullpath))
ziperr = util::archive_file::open_7z(m_fullpath, zip); break;
// insert the part from the right of the separator into the head of the filename
if (!filename.empty()) filename.insert(0, 1, '/');
filename.insert(0, m_fullpath.substr(dirsep + 1, std::string::npos));
// remove this part of the filename and append an archive extension
m_fullpath.resize(dirsep);
m_fullpath.append(suffixes[i]);
// attempt to open the archive file
util::archive_file::ptr zip;
util::archive_file::error ziperr = open_funcs[i](m_fullpath, zip);
// chop the archive suffix back off the filename before continuing
m_fullpath = m_fullpath.substr(0, dirsep);
// if we failed to open this file, continue scanning
if (ziperr != util::archive_file::error::NONE)
continue;
int header = -1;
// see if we can find a file with the right name and (if available) CRC
if (m_openflags & OPEN_FLAG_HAS_CRC) header = zip->search(m_crc, filename, false);
if (header < 0 && (m_openflags & OPEN_FLAG_HAS_CRC)) header = zip->search(m_crc, filename, true);
// if that failed, look for a file with the right CRC, but the wrong filename
if (header < 0 && (m_openflags & OPEN_FLAG_HAS_CRC)) header = zip->search(m_crc);
// if that failed, look for a file with the right name;
// reporting a bad checksum is more helpful and less confusing than reporting "ROM not found"
if (header < 0) header = zip->search(filename, false);
if (header < 0) header = zip->search(filename, true);
// if we got it, read the data
if (header >= 0)
{
m_zipfile = std::move(zip);
m_ziplength = m_zipfile->current_uncompressed_length();
// build a hash with just the CRC
m_hashes.reset();
m_hashes.add_crc(m_zipfile->current_crc());
return (m_openflags & OPEN_FLAG_NO_PRELOAD) ? osd_file::error::NONE : load_zipped_file();
}
// close up the archive file and try the next level
zip.reset();
} }
// chop the .zip/.7z back off the filename before continuing
m_fullpath = m_fullpath.substr(0, dirsep);
// if we failed to open this file, continue scanning
if (ziperr != util::archive_file::error::NONE)
continue;
int header = -1;
// see if we can find a file with the right name and (if available) crc
if (m_openflags & OPEN_FLAG_HAS_CRC) header = zip->search(m_crc, filename, false);
if (header < 0 && (m_openflags & OPEN_FLAG_HAS_CRC)) header = zip->search(m_crc, filename, true);
// if that failed, look for a file with the right crc, but the wrong filename
if (header < 0 && (m_openflags & OPEN_FLAG_HAS_CRC)) header = zip->search(m_crc);
// if that failed, look for a file with the right name; reporting a bad checksum
// is more helpful and less confusing than reporting "rom not found"
if (header < 0) header = zip->search(filename, false);
if (header < 0) header = zip->search(filename, true);
// if we got it, read the data
if (header >= 0)
{
m_zipfile = std::move(zip);
m_ziplength = m_zipfile->current_uncompressed_length();
// build a hash with just the CRC
m_hashes.reset();
m_hashes.add_crc(m_zipfile->current_crc());
return (m_openflags & OPEN_FLAG_NO_PRELOAD) ? osd_file::error::NONE : load_zipped_file();
}
// close up the ZIP file and try the next level
zip.reset();
} }
return osd_file::error::NOT_FOUND;
} }