From 70a510bd8f2f8d150abe632c94dc9a3eb247e43f Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Thu, 9 Aug 2018 20:49:45 -0400 Subject: bis_factory: Add partial implementation of BISFactory Creates and stores RegisteredCaches for user and system NAND, as creation of a RegisteredCache is expensive. --- src/core/file_sys/bis_factory.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/core/file_sys/bis_factory.cpp (limited to 'src/core/file_sys/bis_factory.cpp') diff --git a/src/core/file_sys/bis_factory.cpp b/src/core/file_sys/bis_factory.cpp new file mode 100644 index 000000000..7d0de733b --- /dev/null +++ b/src/core/file_sys/bis_factory.cpp @@ -0,0 +1,24 @@ +// Copyright 2018 yuzu emulator team +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include "core/file_sys/bis_factory.h" + +namespace FileSys { + +BISFactory::BISFactory(VirtualDir nand_root_) + : nand_root(std::move(nand_root_)), + sysnand_cache(std::make_shared( + nand_root->GetDirectoryRelative("/system/Contents/registered"))), + usrnand_cache(std::make_shared( + nand_root->GetDirectoryRelative("/user/Contents/registered"))) {} + +std::shared_ptr BISFactory::GetSystemNANDContents() const { + return sysnand_cache; +} + +std::shared_ptr BISFactory::GetUserNANDContents() const { + return usrnand_cache; +} + +} // namespace FileSys -- cgit v1.2.3 From 62e859c6c7ee3baed499d34e928fce17b8f8be9e Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Fri, 10 Aug 2018 20:47:25 -0400 Subject: bis_factory: Create NAND dirs if they don't exist --- src/core/file_sys/bis_factory.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/core/file_sys/bis_factory.cpp') diff --git a/src/core/file_sys/bis_factory.cpp b/src/core/file_sys/bis_factory.cpp index 7d0de733b..ae4e33800 100644 --- a/src/core/file_sys/bis_factory.cpp +++ b/src/core/file_sys/bis_factory.cpp @@ -6,12 +6,19 @@ namespace FileSys { +static VirtualDir GetOrCreateDirectory(const VirtualDir& dir, std::string_view path) { + const auto res = dir->GetDirectoryRelative(path); + if (res == nullptr) + return dir->CreateDirectoryRelative(path); + return res; +} + BISFactory::BISFactory(VirtualDir nand_root_) : nand_root(std::move(nand_root_)), sysnand_cache(std::make_shared( - nand_root->GetDirectoryRelative("/system/Contents/registered"))), + GetOrCreateDirectory(nand_root, "/system/Contents/registered"))), usrnand_cache(std::make_shared( - nand_root->GetDirectoryRelative("/user/Contents/registered"))) {} + GetOrCreateDirectory(nand_root, "/user/Contents/registered"))) {} std::shared_ptr BISFactory::GetSystemNANDContents() const { return sysnand_cache; -- cgit v1.2.3