mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2025-06-16 10:08:07 -05:00
Archives: Reduced duplicate code in RomFS and SaveCheck.
Fixed a few warnings and cleaned up the code
This commit is contained in:
@ -9,8 +9,6 @@
|
||||
#include "common/make_unique.h"
|
||||
|
||||
#include "core/file_sys/archive_romfs.h"
|
||||
#include "core/file_sys/directory_romfs.h"
|
||||
#include "core/file_sys/file_romfs.h"
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// FileSys namespace
|
||||
@ -24,72 +22,4 @@ Archive_RomFS::Archive_RomFS(const Loader::AppLoader& app_loader) {
|
||||
}
|
||||
}
|
||||
|
||||
Archive_RomFS::Archive_RomFS(std::string mountp) : mount_point(mountp) {
|
||||
|
||||
}
|
||||
|
||||
std::unique_ptr<FileBackend> Archive_RomFS::OpenFile(const Path& path, const Mode mode) const {
|
||||
return Common::make_unique<File_RomFS>(this);
|
||||
}
|
||||
|
||||
bool Archive_RomFS::DeleteFile(const Path& path) const {
|
||||
LOG_WARNING(Service_FS, "Attempted to delete a file from ROMFS.");
|
||||
return false;
|
||||
}
|
||||
|
||||
bool Archive_RomFS::RenameFile(const Path& src_path, const Path& dest_path) const {
|
||||
LOG_WARNING(Service_FS, "Attempted to rename a file within ROMFS.");
|
||||
return false;
|
||||
}
|
||||
|
||||
bool Archive_RomFS::DeleteDirectory(const Path& path) const {
|
||||
LOG_WARNING(Service_FS, "Attempted to delete a directory from ROMFS.");
|
||||
return false;
|
||||
}
|
||||
|
||||
ResultCode Archive_RomFS::CreateFile(const Path& path, u32 size) const {
|
||||
LOG_WARNING(Service_FS, "Attempted to create a file in ROMFS.");
|
||||
// TODO: Verify error code
|
||||
return ResultCode(ErrorDescription::NotAuthorized, ErrorModule::FS, ErrorSummary::NotSupported, ErrorLevel::Permanent);
|
||||
}
|
||||
|
||||
bool Archive_RomFS::CreateDirectory(const Path& path) const {
|
||||
LOG_WARNING(Service_FS, "Attempted to create a directory in ROMFS.");
|
||||
return false;
|
||||
}
|
||||
|
||||
bool Archive_RomFS::RenameDirectory(const Path& src_path, const Path& dest_path) const {
|
||||
LOG_WARNING(Service_FS, "Attempted to rename a file within ROMFS.");
|
||||
return false;
|
||||
}
|
||||
|
||||
std::unique_ptr<DirectoryBackend> Archive_RomFS::OpenDirectory(const Path& path) const {
|
||||
return Common::make_unique<Directory_RomFS>();
|
||||
}
|
||||
|
||||
ResultCode Archive_RomFS::Format(const Path& path) const {
|
||||
LOG_WARNING(Service_FS, "Attempted to format ROMFS.");
|
||||
return UnimplementedFunction(ErrorModule::FS);
|
||||
}
|
||||
|
||||
ResultCode Archive_RomFS::Open(const Path& path) {
|
||||
if (mount_point.empty())
|
||||
return RESULT_SUCCESS;
|
||||
auto vec = path.AsBinary();
|
||||
const u32* data = reinterpret_cast<u32*>(vec.data());
|
||||
std::string file_path = Common::StringFromFormat("%s%08X%08X.bin", mount_point.c_str(), data[1], data[0]);
|
||||
FileUtil::IOFile file(file_path, "rb");
|
||||
|
||||
std::fill(raw_data.begin(), raw_data.end(), 0);
|
||||
|
||||
if (!file.IsOpen()) {
|
||||
return ResultCode(-1); // TODO(Subv): Find the right error code
|
||||
}
|
||||
auto size = file.GetSize();
|
||||
raw_data.resize(size);
|
||||
file.ReadBytes(raw_data.data(), size);
|
||||
file.Close();
|
||||
return RESULT_SUCCESS;
|
||||
}
|
||||
|
||||
} // namespace FileSys
|
||||
|
Reference in New Issue
Block a user