Merge branch 'develop' for release v3.42.1

src/libs/subsonic/impl/SubsonicResponse.cpp

@@ -365,7 +365,7 @@ namespace API::Subsonic
     void Response::JsonSerializer::serializeEscapedString(std::ostream& os, std::string_view str)
     {
         os << '\"';
-        StringUtils::writeJSEscapedString(os, str);
+        StringUtils::writeJsonEscapedString(os, str);
         os << '\"';
     }
 

src/libs/utils/impl/String.cpp

@@ -21,7 +21,7 @@
 
 #include <algorithm>
 #include <iomanip>
-#include <unordered_map>
+#include <utility>
 
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/join.hpp>
@@ -33,6 +33,62 @@
 namespace StringUtils
 {
 
+    namespace
+    {
+        constexpr std::pair<char, std::string_view> jsEscapeChars[]
+        {
+            { '\\', "\\\\" },
+            { '\n', "\\n" },
+            { '\r', "\\r" },
+            { '\t', "\\t" },
+            { '"', "\\\"" },
+            { '\'', "\\\'" },
+        };
+
+        constexpr std::pair<char, std::string_view> jsonEscapeChars[]
+        {
+            { '\\', "\\\\" },
+            { '\n', "\\n" },
+            { '\r', "\\r" },
+            { '\t', "\\t" },
+            { '"', "\\\"" },
+        };
+
+        template <std::size_t N>
+        std::string escape(std::string_view str, const std::pair<char, std::string_view>(&charsToEscape)[N])
+        {
+            std::string escaped;
+            escaped.reserve(str.length());
+
+            for (const char c : str)
+            {
+                auto it{ std::find_if(std::cbegin(charsToEscape), std::cend(charsToEscape), [c](const auto& entry) { return entry.first == c; }) };
+                if (it == std::cend(charsToEscape))
+                {
+                    escaped += c;
+                    continue;
+                }
+
+                escaped += it->second;
+            }
+
+            return escaped;
+        }
+
+        template <std::size_t N>
+        void writeEscapedString(std::ostream& os, std::string_view str, const std::pair<char, std::string_view>(&charsToEscape)[N])
+        {
+            for (const char c : str)
+            {
+                auto itEntry{ std::find_if(std::cbegin(charsToEscape), std::cend(charsToEscape), [=](const auto& entry) { return entry.first == c;}) };
+                if (itEntry != std::cend(charsToEscape))
+                    os << itEntry->second;
+                else
+                    os << c;
+            }
+        }
+    }
+
     bool readList(const std::string& str, const std::string& separators, std::list<std::string>& results)
     {
         std::string curStr;
@@ -221,54 +277,22 @@ namespace StringUtils
 
     std::string jsEscape(std::string_view str)
     {
-        static const std::unordered_map<char, std::string_view> escapeMap
-        {
-            { '\\', "\\\\" },
-            { '\n', "\\n" },
-            { '\r', "\\r" },
-            { '\t', "\\t" },
-            { '"', "\\\"" },
-            { '\'', "\\\'" },
-        };
-
-        std::string escaped;
-        escaped.reserve(str.length());
-
-        for (const char c : str)
-        {
-            auto it{ escapeMap.find(c) };
-            if (it == std::cend(escapeMap))
-            {
-                escaped += c;
-                continue;
-            }
-
-            escaped += it->second;
-        }
-
-        return escaped;
+        return escape(str, jsEscapeChars);
     }
 
     void writeJSEscapedString(std::ostream& os, std::string_view str)
     {
-        static constexpr std::pair<char, std::string_view> charsToEscape[]
-        {
-            {'\\', "\\\\" },
-            { '\n', "\\n" },
-            { '\r', "\\r" },
-            { '\t', "\\t" },
-            { '"', "\\\"" },
-            { '\'', "\\\'" },
-        };
-
-        for (const char c : str)
-        {
-            auto itEntry{ std::find_if(std::cbegin(charsToEscape), std::cend(charsToEscape), [=](const auto& entry) { return entry.first == c;}) };
-            if (itEntry != std::cend(charsToEscape))
-                os << itEntry->second;
-            else
-                os << c;
+        writeEscapedString(os, str, jsEscapeChars);
     }
+    
+    std::string jsonEscape(std::string_view str)
+    {
+        return escape(str, jsonEscapeChars);
+    }
+
+    void writeJsonEscapedString(std::ostream& os, std::string_view str)
+    {
+        writeEscapedString(os, str, jsonEscapeChars);
     }
 
     std::string escapeString(std::string_view str, std::string_view charsToEscape, char escapeChar)

src/libs/utils/include/utils/String.hpp

@@ -84,7 +84,9 @@ namespace StringUtils {
     [[nodiscard]] std::string replaceInString(std::string_view str, const std::string& from, const std::string& to);
 
     [[nodiscard]] std::string jsEscape(std::string_view str);
+    [[nodiscard]] std::string jsonEscape(std::string_view str);
     void writeJSEscapedString(std::ostream& os, std::string_view str);
+    void writeJsonEscapedString(std::ostream& os, std::string_view str);
 
     [[nodiscard]] std::string escapeString(std::string_view str, std::string_view charsToEscape, char escapeChar);
 

src/libs/utils/test/String.cpp

@@ -101,6 +101,22 @@ TEST(StringUtils, splitStringCopy)
 	}
 }
 
+TEST(StringUtils, escapeJSString)
+{
+	EXPECT_EQ(StringUtils::jsEscape(""), "");
+	EXPECT_EQ(StringUtils::jsEscape(R"(Test'.mp3)"), R"(Test\'.mp3)");
+	EXPECT_EQ(StringUtils::jsEscape(R"(Test"".mp3)"), R"(Test\"\".mp3)");
+	EXPECT_EQ(StringUtils::jsEscape(R"(\Test\.mp3)"), R"(\\Test\\.mp3)");
+}
+
+TEST(StringUtils, escapeJsonString)
+{
+	EXPECT_EQ(StringUtils::jsonEscape(""), "");
+	EXPECT_EQ(StringUtils::jsonEscape(R"(Test'.mp3)"), R"(Test'.mp3)");
+	EXPECT_EQ(StringUtils::jsonEscape(R"(Test"".mp3)"), R"(Test\"\".mp3)");
+	EXPECT_EQ(StringUtils::jsonEscape(R"(\Test\.mp3)"), R"(\\Test\\.mp3)");
+}
+
 TEST(StringUtils, escapeString)
 {
 	EXPECT_EQ(StringUtils::escapeString("", "*", ' '), "");