diff --git a/include/Managers/ActionManager.h b/include/Managers/ActionManager.h index f63b2d4..ff2c16d 100644 --- a/include/Managers/ActionManager.h +++ b/include/Managers/ActionManager.h @@ -2,6 +2,7 @@ #define ACTIONMANAGER_H_ #include +#include #include #include"Models/Flags.h" @@ -21,8 +22,6 @@ namespace Managers bool isNumber(std::string); void initialize(); - void initializeSupportedActions(); - void initializeSupportedFlags(); void validateAction(); void validateFlags(); @@ -33,8 +32,13 @@ namespace Managers void printFlags(); std::string action; - std::vector supportedActions; - std::vector supportedFlags; + std::array supportedActions{ + "download", "upload", "retrieve", "delete" + }; + std::array supportedFlags{ + "-u", "-p", "-t", "-h", "-s", + "-d", "-D", "-b", "-rt" + }; std::vector flags; char **params; }; diff --git a/src/Managers/ActionManager.cpp b/src/Managers/ActionManager.cpp index a922a60..4fce238 100644 --- a/src/Managers/ActionManager.cpp +++ b/src/Managers/ActionManager.cpp @@ -20,10 +20,6 @@ namespace Managers { this->params = param; - action = string{params[1]}; - transform(action.begin(), action.end(), - action.begin(), ::tolower); - initialize(); } #pragma Constructors @@ -59,23 +55,11 @@ namespace Managers void ActionManager::initialize() { - initializeSupportedActions(); - validateAction(); validateFlags(); - } - void ActionManager::initializeSupportedActions() - { - supportedActions = vector{ - "download", "delete", - "retrieve", "upload" - }; - } - void ActionManager::initializeSupportedFlags() - { - supportedFlags = vector{ - "-u", "-p", "-t", "-h", "-s", - "-d", "-D", "-b", "-rt" - }; + + action = string{params[1]}; + transform(action.begin(), action.end(), + action.begin(), ::tolower); } void ActionManager::validateAction() { @@ -100,7 +84,6 @@ namespace Managers cout<<"Validating flags"<