-
Notifications
You must be signed in to change notification settings - Fork 145
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Imagine: Combine ArchiveIO and ArchiveEntry classes to simplify the API * Imagine: Directly move an IO object containing ArchiveIO in IO constructor * Imagine: Don't return error in tell() for non-seekable ArchiveIO * EmuFramework: Return empty string from EmuSystem::willLoadContentFromPath() when path is unchanged * MD.emu & PCE.emu: Add support for loading CD images inside archives * C64.emu: Further optimize sysfile_open() to avoid reopening the archive on the next call
- Loading branch information
Robert Broglia
committed
Dec 1, 2023
1 parent
eaeac4d
commit cbe3339
Showing
26 changed files
with
304 additions
and
200 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* This file is part of EmuFramework. | ||
| EmuFramework is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
| the Free Software Foundation, either version 3 of the License, or | ||
| (at your option) any later version. | ||
| EmuFramework is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU General Public License for more details. | ||
| You should have received a copy of the GNU General Public License | ||
| along with EmuFramework. If not, see <http://www.gnu.org/licenses/> */ | ||
|
|
||
| #include "ArchiveVFS.hh" | ||
| #include <mednafen/MemoryStream.h> | ||
| #include <imagine/fs/FS.hh> | ||
| #include <imagine/util/format.hh> | ||
| #include <imagine/logger/logger.h> | ||
|
|
||
| namespace Mednafen | ||
| { | ||
|
|
||
| constexpr IG::SystemLogger log{"ArchiveVFS"}; | ||
|
|
||
| ArchiveVFS::ArchiveVFS(IG::FS::ArchiveIterator it): | ||
| VirtualFS('/', "/"), | ||
| archIt{std::move(it)} {} | ||
|
|
||
| Stream* ArchiveVFS::open(const std::string &path, const uint32 mode, const int do_lock, const bool throw_on_noent, const CanaryType canary) | ||
| { | ||
| assert(mode == MODE_READ); | ||
| assert(do_lock == 0); | ||
| archIt.rewind(); | ||
| auto filename = IG::FS::basename(path); | ||
| log.info("looking for file:{}", filename); | ||
| for(auto &entry : archIt) | ||
| { | ||
| if(entry.type() == IG::FS::file_type::directory) | ||
| { | ||
| continue; | ||
| } | ||
| auto name = IG::FS::basename(entry.name()); | ||
| if(name == filename) | ||
| { | ||
| auto stream = std::make_unique<MemoryStream>(entry.size(), true); | ||
| if(entry.read(stream->map(), entry.size()) != entry.size()) | ||
| { | ||
| throw MDFN_Error(0, "Error reading archive file:\n%s", filename.c_str()); | ||
| } | ||
| return stream.release(); | ||
| } | ||
| } | ||
| throw MDFN_Error(ENOENT, "Not found"); | ||
| } | ||
|
|
||
| bool ArchiveVFS::mkdir(const std::string &path, const bool throw_on_exist) { return false; } | ||
| bool ArchiveVFS::unlink(const std::string &path, const bool throw_on_noent, const CanaryType canary) { return false; } | ||
| void ArchiveVFS::rename(const std::string &oldpath, const std::string &newpath, const CanaryType canary) {} | ||
|
|
||
| bool ArchiveVFS::is_absolute_path(const std::string &path) | ||
| { | ||
| if(!path.size()) | ||
| return false; | ||
| if(is_path_separator(path[0])) | ||
| return true; | ||
| return false; | ||
| } | ||
|
|
||
| void ArchiveVFS::check_firop_safe(const std::string &path) {} | ||
| bool ArchiveVFS::finfo(const std::string& path, FileInfo*, const bool throw_on_noent) { return false; } | ||
| void ArchiveVFS::readdirentries(const std::string& path, std::function<bool(const std::string&)> callb) {} | ||
| std::string ArchiveVFS::get_human_path(const std::string& path) { return path; } | ||
|
|
||
| } |
Oops, something went wrong.