From a98ce7f76a6a0d78857e7a5476bc48f0c8f969fa Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 1 Mar 2024 19:02:41 +0100
Subject: [PATCH] Replace std::filesystem::path by std::string_view in
 Files::getHash argument

---
 apps/openmw_test_suite/files/hash.cpp |  9 ++++++---
 components/files/hash.cpp             | 10 ++++++----
 components/files/hash.hpp             |  4 ++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/apps/openmw_test_suite/files/hash.cpp b/apps/openmw_test_suite/files/hash.cpp
index 6ad19713dc..32c8380422 100644
--- a/apps/openmw_test_suite/files/hash.cpp
+++ b/apps/openmw_test_suite/files/hash.cpp
@@ -10,6 +10,8 @@
 #include <sstream>
 #include <string>
 
+#include <components/files/conversion.hpp>
+
 #include "../testing_util.hpp"
 
 namespace
@@ -35,7 +37,8 @@ namespace
         std::fill_n(std::back_inserter(content), 1, 'a');
         std::istringstream stream(content);
         stream.exceptions(std::ios::failbit | std::ios::badbit);
-        EXPECT_THAT(getHash(fileName, stream), ElementsAre(9607679276477937801ull, 16624257681780017498ull));
+        EXPECT_THAT(getHash(Files::pathToUnicodeString(fileName), stream),
+            ElementsAre(9607679276477937801ull, 16624257681780017498ull));
     }
 
     TEST_P(FilesGetHash, shouldReturnHashForStringStream)
@@ -44,7 +47,7 @@ namespace
         std::string content;
         std::fill_n(std::back_inserter(content), GetParam().mSize, 'a');
         std::istringstream stream(content);
-        EXPECT_EQ(getHash(fileName, stream), GetParam().mHash);
+        EXPECT_EQ(getHash(Files::pathToUnicodeString(fileName), stream), GetParam().mHash);
     }
 
     TEST_P(FilesGetHash, shouldReturnHashForConstrainedFileStream)
@@ -57,7 +60,7 @@ namespace
         std::fstream(file, std::ios_base::out | std::ios_base::binary)
             .write(content.data(), static_cast<std::streamsize>(content.size()));
         const auto stream = Files::openConstrainedFileStream(file, 0, content.size());
-        EXPECT_EQ(getHash(file, *stream), GetParam().mHash);
+        EXPECT_EQ(getHash(Files::pathToUnicodeString(file), *stream), GetParam().mHash);
     }
 
     INSTANTIATE_TEST_SUITE_P(Params, FilesGetHash,
diff --git a/components/files/hash.cpp b/components/files/hash.cpp
index afb59b2e9e..1f1839ed0c 100644
--- a/components/files/hash.cpp
+++ b/components/files/hash.cpp
@@ -1,5 +1,4 @@
 #include "hash.hpp"
-#include "conversion.hpp"
 
 #include <extern/smhasher/MurmurHash3.h>
 
@@ -10,7 +9,7 @@
 
 namespace Files
 {
-    std::array<std::uint64_t, 2> getHash(const std::filesystem::path& fileName, std::istream& stream)
+    std::array<std::uint64_t, 2> getHash(std::string_view fileName, std::istream& stream)
     {
         std::array<std::uint64_t, 2> hash{ 0, 0 };
         try
@@ -35,8 +34,11 @@ namespace Files
         }
         catch (const std::exception& e)
         {
-            throw std::runtime_error(
-                "Error while reading \"" + Files::pathToUnicodeString(fileName) + "\" to get hash: " + e.what());
+            std::string message = "Error while reading \"";
+            message += fileName;
+            message += "\" to get hash: ";
+            message += e.what();
+            throw std::runtime_error(message);
         }
         return hash;
     }
diff --git a/components/files/hash.hpp b/components/files/hash.hpp
index 0e6ce29ab5..48c373b971 100644
--- a/components/files/hash.hpp
+++ b/components/files/hash.hpp
@@ -3,12 +3,12 @@
 
 #include <array>
 #include <cstdint>
-#include <filesystem>
 #include <iosfwd>
+#include <string_view>
 
 namespace Files
 {
-    std::array<std::uint64_t, 2> getHash(const std::filesystem::path& fileName, std::istream& stream);
+    std::array<std::uint64_t, 2> getHash(std::string_view fileName, std::istream& stream);
 }
 
 #endif