From 1f1c09d0cfc5084983c8a490bb07965571503522 Mon Sep 17 00:00:00 2001 From: lucaspalomodevelop Date: Sat, 20 Jan 2024 17:55:01 +0100 Subject: [PATCH 1/2] fix: #25 --- src/main.cpp | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index f5a7b8a..c68a39a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -62,17 +62,23 @@ std::string scriptBuilder(std::string script, std::string args, json script_sett automScript parse(const std::string filecontent) { + + std::cout << "filecontent before parse: " << filecontent << std::endl; std::stringstream file(filecontent); std::string line, content, script; int braceCount = 0; - bool isSettings = true; + bool isSettings = false; + bool start = false; while (std::getline(file, line)) { for (char c : line) { if (c == '{') + { braceCount++; + isSettings = true; + } if (c == '}') braceCount--; if (braceCount == 0 && isSettings) @@ -108,8 +114,8 @@ automScript parse(const std::string filecontent) } result.script = script; - // std::cout << "settings: " << result.settings << std::endl; - // std::cout << "script: " << result.script << std::endl; + std::cout << "settings: " << result.settings << std::endl; + std::cout << "script: " << result.script << std::endl; return result; } @@ -128,6 +134,7 @@ automScript parseAndWriteBack(std::string script) automScript parsed = parse(filecontent); std::ofstream file2(script); + std::cout << "script: " << parsed.script << std::endl; file2 << parsed.script; file2.close(); @@ -145,10 +152,10 @@ std::string saveScriptInTemp(std::string script) while (std::getline(file2, line)) { - script_content += line + "\n"; + file << line << std::endl; } - file << script_content; + file.flush(); file.close(); std::filesystem::permissions(temp_file, std::filesystem::perms::owner_all | std::filesystem::perms::group_all | std::filesystem::perms::others_all); @@ -234,6 +241,8 @@ void runScript(int argc, char *argv[]) script = saveScriptInTemp(script); + std::cout << "script: " << script << std::endl; + json json_settings = parseAndWriteBack(script).settings; script_settings = mergeJson(script_settings, json_settings); @@ -253,7 +262,7 @@ void runScript(int argc, char *argv[]) system(script.c_str()); - cleanTempFile(); + // cleanTempFile(); return; } // } From b0be34ca8e12a1fa7139e4fa436b590f1d4b986c Mon Sep 17 00:00:00 2001 From: lucaspalomodevelop Date: Sat, 20 Jan 2024 17:58:34 +0100 Subject: [PATCH 2/2] =?UTF-8?q?remove=20std::cout=C2=B4s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index c68a39a..2657add 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -63,7 +63,7 @@ std::string scriptBuilder(std::string script, std::string args, json script_sett automScript parse(const std::string filecontent) { - std::cout << "filecontent before parse: " << filecontent << std::endl; + // std::cout << "filecontent before parse: " << filecontent << std::endl; std::stringstream file(filecontent); std::string line, content, script; @@ -114,8 +114,8 @@ automScript parse(const std::string filecontent) } result.script = script; - std::cout << "settings: " << result.settings << std::endl; - std::cout << "script: " << result.script << std::endl; + // std::cout << "settings: " << result.settings << std::endl; + // std::cout << "script: " << result.script << std::endl; return result; } @@ -134,7 +134,7 @@ automScript parseAndWriteBack(std::string script) automScript parsed = parse(filecontent); std::ofstream file2(script); - std::cout << "script: " << parsed.script << std::endl; + // std::cout << "script: " << parsed.script << std::endl; file2 << parsed.script; file2.close(); @@ -241,7 +241,7 @@ void runScript(int argc, char *argv[]) script = saveScriptInTemp(script); - std::cout << "script: " << script << std::endl; + // std::cout << "script: " << script << std::endl; json json_settings = parseAndWriteBack(script).settings;