summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/common/fs/fs_util.cpp4
-rw-r--r--src/common/fs/fs_util.h10
-rw-r--r--src/common/fs/path_util.cpp6
-rw-r--r--src/common/fs/path_util.h9
4 files changed, 14 insertions, 15 deletions
diff --git a/src/common/fs/fs_util.cpp b/src/common/fs/fs_util.cpp
index 9db746c4b..357cf5855 100644
--- a/src/common/fs/fs_util.cpp
+++ b/src/common/fs/fs_util.cpp
@@ -20,4 +20,8 @@ std::string ToUTF8String(std::u8string_view u8_string) {
20 return std::string{u8_string.begin(), u8_string.end()}; 20 return std::string{u8_string.begin(), u8_string.end()};
21} 21}
22 22
23std::string PathToUTF8String(const std::filesystem::path& path) {
24 return ToUTF8String(path.u8string());
25}
26
23} // namespace Common::FS 27} // namespace Common::FS
diff --git a/src/common/fs/fs_util.h b/src/common/fs/fs_util.h
index de452c0f6..ec9950ee7 100644
--- a/src/common/fs/fs_util.h
+++ b/src/common/fs/fs_util.h
@@ -5,6 +5,7 @@
5#pragma once 5#pragma once
6 6
7#include <concepts> 7#include <concepts>
8#include <filesystem>
8#include <span> 9#include <span>
9#include <string> 10#include <string>
10#include <string_view> 11#include <string_view>
@@ -45,4 +46,13 @@ concept IsChar = std::same_as<T, char>;
45 */ 46 */
46[[nodiscard]] std::string ToUTF8String(std::u8string_view u8_string); 47[[nodiscard]] std::string ToUTF8String(std::u8string_view u8_string);
47 48
49/**
50 * Converts a filesystem path to a UTF-8 encoded std::string.
51 *
52 * @param path Filesystem path
53 *
54 * @returns UTF-8 encoded std::string.
55 */
56[[nodiscard]] std::string PathToUTF8String(const std::filesystem::path& path);
57
48} // namespace Common::FS 58} // namespace Common::FS
diff --git a/src/common/fs/path_util.cpp b/src/common/fs/path_util.cpp
index 8b732a21c..6cdd14f13 100644
--- a/src/common/fs/path_util.cpp
+++ b/src/common/fs/path_util.cpp
@@ -129,12 +129,6 @@ private:
129 std::unordered_map<YuzuPath, fs::path> yuzu_paths; 129 std::unordered_map<YuzuPath, fs::path> yuzu_paths;
130}; 130};
131 131
132std::string PathToUTF8String(const fs::path& path) {
133 const auto utf8_string = path.u8string();
134
135 return std::string{utf8_string.begin(), utf8_string.end()};
136}
137
138bool ValidatePath(const fs::path& path) { 132bool ValidatePath(const fs::path& path) {
139 if (path.empty()) { 133 if (path.empty()) {
140 LOG_ERROR(Common_Filesystem, "Input path is empty, path={}", PathToUTF8String(path)); 134 LOG_ERROR(Common_Filesystem, "Input path is empty, path={}", PathToUTF8String(path));
diff --git a/src/common/fs/path_util.h b/src/common/fs/path_util.h
index a9fadbceb..14e8c35d7 100644
--- a/src/common/fs/path_util.h
+++ b/src/common/fs/path_util.h
@@ -26,15 +26,6 @@ enum class YuzuPath {
26}; 26};
27 27
28/** 28/**
29 * Converts a filesystem path to a UTF-8 encoded std::string.
30 *
31 * @param path Filesystem path
32 *
33 * @returns UTF-8 encoded std::string.
34 */
35[[nodiscard]] std::string PathToUTF8String(const std::filesystem::path& path);
36
37/**
38 * Validates a given path. 29 * Validates a given path.
39 * 30 *
40 * A given path is valid if it meets these conditions: 31 * A given path is valid if it meets these conditions: