common: fs: fs_util: Move PathToUTF8String to fs_util
This commit is contained in:
parent
a1eeb9908d
commit
dba7bcd489
|
@ -20,4 +20,8 @@ std::string ToUTF8String(std::u8string_view u8_string) {
|
||||||
return std::string{u8_string.begin(), u8_string.end()};
|
return std::string{u8_string.begin(), u8_string.end()};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::string PathToUTF8String(const std::filesystem::path& path) {
|
||||||
|
return ToUTF8String(path.u8string());
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace Common::FS
|
} // namespace Common::FS
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <concepts>
|
#include <concepts>
|
||||||
|
#include <filesystem>
|
||||||
#include <span>
|
#include <span>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <string_view>
|
#include <string_view>
|
||||||
|
@ -45,4 +46,13 @@ concept IsChar = std::same_as<T, char>;
|
||||||
*/
|
*/
|
||||||
[[nodiscard]] std::string ToUTF8String(std::u8string_view u8_string);
|
[[nodiscard]] std::string ToUTF8String(std::u8string_view u8_string);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Converts a filesystem path to a UTF-8 encoded std::string.
|
||||||
|
*
|
||||||
|
* @param path Filesystem path
|
||||||
|
*
|
||||||
|
* @returns UTF-8 encoded std::string.
|
||||||
|
*/
|
||||||
|
[[nodiscard]] std::string PathToUTF8String(const std::filesystem::path& path);
|
||||||
|
|
||||||
} // namespace Common::FS
|
} // namespace Common::FS
|
||||||
|
|
|
@ -129,12 +129,6 @@ private:
|
||||||
std::unordered_map<YuzuPath, fs::path> yuzu_paths;
|
std::unordered_map<YuzuPath, fs::path> yuzu_paths;
|
||||||
};
|
};
|
||||||
|
|
||||||
std::string PathToUTF8String(const fs::path& path) {
|
|
||||||
const auto utf8_string = path.u8string();
|
|
||||||
|
|
||||||
return std::string{utf8_string.begin(), utf8_string.end()};
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ValidatePath(const fs::path& path) {
|
bool ValidatePath(const fs::path& path) {
|
||||||
if (path.empty()) {
|
if (path.empty()) {
|
||||||
LOG_ERROR(Common_Filesystem, "Input path is empty, path={}", PathToUTF8String(path));
|
LOG_ERROR(Common_Filesystem, "Input path is empty, path={}", PathToUTF8String(path));
|
||||||
|
|
|
@ -25,15 +25,6 @@ enum class YuzuPath {
|
||||||
ShaderDir, // Where shaders are stored.
|
ShaderDir, // Where shaders are stored.
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* Converts a filesystem path to a UTF-8 encoded std::string.
|
|
||||||
*
|
|
||||||
* @param path Filesystem path
|
|
||||||
*
|
|
||||||
* @returns UTF-8 encoded std::string.
|
|
||||||
*/
|
|
||||||
[[nodiscard]] std::string PathToUTF8String(const std::filesystem::path& path);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Validates a given path.
|
* Validates a given path.
|
||||||
*
|
*
|
||||||
|
|
Reference in New Issue