From a634b13f72db58fff2e724a53a65d588f44979fa Mon Sep 17 00:00:00 2001 From: lucaspalomodevelop Date: Fri, 22 Mar 2024 21:45:42 +0100 Subject: [PATCH 1/2] no pointerfunctions in command --- src/command.cpp | 34 +++++++++++++++++++++++++++------- src/command.h | 16 +++++++++++----- src/main.cpp | 13 ++++--------- src/main.h | 2 +- 4 files changed, 43 insertions(+), 22 deletions(-) diff --git a/src/command.cpp b/src/command.cpp index fb54856..ae89ab0 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -4,7 +4,6 @@ Command::Command() {} Command::~Command() {} - // add a command alias to the command map void Command::addCommandAlias(std::string name, std::string alias) { @@ -15,8 +14,26 @@ void Command::addCommandAlias(std::string name, std::string alias) commands[alias] = mycommand; } -// add a command to the command map -void Command::addCommand(std::string name, void (*func)(int argc, char *argv[])) +// // add a command to the command map +// void Command::addCommand(std::string name, void (*func)(int argc, char *argv[])) +// { +// CommandInfo mycommand{ +// name, +// "", +// func}; +// commands[name] = mycommand; +// } + +// void Command::addCommand(std::string name, std::string description, void (*func)(int argc, char *argv[])) +// { +// CommandInfo mycommand{ +// name, +// description, +// func}; +// commands[name] = mycommand; +// } + +void Command::addCommand(std::string name, std::function func) { CommandInfo mycommand{ name, @@ -25,7 +42,7 @@ void Command::addCommand(std::string name, void (*func)(int argc, char *argv[])) commands[name] = mycommand; } -void Command::addCommand(std::string name, std::string description, void (*func)(int argc, char *argv[])) +void Command::addCommand(std::string name, std::string description, std::function func) { CommandInfo mycommand{ name, @@ -35,7 +52,12 @@ void Command::addCommand(std::string name, std::string description, void (*func) } // add a default command to the command map -void Command::addDefaultCommand(void (*func)(int argc, char *argv[])) +// void Command::addDefaultCommand(void (*func)(int argc, char *argv[])) +// { +// defaultCommand = func; +// } + +void Command::addDefaultCommand(std::function func) { defaultCommand = func; } @@ -61,7 +83,6 @@ void Command::runCommand(std::string name, int argc, char *argv[]) } } - // check if a command is in the command map bool Command::isInCommands(std::string name) { @@ -81,7 +102,6 @@ std::string Command::listCommands() { std::string list = ""; - for (std::map::iterator it = commands.begin(); it != commands.end(); ++it) { list += "\t" + it->second.name + " " + it->second.description + "\n"; diff --git a/src/command.h b/src/command.h index ed97960..d00841f 100644 --- a/src/command.h +++ b/src/command.h @@ -4,12 +4,14 @@ #include #include #include +#include struct CommandInfo { std::string name; std::string description; - void (*func)(int argc, char *argv[]); + // void (*func)(int argc, char *argv[]); + std::function func; }; class Command @@ -21,10 +23,13 @@ public: // add a command alias to the command map void addCommandAlias(std::string name, std::string alias); // add a command to the command map - void addCommand(std::string name, void (*func)(int argc, char *argv[])); - void addCommand(std::string name, std::string description, void (*func)(int argc, char *argv[])); + void addCommand(std::string name, std::function funcs); + // void addCommand(std::string name, void (*func)(int argc, char *argv[])); + void addCommand(std::string name, std::string description, std::function funcs); + // void addCommand(std::string name, std::string description, void (*func)(int argc, char *argv[])); // add a default command to the command map - void addDefaultCommand(void (*func)(int argc, char *argv[])); + // void addDefaultCommand(void (*func)(int argc, char *argv[])); + void addDefaultCommand(std::function funcs); // run a command void runCommand(std::string name, int argc, char *argv[]); // check if a command is in the command map @@ -36,7 +41,8 @@ private: // map of commands std::map commands; // default command - void (*defaultCommand)(int argc, char *argv[]); + // void (*defaultCommand)(int argc, char *argv[]); + std::function defaultCommand; }; #endif // COMMAND_H \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 2657add..19c1317 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -20,17 +20,12 @@ void input(int argc, char *argv[]) // std::cout << " [script] - Runs a script if autom has not command with that name" << std::endl; command.addCommand("run", "[script] - Runs a script", runScript); command.addCommand("help", "- Shows this help message", help); - command.addCommandAlias("help", "h"); + command.addCommand("ls", "- Lists all scripts ", listScripts); - command.addCommandAlias("ls", "l"); command.addCommand("add", "[script] - Adds a script", addScript); - command.addCommandAlias("add", "a"); command.addCommand("edit", "[script] - Edits a script", editScript); - command.addCommandAlias("edit", "e"); command.addCommand("remove", "[script] - Remove a script", removeScript); - command.addCommandAlias("remove", "r"); command.addCommand("show", "[script] - Shows a script", showScript); - command.addCommandAlias("show", "s"); command.addCommand("config", " - Configures autom", config); command.addDefaultCommand(runScript); @@ -458,7 +453,7 @@ void addScript(int argc, char *argv[]) file.close(); - editScript(argv[1], dir); + editScript_fn(argv[1], dir); } // edit a script in the autom directory @@ -500,10 +495,10 @@ void editScript(int argc, char *argv[]) dir = dir_options[num]; } - editScript(argv[1], dir); + editScript_fn(argv[1], dir); } -void editScript(std::string name, std::string dir) +void editScript_fn(std::string name, std::string dir) { std::string script = dir + "/" + name; diff --git a/src/main.h b/src/main.h index 20a91a5..91cea4e 100644 --- a/src/main.h +++ b/src/main.h @@ -41,7 +41,7 @@ void listScripts(int argc, char *argv[]); void addScript(int argc, char *argv[]); // edit a script in the autom directory void editScript(int argc, char *argv[]); -void editScript(std::string name, std::string dir); +void editScript_fn(std::string name, std::string dir); // remove a script in the autom directory void removeScript(int argc, char *argv[]); // show a script in the autom directory From c8f913822962685251ca6abf565fe1004bd18c0a Mon Sep 17 00:00:00 2001 From: lucaspalomodevelop Date: Fri, 22 Mar 2024 22:23:08 +0100 Subject: [PATCH 2/2] autom logo --- src/main.cpp | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ src/main.h | 2 ++ 2 files changed, 51 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 19c1317..8872505 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -27,6 +27,7 @@ void input(int argc, char *argv[]) command.addCommand("remove", "[script] - Remove a script", removeScript); command.addCommand("show", "[script] - Shows a script", showScript); command.addCommand("config", " - Configures autom", config); + command.addCommand("logo", "- Shows the autom logo", logo); command.addDefaultCommand(runScript); command.runCommand(argv[1], argc, argv); @@ -263,6 +264,54 @@ void runScript(int argc, char *argv[]) // } } +void logo(int argc, char *argv[]) +{ + std::cout << " ,,irs2XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXAsri,, " << std::endl; + std::cout << " .:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXs:. " << std::endl; + std::cout << " .iXXXXsrii;:;::;:::::::::::::::::::::::::::::::::::::::::::::;iirsXXXXi. " << std::endl; + std::cout << " :XXXXr;::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::;rsXXX; " << std::endl; + std::cout << " ;XXXs;:::;irssssssssssssssssssssssssssssssssssssssssssssssssssssri;:::;rXXXi " << std::endl; + std::cout << " :XsXr:::;rXsssXXXsssXXXsX2AXXXXXXXXXXXXXXXXXXXXXXXsA2XsXXXsssXXXsssXsi:::iXXXi " << std::endl; + std::cout << ",sssr:::isXXhMhXsAMMhXXX39&BS2sXXXXXXssssssXXXXXXXASB&9hXsX3MhAss5MhXXsi:::iXss," << std::endl; + std::cout << "isss;::;sXs2@@@hrM@@@5s2&@@@@Msrri;;;::::::;;;irrrh@@@@@5s2&@@MsX&@@3ssXi:::ssX:" << std::endl; + std::cout << "sssr:::rXssX3H3XsX3G5XsshBB9hi:::::::,,,,,,:::::::iM9BBMXss2HhAss3HhXssss:::rssX" << std::endl; + std::cout << "sssr::;sssssssssssssssXsri;:,::::::,:r2222r:,::::::,::irsXXssssssssssssss;::rsss" << std::endl; + std::cout << "sssr::;sssssssssXsssXsi;,,;:,:::::,sG&@@@@&#A,:::::,:;,,;isXssXXsssssssss:::rsss" << std::endl; + std::cout << "sssr::;sssssssh#B#HAi;::sGB#hi:::,2&@@@&&@@@&A,:::;h#BG2:::rsh#B#HXssssss;::rssr" << std::endl; + std::cout << "rssr::;ssssss2@@@@@2,:,s@@@@@#::,sB@@@#sr#@@@BX,::M@@@@@s,:,2@@@@@5ssssss;::rssr" << std::endl; + std::cout << "rrsr:::ssssssA9@@@Bs,::;G&@@B5:,i9@@@&r,,iB@@@Bi,,AB@@@9i,:,r#@@@BAssssss;::rssr" << std::endl; + std::cout << "rrrr:::sssssssX53X;::::,:s55i,:;S@@@&2,::,X&@@@#;,,i25X;,:::,;X35Xsssssss;::rsrr" << std::endl; + std::cout << "rrrr:::ssssssssi:,:,:::::,,,:::M@@@@h,::::,5@@@@G;::,,,:::::,,,,issssssss;::rrrr" << std::endl; + std::cout << "rrri::;sssssssr:::;5###########&@@@M:::::::,M@@@@9##########hi:::isssssss;::irrr" << std::endl; + std::cout << "rrri:::ssssssr:::,X@@@@@@@@@@@@@@@G:,::::::,:S@@@@@@@@@@@@@@@h,:::rssssss;::irri" << std::endl; + std::cout << "rrri:::rrrrss;::::;399999999&@@@@9i,::::::::,i#@@@@B99999999Mr::::;ssssss;::irri" << std::endl; + std::cout << "rrri:::rrrrsr::::::,:::::::i9@@@&s,::::::::::,i9@@@9r:::::::,::::::isssss;::irri" << std::endl; + std::cout << "rrri:::rrrrr;::::::::::::::G@@@&A,::::::::::::,X&@@@9;,::::::::::::;rrrrs;::irri" << std::endl; + std::cout << "irri:::rrrrr::::,:;,,::::,h@@@&2.,,,,,::::,,,,,.A&@@@H:::::,,;:,::::rrrrs;::irri" << std::endl; + std::cout << "irri:::rrrrr:::ih#9Hs:::,5@@@@&HHHHHMr::::rMHHHHHB@@@@A,::,rH9Shi:::rrrrr:::irri" << std::endl; + std::cout << "irri:::rrrrr:::H@@@@@s,,X&@@@@@@@@@@@&i::;B@@@@@@@@@@Bs,:,i9@@@@#:::rrrrr:::irri" << std::endl; + std::cout << "iiri:::rrrrr::,AB@@&H;,r9@@@&9999999Sh::::2S999999#SMr,::::h&@@B5:::rrrrr:::irii" << std::endl; + std::cout << "iiii:::rrrri:::,i25s,,;9@@@Br;;;;;;;,,,,,,,,:;;;;;:,,,:::,,,s52i,:::rrrrr:::iiii" << std::endl; + std::cout << "iiii:::rrrrr;:::,,,,:;S@@@&A,:::::,issssssssr:::::::,iG#9H;,,,,,:::;rrrrr:::iiii" << std::endl; + std::cout << "iiii:::rrrrri:::::::,M@@@@h,::::::hB@@@@@@@@&H::::::,X@@@@G::::::::irrrrr:::iiii" << std::endl; + std::cout << "iii;:::rrrrrr;:::::,2&@@@H::::::::G@@@@@@@@@@G;:::::::H@@@@M,::::::rrrrrr:::;iii" << std::endl; + std::cout << "iii;:::riiiiri::::,s&@@@#i::::::::;AhhhhhhhhA;:::::::,;S@@@@A,::::irriiii:::;ii;" << std::endl; + std::cout << "iii;:::iiiiiiii:::,H@@@@5.,::::::::,,,,,,,,,,::::::::,.5@@@@H,:::;iiiiiii:::;ii;" << std::endl; + std::cout << "iii;:::iiiiiiiii:::rB@@@&MX:,,::::::::::::::::::::,,:rM&@@@&A,::;iiiiiiii:::;ii;" << std::endl; + std::cout << "iii;:::iiiiiiiiii::,iS@@@@@#hr:,,,,::::::::::,,,,:r3#&@@@@9X,::;iiiiiiiii:::;ii;" << std::endl; + std::cout << "iii;:::iiiiiiiiiii;:,;XG&@@@@&9H5Xs;;;;;;;;;;rA2M#&@@@@&GA;,:;;i;iiiiiiii:::;i;;" << std::endl; + std::cout << ";;i;:::iiiiiiii22Xi;::,:i5S&@@@@@@&BBBB999BBB&@@@@@@&S3s:,::iiX22riiiiiii:::;i;;" << std::endl; + std::cout << "i;;;:::iiiiiis#@@&Giii;::,:iAhG9&@@@@@@@@@@@@@@&BSM2i:,,::;iiM&@@9X;iiiii:::;i;;" << std::endl; + std::cout << ":;;;:::;iiii;A@@@@9riiii;::,,,,;is55MSSSSSSH55Xii,,,,::;iiii;#@@@@2;iiii;:::;;i," << std::endl; + std::cout << " ;;;;:::;iiiii5H#hsiiiiiiii;;:::,,,,,,,,,,,,,,,,:::;;iiiiiiiisM#H5iiiii;::::;;;." << std::endl; + std::cout << " ,;;;::::;iiii;;i;iiiiiiiiiiiiii;;;;;:::::::;;;;iiiiiiiiiiiii;;i;;iiii;::::;;;, " << std::endl; + std::cout << " :;;;::::::;iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii;::::::;;;: " << std::endl; + std::cout << " ,;;;;::::::::::;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:;:::::::;;;;: " << std::endl; + std::cout << " .:;;::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::;;:. " << std::endl; + std::cout << " .:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::,. " << std::endl; + std::cout << " .:,::::::::::::::::::::::::::::::::::::::::::::::::::::::::,,. " << std::endl; +} + void config(int argc, char *argv[]) { diff --git a/src/main.h b/src/main.h index 91cea4e..e71e60e 100644 --- a/src/main.h +++ b/src/main.h @@ -33,6 +33,8 @@ void input(int argc, char *argv[]); std::string scriptBuilder(std::string pre_script, std::string script_name, std::string args, json script_settings); // run a script with is in the autom directory void runScript(int argc, char *argv[]); +// show logo +void logo(int argc, char *argv[]); // config function for configuring autom void config(int argc, char *argv[]); // list all scripts in the autom directory