mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-09 16:19:09 +01:00
Merge pull request #540 from yuriks/multi-archives
FS: Allow multiple instances of the same archive type to be open at once
This commit is contained in:
commit
27e6e6b3cb
21 changed files with 304 additions and 277 deletions
|
@ -180,20 +180,6 @@ public:
|
||||||
virtual ~ArchiveBackend() {
|
virtual ~ArchiveBackend() {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Tries to open the archive of this type with the specified path
|
|
||||||
* @param path Path to the archive
|
|
||||||
* @return ResultCode of the operation
|
|
||||||
*/
|
|
||||||
virtual ResultCode Open(const Path& path) = 0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Deletes the archive contents and then re-creates the base folder
|
|
||||||
* @param path Path to the archive
|
|
||||||
* @return ResultCode of the operation, 0 on success
|
|
||||||
*/
|
|
||||||
virtual ResultCode Format(const Path& path) const = 0;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get a descriptive name for the archive (e.g. "RomFS", "SaveData", etc.)
|
* Get a descriptive name for the archive (e.g. "RomFS", "SaveData", etc.)
|
||||||
*/
|
*/
|
||||||
|
@ -260,4 +246,29 @@ public:
|
||||||
virtual std::unique_ptr<DirectoryBackend> OpenDirectory(const Path& path) const = 0;
|
virtual std::unique_ptr<DirectoryBackend> OpenDirectory(const Path& path) const = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class ArchiveFactory : NonCopyable {
|
||||||
|
public:
|
||||||
|
virtual ~ArchiveFactory() {
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get a descriptive name for the archive (e.g. "RomFS", "SaveData", etc.)
|
||||||
|
*/
|
||||||
|
virtual std::string GetName() const = 0;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tries to open the archive of this type with the specified path
|
||||||
|
* @param path Path to the archive
|
||||||
|
* @return An ArchiveBackend corresponding operating specified archive path.
|
||||||
|
*/
|
||||||
|
virtual ResultVal<std::unique_ptr<ArchiveBackend>> Open(const Path& path) = 0;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Deletes the archive contents and then re-creates the base folder
|
||||||
|
* @param path Path to the archive
|
||||||
|
* @return ResultCode of the operation, 0 on success
|
||||||
|
*/
|
||||||
|
virtual ResultCode Format(const Path& path) = 0;
|
||||||
|
};
|
||||||
|
|
||||||
} // namespace FileSys
|
} // namespace FileSys
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
#include "common/file_util.h"
|
#include "common/file_util.h"
|
||||||
|
#include "common/make_unique.h"
|
||||||
|
|
||||||
#include "core/file_sys/archive_extsavedata.h"
|
#include "core/file_sys/archive_extsavedata.h"
|
||||||
#include "core/file_sys/disk_archive.h"
|
#include "core/file_sys/disk_archive.h"
|
||||||
|
@ -33,12 +34,12 @@ std::string GetExtDataContainerPath(const std::string& mount_point, bool shared)
|
||||||
SYSTEM_ID.c_str(), SDCARD_ID.c_str());
|
SYSTEM_ID.c_str(), SDCARD_ID.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
Archive_ExtSaveData::Archive_ExtSaveData(const std::string& mount_location, bool shared)
|
ArchiveFactory_ExtSaveData::ArchiveFactory_ExtSaveData(const std::string& mount_location, bool shared)
|
||||||
: DiskArchive(GetExtDataContainerPath(mount_location, shared)) {
|
: mount_point(GetExtDataContainerPath(mount_location, shared)) {
|
||||||
LOG_INFO(Service_FS, "Directory %s set as base for ExtSaveData.", mount_point.c_str());
|
LOG_INFO(Service_FS, "Directory %s set as base for ExtSaveData.", mount_point.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Archive_ExtSaveData::Initialize() {
|
bool ArchiveFactory_ExtSaveData::Initialize() {
|
||||||
if (!FileUtil::CreateFullPath(mount_point)) {
|
if (!FileUtil::CreateFullPath(mount_point)) {
|
||||||
LOG_ERROR(Service_FS, "Unable to create ExtSaveData base path.");
|
LOG_ERROR(Service_FS, "Unable to create ExtSaveData base path.");
|
||||||
return false;
|
return false;
|
||||||
|
@ -47,18 +48,18 @@ bool Archive_ExtSaveData::Initialize() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode Archive_ExtSaveData::Open(const Path& path) {
|
ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_ExtSaveData::Open(const Path& path) {
|
||||||
std::string fullpath = GetExtSaveDataPath(mount_point, path);
|
std::string fullpath = GetExtSaveDataPath(mount_point, path);
|
||||||
if (!FileUtil::Exists(fullpath)) {
|
if (!FileUtil::Exists(fullpath)) {
|
||||||
// TODO(Subv): Check error code, this one is probably wrong
|
// TODO(Subv): Check error code, this one is probably wrong
|
||||||
return ResultCode(ErrorDescription::FS_NotFormatted, ErrorModule::FS,
|
return ResultCode(ErrorDescription::FS_NotFormatted, ErrorModule::FS,
|
||||||
ErrorSummary::InvalidState, ErrorLevel::Status);
|
ErrorSummary::InvalidState, ErrorLevel::Status);
|
||||||
}
|
}
|
||||||
concrete_mount_point = fullpath;
|
auto archive = Common::make_unique<DiskArchive>(fullpath);
|
||||||
return RESULT_SUCCESS;
|
return MakeResult<std::unique_ptr<ArchiveBackend>>(std::move(archive));
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode Archive_ExtSaveData::Format(const Path& path) const {
|
ResultCode ArchiveFactory_ExtSaveData::Format(const Path& path) {
|
||||||
std::string fullpath = GetExtSaveDataPath(mount_point, path);
|
std::string fullpath = GetExtSaveDataPath(mount_point, path);
|
||||||
FileUtil::CreateFullPath(fullpath);
|
FileUtil::CreateFullPath(fullpath);
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
|
|
|
@ -15,9 +15,9 @@
|
||||||
namespace FileSys {
|
namespace FileSys {
|
||||||
|
|
||||||
/// File system interface to the ExtSaveData archive
|
/// File system interface to the ExtSaveData archive
|
||||||
class Archive_ExtSaveData final : public DiskArchive {
|
class ArchiveFactory_ExtSaveData final : public ArchiveFactory {
|
||||||
public:
|
public:
|
||||||
Archive_ExtSaveData(const std::string& mount_point, bool shared);
|
ArchiveFactory_ExtSaveData(const std::string& mount_point, bool shared);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize the archive.
|
* Initialize the archive.
|
||||||
|
@ -25,21 +25,20 @@ public:
|
||||||
*/
|
*/
|
||||||
bool Initialize();
|
bool Initialize();
|
||||||
|
|
||||||
ResultCode Open(const Path& path) override;
|
|
||||||
ResultCode Format(const Path& path) const override;
|
|
||||||
std::string GetName() const override { return "ExtSaveData"; }
|
std::string GetName() const override { return "ExtSaveData"; }
|
||||||
|
|
||||||
const std::string& GetMountPoint() const override {
|
ResultVal<std::unique_ptr<ArchiveBackend>> Open(const Path& path) override;
|
||||||
return concrete_mount_point;
|
ResultCode Format(const Path& path) override;
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
const std::string& GetMountPoint() const { return mount_point; }
|
||||||
|
|
||||||
|
private:
|
||||||
/**
|
/**
|
||||||
* This holds the full directory path for this archive, it is only set after a successful call to Open,
|
* This holds the full directory path for this archive, it is only set after a successful call
|
||||||
* this is formed as <base extsavedatapath>/<type>/<high>/<low>.
|
* to Open, this is formed as <base extsavedatapath>/<type>/<high>/<low>.
|
||||||
* See GetExtSaveDataPath for the code that extracts this data from an archive path.
|
* See GetExtSaveDataPath for the code that extracts this data from an archive path.
|
||||||
*/
|
*/
|
||||||
std::string concrete_mount_point;
|
std::string mount_point;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -15,11 +15,24 @@
|
||||||
|
|
||||||
namespace FileSys {
|
namespace FileSys {
|
||||||
|
|
||||||
Archive_RomFS::Archive_RomFS(const Loader::AppLoader& app_loader) {
|
ArchiveFactory_RomFS::ArchiveFactory_RomFS(const Loader::AppLoader& app_loader)
|
||||||
|
: romfs_data(std::make_shared<std::vector<u8>>()) {
|
||||||
// Load the RomFS from the app
|
// Load the RomFS from the app
|
||||||
if (Loader::ResultStatus::Success != app_loader.ReadRomFS(raw_data)) {
|
if (Loader::ResultStatus::Success != app_loader.ReadRomFS(*romfs_data)) {
|
||||||
LOG_ERROR(Service_FS, "Unable to read RomFS!");
|
LOG_ERROR(Service_FS, "Unable to read RomFS!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_RomFS::Open(const Path& path) {
|
||||||
|
auto archive = Common::make_unique<IVFCArchive>(romfs_data);
|
||||||
|
return MakeResult<std::unique_ptr<ArchiveBackend>>(std::move(archive));
|
||||||
|
}
|
||||||
|
|
||||||
|
ResultCode ArchiveFactory_RomFS::Format(const Path& path) {
|
||||||
|
LOG_ERROR(Service_FS, "Attempted to format a RomFS archive.");
|
||||||
|
// TODO: Verify error code
|
||||||
|
return ResultCode(ErrorDescription::NotAuthorized, ErrorModule::FS,
|
||||||
|
ErrorSummary::NotSupported, ErrorLevel::Permanent);
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace FileSys
|
} // namespace FileSys
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
|
@ -17,12 +18,16 @@
|
||||||
namespace FileSys {
|
namespace FileSys {
|
||||||
|
|
||||||
/// File system interface to the RomFS archive
|
/// File system interface to the RomFS archive
|
||||||
class Archive_RomFS final : public IVFCArchive {
|
class ArchiveFactory_RomFS final : public ArchiveFactory {
|
||||||
public:
|
public:
|
||||||
Archive_RomFS(const Loader::AppLoader& app_loader);
|
ArchiveFactory_RomFS(const Loader::AppLoader& app_loader);
|
||||||
|
|
||||||
std::string GetName() const override { return "RomFS"; }
|
std::string GetName() const override { return "RomFS"; }
|
||||||
ResultCode Open(const Path& path) override { return RESULT_SUCCESS; }
|
ResultVal<std::unique_ptr<ArchiveBackend>> Open(const Path& path) override;
|
||||||
|
ResultCode Format(const Path& path) override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::shared_ptr<std::vector<u8>> romfs_data;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace FileSys
|
} // namespace FileSys
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
#include "common/file_util.h"
|
#include "common/file_util.h"
|
||||||
|
#include "common/make_unique.h"
|
||||||
|
|
||||||
#include "core/file_sys/archive_savedata.h"
|
#include "core/file_sys/archive_savedata.h"
|
||||||
#include "core/file_sys/disk_archive.h"
|
#include "core/file_sys/disk_archive.h"
|
||||||
|
@ -28,26 +29,28 @@ static std::string GetSaveDataPath(const std::string& mount_location, u64 progra
|
||||||
return Common::StringFromFormat("%s%08x/%08x/data/00000001/", mount_location.c_str(), high, low);
|
return Common::StringFromFormat("%s%08x/%08x/data/00000001/", mount_location.c_str(), high, low);
|
||||||
}
|
}
|
||||||
|
|
||||||
Archive_SaveData::Archive_SaveData(const std::string& sdmc_directory)
|
ArchiveFactory_SaveData::ArchiveFactory_SaveData(const std::string& sdmc_directory)
|
||||||
: DiskArchive(GetSaveDataContainerPath(sdmc_directory)) {
|
: mount_point(GetSaveDataContainerPath(sdmc_directory)) {
|
||||||
LOG_INFO(Service_FS, "Directory %s set as SaveData.", this->mount_point.c_str());
|
LOG_INFO(Service_FS, "Directory %s set as SaveData.", this->mount_point.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode Archive_SaveData::Open(const Path& path) {
|
ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_SaveData::Open(const Path& path) {
|
||||||
if (concrete_mount_point.empty())
|
std::string concrete_mount_point = GetSaveDataPath(mount_point, Kernel::g_program_id);
|
||||||
concrete_mount_point = GetSaveDataPath(mount_point, Kernel::g_program_id);
|
|
||||||
if (!FileUtil::Exists(concrete_mount_point)) {
|
if (!FileUtil::Exists(concrete_mount_point)) {
|
||||||
// When a SaveData archive is created for the first time, it is not yet formatted
|
// When a SaveData archive is created for the first time, it is not yet formatted
|
||||||
// and the save file/directory structure expected by the game has not yet been initialized.
|
// and the save file/directory structure expected by the game has not yet been initialized.
|
||||||
// Returning the NotFormatted error code will signal the game to provision the SaveData archive
|
// Returning the NotFormatted error code will signal the game to provision the SaveData archive
|
||||||
// with the files and folders that it expects.
|
// with the files and folders that it expects.
|
||||||
return ResultCode(ErrorDescription::FS_NotFormatted, ErrorModule::FS,
|
return ResultCode(ErrorDescription::FS_NotFormatted, ErrorModule::FS,
|
||||||
ErrorSummary::InvalidState, ErrorLevel::Status);
|
ErrorSummary::InvalidState, ErrorLevel::Status);
|
||||||
}
|
}
|
||||||
return RESULT_SUCCESS;
|
|
||||||
|
auto archive = Common::make_unique<DiskArchive>(std::move(concrete_mount_point));
|
||||||
|
return MakeResult<std::unique_ptr<ArchiveBackend>>(std::move(archive));
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode Archive_SaveData::Format(const Path& path) const {
|
ResultCode ArchiveFactory_SaveData::Format(const Path& path) {
|
||||||
|
std::string concrete_mount_point = GetSaveDataPath(mount_point, Kernel::g_program_id);
|
||||||
FileUtil::DeleteDirRecursively(concrete_mount_point);
|
FileUtil::DeleteDirRecursively(concrete_mount_point);
|
||||||
FileUtil::CreateFullPath(concrete_mount_point);
|
FileUtil::CreateFullPath(concrete_mount_point);
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
|
|
|
@ -15,22 +15,17 @@
|
||||||
namespace FileSys {
|
namespace FileSys {
|
||||||
|
|
||||||
/// File system interface to the SaveData archive
|
/// File system interface to the SaveData archive
|
||||||
class Archive_SaveData final : public DiskArchive {
|
class ArchiveFactory_SaveData final : public ArchiveFactory {
|
||||||
public:
|
public:
|
||||||
Archive_SaveData(const std::string& mount_point);
|
ArchiveFactory_SaveData(const std::string& mount_point);
|
||||||
|
|
||||||
std::string GetName() const override { return "SaveData"; }
|
std::string GetName() const override { return "SaveData"; }
|
||||||
|
|
||||||
ResultCode Open(const Path& path) override;
|
ResultVal<std::unique_ptr<ArchiveBackend>> Open(const Path& path) override;
|
||||||
|
ResultCode Format(const Path& path) override;
|
||||||
|
|
||||||
ResultCode Format(const Path& path) const override;
|
private:
|
||||||
|
std::string mount_point;
|
||||||
const std::string& GetMountPoint() const override {
|
|
||||||
return concrete_mount_point;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
|
||||||
std::string concrete_mount_point;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace FileSys
|
} // namespace FileSys
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include "common/file_util.h"
|
#include "common/file_util.h"
|
||||||
|
#include "common/make_unique.h"
|
||||||
|
|
||||||
#include "core/file_sys/archive_savedatacheck.h"
|
#include "core/file_sys/archive_savedatacheck.h"
|
||||||
#include "core/hle/service/fs/archive.h"
|
#include "core/hle/service/fs/archive.h"
|
||||||
|
@ -21,32 +22,33 @@ static std::string GetSaveDataCheckPath(const std::string& mount_point, u32 high
|
||||||
mount_point.c_str(), high, low);
|
mount_point.c_str(), high, low);
|
||||||
}
|
}
|
||||||
|
|
||||||
Archive_SaveDataCheck::Archive_SaveDataCheck(const std::string& nand_directory) :
|
ArchiveFactory_SaveDataCheck::ArchiveFactory_SaveDataCheck(const std::string& nand_directory) :
|
||||||
mount_point(GetSaveDataCheckContainerPath(nand_directory)) {
|
mount_point(GetSaveDataCheckContainerPath(nand_directory)) {
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode Archive_SaveDataCheck::Open(const Path& path) {
|
ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_SaveDataCheck::Open(const Path& path) {
|
||||||
// TODO(Subv): We should not be overwriting raw_data everytime this function is called,
|
|
||||||
// but until we use factory classes to create the archives at runtime instead of creating them beforehand
|
|
||||||
// and allow multiple archives of the same type to be open at the same time without clobbering each other,
|
|
||||||
// we won't be able to maintain the state of each archive, hence we overwrite it every time it's needed.
|
|
||||||
// There are a number of problems with this, for example opening a file in this archive, then opening
|
|
||||||
// this archive again with a different path, will corrupt the previously open file.
|
|
||||||
auto vec = path.AsBinary();
|
auto vec = path.AsBinary();
|
||||||
const u32* data = reinterpret_cast<u32*>(vec.data());
|
const u32* data = reinterpret_cast<u32*>(vec.data());
|
||||||
std::string file_path = GetSaveDataCheckPath(mount_point, data[1], data[0]);
|
std::string file_path = GetSaveDataCheckPath(mount_point, data[1], data[0]);
|
||||||
FileUtil::IOFile file(file_path, "rb");
|
FileUtil::IOFile file(file_path, "rb");
|
||||||
|
|
||||||
std::fill(raw_data.begin(), raw_data.end(), 0);
|
|
||||||
|
|
||||||
if (!file.IsOpen()) {
|
if (!file.IsOpen()) {
|
||||||
return ResultCode(-1); // TODO(Subv): Find the right error code
|
return ResultCode(-1); // TODO(Subv): Find the right error code
|
||||||
}
|
}
|
||||||
auto size = file.GetSize();
|
auto size = file.GetSize();
|
||||||
raw_data.resize(size);
|
auto raw_data = std::make_shared<std::vector<u8>>(size);
|
||||||
file.ReadBytes(raw_data.data(), size);
|
file.ReadBytes(raw_data->data(), size);
|
||||||
file.Close();
|
file.Close();
|
||||||
return RESULT_SUCCESS;
|
|
||||||
|
auto archive = Common::make_unique<IVFCArchive>(std::move(raw_data));
|
||||||
|
return MakeResult<std::unique_ptr<ArchiveBackend>>(std::move(archive));
|
||||||
|
}
|
||||||
|
|
||||||
|
ResultCode ArchiveFactory_SaveDataCheck::Format(const Path& path) {
|
||||||
|
LOG_ERROR(Service_FS, "Attempted to format a SaveDataCheck archive.");
|
||||||
|
// TODO: Verify error code
|
||||||
|
return ResultCode(ErrorDescription::NotAuthorized, ErrorModule::FS,
|
||||||
|
ErrorSummary::NotSupported, ErrorLevel::Permanent);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace FileSys
|
} // namespace FileSys
|
||||||
|
|
|
@ -17,12 +17,14 @@
|
||||||
namespace FileSys {
|
namespace FileSys {
|
||||||
|
|
||||||
/// File system interface to the SaveDataCheck archive
|
/// File system interface to the SaveDataCheck archive
|
||||||
class Archive_SaveDataCheck final : public IVFCArchive {
|
class ArchiveFactory_SaveDataCheck final : public ArchiveFactory {
|
||||||
public:
|
public:
|
||||||
Archive_SaveDataCheck(const std::string& mount_point);
|
ArchiveFactory_SaveDataCheck(const std::string& mount_point);
|
||||||
|
|
||||||
std::string GetName() const override { return "SaveDataCheck"; }
|
std::string GetName() const override { return "SaveDataCheck"; }
|
||||||
ResultCode Open(const Path& path) override;
|
|
||||||
|
ResultVal<std::unique_ptr<ArchiveBackend>> Open(const Path& path) override;
|
||||||
|
ResultCode Format(const Path& path) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::string mount_point;
|
std::string mount_point;
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
#include "common/file_util.h"
|
#include "common/file_util.h"
|
||||||
|
#include "common/make_unique.h"
|
||||||
|
|
||||||
#include "core/file_sys/archive_sdmc.h"
|
#include "core/file_sys/archive_sdmc.h"
|
||||||
#include "core/file_sys/disk_archive.h"
|
#include "core/file_sys/disk_archive.h"
|
||||||
|
@ -16,17 +17,17 @@
|
||||||
|
|
||||||
namespace FileSys {
|
namespace FileSys {
|
||||||
|
|
||||||
Archive_SDMC::Archive_SDMC(const std::string& sdmc_directory) : DiskArchive(sdmc_directory) {
|
ArchiveFactory_SDMC::ArchiveFactory_SDMC(const std::string& sdmc_directory) : sdmc_directory(sdmc_directory) {
|
||||||
LOG_INFO(Service_FS, "Directory %s set as SDMC.", sdmc_directory.c_str());
|
LOG_INFO(Service_FS, "Directory %s set as SDMC.", sdmc_directory.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Archive_SDMC::Initialize() {
|
bool ArchiveFactory_SDMC::Initialize() {
|
||||||
if (!Settings::values.use_virtual_sd) {
|
if (!Settings::values.use_virtual_sd) {
|
||||||
LOG_WARNING(Service_FS, "SDMC disabled by config.");
|
LOG_WARNING(Service_FS, "SDMC disabled by config.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!FileUtil::CreateFullPath(mount_point)) {
|
if (!FileUtil::CreateFullPath(sdmc_directory)) {
|
||||||
LOG_ERROR(Service_FS, "Unable to create SDMC path.");
|
LOG_ERROR(Service_FS, "Unable to create SDMC path.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -34,4 +35,14 @@ bool Archive_SDMC::Initialize() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_SDMC::Open(const Path& path) {
|
||||||
|
auto archive = Common::make_unique<DiskArchive>(sdmc_directory);
|
||||||
|
return MakeResult<std::unique_ptr<ArchiveBackend>>(std::move(archive));
|
||||||
|
}
|
||||||
|
|
||||||
|
ResultCode ArchiveFactory_SDMC::Format(const Path& path) {
|
||||||
|
// This is kind of an undesirable operation, so let's just ignore it. :)
|
||||||
|
return RESULT_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace FileSys
|
} // namespace FileSys
|
||||||
|
|
|
@ -15,9 +15,9 @@
|
||||||
namespace FileSys {
|
namespace FileSys {
|
||||||
|
|
||||||
/// File system interface to the SDMC archive
|
/// File system interface to the SDMC archive
|
||||||
class Archive_SDMC final : public DiskArchive {
|
class ArchiveFactory_SDMC final : public ArchiveFactory {
|
||||||
public:
|
public:
|
||||||
Archive_SDMC(const std::string& mount_point);
|
ArchiveFactory_SDMC(const std::string& mount_point);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize the archive.
|
* Initialize the archive.
|
||||||
|
@ -26,6 +26,12 @@ public:
|
||||||
bool Initialize();
|
bool Initialize();
|
||||||
|
|
||||||
std::string GetName() const override { return "SDMC"; }
|
std::string GetName() const override { return "SDMC"; }
|
||||||
|
|
||||||
|
ResultVal<std::unique_ptr<ArchiveBackend>> Open(const Path& path) override;
|
||||||
|
ResultCode Format(const Path& path) override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::string sdmc_directory;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace FileSys
|
} // namespace FileSys
|
||||||
|
|
|
@ -18,26 +18,26 @@ namespace FileSys {
|
||||||
|
|
||||||
std::unique_ptr<FileBackend> DiskArchive::OpenFile(const Path& path, const Mode mode) const {
|
std::unique_ptr<FileBackend> DiskArchive::OpenFile(const Path& path, const Mode mode) const {
|
||||||
LOG_DEBUG(Service_FS, "called path=%s mode=%01X", path.DebugStr().c_str(), mode.hex);
|
LOG_DEBUG(Service_FS, "called path=%s mode=%01X", path.DebugStr().c_str(), mode.hex);
|
||||||
auto file = Common::make_unique<DiskFile>(this, path, mode);
|
auto file = Common::make_unique<DiskFile>(*this, path, mode);
|
||||||
if (!file->Open())
|
if (!file->Open())
|
||||||
return nullptr;
|
return nullptr;
|
||||||
return std::move(file);
|
return std::move(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DiskArchive::DeleteFile(const Path& path) const {
|
bool DiskArchive::DeleteFile(const Path& path) const {
|
||||||
return FileUtil::Delete(GetMountPoint() + path.AsString());
|
return FileUtil::Delete(mount_point + path.AsString());
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DiskArchive::RenameFile(const Path& src_path, const Path& dest_path) const {
|
bool DiskArchive::RenameFile(const Path& src_path, const Path& dest_path) const {
|
||||||
return FileUtil::Rename(GetMountPoint() + src_path.AsString(), GetMountPoint() + dest_path.AsString());
|
return FileUtil::Rename(mount_point + src_path.AsString(), mount_point + dest_path.AsString());
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DiskArchive::DeleteDirectory(const Path& path) const {
|
bool DiskArchive::DeleteDirectory(const Path& path) const {
|
||||||
return FileUtil::DeleteDir(GetMountPoint() + path.AsString());
|
return FileUtil::DeleteDir(mount_point + path.AsString());
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode DiskArchive::CreateFile(const FileSys::Path& path, u32 size) const {
|
ResultCode DiskArchive::CreateFile(const FileSys::Path& path, u32 size) const {
|
||||||
std::string full_path = GetMountPoint() + path.AsString();
|
std::string full_path = mount_point + path.AsString();
|
||||||
|
|
||||||
if (FileUtil::Exists(full_path))
|
if (FileUtil::Exists(full_path))
|
||||||
return ResultCode(ErrorDescription::AlreadyExists, ErrorModule::FS, ErrorSummary::NothingHappened, ErrorLevel::Info);
|
return ResultCode(ErrorDescription::AlreadyExists, ErrorModule::FS, ErrorSummary::NothingHappened, ErrorLevel::Info);
|
||||||
|
@ -58,16 +58,16 @@ ResultCode DiskArchive::CreateFile(const FileSys::Path& path, u32 size) const {
|
||||||
|
|
||||||
|
|
||||||
bool DiskArchive::CreateDirectory(const Path& path) const {
|
bool DiskArchive::CreateDirectory(const Path& path) const {
|
||||||
return FileUtil::CreateDir(GetMountPoint() + path.AsString());
|
return FileUtil::CreateDir(mount_point + path.AsString());
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DiskArchive::RenameDirectory(const Path& src_path, const Path& dest_path) const {
|
bool DiskArchive::RenameDirectory(const Path& src_path, const Path& dest_path) const {
|
||||||
return FileUtil::Rename(GetMountPoint() + src_path.AsString(), GetMountPoint() + dest_path.AsString());
|
return FileUtil::Rename(mount_point + src_path.AsString(), mount_point + dest_path.AsString());
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<DirectoryBackend> DiskArchive::OpenDirectory(const Path& path) const {
|
std::unique_ptr<DirectoryBackend> DiskArchive::OpenDirectory(const Path& path) const {
|
||||||
LOG_DEBUG(Service_FS, "called path=%s", path.DebugStr().c_str());
|
LOG_DEBUG(Service_FS, "called path=%s", path.DebugStr().c_str());
|
||||||
auto directory = Common::make_unique<DiskDirectory>(this, path);
|
auto directory = Common::make_unique<DiskDirectory>(*this, path);
|
||||||
if (!directory->Open())
|
if (!directory->Open())
|
||||||
return nullptr;
|
return nullptr;
|
||||||
return std::move(directory);
|
return std::move(directory);
|
||||||
|
@ -75,13 +75,12 @@ std::unique_ptr<DirectoryBackend> DiskArchive::OpenDirectory(const Path& path) c
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
DiskFile::DiskFile(const DiskArchive* archive, const Path& path, const Mode mode) {
|
DiskFile::DiskFile(const DiskArchive& archive, const Path& path, const Mode mode) {
|
||||||
// TODO(Link Mauve): normalize path into an absolute path without "..", it can currently bypass
|
// TODO(Link Mauve): normalize path into an absolute path without "..", it can currently bypass
|
||||||
// the root directory we set while opening the archive.
|
// the root directory we set while opening the archive.
|
||||||
// For example, opening /../../etc/passwd can give the emulated program your users list.
|
// For example, opening /../../etc/passwd can give the emulated program your users list.
|
||||||
this->path = archive->GetMountPoint() + path.AsString();
|
this->path = archive.mount_point + path.AsString();
|
||||||
this->mode.hex = mode.hex;
|
this->mode.hex = mode.hex;
|
||||||
this->archive = archive;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DiskFile::Open() {
|
bool DiskFile::Open() {
|
||||||
|
@ -134,12 +133,11 @@ bool DiskFile::Close() const {
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
DiskDirectory::DiskDirectory(const DiskArchive* archive, const Path& path) {
|
DiskDirectory::DiskDirectory(const DiskArchive& archive, const Path& path) {
|
||||||
// TODO(Link Mauve): normalize path into an absolute path without "..", it can currently bypass
|
// TODO(Link Mauve): normalize path into an absolute path without "..", it can currently bypass
|
||||||
// the root directory we set while opening the archive.
|
// the root directory we set while opening the archive.
|
||||||
// For example, opening /../../usr/bin can give the emulated program your installed programs.
|
// For example, opening /../../usr/bin can give the emulated program your installed programs.
|
||||||
this->path = archive->GetMountPoint() + path.AsString();
|
this->path = archive.mount_point + path.AsString();
|
||||||
this->archive = archive;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DiskDirectory::Open() {
|
bool DiskDirectory::Open() {
|
||||||
|
|
|
@ -24,8 +24,8 @@ class DiskArchive : public ArchiveBackend {
|
||||||
public:
|
public:
|
||||||
DiskArchive(const std::string& mount_point_) : mount_point(mount_point_) {}
|
DiskArchive(const std::string& mount_point_) : mount_point(mount_point_) {}
|
||||||
|
|
||||||
virtual std::string GetName() const = 0;
|
virtual std::string GetName() const { return "DiskArchive: " + mount_point; }
|
||||||
virtual ResultCode Format(const Path& path) const { return RESULT_SUCCESS; }
|
|
||||||
std::unique_ptr<FileBackend> OpenFile(const Path& path, const Mode mode) const override;
|
std::unique_ptr<FileBackend> OpenFile(const Path& path, const Mode mode) const override;
|
||||||
bool DeleteFile(const Path& path) const override;
|
bool DeleteFile(const Path& path) const override;
|
||||||
bool RenameFile(const Path& src_path, const Path& dest_path) const override;
|
bool RenameFile(const Path& src_path, const Path& dest_path) const override;
|
||||||
|
@ -35,26 +35,17 @@ public:
|
||||||
bool RenameDirectory(const Path& src_path, const Path& dest_path) const override;
|
bool RenameDirectory(const Path& src_path, const Path& dest_path) const override;
|
||||||
std::unique_ptr<DirectoryBackend> OpenDirectory(const Path& path) const override;
|
std::unique_ptr<DirectoryBackend> OpenDirectory(const Path& path) const override;
|
||||||
|
|
||||||
virtual ResultCode Open(const Path& path) override {
|
|
||||||
return RESULT_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Getter for the path used for this Archive
|
|
||||||
* @return Mount point of that passthrough archive
|
|
||||||
*/
|
|
||||||
virtual const std::string& GetMountPoint() const {
|
|
||||||
return mount_point;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
friend class DiskFile;
|
||||||
|
friend class DiskDirectory;
|
||||||
|
|
||||||
std::string mount_point;
|
std::string mount_point;
|
||||||
};
|
};
|
||||||
|
|
||||||
class DiskFile : public FileBackend {
|
class DiskFile : public FileBackend {
|
||||||
public:
|
public:
|
||||||
DiskFile();
|
DiskFile();
|
||||||
DiskFile(const DiskArchive* archive, const Path& path, const Mode mode);
|
DiskFile(const DiskArchive& archive, const Path& path, const Mode mode);
|
||||||
|
|
||||||
bool Open() override;
|
bool Open() override;
|
||||||
size_t Read(const u64 offset, const u32 length, u8* buffer) const override;
|
size_t Read(const u64 offset, const u32 length, u8* buffer) const override;
|
||||||
|
@ -68,7 +59,6 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
const DiskArchive* archive;
|
|
||||||
std::string path;
|
std::string path;
|
||||||
Mode mode;
|
Mode mode;
|
||||||
std::unique_ptr<FileUtil::IOFile> file;
|
std::unique_ptr<FileUtil::IOFile> file;
|
||||||
|
@ -77,7 +67,7 @@ protected:
|
||||||
class DiskDirectory : public DirectoryBackend {
|
class DiskDirectory : public DirectoryBackend {
|
||||||
public:
|
public:
|
||||||
DiskDirectory();
|
DiskDirectory();
|
||||||
DiskDirectory(const DiskArchive* archive, const Path& path);
|
DiskDirectory(const DiskArchive& archive, const Path& path);
|
||||||
|
|
||||||
~DiskDirectory() override {
|
~DiskDirectory() override {
|
||||||
Close();
|
Close();
|
||||||
|
@ -91,7 +81,6 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
const DiskArchive* archive;
|
|
||||||
std::string path;
|
std::string path;
|
||||||
u32 total_entries_in_directory;
|
u32 total_entries_in_directory;
|
||||||
FileUtil::FSTEntry directory;
|
FileUtil::FSTEntry directory;
|
||||||
|
|
|
@ -15,11 +15,15 @@
|
||||||
|
|
||||||
namespace FileSys {
|
namespace FileSys {
|
||||||
|
|
||||||
IVFCArchive::IVFCArchive() {
|
IVFCArchive::IVFCArchive(std::shared_ptr<const std::vector<u8>> data) : data(data) {
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string IVFCArchive::GetName() const {
|
||||||
|
return "IVFC";
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<FileBackend> IVFCArchive::OpenFile(const Path& path, const Mode mode) const {
|
std::unique_ptr<FileBackend> IVFCArchive::OpenFile(const Path& path, const Mode mode) const {
|
||||||
return Common::make_unique<IVFCFile>(this);
|
return Common::make_unique<IVFCFile>(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IVFCArchive::DeleteFile(const Path& path) const {
|
bool IVFCArchive::DeleteFile(const Path& path) const {
|
||||||
|
@ -57,31 +61,25 @@ std::unique_ptr<DirectoryBackend> IVFCArchive::OpenDirectory(const Path& path) c
|
||||||
return Common::make_unique<IVFCDirectory>();
|
return Common::make_unique<IVFCDirectory>();
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode IVFCArchive::Format(const Path& path) const {
|
|
||||||
LOG_CRITICAL(Service_FS, "Attempted to format an IVFC archive (%s).", GetName().c_str());
|
|
||||||
// TODO: Verify error code
|
|
||||||
return ResultCode(ErrorDescription::NotAuthorized, ErrorModule::FS, ErrorSummary::NotSupported, ErrorLevel::Permanent);
|
|
||||||
}
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
size_t IVFCFile::Read(const u64 offset, const u32 length, u8* buffer) const {
|
size_t IVFCFile::Read(const u64 offset, const u32 length, u8* buffer) const {
|
||||||
LOG_TRACE(Service_FS, "called offset=%llu, length=%d", offset, length);
|
LOG_TRACE(Service_FS, "called offset=%llu, length=%d", offset, length);
|
||||||
memcpy(buffer, &archive->raw_data[(u32)offset], length);
|
memcpy(buffer, data->data() + offset, length);
|
||||||
return length;
|
return length;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t IVFCFile::Write(const u64 offset, const u32 length, const u32 flush, const u8* buffer) const {
|
size_t IVFCFile::Write(const u64 offset, const u32 length, const u32 flush, const u8* buffer) const {
|
||||||
LOG_CRITICAL(Service_FS, "Attempted to write to IVFC file in archive %s.", archive->GetName().c_str());
|
LOG_ERROR(Service_FS, "Attempted to write to IVFC file");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t IVFCFile::GetSize() const {
|
size_t IVFCFile::GetSize() const {
|
||||||
return sizeof(u8) * archive->raw_data.size();
|
return sizeof(u8) * data->size();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IVFCFile::SetSize(const u64 size) const {
|
bool IVFCFile::SetSize(const u64 size) const {
|
||||||
LOG_CRITICAL(Service_FS, "Attempted to set the size of an IVFC file in archive %s", archive->GetName().c_str());
|
LOG_ERROR(Service_FS, "Attempted to set the size of an IVFC file");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
|
@ -23,7 +24,9 @@ namespace FileSys {
|
||||||
*/
|
*/
|
||||||
class IVFCArchive : public ArchiveBackend {
|
class IVFCArchive : public ArchiveBackend {
|
||||||
public:
|
public:
|
||||||
IVFCArchive();
|
IVFCArchive(std::shared_ptr<const std::vector<u8>> data);
|
||||||
|
|
||||||
|
std::string GetName() const override;
|
||||||
|
|
||||||
std::unique_ptr<FileBackend> OpenFile(const Path& path, const Mode mode) const override;
|
std::unique_ptr<FileBackend> OpenFile(const Path& path, const Mode mode) const override;
|
||||||
bool DeleteFile(const Path& path) const override;
|
bool DeleteFile(const Path& path) const override;
|
||||||
|
@ -33,16 +36,14 @@ public:
|
||||||
bool CreateDirectory(const Path& path) const override;
|
bool CreateDirectory(const Path& path) const override;
|
||||||
bool RenameDirectory(const Path& src_path, const Path& dest_path) const override;
|
bool RenameDirectory(const Path& src_path, const Path& dest_path) const override;
|
||||||
std::unique_ptr<DirectoryBackend> OpenDirectory(const Path& path) const override;
|
std::unique_ptr<DirectoryBackend> OpenDirectory(const Path& path) const override;
|
||||||
ResultCode Format(const Path& path) const override;
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
friend class IVFCFile;
|
std::shared_ptr<const std::vector<u8>> data;
|
||||||
std::vector<u8> raw_data;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class IVFCFile : public FileBackend {
|
class IVFCFile : public FileBackend {
|
||||||
public:
|
public:
|
||||||
IVFCFile(const IVFCArchive* archive) : archive(archive) {}
|
IVFCFile(std::shared_ptr<const std::vector<u8>> data) : data(data) {}
|
||||||
|
|
||||||
bool Open() override { return true; }
|
bool Open() override { return true; }
|
||||||
size_t Read(const u64 offset, const u32 length, u8* buffer) const override;
|
size_t Read(const u64 offset, const u32 length, u8* buffer) const override;
|
||||||
|
@ -53,7 +54,7 @@ public:
|
||||||
void Flush() const override { }
|
void Flush() const override { }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const IVFCArchive* archive;
|
std::shared_ptr<const std::vector<u8>> data;
|
||||||
};
|
};
|
||||||
|
|
||||||
class IVFCDirectory : public DirectoryBackend {
|
class IVFCDirectory : public DirectoryBackend {
|
||||||
|
|
|
@ -307,14 +307,14 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultVal& operator=(const ResultVal& o) {
|
ResultVal& operator=(const ResultVal& o) {
|
||||||
if (*this) {
|
if (!empty()) {
|
||||||
if (o) {
|
if (!o.empty()) {
|
||||||
*GetPointer() = *o.GetPointer();
|
*GetPointer() = *o.GetPointer();
|
||||||
} else {
|
} else {
|
||||||
GetPointer()->~T();
|
GetPointer()->~T();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (o) {
|
if (!o.empty()) {
|
||||||
new (&storage) T(*o.GetPointer());
|
new (&storage) T(*o.GetPointer());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,6 +5,8 @@
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
|
||||||
|
#include <boost/container/flat_map.hpp>
|
||||||
|
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
#include "common/file_util.h"
|
#include "common/file_util.h"
|
||||||
#include "common/make_unique.h"
|
#include "common/make_unique.h"
|
||||||
|
@ -18,7 +20,6 @@
|
||||||
#include "core/file_sys/archive_sdmc.h"
|
#include "core/file_sys/archive_sdmc.h"
|
||||||
#include "core/file_sys/directory_backend.h"
|
#include "core/file_sys/directory_backend.h"
|
||||||
#include "core/hle/service/fs/archive.h"
|
#include "core/hle/service/fs/archive.h"
|
||||||
#include "core/hle/kernel/session.h"
|
|
||||||
#include "core/hle/result.h"
|
#include "core/hle/result.h"
|
||||||
|
|
||||||
// Specializes std::hash for ArchiveIdCode, so that we can use it in std::unordered_map.
|
// Specializes std::hash for ArchiveIdCode, so that we can use it in std::unordered_map.
|
||||||
|
@ -74,43 +75,19 @@ enum class DirectoryCommand : u32 {
|
||||||
Close = 0x08020000,
|
Close = 0x08020000,
|
||||||
};
|
};
|
||||||
|
|
||||||
class Archive {
|
ResultVal<bool> File::SyncRequest() {
|
||||||
public:
|
u32* cmd_buff = Kernel::GetCommandBuffer();
|
||||||
Archive(std::unique_ptr<FileSys::ArchiveBackend>&& backend, ArchiveIdCode id_code)
|
FileCommand cmd = static_cast<FileCommand>(cmd_buff[0]);
|
||||||
: id_code(id_code), backend(std::move(backend)) {
|
switch (cmd) {
|
||||||
}
|
|
||||||
|
|
||||||
std::string GetName() const { return "Archive: " + backend->GetName(); }
|
|
||||||
|
|
||||||
ArchiveIdCode id_code; ///< Id code of the archive
|
|
||||||
std::unique_ptr<FileSys::ArchiveBackend> backend; ///< Archive backend interface
|
|
||||||
};
|
|
||||||
|
|
||||||
class File : public Kernel::Session {
|
|
||||||
public:
|
|
||||||
File(std::unique_ptr<FileSys::FileBackend>&& backend, const FileSys::Path& path)
|
|
||||||
: path(path), priority(0), backend(std::move(backend)) {
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string GetName() const override { return "Path: " + path.DebugStr(); }
|
|
||||||
|
|
||||||
FileSys::Path path; ///< Path of the file
|
|
||||||
u32 priority; ///< Priority of the file. TODO(Subv): Find out what this means
|
|
||||||
std::unique_ptr<FileSys::FileBackend> backend; ///< File backend interface
|
|
||||||
|
|
||||||
ResultVal<bool> SyncRequest() override {
|
|
||||||
u32* cmd_buff = Kernel::GetCommandBuffer();
|
|
||||||
FileCommand cmd = static_cast<FileCommand>(cmd_buff[0]);
|
|
||||||
switch (cmd) {
|
|
||||||
|
|
||||||
// Read from file...
|
// Read from file...
|
||||||
case FileCommand::Read:
|
case FileCommand::Read:
|
||||||
{
|
{
|
||||||
u64 offset = cmd_buff[1] | ((u64) cmd_buff[2]) << 32;
|
u64 offset = cmd_buff[1] | ((u64)cmd_buff[2]) << 32;
|
||||||
u32 length = cmd_buff[3];
|
u32 length = cmd_buff[3];
|
||||||
u32 address = cmd_buff[5];
|
u32 address = cmd_buff[5];
|
||||||
LOG_TRACE(Service_FS, "Read %s %s: offset=0x%llx length=%d address=0x%x",
|
LOG_TRACE(Service_FS, "Read %s %s: offset=0x%llx length=%d address=0x%x",
|
||||||
GetTypeName().c_str(), GetName().c_str(), offset, length, address);
|
GetTypeName().c_str(), GetName().c_str(), offset, length, address);
|
||||||
cmd_buff[2] = backend->Read(offset, length, Memory::GetPointer(address));
|
cmd_buff[2] = backend->Read(offset, length, Memory::GetPointer(address));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -118,12 +95,12 @@ public:
|
||||||
// Write to file...
|
// Write to file...
|
||||||
case FileCommand::Write:
|
case FileCommand::Write:
|
||||||
{
|
{
|
||||||
u64 offset = cmd_buff[1] | ((u64) cmd_buff[2]) << 32;
|
u64 offset = cmd_buff[1] | ((u64)cmd_buff[2]) << 32;
|
||||||
u32 length = cmd_buff[3];
|
u32 length = cmd_buff[3];
|
||||||
u32 flush = cmd_buff[4];
|
u32 flush = cmd_buff[4];
|
||||||
u32 address = cmd_buff[6];
|
u32 address = cmd_buff[6];
|
||||||
LOG_TRACE(Service_FS, "Write %s %s: offset=0x%llx length=%d address=0x%x, flush=0x%x",
|
LOG_TRACE(Service_FS, "Write %s %s: offset=0x%llx length=%d address=0x%x, flush=0x%x",
|
||||||
GetTypeName().c_str(), GetName().c_str(), offset, length, address, flush);
|
GetTypeName().c_str(), GetName().c_str(), offset, length, address, flush);
|
||||||
cmd_buff[2] = backend->Write(offset, length, flush, Memory::GetPointer(address));
|
cmd_buff[2] = backend->Write(offset, length, flush, Memory::GetPointer(address));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -141,7 +118,7 @@ public:
|
||||||
{
|
{
|
||||||
u64 size = cmd_buff[1] | ((u64)cmd_buff[2] << 32);
|
u64 size = cmd_buff[1] | ((u64)cmd_buff[2] << 32);
|
||||||
LOG_TRACE(Service_FS, "SetSize %s %s size=%llu",
|
LOG_TRACE(Service_FS, "SetSize %s %s size=%llu",
|
||||||
GetTypeName().c_str(), GetName().c_str(), size);
|
GetTypeName().c_str(), GetName().c_str(), size);
|
||||||
backend->SetSize(size);
|
backend->SetSize(size);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -187,27 +164,15 @@ public:
|
||||||
ResultCode error = UnimplementedFunction(ErrorModule::FS);
|
ResultCode error = UnimplementedFunction(ErrorModule::FS);
|
||||||
cmd_buff[1] = error.raw; // TODO(Link Mauve): use the correct error code for that.
|
cmd_buff[1] = error.raw; // TODO(Link Mauve): use the correct error code for that.
|
||||||
return error;
|
return error;
|
||||||
}
|
|
||||||
cmd_buff[1] = 0; // No error
|
|
||||||
return MakeResult<bool>(false);
|
|
||||||
}
|
}
|
||||||
};
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
|
return MakeResult<bool>(false);
|
||||||
|
}
|
||||||
|
|
||||||
class Directory : public Kernel::Session {
|
ResultVal<bool> Directory::SyncRequest() {
|
||||||
public:
|
u32* cmd_buff = Kernel::GetCommandBuffer();
|
||||||
Directory(std::unique_ptr<FileSys::DirectoryBackend>&& backend, const FileSys::Path& path)
|
DirectoryCommand cmd = static_cast<DirectoryCommand>(cmd_buff[0]);
|
||||||
: path(path), backend(std::move(backend)) {
|
switch (cmd) {
|
||||||
}
|
|
||||||
|
|
||||||
std::string GetName() const override { return "Directory: " + path.DebugStr(); }
|
|
||||||
|
|
||||||
FileSys::Path path; ///< Path of the directory
|
|
||||||
std::unique_ptr<FileSys::DirectoryBackend> backend; ///< File backend interface
|
|
||||||
|
|
||||||
ResultVal<bool> SyncRequest() override {
|
|
||||||
u32* cmd_buff = Kernel::GetCommandBuffer();
|
|
||||||
DirectoryCommand cmd = static_cast<DirectoryCommand>(cmd_buff[0]);
|
|
||||||
switch (cmd) {
|
|
||||||
|
|
||||||
// Read from directory...
|
// Read from directory...
|
||||||
case DirectoryCommand::Read:
|
case DirectoryCommand::Read:
|
||||||
|
@ -216,7 +181,7 @@ public:
|
||||||
u32 address = cmd_buff[3];
|
u32 address = cmd_buff[3];
|
||||||
auto entries = reinterpret_cast<FileSys::Entry*>(Memory::GetPointer(address));
|
auto entries = reinterpret_cast<FileSys::Entry*>(Memory::GetPointer(address));
|
||||||
LOG_TRACE(Service_FS, "Read %s %s: count=%d",
|
LOG_TRACE(Service_FS, "Read %s %s: count=%d",
|
||||||
GetTypeName().c_str(), GetName().c_str(), count);
|
GetTypeName().c_str(), GetName().c_str(), count);
|
||||||
|
|
||||||
// Number of entries actually read
|
// Number of entries actually read
|
||||||
cmd_buff[2] = backend->Read(count, entries);
|
cmd_buff[2] = backend->Read(count, entries);
|
||||||
|
@ -236,29 +201,31 @@ public:
|
||||||
ResultCode error = UnimplementedFunction(ErrorModule::FS);
|
ResultCode error = UnimplementedFunction(ErrorModule::FS);
|
||||||
cmd_buff[1] = error.raw; // TODO(Link Mauve): use the correct error code for that.
|
cmd_buff[1] = error.raw; // TODO(Link Mauve): use the correct error code for that.
|
||||||
return MakeResult<bool>(false);
|
return MakeResult<bool>(false);
|
||||||
}
|
|
||||||
cmd_buff[1] = 0; // No error
|
|
||||||
return MakeResult<bool>(false);
|
|
||||||
}
|
}
|
||||||
};
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
|
return MakeResult<bool>(false);
|
||||||
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
using FileSys::ArchiveBackend;
|
||||||
|
using FileSys::ArchiveFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Map of registered archives, identified by id code. Once an archive is registered here, it is
|
* Map of registered archives, identified by id code. Once an archive is registered here, it is
|
||||||
* never removed until the FS service is shut down.
|
* never removed until the FS service is shut down.
|
||||||
*/
|
*/
|
||||||
static std::unordered_map<ArchiveIdCode, std::unique_ptr<Archive>> id_code_map;
|
static boost::container::flat_map<ArchiveIdCode, std::unique_ptr<ArchiveFactory>> id_code_map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Map of active archive handles. Values are pointers to the archives in `idcode_map`.
|
* Map of active archive handles. Values are pointers to the archives in `idcode_map`.
|
||||||
*/
|
*/
|
||||||
static std::unordered_map<ArchiveHandle, Archive*> handle_map;
|
static std::unordered_map<ArchiveHandle, std::unique_ptr<ArchiveBackend>> handle_map;
|
||||||
static ArchiveHandle next_handle;
|
static ArchiveHandle next_handle;
|
||||||
|
|
||||||
static Archive* GetArchive(ArchiveHandle handle) {
|
static ArchiveBackend* GetArchive(ArchiveHandle handle) {
|
||||||
auto itr = handle_map.find(handle);
|
auto itr = handle_map.find(handle);
|
||||||
return (itr == handle_map.end()) ? nullptr : itr->second;
|
return (itr == handle_map.end()) ? nullptr : itr->second.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultVal<ArchiveHandle> OpenArchive(ArchiveIdCode id_code, FileSys::Path& archive_path) {
|
ResultVal<ArchiveHandle> OpenArchive(ArchiveIdCode id_code, FileSys::Path& archive_path) {
|
||||||
|
@ -271,15 +238,13 @@ ResultVal<ArchiveHandle> OpenArchive(ArchiveIdCode id_code, FileSys::Path& archi
|
||||||
ErrorSummary::NotFound, ErrorLevel::Permanent);
|
ErrorSummary::NotFound, ErrorLevel::Permanent);
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode res = itr->second->backend->Open(archive_path);
|
CASCADE_RESULT(std::unique_ptr<ArchiveBackend> res, itr->second->Open(archive_path));
|
||||||
if (!res.IsSuccess())
|
|
||||||
return res;
|
|
||||||
|
|
||||||
// This should never even happen in the first place with 64-bit handles,
|
// This should never even happen in the first place with 64-bit handles,
|
||||||
while (handle_map.count(next_handle) != 0) {
|
while (handle_map.count(next_handle) != 0) {
|
||||||
++next_handle;
|
++next_handle;
|
||||||
}
|
}
|
||||||
handle_map.emplace(next_handle, itr->second.get());
|
handle_map.emplace(next_handle, std::move(res));
|
||||||
return MakeResult<ArchiveHandle>(next_handle++);
|
return MakeResult<ArchiveHandle>(next_handle++);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -292,39 +257,39 @@ ResultCode CloseArchive(ArchiveHandle handle) {
|
||||||
|
|
||||||
// TODO(yuriks): This might be what the fs:REG service is for. See the Register/Unregister calls in
|
// TODO(yuriks): This might be what the fs:REG service is for. See the Register/Unregister calls in
|
||||||
// http://3dbrew.org/wiki/Filesystem_services#ProgramRegistry_service_.22fs:REG.22
|
// http://3dbrew.org/wiki/Filesystem_services#ProgramRegistry_service_.22fs:REG.22
|
||||||
ResultCode CreateArchive(std::unique_ptr<FileSys::ArchiveBackend>&& backend, ArchiveIdCode id_code) {
|
ResultCode RegisterArchiveType(std::unique_ptr<FileSys::ArchiveFactory>&& factory, ArchiveIdCode id_code) {
|
||||||
auto result = id_code_map.emplace(id_code, Common::make_unique<Archive>(std::move(backend), id_code));
|
auto result = id_code_map.emplace(id_code, std::move(factory));
|
||||||
|
|
||||||
bool inserted = result.second;
|
bool inserted = result.second;
|
||||||
_dbg_assert_msg_(Service_FS, inserted, "Tried to register more than one archive with same id code");
|
_assert_msg_(Service_FS, inserted, "Tried to register more than one archive with same id code");
|
||||||
|
|
||||||
auto& archive = result.first->second;
|
auto& archive = result.first->second;
|
||||||
LOG_DEBUG(Service_FS, "Registered archive %s with id code 0x%08X", archive->GetName().c_str(), id_code);
|
LOG_DEBUG(Service_FS, "Registered archive %s with id code 0x%08X", archive->GetName().c_str(), id_code);
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultVal<Kernel::SharedPtr<Kernel::Session>> OpenFileFromArchive(ArchiveHandle archive_handle,
|
ResultVal<Kernel::SharedPtr<File>> OpenFileFromArchive(ArchiveHandle archive_handle,
|
||||||
const FileSys::Path& path, const FileSys::Mode mode) {
|
const FileSys::Path& path, const FileSys::Mode mode) {
|
||||||
Archive* archive = GetArchive(archive_handle);
|
ArchiveBackend* archive = GetArchive(archive_handle);
|
||||||
if (archive == nullptr)
|
if (archive == nullptr)
|
||||||
return ERR_INVALID_HANDLE;
|
return ERR_INVALID_HANDLE;
|
||||||
|
|
||||||
std::unique_ptr<FileSys::FileBackend> backend = archive->backend->OpenFile(path, mode);
|
std::unique_ptr<FileSys::FileBackend> backend = archive->OpenFile(path, mode);
|
||||||
if (backend == nullptr) {
|
if (backend == nullptr) {
|
||||||
return ResultCode(ErrorDescription::FS_NotFound, ErrorModule::FS,
|
return ResultCode(ErrorDescription::FS_NotFound, ErrorModule::FS,
|
||||||
ErrorSummary::NotFound, ErrorLevel::Status);
|
ErrorSummary::NotFound, ErrorLevel::Status);
|
||||||
}
|
}
|
||||||
|
|
||||||
auto file = Kernel::SharedPtr<File>(new File(std::move(backend), path));
|
auto file = Kernel::SharedPtr<File>(new File(std::move(backend), path));
|
||||||
return MakeResult<Kernel::SharedPtr<Kernel::Session>>(std::move(file));
|
return MakeResult<Kernel::SharedPtr<File>>(std::move(file));
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode DeleteFileFromArchive(ArchiveHandle archive_handle, const FileSys::Path& path) {
|
ResultCode DeleteFileFromArchive(ArchiveHandle archive_handle, const FileSys::Path& path) {
|
||||||
Archive* archive = GetArchive(archive_handle);
|
ArchiveBackend* archive = GetArchive(archive_handle);
|
||||||
if (archive == nullptr)
|
if (archive == nullptr)
|
||||||
return ERR_INVALID_HANDLE;
|
return ERR_INVALID_HANDLE;
|
||||||
|
|
||||||
if (archive->backend->DeleteFile(path))
|
if (archive->DeleteFile(path))
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
return ResultCode(ErrorDescription::NoData, ErrorModule::FS, // TODO: verify description
|
return ResultCode(ErrorDescription::NoData, ErrorModule::FS, // TODO: verify description
|
||||||
ErrorSummary::Canceled, ErrorLevel::Status);
|
ErrorSummary::Canceled, ErrorLevel::Status);
|
||||||
|
@ -332,13 +297,13 @@ ResultCode DeleteFileFromArchive(ArchiveHandle archive_handle, const FileSys::Pa
|
||||||
|
|
||||||
ResultCode RenameFileBetweenArchives(ArchiveHandle src_archive_handle, const FileSys::Path& src_path,
|
ResultCode RenameFileBetweenArchives(ArchiveHandle src_archive_handle, const FileSys::Path& src_path,
|
||||||
ArchiveHandle dest_archive_handle, const FileSys::Path& dest_path) {
|
ArchiveHandle dest_archive_handle, const FileSys::Path& dest_path) {
|
||||||
Archive* src_archive = GetArchive(src_archive_handle);
|
ArchiveBackend* src_archive = GetArchive(src_archive_handle);
|
||||||
Archive* dest_archive = GetArchive(dest_archive_handle);
|
ArchiveBackend* dest_archive = GetArchive(dest_archive_handle);
|
||||||
if (src_archive == nullptr || dest_archive == nullptr)
|
if (src_archive == nullptr || dest_archive == nullptr)
|
||||||
return ERR_INVALID_HANDLE;
|
return ERR_INVALID_HANDLE;
|
||||||
|
|
||||||
if (src_archive == dest_archive) {
|
if (src_archive == dest_archive) {
|
||||||
if (src_archive->backend->RenameFile(src_path, dest_path))
|
if (src_archive->RenameFile(src_path, dest_path))
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
} else {
|
} else {
|
||||||
// TODO: Implement renaming across archives
|
// TODO: Implement renaming across archives
|
||||||
|
@ -352,30 +317,30 @@ ResultCode RenameFileBetweenArchives(ArchiveHandle src_archive_handle, const Fil
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode DeleteDirectoryFromArchive(ArchiveHandle archive_handle, const FileSys::Path& path) {
|
ResultCode DeleteDirectoryFromArchive(ArchiveHandle archive_handle, const FileSys::Path& path) {
|
||||||
Archive* archive = GetArchive(archive_handle);
|
ArchiveBackend* archive = GetArchive(archive_handle);
|
||||||
if (archive == nullptr)
|
if (archive == nullptr)
|
||||||
return ERR_INVALID_HANDLE;
|
return ERR_INVALID_HANDLE;
|
||||||
|
|
||||||
if (archive->backend->DeleteDirectory(path))
|
if (archive->DeleteDirectory(path))
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
return ResultCode(ErrorDescription::NoData, ErrorModule::FS, // TODO: verify description
|
return ResultCode(ErrorDescription::NoData, ErrorModule::FS, // TODO: verify description
|
||||||
ErrorSummary::Canceled, ErrorLevel::Status);
|
ErrorSummary::Canceled, ErrorLevel::Status);
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode CreateFileInArchive(ArchiveHandle archive_handle, const FileSys::Path& path, u32 file_size) {
|
ResultCode CreateFileInArchive(ArchiveHandle archive_handle, const FileSys::Path& path, u32 file_size) {
|
||||||
Archive* archive = GetArchive(archive_handle);
|
ArchiveBackend* archive = GetArchive(archive_handle);
|
||||||
if (archive == nullptr)
|
if (archive == nullptr)
|
||||||
return ERR_INVALID_HANDLE;
|
return ERR_INVALID_HANDLE;
|
||||||
|
|
||||||
return archive->backend->CreateFile(path, file_size);
|
return archive->CreateFile(path, file_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode CreateDirectoryFromArchive(ArchiveHandle archive_handle, const FileSys::Path& path) {
|
ResultCode CreateDirectoryFromArchive(ArchiveHandle archive_handle, const FileSys::Path& path) {
|
||||||
Archive* archive = GetArchive(archive_handle);
|
ArchiveBackend* archive = GetArchive(archive_handle);
|
||||||
if (archive == nullptr)
|
if (archive == nullptr)
|
||||||
return ERR_INVALID_HANDLE;
|
return ERR_INVALID_HANDLE;
|
||||||
|
|
||||||
if (archive->backend->CreateDirectory(path))
|
if (archive->CreateDirectory(path))
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
return ResultCode(ErrorDescription::NoData, ErrorModule::FS, // TODO: verify description
|
return ResultCode(ErrorDescription::NoData, ErrorModule::FS, // TODO: verify description
|
||||||
ErrorSummary::Canceled, ErrorLevel::Status);
|
ErrorSummary::Canceled, ErrorLevel::Status);
|
||||||
|
@ -383,13 +348,13 @@ ResultCode CreateDirectoryFromArchive(ArchiveHandle archive_handle, const FileSy
|
||||||
|
|
||||||
ResultCode RenameDirectoryBetweenArchives(ArchiveHandle src_archive_handle, const FileSys::Path& src_path,
|
ResultCode RenameDirectoryBetweenArchives(ArchiveHandle src_archive_handle, const FileSys::Path& src_path,
|
||||||
ArchiveHandle dest_archive_handle, const FileSys::Path& dest_path) {
|
ArchiveHandle dest_archive_handle, const FileSys::Path& dest_path) {
|
||||||
Archive* src_archive = GetArchive(src_archive_handle);
|
ArchiveBackend* src_archive = GetArchive(src_archive_handle);
|
||||||
Archive* dest_archive = GetArchive(dest_archive_handle);
|
ArchiveBackend* dest_archive = GetArchive(dest_archive_handle);
|
||||||
if (src_archive == nullptr || dest_archive == nullptr)
|
if (src_archive == nullptr || dest_archive == nullptr)
|
||||||
return ERR_INVALID_HANDLE;
|
return ERR_INVALID_HANDLE;
|
||||||
|
|
||||||
if (src_archive == dest_archive) {
|
if (src_archive == dest_archive) {
|
||||||
if (src_archive->backend->RenameDirectory(src_path, dest_path))
|
if (src_archive->RenameDirectory(src_path, dest_path))
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
} else {
|
} else {
|
||||||
// TODO: Implement renaming across archives
|
// TODO: Implement renaming across archives
|
||||||
|
@ -402,31 +367,29 @@ ResultCode RenameDirectoryBetweenArchives(ArchiveHandle src_archive_handle, cons
|
||||||
ErrorSummary::NothingHappened, ErrorLevel::Status);
|
ErrorSummary::NothingHappened, ErrorLevel::Status);
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultVal<Kernel::SharedPtr<Kernel::Session>> OpenDirectoryFromArchive(ArchiveHandle archive_handle,
|
ResultVal<Kernel::SharedPtr<Directory>> OpenDirectoryFromArchive(ArchiveHandle archive_handle,
|
||||||
const FileSys::Path& path) {
|
const FileSys::Path& path) {
|
||||||
Archive* archive = GetArchive(archive_handle);
|
ArchiveBackend* archive = GetArchive(archive_handle);
|
||||||
if (archive == nullptr)
|
if (archive == nullptr)
|
||||||
return ERR_INVALID_HANDLE;
|
return ERR_INVALID_HANDLE;
|
||||||
|
|
||||||
std::unique_ptr<FileSys::DirectoryBackend> backend = archive->backend->OpenDirectory(path);
|
std::unique_ptr<FileSys::DirectoryBackend> backend = archive->OpenDirectory(path);
|
||||||
if (backend == nullptr) {
|
if (backend == nullptr) {
|
||||||
return ResultCode(ErrorDescription::NotFound, ErrorModule::FS,
|
return ResultCode(ErrorDescription::NotFound, ErrorModule::FS,
|
||||||
ErrorSummary::NotFound, ErrorLevel::Permanent);
|
ErrorSummary::NotFound, ErrorLevel::Permanent);
|
||||||
}
|
}
|
||||||
|
|
||||||
auto directory = Kernel::SharedPtr<Directory>(new Directory(std::move(backend), path));
|
auto directory = Kernel::SharedPtr<Directory>(new Directory(std::move(backend), path));
|
||||||
return MakeResult<Kernel::SharedPtr<Kernel::Session>>(std::move(directory));
|
return MakeResult<Kernel::SharedPtr<Directory>>(std::move(directory));
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode FormatSaveData() {
|
ResultCode FormatArchive(ArchiveIdCode id_code, const FileSys::Path& path) {
|
||||||
// Do not create the archive again if it already exists
|
auto archive_itr = id_code_map.find(id_code);
|
||||||
auto archive_itr = id_code_map.find(ArchiveIdCode::SaveData);
|
|
||||||
if (archive_itr == id_code_map.end()) {
|
if (archive_itr == id_code_map.end()) {
|
||||||
return UnimplementedFunction(ErrorModule::FS); // TODO(Subv): Find the right error
|
return UnimplementedFunction(ErrorModule::FS); // TODO(Subv): Find the right error
|
||||||
}
|
}
|
||||||
|
|
||||||
// Use an empty path, we do not use it when formatting the savedata
|
return archive_itr->second->Format(path);
|
||||||
return archive_itr->second->backend->Format(FileSys::Path());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ResultCode CreateExtSaveData(u32 high, u32 low) {
|
ResultCode CreateExtSaveData(u32 high, u32 low) {
|
||||||
|
@ -460,32 +423,32 @@ void ArchiveInit() {
|
||||||
|
|
||||||
std::string sdmc_directory = FileUtil::GetUserPath(D_SDMC_IDX);
|
std::string sdmc_directory = FileUtil::GetUserPath(D_SDMC_IDX);
|
||||||
std::string nand_directory = FileUtil::GetUserPath(D_NAND_IDX);
|
std::string nand_directory = FileUtil::GetUserPath(D_NAND_IDX);
|
||||||
auto sdmc_archive = Common::make_unique<FileSys::Archive_SDMC>(sdmc_directory);
|
auto sdmc_factory = Common::make_unique<FileSys::ArchiveFactory_SDMC>(sdmc_directory);
|
||||||
if (sdmc_archive->Initialize())
|
if (sdmc_factory->Initialize())
|
||||||
CreateArchive(std::move(sdmc_archive), ArchiveIdCode::SDMC);
|
RegisterArchiveType(std::move(sdmc_factory), ArchiveIdCode::SDMC);
|
||||||
else
|
else
|
||||||
LOG_ERROR(Service_FS, "Can't instantiate SDMC archive with path %s", sdmc_directory.c_str());
|
LOG_ERROR(Service_FS, "Can't instantiate SDMC archive with path %s", sdmc_directory.c_str());
|
||||||
|
|
||||||
// Create the SaveData archive
|
// Create the SaveData archive
|
||||||
auto savedata_archive = Common::make_unique<FileSys::Archive_SaveData>(sdmc_directory);
|
auto savedata_factory = Common::make_unique<FileSys::ArchiveFactory_SaveData>(sdmc_directory);
|
||||||
CreateArchive(std::move(savedata_archive), ArchiveIdCode::SaveData);
|
RegisterArchiveType(std::move(savedata_factory), ArchiveIdCode::SaveData);
|
||||||
|
|
||||||
auto extsavedata_archive = Common::make_unique<FileSys::Archive_ExtSaveData>(sdmc_directory, false);
|
auto extsavedata_factory = Common::make_unique<FileSys::ArchiveFactory_ExtSaveData>(sdmc_directory, false);
|
||||||
if (extsavedata_archive->Initialize())
|
if (extsavedata_factory->Initialize())
|
||||||
CreateArchive(std::move(extsavedata_archive), ArchiveIdCode::ExtSaveData);
|
RegisterArchiveType(std::move(extsavedata_factory), ArchiveIdCode::ExtSaveData);
|
||||||
else
|
else
|
||||||
LOG_ERROR(Service_FS, "Can't instantiate ExtSaveData archive with path %s", extsavedata_archive->GetMountPoint().c_str());
|
LOG_ERROR(Service_FS, "Can't instantiate ExtSaveData archive with path %s", extsavedata_factory->GetMountPoint().c_str());
|
||||||
|
|
||||||
auto sharedextsavedata_archive = Common::make_unique<FileSys::Archive_ExtSaveData>(nand_directory, true);
|
auto sharedextsavedata_factory = Common::make_unique<FileSys::ArchiveFactory_ExtSaveData>(nand_directory, true);
|
||||||
if (sharedextsavedata_archive->Initialize())
|
if (sharedextsavedata_factory->Initialize())
|
||||||
CreateArchive(std::move(sharedextsavedata_archive), ArchiveIdCode::SharedExtSaveData);
|
RegisterArchiveType(std::move(sharedextsavedata_factory), ArchiveIdCode::SharedExtSaveData);
|
||||||
else
|
else
|
||||||
LOG_ERROR(Service_FS, "Can't instantiate SharedExtSaveData archive with path %s",
|
LOG_ERROR(Service_FS, "Can't instantiate SharedExtSaveData archive with path %s",
|
||||||
sharedextsavedata_archive->GetMountPoint().c_str());
|
sharedextsavedata_factory->GetMountPoint().c_str());
|
||||||
|
|
||||||
// Create the SaveDataCheck archive, basically a small variation of the RomFS archive
|
// Create the SaveDataCheck archive, basically a small variation of the RomFS archive
|
||||||
auto savedatacheck_archive = Common::make_unique<FileSys::Archive_SaveDataCheck>(nand_directory);
|
auto savedatacheck_factory = Common::make_unique<FileSys::ArchiveFactory_SaveDataCheck>(nand_directory);
|
||||||
CreateArchive(std::move(savedatacheck_archive), ArchiveIdCode::SaveDataCheck);
|
RegisterArchiveType(std::move(savedatacheck_factory), ArchiveIdCode::SaveDataCheck);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Shutdown archives
|
/// Shutdown archives
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
|
|
||||||
#include "core/file_sys/archive_backend.h"
|
#include "core/file_sys/archive_backend.h"
|
||||||
#include "core/hle/kernel/kernel.h"
|
#include "core/hle/kernel/kernel.h"
|
||||||
|
#include "core/hle/kernel/session.h"
|
||||||
#include "core/hle/result.h"
|
#include "core/hle/result.h"
|
||||||
|
|
||||||
/// The unique system identifier hash, also known as ID0
|
/// The unique system identifier hash, also known as ID0
|
||||||
|
@ -36,6 +37,35 @@ enum class ArchiveIdCode : u32 {
|
||||||
|
|
||||||
typedef u64 ArchiveHandle;
|
typedef u64 ArchiveHandle;
|
||||||
|
|
||||||
|
class File : public Kernel::Session {
|
||||||
|
public:
|
||||||
|
File(std::unique_ptr<FileSys::FileBackend>&& backend, const FileSys::Path& path)
|
||||||
|
: path(path), priority(0), backend(std::move(backend)) {
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string GetName() const override { return "Path: " + path.DebugStr(); }
|
||||||
|
|
||||||
|
FileSys::Path path; ///< Path of the file
|
||||||
|
u32 priority; ///< Priority of the file. TODO(Subv): Find out what this means
|
||||||
|
std::unique_ptr<FileSys::FileBackend> backend; ///< File backend interface
|
||||||
|
|
||||||
|
ResultVal<bool> SyncRequest() override;
|
||||||
|
};
|
||||||
|
|
||||||
|
class Directory : public Kernel::Session {
|
||||||
|
public:
|
||||||
|
Directory(std::unique_ptr<FileSys::DirectoryBackend>&& backend, const FileSys::Path& path)
|
||||||
|
: path(path), backend(std::move(backend)) {
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string GetName() const override { return "Directory: " + path.DebugStr(); }
|
||||||
|
|
||||||
|
FileSys::Path path; ///< Path of the directory
|
||||||
|
std::unique_ptr<FileSys::DirectoryBackend> backend; ///< File backend interface
|
||||||
|
|
||||||
|
ResultVal<bool> SyncRequest() override;
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Opens an archive
|
* Opens an archive
|
||||||
* @param id_code IdCode of the archive to open
|
* @param id_code IdCode of the archive to open
|
||||||
|
@ -51,11 +81,11 @@ ResultVal<ArchiveHandle> OpenArchive(ArchiveIdCode id_code, FileSys::Path& archi
|
||||||
ResultCode CloseArchive(ArchiveHandle handle);
|
ResultCode CloseArchive(ArchiveHandle handle);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates an Archive
|
* Registers an Archive type, instances of which can later be opened using its IdCode.
|
||||||
* @param backend File system backend interface to the archive
|
* @param backend File system backend interface to the archive
|
||||||
* @param id_code Id code used to access this type of archive
|
* @param id_code Id code used to access this type of archive
|
||||||
*/
|
*/
|
||||||
ResultCode CreateArchive(std::unique_ptr<FileSys::ArchiveBackend>&& backend, ArchiveIdCode id_code);
|
ResultCode RegisterArchiveType(std::unique_ptr<FileSys::ArchiveFactory>&& factory, ArchiveIdCode id_code);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Open a File from an Archive
|
* Open a File from an Archive
|
||||||
|
@ -64,7 +94,7 @@ ResultCode CreateArchive(std::unique_ptr<FileSys::ArchiveBackend>&& backend, Arc
|
||||||
* @param mode Mode under which to open the File
|
* @param mode Mode under which to open the File
|
||||||
* @return The opened File object as a Session
|
* @return The opened File object as a Session
|
||||||
*/
|
*/
|
||||||
ResultVal<Kernel::SharedPtr<Kernel::Session>> OpenFileFromArchive(ArchiveHandle archive_handle,
|
ResultVal<Kernel::SharedPtr<File>> OpenFileFromArchive(ArchiveHandle archive_handle,
|
||||||
const FileSys::Path& path, const FileSys::Mode mode);
|
const FileSys::Path& path, const FileSys::Mode mode);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -128,14 +158,17 @@ ResultCode RenameDirectoryBetweenArchives(ArchiveHandle src_archive_handle, cons
|
||||||
* @param path Path to the Directory inside of the Archive
|
* @param path Path to the Directory inside of the Archive
|
||||||
* @return The opened Directory object as a Session
|
* @return The opened Directory object as a Session
|
||||||
*/
|
*/
|
||||||
ResultVal<Kernel::SharedPtr<Kernel::Session>> OpenDirectoryFromArchive(ArchiveHandle archive_handle,
|
ResultVal<Kernel::SharedPtr<Directory>> OpenDirectoryFromArchive(ArchiveHandle archive_handle,
|
||||||
const FileSys::Path& path);
|
const FileSys::Path& path);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a blank SaveData archive.
|
* Erases the contents of the physical folder that contains the archive
|
||||||
|
* identified by the specified id code and path
|
||||||
|
* @param id_code The id of the archive to format
|
||||||
|
* @param path The path to the archive, if relevant.
|
||||||
* @return ResultCode 0 on success or the corresponding code on error
|
* @return ResultCode 0 on success or the corresponding code on error
|
||||||
*/
|
*/
|
||||||
ResultCode FormatSaveData();
|
ResultCode FormatArchive(ArchiveIdCode id_code, const FileSys::Path& path = FileSys::Path());
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a blank SharedExtSaveData archive for the specified extdata ID
|
* Creates a blank SharedExtSaveData archive for the specified extdata ID
|
||||||
|
|
|
@ -61,7 +61,7 @@ static void OpenFile(Service::Interface* self) {
|
||||||
|
|
||||||
LOG_DEBUG(Service_FS, "path=%s, mode=%d attrs=%u", file_path.DebugStr().c_str(), mode.hex, attributes);
|
LOG_DEBUG(Service_FS, "path=%s, mode=%d attrs=%u", file_path.DebugStr().c_str(), mode.hex, attributes);
|
||||||
|
|
||||||
ResultVal<SharedPtr<Session>> file_res = OpenFileFromArchive(archive_handle, file_path, mode);
|
ResultVal<SharedPtr<File>> file_res = OpenFileFromArchive(archive_handle, file_path, mode);
|
||||||
cmd_buff[1] = file_res.Code().raw;
|
cmd_buff[1] = file_res.Code().raw;
|
||||||
if (file_res.Succeeded()) {
|
if (file_res.Succeeded()) {
|
||||||
cmd_buff[3] = Kernel::g_handle_table.Create(*file_res).MoveFrom();
|
cmd_buff[3] = Kernel::g_handle_table.Create(*file_res).MoveFrom();
|
||||||
|
@ -117,7 +117,7 @@ static void OpenFileDirectly(Service::Interface* self) {
|
||||||
}
|
}
|
||||||
SCOPE_EXIT({ CloseArchive(*archive_handle); });
|
SCOPE_EXIT({ CloseArchive(*archive_handle); });
|
||||||
|
|
||||||
ResultVal<SharedPtr<Session>> file_res = OpenFileFromArchive(*archive_handle, file_path, mode);
|
ResultVal<SharedPtr<File>> file_res = OpenFileFromArchive(*archive_handle, file_path, mode);
|
||||||
cmd_buff[1] = file_res.Code().raw;
|
cmd_buff[1] = file_res.Code().raw;
|
||||||
if (file_res.Succeeded()) {
|
if (file_res.Succeeded()) {
|
||||||
cmd_buff[3] = Kernel::g_handle_table.Create(*file_res).MoveFrom();
|
cmd_buff[3] = Kernel::g_handle_table.Create(*file_res).MoveFrom();
|
||||||
|
@ -337,7 +337,7 @@ static void OpenDirectory(Service::Interface* self) {
|
||||||
|
|
||||||
LOG_DEBUG(Service_FS, "type=%d size=%d data=%s", dirname_type, dirname_size, dir_path.DebugStr().c_str());
|
LOG_DEBUG(Service_FS, "type=%d size=%d data=%s", dirname_type, dirname_size, dir_path.DebugStr().c_str());
|
||||||
|
|
||||||
ResultVal<SharedPtr<Session>> dir_res = OpenDirectoryFromArchive(archive_handle, dir_path);
|
ResultVal<SharedPtr<Directory>> dir_res = OpenDirectoryFromArchive(archive_handle, dir_path);
|
||||||
cmd_buff[1] = dir_res.Code().raw;
|
cmd_buff[1] = dir_res.Code().raw;
|
||||||
if (dir_res.Succeeded()) {
|
if (dir_res.Succeeded()) {
|
||||||
cmd_buff[3] = Kernel::g_handle_table.Create(*dir_res).MoveFrom();
|
cmd_buff[3] = Kernel::g_handle_table.Create(*dir_res).MoveFrom();
|
||||||
|
@ -468,7 +468,7 @@ static void FormatSaveData(Service::Interface* self) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd_buff[1] = FormatSaveData().raw;
|
cmd_buff[1] = FormatArchive(ArchiveIdCode::SaveData).raw;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -484,7 +484,7 @@ static void FormatThisUserSaveData(Service::Interface* self) {
|
||||||
|
|
||||||
// TODO(Subv): Find out what the inputs and outputs of this function are
|
// TODO(Subv): Find out what the inputs and outputs of this function are
|
||||||
|
|
||||||
cmd_buff[1] = FormatSaveData().raw;
|
cmd_buff[1] = FormatArchive(ArchiveIdCode::SaveData).raw;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void CreateExtSaveData(Service::Interface* self) {
|
static void CreateExtSaveData(Service::Interface* self) {
|
||||||
|
|
|
@ -4,8 +4,9 @@
|
||||||
|
|
||||||
#include "common/log.h"
|
#include "common/log.h"
|
||||||
#include "common/make_unique.h"
|
#include "common/make_unique.h"
|
||||||
#include "core/file_sys/archive_extsavedata.h"
|
|
||||||
#include "core/hle/hle.h"
|
#include "core/hle/hle.h"
|
||||||
|
#include "core/hle/service/fs/archive.h"
|
||||||
#include "core/hle/service/ptm_u.h"
|
#include "core/hle/service/ptm_u.h"
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
@ -28,7 +29,6 @@ struct GameCoin {
|
||||||
u8 day;
|
u8 day;
|
||||||
};
|
};
|
||||||
static const GameCoin default_game_coin = { 0x4F00, 42, 0, 0, 0, 2014, 12, 29 };
|
static const GameCoin default_game_coin = { 0x4F00, 42, 0, 0, 0, 2014, 12, 29 };
|
||||||
static std::unique_ptr<FileSys::Archive_ExtSaveData> ptm_shared_extsavedata;
|
|
||||||
static const std::vector<u8> ptm_shared_extdata_id = {0, 0, 0, 0, 0x0B, 0, 0, 0xF0, 0, 0, 0, 0};
|
static const std::vector<u8> ptm_shared_extdata_id = {0, 0, 0, 0, 0x0B, 0, 0, 0xF0, 0, 0, 0, 0};
|
||||||
|
|
||||||
/// Charge levels used by PTM functions
|
/// Charge levels used by PTM functions
|
||||||
|
@ -138,31 +138,28 @@ const Interface::FunctionInfo FunctionTable[] = {
|
||||||
|
|
||||||
Interface::Interface() {
|
Interface::Interface() {
|
||||||
Register(FunctionTable);
|
Register(FunctionTable);
|
||||||
// Create the SharedExtSaveData archive 0xF000000B and the gamecoin.dat file
|
|
||||||
// TODO(Subv): In the future we should use the FS service to query this archive
|
// Open the SharedExtSaveData archive 0xF000000B and the gamecoin.dat file
|
||||||
std::string nand_directory = FileUtil::GetUserPath(D_NAND_IDX);
|
|
||||||
ptm_shared_extsavedata = Common::make_unique<FileSys::Archive_ExtSaveData>(nand_directory, true);
|
|
||||||
if (!ptm_shared_extsavedata->Initialize()) {
|
|
||||||
LOG_CRITICAL(Service_PTM, "Could not initialize SharedExtSaveData archive for the PTM:U service");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
FileSys::Path archive_path(ptm_shared_extdata_id);
|
FileSys::Path archive_path(ptm_shared_extdata_id);
|
||||||
ResultCode result = ptm_shared_extsavedata->Open(archive_path);
|
auto archive_result = Service::FS::OpenArchive(Service::FS::ArchiveIdCode::SharedExtSaveData, archive_path);
|
||||||
// If the archive didn't exist, create the files inside
|
// If the archive didn't exist, create the files inside
|
||||||
if (result.description == ErrorDescription::FS_NotFormatted) {
|
if (archive_result.Code().description == ErrorDescription::FS_NotFormatted) {
|
||||||
// Format the archive to clear the directories
|
// Format the archive to create the directories
|
||||||
ptm_shared_extsavedata->Format(archive_path);
|
Service::FS::FormatArchive(Service::FS::ArchiveIdCode::SharedExtSaveData, archive_path);
|
||||||
// Open it again to get a valid archive now that the folder exists
|
// Open it again to get a valid archive now that the folder exists
|
||||||
ptm_shared_extsavedata->Open(archive_path);
|
archive_result = Service::FS::OpenArchive(Service::FS::ArchiveIdCode::SharedExtSaveData, archive_path);
|
||||||
|
_assert_msg_(Service_PTM, archive_result.Succeeded(), "Could not open the PTM SharedExtSaveData archive!");
|
||||||
|
|
||||||
FileSys::Path gamecoin_path("gamecoin.dat");
|
FileSys::Path gamecoin_path("gamecoin.dat");
|
||||||
FileSys::Mode open_mode = {};
|
FileSys::Mode open_mode = {};
|
||||||
open_mode.write_flag = 1;
|
open_mode.write_flag = 1;
|
||||||
open_mode.create_flag = 1;
|
open_mode.create_flag = 1;
|
||||||
// Open the file and write the default gamecoin information
|
// Open the file and write the default gamecoin information
|
||||||
auto gamecoin = ptm_shared_extsavedata->OpenFile(gamecoin_path, open_mode);
|
auto gamecoin_result = Service::FS::OpenFileFromArchive(*archive_result, gamecoin_path, open_mode);
|
||||||
if (gamecoin != nullptr) {
|
if (gamecoin_result.Succeeded()) {
|
||||||
gamecoin->Write(0, sizeof(GameCoin), 1, reinterpret_cast<const u8*>(&default_game_coin));
|
auto gamecoin = gamecoin_result.MoveFrom();
|
||||||
gamecoin->Close();
|
gamecoin->backend->Write(0, sizeof(GameCoin), 1, reinterpret_cast<const u8*>(&default_game_coin));
|
||||||
|
gamecoin->backend->Close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -127,7 +127,7 @@ ResultStatus LoadFile(const std::string& filename) {
|
||||||
// Load application and RomFS
|
// Load application and RomFS
|
||||||
if (ResultStatus::Success == app_loader.Load()) {
|
if (ResultStatus::Success == app_loader.Load()) {
|
||||||
Kernel::g_program_id = app_loader.GetProgramId();
|
Kernel::g_program_id = app_loader.GetProgramId();
|
||||||
Service::FS::CreateArchive(Common::make_unique<FileSys::Archive_RomFS>(app_loader), Service::FS::ArchiveIdCode::RomFS);
|
Service::FS::RegisterArchiveType(Common::make_unique<FileSys::ArchiveFactory_RomFS>(app_loader), Service::FS::ArchiveIdCode::RomFS);
|
||||||
return ResultStatus::Success;
|
return ResultStatus::Success;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue