FileSys: remove unused DiskArchive
All "subclasses" of DiskArchive are splitted out. This class is useless
This commit is contained in:
wwylele
parent
5c6e13a171
commit
f775a3781b
|
|
@ -15,153 +15,6 @@
|
||||||
|
|
||||||
namespace FileSys {
|
namespace FileSys {
|
||||||
|
|
||||||
ResultVal<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);
|
|
||||||
|
|
||||||
auto full_path = mount_point + path.AsString();
|
|
||||||
if (FileUtil::IsDirectory(full_path))
|
|
||||||
return ResultCode(ErrorDescription::FS_NotAFile, ErrorModule::FS, ErrorSummary::Canceled,
|
|
||||||
ErrorLevel::Status);
|
|
||||||
|
|
||||||
// Specifying only the Create flag is invalid
|
|
||||||
if (mode.create_flag && !mode.read_flag && !mode.write_flag) {
|
|
||||||
return ResultCode(ErrorDescription::FS_InvalidOpenFlags, ErrorModule::FS,
|
|
||||||
ErrorSummary::Canceled, ErrorLevel::Status);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!FileUtil::Exists(full_path)) {
|
|
||||||
if (!mode.create_flag) {
|
|
||||||
LOG_ERROR(Service_FS, "Non-existing file %s can't be open without mode create.",
|
|
||||||
full_path.c_str());
|
|
||||||
return ResultCode(ErrorDescription::FS_NotFound, ErrorModule::FS,
|
|
||||||
ErrorSummary::NotFound, ErrorLevel::Status);
|
|
||||||
} else {
|
|
||||||
// Create the file
|
|
||||||
FileUtil::CreateEmptyFile(full_path);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string mode_string = "";
|
|
||||||
if (mode.write_flag)
|
|
||||||
mode_string += "r+"; // Files opened with Write access can be read from
|
|
||||||
else if (mode.read_flag)
|
|
||||||
mode_string += "r";
|
|
||||||
|
|
||||||
// Open the file in binary mode, to avoid problems with CR/LF on Windows systems
|
|
||||||
mode_string += "b";
|
|
||||||
|
|
||||||
FileUtil::IOFile file(full_path, mode_string.c_str());
|
|
||||||
if (!file.IsOpen())
|
|
||||||
return ResultCode(ErrorDescription::FS_NotFound, ErrorModule::FS, ErrorSummary::NotFound,
|
|
||||||
ErrorLevel::Status);
|
|
||||||
|
|
||||||
auto disk_file = std::make_unique<DiskFile>(std::move(file), mode);
|
|
||||||
return MakeResult<std::unique_ptr<FileBackend>>(std::move(disk_file));
|
|
||||||
}
|
|
||||||
|
|
||||||
ResultCode DiskArchive::DeleteFile(const Path& path) const {
|
|
||||||
std::string file_path = mount_point + path.AsString();
|
|
||||||
|
|
||||||
if (FileUtil::IsDirectory(file_path))
|
|
||||||
return ResultCode(ErrorDescription::FS_NotAFile, ErrorModule::FS, ErrorSummary::Canceled,
|
|
||||||
ErrorLevel::Status);
|
|
||||||
|
|
||||||
if (!FileUtil::Exists(file_path))
|
|
||||||
return ResultCode(ErrorDescription::FS_NotFound, ErrorModule::FS, ErrorSummary::NotFound,
|
|
||||||
ErrorLevel::Status);
|
|
||||||
|
|
||||||
if (FileUtil::Delete(file_path))
|
|
||||||
return RESULT_SUCCESS;
|
|
||||||
|
|
||||||
return ResultCode(ErrorDescription::FS_NotAFile, ErrorModule::FS, ErrorSummary::Canceled,
|
|
||||||
ErrorLevel::Status);
|
|
||||||
}
|
|
||||||
|
|
||||||
ResultCode DiskArchive::RenameFile(const Path& src_path, const Path& dest_path) const {
|
|
||||||
if (FileUtil::Rename(mount_point + src_path.AsString(), mount_point + dest_path.AsString()))
|
|
||||||
return RESULT_SUCCESS;
|
|
||||||
|
|
||||||
// TODO(yuriks): This code probably isn't right, it'll return a Status even if the file didn't
|
|
||||||
// exist or similar. Verify.
|
|
||||||
return ResultCode(ErrorDescription::NoData, ErrorModule::FS, // TODO: verify description
|
|
||||||
ErrorSummary::NothingHappened, ErrorLevel::Status);
|
|
||||||
}
|
|
||||||
|
|
||||||
ResultCode DiskArchive::DeleteDirectory(const Path& path) const {
|
|
||||||
if (FileUtil::DeleteDir(mount_point + path.AsString()))
|
|
||||||
return RESULT_SUCCESS;
|
|
||||||
return ResultCode(ErrorDescription::NoData, ErrorModule::FS, // TODO: verify description
|
|
||||||
ErrorSummary::Canceled, ErrorLevel::Status);
|
|
||||||
}
|
|
||||||
|
|
||||||
ResultCode DiskArchive::DeleteDirectoryRecursively(const Path& path) const {
|
|
||||||
if (FileUtil::DeleteDirRecursively(mount_point + path.AsString()))
|
|
||||||
return RESULT_SUCCESS;
|
|
||||||
return ResultCode(ErrorDescription::NoData, ErrorModule::FS, // TODO: verify description
|
|
||||||
ErrorSummary::Canceled, ErrorLevel::Status);
|
|
||||||
}
|
|
||||||
|
|
||||||
ResultCode DiskArchive::CreateFile(const FileSys::Path& path, u64 size) const {
|
|
||||||
std::string full_path = mount_point + path.AsString();
|
|
||||||
|
|
||||||
if (FileUtil::IsDirectory(full_path))
|
|
||||||
return ResultCode(ErrorDescription::FS_NotAFile, ErrorModule::FS, ErrorSummary::Canceled,
|
|
||||||
ErrorLevel::Status);
|
|
||||||
|
|
||||||
if (FileUtil::Exists(full_path))
|
|
||||||
return ResultCode(ErrorDescription::FS_AlreadyExists, ErrorModule::FS,
|
|
||||||
ErrorSummary::NothingHappened, ErrorLevel::Status);
|
|
||||||
|
|
||||||
if (size == 0) {
|
|
||||||
FileUtil::CreateEmptyFile(full_path);
|
|
||||||
return RESULT_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
FileUtil::IOFile file(full_path, "wb");
|
|
||||||
// Creates a sparse file (or a normal file on filesystems without the concept of sparse files)
|
|
||||||
// We do this by seeking to the right size, then writing a single null byte.
|
|
||||||
if (file.Seek(size - 1, SEEK_SET) && file.WriteBytes("", 1) == 1)
|
|
||||||
return RESULT_SUCCESS;
|
|
||||||
|
|
||||||
return ResultCode(ErrorDescription::TooLarge, ErrorModule::FS, ErrorSummary::OutOfResource,
|
|
||||||
ErrorLevel::Info);
|
|
||||||
}
|
|
||||||
|
|
||||||
ResultCode DiskArchive::CreateDirectory(const Path& path) const {
|
|
||||||
if (FileUtil::CreateDir(mount_point + path.AsString()))
|
|
||||||
return RESULT_SUCCESS;
|
|
||||||
return ResultCode(ErrorDescription::NoData, ErrorModule::FS, // TODO: verify description
|
|
||||||
ErrorSummary::Canceled, ErrorLevel::Status);
|
|
||||||
}
|
|
||||||
|
|
||||||
ResultCode DiskArchive::RenameDirectory(const Path& src_path, const Path& dest_path) const {
|
|
||||||
if (FileUtil::Rename(mount_point + src_path.AsString(), mount_point + dest_path.AsString()))
|
|
||||||
return RESULT_SUCCESS;
|
|
||||||
|
|
||||||
// TODO(yuriks): This code probably isn't right, it'll return a Status even if the file didn't
|
|
||||||
// exist or similar. Verify.
|
|
||||||
return ResultCode(ErrorDescription::NoData, ErrorModule::FS, // TODO: verify description
|
|
||||||
ErrorSummary::NothingHappened, ErrorLevel::Status);
|
|
||||||
}
|
|
||||||
|
|
||||||
ResultVal<std::unique_ptr<DirectoryBackend>> DiskArchive::OpenDirectory(const Path& path) const {
|
|
||||||
LOG_DEBUG(Service_FS, "called path=%s", path.DebugStr().c_str());
|
|
||||||
auto full_path = mount_point + path.AsString();
|
|
||||||
if (!FileUtil::IsDirectory(full_path))
|
|
||||||
return ResultCode(ErrorDescription::FS_NotFound, ErrorModule::FS, ErrorSummary::NotFound,
|
|
||||||
ErrorLevel::Permanent);
|
|
||||||
auto directory = std::make_unique<DiskDirectory>(full_path);
|
|
||||||
return MakeResult<std::unique_ptr<DirectoryBackend>>(std::move(directory));
|
|
||||||
}
|
|
||||||
|
|
||||||
u64 DiskArchive::GetFreeBytes() const {
|
|
||||||
// TODO: Stubbed to return 1GiB
|
|
||||||
return 1024 * 1024 * 1024;
|
|
||||||
}
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
ResultVal<size_t> DiskFile::Read(const u64 offset, const size_t length, u8* buffer) const {
|
ResultVal<size_t> DiskFile::Read(const u64 offset, const size_t length, u8* buffer) const {
|
||||||
if (!mode.read_flag)
|
if (!mode.read_flag)
|
||||||
return ResultCode(ErrorDescription::FS_InvalidOpenFlags, ErrorModule::FS,
|
return ResultCode(ErrorDescription::FS_InvalidOpenFlags, ErrorModule::FS,
|
||||||
|
|
|
||||||
|
|
@ -20,38 +20,6 @@
|
||||||
|
|
||||||
namespace FileSys {
|
namespace FileSys {
|
||||||
|
|
||||||
/**
|
|
||||||
* Helper which implements a backend accessing the host machine's filesystem.
|
|
||||||
* This should be subclassed by concrete archive types, which will provide the
|
|
||||||
* base directory on the host filesystem and override any required functionality.
|
|
||||||
*/
|
|
||||||
class DiskArchive : public ArchiveBackend {
|
|
||||||
public:
|
|
||||||
DiskArchive(const std::string& mount_point_) : mount_point(mount_point_) {}
|
|
||||||
|
|
||||||
virtual std::string GetName() const override {
|
|
||||||
return "DiskArchive: " + mount_point;
|
|
||||||
}
|
|
||||||
|
|
||||||
ResultVal<std::unique_ptr<FileBackend>> OpenFile(const Path& path,
|
|
||||||
const Mode& mode) const override;
|
|
||||||
ResultCode DeleteFile(const Path& path) const override;
|
|
||||||
ResultCode RenameFile(const Path& src_path, const Path& dest_path) const override;
|
|
||||||
ResultCode DeleteDirectory(const Path& path) const override;
|
|
||||||
ResultCode DeleteDirectoryRecursively(const Path& path) const override;
|
|
||||||
ResultCode CreateFile(const Path& path, u64 size) const override;
|
|
||||||
ResultCode CreateDirectory(const Path& path) const override;
|
|
||||||
ResultCode RenameDirectory(const Path& src_path, const Path& dest_path) const override;
|
|
||||||
ResultVal<std::unique_ptr<DirectoryBackend>> OpenDirectory(const Path& path) const override;
|
|
||||||
u64 GetFreeBytes() const override;
|
|
||||||
|
|
||||||
protected:
|
|
||||||
friend class DiskFile;
|
|
||||||
friend class DiskDirectory;
|
|
||||||
|
|
||||||
std::string mount_point;
|
|
||||||
};
|
|
||||||
|
|
||||||
class DiskFile : public FileBackend {
|
class DiskFile : public FileBackend {
|
||||||
public:
|
public:
|
||||||
DiskFile(FileUtil::IOFile&& file_, const Mode& mode_)
|
DiskFile(FileUtil::IOFile&& file_, const Mode& mode_)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue