1 files changed, 55 insertions, 0 deletions
diff --git a/src/zencore/string.cpp b/src/zencore/string.cpp
index a0d8c927f..c8c7c2cde 100644
--- a/src/zencore/string.cpp
+++ b/src/zencore/string.cpp
@@ -483,12 +483,67 @@ template class StringBuilderImpl<char>;
 template class StringBuilderImpl<wchar_t>;
 
 //////////////////////////////////////////////////////////////////////////
+
+void
+UrlDecode(std::string_view InUrl, StringBuilderBase& OutUrl)
+{
+	std::string_view::size_type i = 0;
+
+	for (; i != InUrl.size();)
+	{
+		char c = InUrl[i];
+
+		if ((c == '%') && ((i + 2) < InUrl.size()))
+		{
+			char	hex[2] = {InUrl[i + 1], InUrl[i + 2]};
+			uint8_t HexedChar;
+			if (ParseHexBytes(hex, 2, &HexedChar))
+			{
+				OutUrl.Append(HexedChar);
+				i += 3;
+
+				continue;
+			}
+		}
+
+		OutUrl.Append(c);
+		++i;
+	}
+}
+
+std::string
+UrlDecode(std::string_view InUrl)
+{
+	ExtendableStringBuilder<128> Url;
+	UrlDecode(InUrl, Url);
+
+	return std::string(Url.ToView());
+}
+
+//////////////////////////////////////////////////////////////////////////
 //
 // Unit tests
 //
 
 #if ZEN_WITH_TESTS
 
+TEST_CASE("url")
+{
+	using namespace std::literals;
+
+	ExtendableStringBuilder<32> OutUrl;
+	UrlDecode("http://blah.com/foo?bar=hi%20ho", OutUrl);
+	CHECK_EQ(OutUrl.ToView(), "http://blah.com/foo?bar=hi ho"sv);
+
+	OutUrl.Reset();
+
+	UrlDecode("http://blah.com/foo?bar=hi%ho", OutUrl);
+	CHECK_EQ(OutUrl.ToView(), "http://blah.com/foo?bar=hi%ho"sv);
+
+	CHECK_EQ(UrlDecode("http://blah.com/foo?bar=hi%20ho"), "http://blah.com/foo?bar=hi ho"sv);
+	CHECK_EQ(UrlDecode("http://blah.com/foo?bar=hi%ho"), "http://blah.com/foo?bar=hi%ho"sv);
+}
+
 TEST_CASE("niceNum")
 {
 	char Buffer[16];