From 92cd5fb5e8b8e17eb457b63ef3d1999b92968e3d Mon Sep 17 00:00:00 2001
From: WarmUpTill <WarmUpTill@web.de>
Date: Wed, 29 Jun 2016 04:56:11 +0200
Subject: [PATCH] Loading of old Settings working, Switcher using Options UI to
 load settings

---
 SceneSwitcher.cpp | 44 +++++++++++++++++++++++++++++++-------------
 settings.cpp      |  9 +++++++--
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/SceneSwitcher.cpp b/SceneSwitcher.cpp
index 42548954..8758f4d3 100644
--- a/SceneSwitcher.cpp
+++ b/SceneSwitcher.cpp
@@ -8,6 +8,8 @@
 
 using namespace std;
 
+//temporary 
+bool oldSettingsLoaded = false;
 //Swicthing done in here
 Switcher *switcher = new Switcher();
 //settings source
@@ -35,6 +37,7 @@ void saveKeybinding(string name, obs_data_array_t *hotkeyData) {
 			string temp = obs_data_get_json(obs_data_array_item(hotkeyData, i));
 			file << temp;
 		}
+		file.close();
 	}
 }
 
@@ -50,6 +53,7 @@ string loadConfigFile(string filename)
 		settingsFile.seekg(0, ios::beg);
 		value.assign((istreambuf_iterator<char>(settingsFile)), istreambuf_iterator<char>());
 	}
+	settingsFile.close();
 	return value;
 }
 
@@ -95,7 +99,7 @@ const char *sceneSwitcherOptionsGetName(void *type_data)
 void *sceneSwitcherOptionsCreate(obs_data_t *settings, obs_source_t *source) {
 	UNUSED_PARAMETER(settings);
 	UNUSED_PARAMETER(source);
-	return (void*)"";
+	return (void*)switcher;
 }
 void sceneSwitcherOptionsDestroy(void *data) {
 	UNUSED_PARAMETER(data);
@@ -120,7 +124,7 @@ void sceneSwitcherOptionsSourceGetDefaults(obs_data_t *settings)
 bool loadOldSettings(obs_properties_t *props, obs_property_t *property, void *data)
 {
 	//read old settings
-	string oldPath = "F:/OBS/obs-studio/BUILD/rundir/Debug/data/obs-plugins/SceneSwitcher/settings.txt";
+	string oldPath = "../../data/obs-plugins/SceneSwitcher/settings.txt";
 	ifstream oldSettingsFile;
 	oldSettingsFile.open(oldPath);
 	string line;
@@ -136,6 +140,7 @@ bool loadOldSettings(obs_properties_t *props, obs_property_t *property, void *da
 				newFormat += valueBeginning + line + "\"\n" + valueEnd;
 			}
 	}
+	oldSettingsFile.close();
 	//remove trailing ',' and newline
 	newFormat.pop_back();
 	newFormat.pop_back();
@@ -146,12 +151,14 @@ bool loadOldSettings(obs_properties_t *props, obs_property_t *property, void *da
 		ofstream file;
 		file.open(string(configPath).append("settings.txt"));
 		file << newFormat;
-		//obs_property_list_clear(obs_properties_get(props, "WindowList"));
-		//obs_data_t *settings = obs_data_create_from_json(newFormat.c_str());
-		//obs_property_modified(obs_properties_get(props, "WindowList"), obs_data_create_from_json(newFormat.c_str()));
-		//obs_properties_apply_settings(props, settings);
-		//obs_property_list_item_remove(obs_properties_first(props),1);
-		//obs_properties_apply_settings(props, obs_data_create_from_json(newFormat.c_str()));
+		file.close();
+		//make sure not to overwrite the settings
+		oldSettingsLoaded = true;
+		if (switcher->getIsRunning()) {
+			switcher->stop();
+		}
+		switcher->load();
+		switcher->start();
 	}
 	return true;
 }
@@ -163,15 +170,26 @@ obs_properties_t *sceneSwitcherOptionsSourceGetProperties(void *data)
 		"WindowList", "Window Name",
 		(enum obs_editable_list_type)0, "",
 		NULL);
-	obs_properties_add_button(props, "LoadOldSettings", "Load settings from old version", &loadOldSettings);
+	obs_properties_add_button(props, "LoadOldSettings", "Load settings from old version (restart OBS after clicking this button)", &loadOldSettings);
 	return props;
 }
 void sceneSwitcherOptionsSourceSave(void *data, obs_data_t *settings)
 {
-	UNUSED_PARAMETER(data);
-	fstream settingsFile;
-	settingsFile.open(string(configPath).append("settings.txt"), fstream::in | fstream::out | ofstream::trunc);
-	settingsFile << obs_data_get_json(settings);
+	//check if user chose to load old settings
+	if (oldSettingsLoaded) {
+		//oldSettingsLoaded = false;
+	}
+	else {
+		//hang here if multiple instances of Scene Switcher Options are active (why?)
+		ofstream settingsFile;
+		settingsFile.open(string(configPath).append("settings.txt"), ofstream::trunc);
+		settingsFile << obs_data_get_json(settings);
+		settingsFile.close();
+		if (switcher->getIsRunning())
+			switcher->stop();
+		switcher->load();
+		switcher->start();
+	}
 }
 void sceneSwitcherOptionsSourceLoad(void *data, obs_data_t *settings)
 {
diff --git a/settings.cpp b/settings.cpp
index a541c9f5..1b726ba9 100644
--- a/settings.cpp
+++ b/settings.cpp
@@ -20,18 +20,22 @@ void Settings::setSettingsFilePath(string path)
 
 
 void Settings::load() {
+	//clear settings map
+	settings = map<string, string> ();
 	//read the settings file
 	std::vector<std::string> settingsElements;
 	int numValues = 0;
 	ifstream infile(settingsFilePath);
 	string value;
 	string line;
+	size_t pos = string::npos;
+	infile.seekg(0);
 	while (infile.good())
 	{
 		//read json file
 		getline(infile, line);
-		size_t pos = line.find("\"value\":");
-		if (!line.empty() && pos != -1) {
+		pos = line.find("\"value\":");
+		if (!line.empty() && pos != string::npos) {
 			string temp = line.substr(pos + 10, string::npos - 1);
 			temp.pop_back();
 			stringstream lineStream = stringstream(temp);
@@ -42,6 +46,7 @@ void Settings::load() {
 			}
 		}
 	}
+	infile.close();
 	//create settings map containing windowname and desired scene
 	for (int i = 0; i < numValues; ) {
 		string s2 = settingsElements.back();