mirror of
https://github.com/yuzu-emu/yuzu-android.git
synced 2025-07-07 16:57:53 -05:00
fs: Add FileSystemAccessor classes
This commit is contained in:
@ -8,43 +8,15 @@
|
||||
|
||||
namespace Service::FileSystem {
|
||||
|
||||
template <typename T>
|
||||
static void BuildEntryIndex(std::vector<FileSys::DirectoryEntry>& entries,
|
||||
const std::vector<T>& new_data, FileSys::DirectoryEntryType type) {
|
||||
entries.reserve(entries.size() + new_data.size());
|
||||
|
||||
for (const auto& new_entry : new_data) {
|
||||
auto name = new_entry->GetName();
|
||||
|
||||
if (type == FileSys::DirectoryEntryType::File &&
|
||||
name == FileSys::GetSaveDataSizeFileName()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
entries.emplace_back(name, static_cast<s8>(type),
|
||||
type == FileSys::DirectoryEntryType::Directory ? 0
|
||||
: new_entry->GetSize());
|
||||
}
|
||||
}
|
||||
|
||||
IDirectory::IDirectory(Core::System& system_, FileSys::VirtualDir backend_,
|
||||
IDirectory::IDirectory(Core::System& system_, FileSys::VirtualDir directory_,
|
||||
FileSys::OpenDirectoryMode mode)
|
||||
: ServiceFramework{system_, "IDirectory"}, backend(std::move(backend_)) {
|
||||
: ServiceFramework{system_, "IDirectory"},
|
||||
backend(std::make_unique<FileSys::Fsa::IDirectory>(directory_, mode)) {
|
||||
static const FunctionInfo functions[] = {
|
||||
{0, &IDirectory::Read, "Read"},
|
||||
{1, &IDirectory::GetEntryCount, "GetEntryCount"},
|
||||
};
|
||||
RegisterHandlers(functions);
|
||||
|
||||
// TODO(DarkLordZach): Verify that this is the correct behavior.
|
||||
// Build entry index now to save time later.
|
||||
if (True(mode & FileSys::OpenDirectoryMode::Directory)) {
|
||||
BuildEntryIndex(entries, backend->GetSubdirectories(),
|
||||
FileSys::DirectoryEntryType::Directory);
|
||||
}
|
||||
if (True(mode & FileSys::OpenDirectoryMode::File)) {
|
||||
BuildEntryIndex(entries, backend->GetFiles(), FileSys::DirectoryEntryType::File);
|
||||
}
|
||||
}
|
||||
|
||||
void IDirectory::Read(HLERequestContext& ctx) {
|
||||
@ -53,32 +25,26 @@ void IDirectory::Read(HLERequestContext& ctx) {
|
||||
// Calculate how many entries we can fit in the output buffer
|
||||
const u64 count_entries = ctx.GetWriteBufferNumElements<FileSys::DirectoryEntry>();
|
||||
|
||||
// Cap at total number of entries.
|
||||
const u64 actual_entries = std::min(count_entries, entries.size() - next_entry_index);
|
||||
|
||||
// Determine data start and end
|
||||
const auto* begin = reinterpret_cast<u8*>(entries.data() + next_entry_index);
|
||||
const auto* end = reinterpret_cast<u8*>(entries.data() + next_entry_index + actual_entries);
|
||||
const auto range_size = static_cast<std::size_t>(std::distance(begin, end));
|
||||
|
||||
next_entry_index += actual_entries;
|
||||
s64 out_count{};
|
||||
FileSys::DirectoryEntry* out_entries = nullptr;
|
||||
const auto result = backend->Read(&out_count, out_entries, count_entries);
|
||||
|
||||
// Write the data to memory
|
||||
ctx.WriteBuffer(begin, range_size);
|
||||
ctx.WriteBuffer(out_entries, out_count);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 4};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.Push(actual_entries);
|
||||
rb.Push(result);
|
||||
rb.Push(out_count);
|
||||
}
|
||||
|
||||
void IDirectory::GetEntryCount(HLERequestContext& ctx) {
|
||||
LOG_DEBUG(Service_FS, "called");
|
||||
|
||||
u64 count = entries.size() - next_entry_index;
|
||||
s64 out_count{};
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 4};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.Push(count);
|
||||
rb.Push(backend->GetEntryCount(&out_count));
|
||||
rb.Push(out_count);
|
||||
}
|
||||
|
||||
} // namespace Service::FileSystem
|
||||
|
@ -3,6 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "core/file_sys/fsa/fs_i_directory.h"
|
||||
#include "core/file_sys/vfs/vfs.h"
|
||||
#include "core/hle/service/filesystem/filesystem.h"
|
||||
#include "core/hle/service/service.h"
|
||||
@ -15,13 +16,11 @@ namespace Service::FileSystem {
|
||||
|
||||
class IDirectory final : public ServiceFramework<IDirectory> {
|
||||
public:
|
||||
explicit IDirectory(Core::System& system_, FileSys::VirtualDir backend_,
|
||||
explicit IDirectory(Core::System& system_, FileSys::VirtualDir directory_,
|
||||
FileSys::OpenDirectoryMode mode);
|
||||
|
||||
private:
|
||||
FileSys::VirtualDir backend;
|
||||
std::vector<FileSys::DirectoryEntry> entries;
|
||||
u64 next_entry_index = 0;
|
||||
std::unique_ptr<FileSys::Fsa::IDirectory> backend;
|
||||
|
||||
void Read(HLERequestContext& ctx);
|
||||
void GetEntryCount(HLERequestContext& ctx);
|
||||
|
@ -7,8 +7,8 @@
|
||||
|
||||
namespace Service::FileSystem {
|
||||
|
||||
IFile::IFile(Core::System& system_, FileSys::VirtualFile backend_)
|
||||
: ServiceFramework{system_, "IFile"}, backend(std::move(backend_)) {
|
||||
IFile::IFile(Core::System& system_, FileSys::VirtualFile file_)
|
||||
: ServiceFramework{system_, "IFile"}, backend{std::make_unique<FileSys::Fsa::IFile>(file_)} {
|
||||
static const FunctionInfo functions[] = {
|
||||
{0, &IFile::Read, "Read"},
|
||||
{1, &IFile::Write, "Write"},
|
||||
@ -29,79 +29,40 @@ void IFile::Read(HLERequestContext& ctx) {
|
||||
|
||||
LOG_DEBUG(Service_FS, "called, option={}, offset=0x{:X}, length={}", option, offset, length);
|
||||
|
||||
// Error checking
|
||||
if (length < 0) {
|
||||
LOG_ERROR(Service_FS, "Length is less than 0, length={}", length);
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(FileSys::ResultInvalidSize);
|
||||
return;
|
||||
}
|
||||
if (offset < 0) {
|
||||
LOG_ERROR(Service_FS, "Offset is less than 0, offset={}", offset);
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(FileSys::ResultInvalidOffset);
|
||||
return;
|
||||
}
|
||||
|
||||
// Read the data from the Storage backend
|
||||
std::vector<u8> output = backend->ReadBytes(length, offset);
|
||||
std::vector<u8> output(length);
|
||||
std::size_t bytes_read;
|
||||
const auto result = backend->Read(&bytes_read, offset, output.data(), length);
|
||||
|
||||
// Write the data to memory
|
||||
ctx.WriteBuffer(output);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 4};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.Push(static_cast<u64>(output.size()));
|
||||
rb.Push(result);
|
||||
rb.Push(static_cast<u64>(bytes_read));
|
||||
}
|
||||
|
||||
void IFile::Write(HLERequestContext& ctx) {
|
||||
IPC::RequestParser rp{ctx};
|
||||
const u64 option = rp.Pop<u64>();
|
||||
const auto option = rp.PopRaw<FileSys::WriteOption>();
|
||||
[[maybe_unused]] const u32 unused = rp.Pop<u32>();
|
||||
const s64 offset = rp.Pop<s64>();
|
||||
const s64 length = rp.Pop<s64>();
|
||||
|
||||
LOG_DEBUG(Service_FS, "called, option={}, offset=0x{:X}, length={}", option, offset, length);
|
||||
|
||||
// Error checking
|
||||
if (length < 0) {
|
||||
LOG_ERROR(Service_FS, "Length is less than 0, length={}", length);
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(FileSys::ResultInvalidSize);
|
||||
return;
|
||||
}
|
||||
if (offset < 0) {
|
||||
LOG_ERROR(Service_FS, "Offset is less than 0, offset={}", offset);
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(FileSys::ResultInvalidOffset);
|
||||
return;
|
||||
}
|
||||
LOG_DEBUG(Service_FS, "called, option={}, offset=0x{:X}, length={}", option.value, offset,
|
||||
length);
|
||||
|
||||
const auto data = ctx.ReadBuffer();
|
||||
|
||||
ASSERT_MSG(static_cast<s64>(data.size()) <= length,
|
||||
"Attempting to write more data than requested (requested={:016X}, actual={:016X}).",
|
||||
length, data.size());
|
||||
|
||||
// Write the data to the Storage backend
|
||||
const auto write_size =
|
||||
static_cast<std::size_t>(std::distance(data.begin(), data.begin() + length));
|
||||
const std::size_t written = backend->Write(data.data(), write_size, offset);
|
||||
|
||||
ASSERT_MSG(static_cast<s64>(written) == length,
|
||||
"Could not write all bytes to file (requested={:016X}, actual={:016X}).", length,
|
||||
written);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.Push(backend->Write(offset, data.data(), length, option));
|
||||
}
|
||||
|
||||
void IFile::Flush(HLERequestContext& ctx) {
|
||||
LOG_DEBUG(Service_FS, "called");
|
||||
|
||||
// Exists for SDK compatibiltity -- No need to flush file.
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.Push(backend->Flush());
|
||||
}
|
||||
|
||||
void IFile::SetSize(HLERequestContext& ctx) {
|
||||
@ -109,18 +70,17 @@ void IFile::SetSize(HLERequestContext& ctx) {
|
||||
const u64 size = rp.Pop<u64>();
|
||||
LOG_DEBUG(Service_FS, "called, size={}", size);
|
||||
|
||||
backend->Resize(size);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.Push(backend->SetSize(size));
|
||||
}
|
||||
|
||||
void IFile::GetSize(HLERequestContext& ctx) {
|
||||
const u64 size = backend->GetSize();
|
||||
s64 size;
|
||||
const auto result = backend->GetSize(&size);
|
||||
LOG_DEBUG(Service_FS, "called, size={}", size);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 4};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.Push(result);
|
||||
rb.Push<u64>(size);
|
||||
}
|
||||
|
||||
|
@ -3,6 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "core/file_sys/fsa/fs_i_file.h"
|
||||
#include "core/hle/service/filesystem/filesystem.h"
|
||||
#include "core/hle/service/service.h"
|
||||
|
||||
@ -10,10 +11,10 @@ namespace Service::FileSystem {
|
||||
|
||||
class IFile final : public ServiceFramework<IFile> {
|
||||
public:
|
||||
explicit IFile(Core::System& system_, FileSys::VirtualFile backend_);
|
||||
explicit IFile(Core::System& system_, FileSys::VirtualFile file_);
|
||||
|
||||
private:
|
||||
FileSys::VirtualFile backend;
|
||||
std::unique_ptr<FileSys::Fsa::IFile> backend;
|
||||
|
||||
void Read(HLERequestContext& ctx);
|
||||
void Write(HLERequestContext& ctx);
|
||||
|
@ -9,9 +9,9 @@
|
||||
|
||||
namespace Service::FileSystem {
|
||||
|
||||
IFileSystem::IFileSystem(Core::System& system_, FileSys::VirtualDir backend_, SizeGetter size_)
|
||||
: ServiceFramework{system_, "IFileSystem"}, backend{std::move(backend_)}, size{std::move(
|
||||
size_)} {
|
||||
IFileSystem::IFileSystem(Core::System& system_, FileSys::VirtualDir dir_, SizeGetter size_)
|
||||
: ServiceFramework{system_, "IFileSystem"},
|
||||
backend{std::make_unique<FileSys::Fsa::IFileSystem>(dir_)}, size{std::move(size_)} {
|
||||
static const FunctionInfo functions[] = {
|
||||
{0, &IFileSystem::CreateFile, "CreateFile"},
|
||||
{1, &IFileSystem::DeleteFile, "DeleteFile"},
|
||||
@ -39,6 +39,7 @@ void IFileSystem::CreateFile(HLERequestContext& ctx) {
|
||||
|
||||
const auto file_buffer = ctx.ReadBuffer();
|
||||
const std::string name = Common::StringFromBuffer(file_buffer);
|
||||
const auto path = FileSys::Path(name.c_str());
|
||||
|
||||
const u64 file_mode = rp.Pop<u64>();
|
||||
const u32 file_size = rp.Pop<u32>();
|
||||
@ -47,67 +48,75 @@ void IFileSystem::CreateFile(HLERequestContext& ctx) {
|
||||
file_size);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(backend.CreateFile(name, file_size));
|
||||
rb.Push(backend->CreateFile(path, file_size));
|
||||
}
|
||||
|
||||
void IFileSystem::DeleteFile(HLERequestContext& ctx) {
|
||||
const auto file_buffer = ctx.ReadBuffer();
|
||||
const std::string name = Common::StringFromBuffer(file_buffer);
|
||||
const auto path = FileSys::Path(name.c_str());
|
||||
|
||||
LOG_DEBUG(Service_FS, "called. file={}", name);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(backend.DeleteFile(name));
|
||||
rb.Push(backend->DeleteFile(path));
|
||||
}
|
||||
|
||||
void IFileSystem::CreateDirectory(HLERequestContext& ctx) {
|
||||
const auto file_buffer = ctx.ReadBuffer();
|
||||
const std::string name = Common::StringFromBuffer(file_buffer);
|
||||
const auto path = FileSys::Path(name.c_str());
|
||||
|
||||
LOG_DEBUG(Service_FS, "called. directory={}", name);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(backend.CreateDirectory(name));
|
||||
rb.Push(backend->CreateDirectory(path));
|
||||
}
|
||||
|
||||
void IFileSystem::DeleteDirectory(HLERequestContext& ctx) {
|
||||
const auto file_buffer = ctx.ReadBuffer();
|
||||
const std::string name = Common::StringFromBuffer(file_buffer);
|
||||
const auto path = FileSys::Path(name.c_str());
|
||||
|
||||
LOG_DEBUG(Service_FS, "called. directory={}", name);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(backend.DeleteDirectory(name));
|
||||
rb.Push(backend->DeleteDirectory(path));
|
||||
}
|
||||
|
||||
void IFileSystem::DeleteDirectoryRecursively(HLERequestContext& ctx) {
|
||||
const auto file_buffer = ctx.ReadBuffer();
|
||||
const std::string name = Common::StringFromBuffer(file_buffer);
|
||||
const auto path = FileSys::Path(name.c_str());
|
||||
|
||||
LOG_DEBUG(Service_FS, "called. directory={}", name);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(backend.DeleteDirectoryRecursively(name));
|
||||
rb.Push(backend->DeleteDirectoryRecursively(path));
|
||||
}
|
||||
|
||||
void IFileSystem::CleanDirectoryRecursively(HLERequestContext& ctx) {
|
||||
const auto file_buffer = ctx.ReadBuffer();
|
||||
const std::string name = Common::StringFromBuffer(file_buffer);
|
||||
const auto path = FileSys::Path(name.c_str());
|
||||
|
||||
LOG_DEBUG(Service_FS, "called. Directory: {}", name);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(backend.CleanDirectoryRecursively(name));
|
||||
rb.Push(backend->CleanDirectoryRecursively(path));
|
||||
}
|
||||
|
||||
void IFileSystem::RenameFile(HLERequestContext& ctx) {
|
||||
const std::string src_name = Common::StringFromBuffer(ctx.ReadBuffer(0));
|
||||
const std::string dst_name = Common::StringFromBuffer(ctx.ReadBuffer(1));
|
||||
|
||||
const auto src_path = FileSys::Path(src_name.c_str());
|
||||
const auto dst_path = FileSys::Path(dst_name.c_str());
|
||||
|
||||
LOG_DEBUG(Service_FS, "called. file '{}' to file '{}'", src_name, dst_name);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(backend.RenameFile(src_name, dst_name));
|
||||
rb.Push(backend->RenameFile(src_path, dst_path));
|
||||
}
|
||||
|
||||
void IFileSystem::OpenFile(HLERequestContext& ctx) {
|
||||
@ -115,13 +124,14 @@ void IFileSystem::OpenFile(HLERequestContext& ctx) {
|
||||
|
||||
const auto file_buffer = ctx.ReadBuffer();
|
||||
const std::string name = Common::StringFromBuffer(file_buffer);
|
||||
const auto path = FileSys::Path(name.c_str());
|
||||
|
||||
const auto mode = static_cast<FileSys::OpenMode>(rp.Pop<u32>());
|
||||
|
||||
LOG_DEBUG(Service_FS, "called. file={}, mode={}", name, mode);
|
||||
|
||||
FileSys::VirtualFile vfs_file{};
|
||||
auto result = backend.OpenFile(&vfs_file, name, mode);
|
||||
auto result = backend->OpenFile(&vfs_file, path, mode);
|
||||
if (result != ResultSuccess) {
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(result);
|
||||
@ -140,12 +150,13 @@ void IFileSystem::OpenDirectory(HLERequestContext& ctx) {
|
||||
|
||||
const auto file_buffer = ctx.ReadBuffer();
|
||||
const std::string name = Common::StringFromBuffer(file_buffer);
|
||||
const auto path = FileSys::Path(name.c_str());
|
||||
const auto mode = rp.PopRaw<FileSys::OpenDirectoryMode>();
|
||||
|
||||
LOG_DEBUG(Service_FS, "called. directory={}, mode={}", name, mode);
|
||||
|
||||
FileSys::VirtualDir vfs_dir{};
|
||||
auto result = backend.OpenDirectory(&vfs_dir, name);
|
||||
auto result = backend->OpenDirectory(&vfs_dir, path, mode);
|
||||
if (result != ResultSuccess) {
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(result);
|
||||
@ -162,11 +173,12 @@ void IFileSystem::OpenDirectory(HLERequestContext& ctx) {
|
||||
void IFileSystem::GetEntryType(HLERequestContext& ctx) {
|
||||
const auto file_buffer = ctx.ReadBuffer();
|
||||
const std::string name = Common::StringFromBuffer(file_buffer);
|
||||
const auto path = FileSys::Path(name.c_str());
|
||||
|
||||
LOG_DEBUG(Service_FS, "called. file={}", name);
|
||||
|
||||
FileSys::DirectoryEntryType vfs_entry_type{};
|
||||
auto result = backend.GetEntryType(&vfs_entry_type, name);
|
||||
auto result = backend->GetEntryType(&vfs_entry_type, path);
|
||||
if (result != ResultSuccess) {
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(result);
|
||||
@ -204,11 +216,12 @@ void IFileSystem::GetTotalSpaceSize(HLERequestContext& ctx) {
|
||||
void IFileSystem::GetFileTimeStampRaw(HLERequestContext& ctx) {
|
||||
const auto file_buffer = ctx.ReadBuffer();
|
||||
const std::string name = Common::StringFromBuffer(file_buffer);
|
||||
const auto path = FileSys::Path(name.c_str());
|
||||
|
||||
LOG_WARNING(Service_FS, "(Partial Implementation) called. file={}", name);
|
||||
|
||||
FileSys::FileTimeStampRaw vfs_timestamp{};
|
||||
auto result = backend.GetFileTimeStampRaw(&vfs_timestamp, name);
|
||||
auto result = backend->GetFileTimeStampRaw(&vfs_timestamp, path);
|
||||
if (result != ResultSuccess) {
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(result);
|
||||
|
@ -3,6 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "core/file_sys/fsa/fs_i_filesystem.h"
|
||||
#include "core/file_sys/vfs/vfs.h"
|
||||
#include "core/hle/service/filesystem/filesystem.h"
|
||||
#include "core/hle/service/filesystem/fsp/fsp_util.h"
|
||||
@ -12,7 +13,7 @@ namespace Service::FileSystem {
|
||||
|
||||
class IFileSystem final : public ServiceFramework<IFileSystem> {
|
||||
public:
|
||||
explicit IFileSystem(Core::System& system_, FileSys::VirtualDir backend_, SizeGetter size_);
|
||||
explicit IFileSystem(Core::System& system_, FileSys::VirtualDir dir_, SizeGetter size_);
|
||||
|
||||
void CreateFile(HLERequestContext& ctx);
|
||||
void DeleteFile(HLERequestContext& ctx);
|
||||
@ -31,7 +32,7 @@ public:
|
||||
void GetFileSystemAttribute(HLERequestContext& ctx);
|
||||
|
||||
private:
|
||||
VfsDirectoryServiceWrapper backend;
|
||||
std::unique_ptr<FileSys::Fsa::IFileSystem> backend;
|
||||
SizeGetter size;
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user