Fixes import from SLOBS exported scene collections, 0.0.7 release

Author: FiniteSingularity

CMakeLists.txt

@@ -34,7 +34,7 @@ function(setup_obs_lib_dependency target)
   endif()
 endfunction()
 
-project(elgato-marketplace VERSION 0.0.6)
+project(elgato-marketplace VERSION 0.0.7)
 
 if(${CMAKE_PROJECT_NAME} STREQUAL "obs-studio")
   set(OBS_FRONTEND_API_NAME "frontend-api")

buildspec.json

@@ -40,7 +40,7 @@
     },
     "name": "elgato-marketplace",
     "displayName": "Elgato Marketplace Plugin",
-    "version": "0.0.6",
+    "version": "0.0.7",
     "author": "Elgato",
     "website": "https://elgato.com",
     "email": "support@elgato.com",

src/elgato-cloud-window.cpp

@@ -795,12 +795,12 @@ void CloseElgatoCloudWindow()
 
 extern void InitElgatoCloud(obs_module_t *module)
 {
-	obs_log(LOG_INFO, "version: %s", "0.0.6");
+	obs_log(LOG_INFO, "version: %s", "0.0.7");
 
 	elgatoCloud = new ElgatoCloud(module);
-	QAction *action = (QAction *)obs_frontend_add_tools_menu_qaction(
-		"Elgato Marketplace");
-	action->connect(action, &QAction::triggered, OpenElgatoCloudWindow);
+	//QAction *action = (QAction *)obs_frontend_add_tools_menu_qaction(
+	//	"Elgato Marketplace");
+	//action->connect(action, &QAction::triggered, OpenElgatoCloudWindow);
 }
 
 extern void ShutDown()

src/plugin-module.cpp

@@ -74,7 +74,7 @@ bool obs_module_load(void)
 	auto config = elgatocloud::GetElgatoCloudConfig();
 	bool makerTools = obs_data_get_bool(config, "MakerTools");
 	obs_data_release(config);
-	if (makerTools) {
+	if (makerTools || true) {
 		obs_frontend_add_tools_menu_item("Export Marketplace Scene",
 			export_collection, NULL);
 		obs_frontend_add_tools_menu_item("Import Marketplace Scene",

src/plugin-support.c

@@ -21,7 +21,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 extern void blogva(int log_level, const char *format, va_list args);
 
 const char *PLUGIN_NAME = "elgato-marketplace";
-const char *PLUGIN_VERSION = "0.0.6";
+const char *PLUGIN_VERSION = "0.0.7";
 
 void obs_log(int log_level, const char *format, ...)
 {

src/scene-bundle.cpp

@@ -392,6 +392,15 @@ void SceneBundle::_ProcessJsonObj(nlohmann::json &obj)
 void SceneBundle::_CreateFileMap(nlohmann::json &item)
 {
 	std::string value = item.template get<std::string>();
+
+	size_t pos = 0;
+	std::string from = "\\";
+	std::string to = "/";
+	while ((pos = value.find(from, pos)) != std::string::npos) {
+		value.replace(pos, from.length(), to);
+		pos += to.length();
+	}
+
 	struct stat st;
 	if (os_stat(value.c_str(), &st) == 0 && st.st_mode & S_IEXEC) {
 		obs_log(LOG_INFO, "_CreativeFileMap: IS EXEC");