OmniNX/sphaira
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

optimise fs CreateDirectoryRecursively() by checking if the path already exists prior to the loop.

Browse Source
This commit is contained in:
ITotalJustice
2025-05-30 13:16:39 +01:00
parent 390c1e870d
commit b46136b959
1 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
sphaira/source/fs.cpp
View File

@@ -118,6 +118,18 @@ Result CreateDirectory(FsFileSystem* fs, const FsPath& path, bool ignore_read_on
Result CreateDirectoryRecursively(FsFileSystem* fs, const FsPath& _path, bool ignore_read_only) { Result CreateDirectoryRecursively(FsFileSystem* fs, const FsPath& _path, bool ignore_read_only) {
R_UNLESS(ignore_read_only || !is_read_only_root(_path), Fs::ResultReadOnly); R_UNLESS(ignore_read_only || !is_read_only_root(_path), Fs::ResultReadOnly);
// try and create the directory / see if it already exists before the loop.
Result rc;
if (fs) {
rc = CreateDirectory(fs, _path, ignore_read_only);
} else {
rc = CreateDirectory(_path, ignore_read_only);
}
if (R_SUCCEEDED(rc) || rc == FsError_PathAlreadyExists) {
R_SUCCEED();
}
auto path_view = std::string_view{_path}; auto path_view = std::string_view{_path};
// todo: fix this for sdmc: and ums0: // todo: fix this for sdmc: and ums0:
FsPath path{"/"}; FsPath path{"/"};
@@ -134,7 +146,6 @@ Result CreateDirectoryRecursively(FsFileSystem* fs, const FsPath& _path, bool ig
std::strncat(path, dir.data(), dir.size()); std::strncat(path, dir.data(), dir.size());
log_write("[FS] dir creation path is now: %s\n", path.s); log_write("[FS] dir creation path is now: %s\n", path.s);
Result rc;
if (fs) { if (fs) {
rc = CreateDirectory(fs, path, ignore_read_only); rc = CreateDirectory(fs, path, ignore_read_only);
} else { } else {
@@ -155,31 +166,15 @@ Result CreateDirectoryRecursively(FsFileSystem* fs, const FsPath& _path, bool ig
Result CreateDirectoryRecursivelyWithPath(FsFileSystem* fs, const FsPath& _path, bool ignore_read_only) { Result CreateDirectoryRecursivelyWithPath(FsFileSystem* fs, const FsPath& _path, bool ignore_read_only) {
R_UNLESS(ignore_read_only || !is_read_only_root(_path), Fs::ResultReadOnly); R_UNLESS(ignore_read_only || !is_read_only_root(_path), Fs::ResultReadOnly);
size_t off = 0; // strip file name form path.
while (true) { const auto last_slash = std::strrchr(_path, '/');
const auto first = std::strchr(_path + off, '/'); if (!last_slash) {
if (!first) { R_SUCCEED();
R_SUCCEED();
}
off = (first - _path.s) + 1;
FsPath path;
std::strncpy(path, _path, off);
Result rc;
if (fs) {
rc = CreateDirectory(fs, path, ignore_read_only);
} else {
rc = CreateDirectory(path, ignore_read_only);
}
if (R_FAILED(rc) && rc != FsError_PathAlreadyExists) {
log_write("failed to create folder recursively: %s\n", path.s);
return rc;
}
// log_write("created_directory recursively: %s\n", path);
} }
FsPath new_path{};
std::snprintf(new_path, sizeof(new_path), "%.*s", (int)(last_slash - _path.s), _path.s);
return CreateDirectoryRecursively(fs, new_path, ignore_read_only);
} }
Result DeleteFile(FsFileSystem* fs, const FsPath& path, bool ignore_read_only) { Result DeleteFile(FsFileSystem* fs, const FsPath& path, bool ignore_read_only) {