summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2018-08-16 23:05:30 +0200
committerZach Hilman <zachhilman@gmail.com>2018-08-23 17:52:44 +0200
commitbf33f80fae1e97f48a62e16b1e965d7994ac4c45 (patch)
treec5bf8e27201430b922fb793e6293f78346a97bdf
parentfilesystem: Add CreateFactories methods to fs (diff)
downloadyuzu-bf33f80fae1e97f48a62e16b1e965d7994ac4c45.tar
yuzu-bf33f80fae1e97f48a62e16b1e965d7994ac4c45.tar.gz
yuzu-bf33f80fae1e97f48a62e16b1e965d7994ac4c45.tar.bz2
yuzu-bf33f80fae1e97f48a62e16b1e965d7994ac4c45.tar.lz
yuzu-bf33f80fae1e97f48a62e16b1e965d7994ac4c45.tar.xz
yuzu-bf33f80fae1e97f48a62e16b1e965d7994ac4c45.tar.zst
yuzu-bf33f80fae1e97f48a62e16b1e965d7994ac4c45.zip
-rw-r--r--src/core/file_sys/bis_factory.cpp11
-rw-r--r--src/core/file_sys/vfs.cpp7
-rw-r--r--src/core/file_sys/vfs.h4
3 files changed, 13 insertions, 9 deletions
diff --git a/src/core/file_sys/bis_factory.cpp b/src/core/file_sys/bis_factory.cpp
index ae4e33800..08a7cea5a 100644
--- a/src/core/file_sys/bis_factory.cpp
+++ b/src/core/file_sys/bis_factory.cpp
@@ -6,19 +6,12 @@
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<RegisteredCache>(
- GetOrCreateDirectory(nand_root, "/system/Contents/registered"))),
+ GetOrCreateDirectoryRelative(nand_root, "/system/Contents/registered"))),
usrnand_cache(std::make_shared<RegisteredCache>(
- GetOrCreateDirectory(nand_root, "/user/Contents/registered"))) {}
+ GetOrCreateDirectoryRelative(nand_root, "/user/Contents/registered"))) {}
std::shared_ptr<RegisteredCache> BISFactory::GetSystemNANDContents() const {
return sysnand_cache;
diff --git a/src/core/file_sys/vfs.cpp b/src/core/file_sys/vfs.cpp
index b915b4c11..146c839f4 100644
--- a/src/core/file_sys/vfs.cpp
+++ b/src/core/file_sys/vfs.cpp
@@ -462,4 +462,11 @@ bool VfsRawCopy(VirtualFile src, VirtualFile dest) {
std::vector<u8> data = src->ReadAllBytes();
return dest->WriteBytes(data, 0) == data.size();
}
+
+VirtualDir GetOrCreateDirectoryRelative(const VirtualDir& rel, std::string_view path) {
+ const auto res = rel->GetDirectoryRelative(path);
+ if (res == nullptr)
+ return rel->CreateDirectoryRelative(path);
+ return res;
+}
} // namespace FileSys
diff --git a/src/core/file_sys/vfs.h b/src/core/file_sys/vfs.h
index 22db08b59..5142a3e86 100644
--- a/src/core/file_sys/vfs.h
+++ b/src/core/file_sys/vfs.h
@@ -318,4 +318,8 @@ bool DeepEquals(const VirtualFile& file1, const VirtualFile& file2, size_t block
// directory of src/dest.
bool VfsRawCopy(VirtualFile src, VirtualFile dest);
+// Checks if the directory at path relative to rel exists. If it does, returns that. If it does not
+// it attempts to create it and returns the new dir or nullptr on failure.
+VirtualDir GetOrCreateDirectoryRelative(const VirtualDir& rel, std::string_view path);
+
} // namespace FileSys