Revived help command & single execution mode

Author: Dannode36

src/Options.cpp

@@ -78,9 +78,15 @@ namespace CLOptions {
 			outputDir = std::wstring(args[i].begin(), args[i].end());
 		}}}
 	};
-		
-	void parse(std::vector<std::string>& args)
+
+	//Returns: Wether the current command should continue execution. e.g. "help" will return false
+	bool parse(std::vector<std::string>& args)
 	{
+		if (args.size() > 0 && args[0] == "help") {
+			CLOptions::help();
+			return false;
+		}
+
 		if (args.size() < 2) {
 			throw std::exception("Correct syntax is \"<file-path> <language> <options>\"");
 		}
@@ -95,10 +101,6 @@ namespace CLOptions {
 			}
 		} //This might be too hard (Probably need to use IFileDialog (that shit is wack))
 
-		if (args[0] == "help") {
-			help();
-		}
-
 		//Get filepath
 		r_filePath = args[0];
 
@@ -132,6 +134,8 @@ namespace CLOptions {
 			//State errors
 			if (o_forcePerfection && o_forceThroughErrors) { throw std::exception("-f and -p cannot be set simultaneously"); }
 		}
+
+		return true;
 	}
 
 	std::string filePath()
@@ -166,9 +170,11 @@ namespace CLOptions {
 	}
 	void help(std::string arg)
 	{
+		fmt::print("Syntax: json2x <file-path> <language> <options>\n");
+
 		for (auto& option : commandStringToId)
 		{
-			fmt::print("  " + option.second.description + '\n');
+			fmt::print(option.second.description + '\n');
 		}
 	}
 }

src/Options.h

@@ -4,7 +4,7 @@
 #include "LangFormat.h"
 
 namespace CLOptions {
-	void parse(std::vector<std::string>& args);
+	bool parse(std::vector<std::string>& args);
 
 	std::string filePath();
 	LangFormat& langFormat();

src/main.cpp

@@ -15,8 +15,6 @@ int main(int argc, char* argv[]) {
     const std::wstring outFileName = L"\\output";
     bool running = true;
 
-    std::cout << "json2x " << VERSION_MAJOR << "." << VERSION_MINOR << "\n";
-
     while (running)
     {
         try
@@ -31,14 +29,17 @@ int main(int argc, char* argv[]) {
                         throw std::exception("Correct syntax is \"json2x <file-path> <language> <options>\"\n");
                     }
 
-                    for (int i = 0; i < argc; i++) {
+                    for (int i = 1; i < argc; i++) {
                         args.push_back(argv[i]);
                     }
 
                     running = false; //Run once
                     argc = 0; //Prevent args being used again
                 }
                 else {
+
+                    std::cout << "json2x " << VERSION_MAJOR << "." << VERSION_MINOR << " (shell mode) " << "\n";
+
                     std::cout << ">> ";
 
                     std::string tempInput;
@@ -56,7 +57,9 @@ int main(int argc, char* argv[]) {
                     }
                 }
 
-                CLOptions::parse(args);
+                if (CLOptions::parse(args) != true) {
+                    continue;
+                }
             }
 
             //Load JSON file
@@ -73,7 +76,7 @@ int main(int argc, char* argv[]) {
             //Construct a code generator object with an indent style (4 spaces) and an initial class name ("MyClass")
             CodeGenerator generator(CLOptions::indent(), className);
 
-            //Write generated code to a file if no parsing error occured
+            //Get generated code if no parsing error occured
             std::string genOutput = generator.convertJson(json, CLOptions::langFormat());
 
             //Write generated code to file