Support local file paths with diacritic characters in them

Author: OsirisNL

shared/browser-scheme.cpp

@@ -3,6 +3,7 @@
 #include <include/cef_parser.h>
 
 #include "browser-scheme.hpp"
+#include "obs.h"
 
 
 BrowserSchemeHandlerFactory::BrowserSchemeHandlerFactory()
@@ -33,18 +34,20 @@ bool BrowserSchemeHandler::ProcessRequest(CefRefPtr<CefRequest> request,
 	CefURLParts parts;
 	CefParseURL(request->GetURL(), parts);
 
-	std::string path = CefString(&parts.path);
-
-	// Set fileName for use in GetResponseHeaders
-	fileName = path;
+	std::wstring path = CefString(&parts.path);
 
 	path = CefURIDecode(path, true, cef_uri_unescape_rule_t::UU_SPACES);
-	path = CefURIDecode(path, true, cef_uri_unescape_rule_t::UU_NORMAL);
+	path = CefURIDecode(path, true, cef_uri_unescape_rule_t::UU_URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS);
 #ifdef WIN32
+	//blog(LOG_INFO, "%s", path.erase(0,1));
 	inputStream.open(path.erase(0,1), std::ifstream::binary);
 #else
 	inputStream.open(path, std::ifstream::binary);
 #endif
+
+	// Set fileName for use in GetResponseHeaders
+	fileName = path;
+
 	if (!inputStream.is_open()) {
 		callback->Cancel();
 		return false;
@@ -66,11 +69,11 @@ void BrowserSchemeHandler::GetResponseHeaders(CefRefPtr<CefResponse> response,
 		return;
 	}
 
-	std::string fileExtension = fileName.substr(
-		fileName.find_last_of(".") + 1);
+	std::wstring fileExtension = fileName.substr(
+		fileName.find_last_of(L".") + 1);
 
-	if (fileExtension == "woff2") {
-		fileExtension = "woff";
+	if (fileExtension.compare(L"woff2") == 0) {
+		fileExtension = L"woff";
 	}
 
 	std::transform(fileExtension.begin(), fileExtension.end(),

shared/browser-scheme.hpp

@@ -51,7 +51,7 @@ class BrowserSchemeHandler : public CefResourceHandler {
 
 
 private:
-	std::string fileName;
+	std::wstring fileName;
 	std::ifstream inputStream;
 	bool isComplete;
 	int64 length;