Minor settings class refactor

Author: cspangler

cfg-switcher/Settings.cpp

@@ -7,8 +7,9 @@
 #include "game.h"
 #include "Settings.h"
 
-void Settings::deleteSettingsFile() {
-	remove("settings.xml");
+Settings::Settings() {
+	path = GetCurrentWorkingDir();
+	cfgPath = path + "\\configs";
 }
 
 bool Settings::initSettings() {
@@ -69,7 +70,7 @@ bool Settings::createSettingsFile() {
 	element->SetText(0.1f);
 	rootNode->InsertEndChild(element);
 	element = settings.NewElement("path");
-	element->SetText("D:\\cfg-switcher\\cfg-switcher");
+	element->SetText(path.c_str());
 	rootNode->InsertEndChild(element);
 	rootNode->InsertEndChild(settings.NewElement("games"));
 	tinyxml2::XMLError saved = settings.SaveFile("settings.xml");

cfg-switcher/Settings.h

@@ -9,13 +9,12 @@ class Settings {
 	std::vector<game> games;
 	std::string path;
 	std::string cfgPath;
-public:
-	void deleteSettingsFile();
-	bool initSettings();
 	bool createSettingsFile();
 	bool createFileStruct();
-	bool removeFileStruct(game remGame);
 	bool updateFileStruct();
+public:
+	Settings();
+	bool initSettings();
 	bool addGame(std::string gameID, std::string gamePath);
 	bool removeGame(game remGame, powerState keep);
 	bool gameExists(std::string gameID);

cfg-switcher/WinUtils.cpp

@@ -7,6 +7,8 @@
 #include <iostream>
 #include <fstream>
 #include <conio.h>
+#include <stdio.h>
+#include <direct.h>
 
 //Returns the last Win32 error, in string format. Returns an empty string if there is no error.
 std::string GetLastErrorAsString() {
@@ -180,4 +182,11 @@ int DeleteDirectory(const std::string &refcstrRootDirectory, bool bDeleteSubdire
 	}
 
 	return 0;
+}
+
+std::string GetCurrentWorkingDir() {
+	char buff[FILENAME_MAX];
+	_getcwd(buff, FILENAME_MAX);
+	std::string current_working_dir(buff);
+	return current_working_dir;
 }

cfg-switcher/WinUtils.h

@@ -9,3 +9,4 @@ std::string BrowseFile(std::string prompt);
 std::string FileFromPath(std::string filePath);
 bool copyFile(const char *SRC, const char* DEST);
 int DeleteDirectory(const std::string &refcstrRootDirectory, bool bDeleteSubdirectories = true);
+std::string GetCurrentWorkingDir();

cfg-switcher/main.cpp

@@ -220,15 +220,15 @@ int main() {
 			}
 			else {
 				std::cout << "Set configs for MAIN or BATTERY power?" << std::endl;
-				std::cout << "1: BATTERY\n2: MAIN" << std::endl;
+				std::cout << "1: BATTERY\n2: MAIN\n3: CANCEL" << std::endl;
 				opt = 0;
-				while (opt < 1 || opt > 2) {
+				while (opt < 1 || opt > 3) {
 					while (!(std::cin >> opt)) {
 						std::cerr << "Error: Invalid input; expecting option number" << std::endl;
 						std::cin.clear();
 						std::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
 					}
-					if (opt < 1 || opt > 2)
+					if (opt < 1 || opt > 3)
 						std::cerr << "Error: Invalid option" << std::endl;
 				}
 				bool result;