From a1eeb9908d9cba0a51fbad519ce770b96d0a78d5 Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Tue, 1 Jun 2021 09:19:08 -0400
Subject: common: fs: fs_util: Add more string conversion functions

---
 src/common/fs/fs_util.h | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'src/common/fs/fs_util.h')

diff --git a/src/common/fs/fs_util.h b/src/common/fs/fs_util.h
index 951df53b6..de452c0f6 100644
--- a/src/common/fs/fs_util.h
+++ b/src/common/fs/fs_util.h
@@ -5,9 +5,12 @@
 #pragma once
 
 #include <concepts>
+#include <span>
 #include <string>
 #include <string_view>
 
+#include "common/common_types.h"
+
 namespace Common::FS {
 
 template <typename T>
@@ -22,4 +25,24 @@ concept IsChar = std::same_as<T, char>;
  */
 [[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);
+
 } // namespace Common::FS
-- 
cgit v1.2.3


From dba7bcd489b9802c3d25e3e8183ef7991af301b8 Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Tue, 1 Jun 2021 09:22:18 -0400
Subject: common: fs: fs_util: Move PathToUTF8String to fs_util

---
 src/common/fs/fs_util.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/common/fs/fs_util.h')

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 @@
 #pragma once
 
 #include <concepts>
+#include <filesystem>
 #include <span>
 #include <string>
 #include <string_view>
@@ -45,4 +46,13 @@ concept IsChar = std::same_as<T, char>;
  */
 [[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
-- 
cgit v1.2.3