Merge pull request #12 from OsirisNL/localfiles

Better local file handling on Windows

Author: OsirisNL

CMakeLists.txt

@@ -31,16 +31,20 @@ set(obs-browser_SOURCES
 	shared/browser-source.cpp
 	shared/base64.cpp
 	obs-browser/browser-load-handler.cpp
+	shared/browser-scheme.cpp
 )
 
 set(obs-browser_HEADERS
 	shared/browser-manager.hpp
 	shared/browser-source.hpp
 	shared/browser-listener.hpp
 	shared/browser-settings.hpp
+	shared/browser-types.h)
 	shared/browser-types.h
 	shared/base64.hpp
 	obs-browser/browser-load-handler.hpp)
+	shared/browser-scheme.hpp
+	shared/browser-types.h)
 
 if (APPLE)
 	list(APPEND obs-browser_SOURCES

obs-browser/browser-manager-base.cpp

@@ -4,6 +4,7 @@
 #include "browser-task.hpp"
 #include "browser-app.hpp"
 #include "browser-settings.hpp"
+#include "browser-scheme.hpp"
 #include "browser-client.hpp"
 #include "browser-render-handler.hpp"
 #include "browser-load-handler.hpp"
@@ -350,7 +351,9 @@ void BrowserManager::Impl::BrowserManagerEntry()
 		CefRefPtr<BrowserApp> app(new BrowserApp());
 		CefExecuteProcess(mainArgs, app, nullptr);
 		CefInitialize(mainArgs, settings, app, nullptr);
+		CefRegisterSchemeHandlerFactory("http", "absolute", new BrowserSchemeHandlerFactory());
 		CefRunMessageLoop();
+		CefShutdown();
 	});
 
 	while (true) {

obs-browser/main-source.cpp

@@ -103,7 +103,7 @@ static uint32_t browser_source_get_height(void *data)
 }
 
 
-static const char *browser_source_get_name(void)
+static const char *browser_source_get_name(void *)
 {
 	return obs_module_text("BrowserSource");
 }

shared/browser-scheme.cpp

@@ -31,12 +31,16 @@ bool BrowserSchemeHandler::ProcessRequest(CefRefPtr<CefRequest> request,
 		CefRefPtr<CefCallback> callback)
 {
 	CefURLParts parts;
+	CefString fileName;
 	CefParseURL(request->GetURL(), parts);
 
 	std::string path = CefString(&parts.path);
-	fileName = path.substr(path.find_last_of("/") + 1);
-
+	path = CefURIDecode(path,true,cef_uri_unescape_rule_t::UU_SPACES);
+#ifdef WIN32
+	inputStream.open(path.erase(0,1), std::ifstream::binary);
+#else
 	inputStream.open(path, std::ifstream::binary);
+#endif
 	if (!inputStream.is_open()) {
 		callback->Cancel();
 		return false;

shared/browser-source.cpp

@@ -46,7 +46,7 @@ void BrowserSource::UpdateBrowser()
 
 	BrowserSettings browserSettings;
 
-	browserSettings.url = isLocalFile? "http://absolute"+ url : url,
+	browserSettings.url = isLocalFile? "http://absolute/"+ url : url,
 	browserSettings.width = width;
 	browserSettings.height = height;
 	browserSettings.fps = fps;