mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-24 16:17:20 +02:00
Merge pull request #6397 from Morph1984/fs_util
common: fs: fs_util: Add more string conversion functions
This commit is contained in:
commit
50866199a4
@ -2,6 +2,8 @@
|
|||||||
// Licensed under GPLv2 or any later version
|
// Licensed under GPLv2 or any later version
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
#include "common/fs/fs_util.h"
|
#include "common/fs/fs_util.h"
|
||||||
|
|
||||||
namespace Common::FS {
|
namespace Common::FS {
|
||||||
@ -10,4 +12,16 @@ std::u8string ToU8String(std::string_view utf8_string) {
|
|||||||
return std::u8string{utf8_string.begin(), utf8_string.end()};
|
return std::u8string{utf8_string.begin(), utf8_string.end()};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::u8string BufferToU8String(std::span<const u8> buffer) {
|
||||||
|
return std::u8string{buffer.begin(), std::ranges::find(buffer, u8{0})};
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string ToUTF8String(std::u8string_view u8_string) {
|
||||||
|
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,9 +5,13 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <concepts>
|
#include <concepts>
|
||||||
|
#include <filesystem>
|
||||||
|
#include <span>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <string_view>
|
#include <string_view>
|
||||||
|
|
||||||
|
#include "common/common_types.h"
|
||||||
|
|
||||||
namespace Common::FS {
|
namespace Common::FS {
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
@ -22,4 +26,33 @@ concept IsChar = std::same_as<T, char>;
|
|||||||
*/
|
*/
|
||||||
[[nodiscard]] std::u8string ToU8String(std::string_view utf8_string);
|
[[nodiscard]] std::u8string ToU8String(std::string_view utf8_string);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Converts a buffer of bytes to a UTF8-encoded std::u8string.
|
||||||
|
* This converts from the start of the buffer until the first encountered null-terminator.
|
||||||
|
* If no null-terminator is found, this converts the entire buffer instead.
|
||||||
|
*
|
||||||
|
* @param buffer Buffer of bytes
|
||||||
|
*
|
||||||
|
* @returns UTF-8 encoded std::u8string.
|
||||||
|
*/
|
||||||
|
[[nodiscard]] std::u8string BufferToU8String(std::span<const u8> buffer);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Converts a std::u8string or std::u8string_view to a UTF-8 encoded std::string.
|
||||||
|
*
|
||||||
|
* @param u8_string UTF-8 encoded u8string
|
||||||
|
*
|
||||||
|
* @returns UTF-8 encoded std::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.
|
||||||
*
|
*
|
||||||
|
Loading…
Reference in New Issue
Block a user