minor changes

This commit is contained in:
kdeng00
2019-08-10 10:49:40 -04:00
parent 271921d55b
commit 27aecc7a0d
12 changed files with 30 additions and 187 deletions
+7 -59
View File
@@ -2,7 +2,7 @@
#include<algorithm>
#include<iostream>
#include<exception>
#include<utility>
#include<cstring>
using std::cout;
@@ -16,10 +16,9 @@ using Models::IcarusAction;
namespace Managers
{
#pragma
ActionManager::ActionManager(char **param)
ActionManager::ActionManager(char **param, int paramCount) :
params(std::move(param)), paramCount(paramCount)
{
this->params = param;
initialize();
}
#pragma Constructors
@@ -34,15 +33,6 @@ namespace Managers
return icarusAction;
}
vector<Flags> ActionManager::retrieveFlags() const
{
return flags;
}
string ActionManager::retrieveAction() const
{
return action;
}
bool ActionManager::isNumber(string val)
{
@@ -57,28 +47,10 @@ namespace Managers
{
validateFlags();
action = string{params[1]};
action = std::move(string{params[1]});
transform(action.begin(), action.end(),
action.begin(), ::tolower);
}
void ActionManager::validateAction()
{
cout<<"Validating action"<<endl;
if (std::any_of(supportedActions.begin(), supportedActions.end(),
[&](string val)
{
return !val.compare(action);
}))
{
//cout<<"Action: "<<action<<" is valid"<<endl;
}
else
{
cout<<"Action is not valid"<<endl;
exit(1);
}
}
void ActionManager::validateFlags()
{
cout<<"Validating flags"<<endl;
@@ -118,19 +90,10 @@ namespace Managers
vector<string> ActionManager::parsedFlags()
{
auto parsed = vector<string>{};
try
for (auto i = 2; i < paramCount; ++i)
{
for (auto i = 2; true; ++i)
{
string val{*(params + i)};
//cout<<"Parsed flag "<<val<<endl;
parsed.push_back(val);
}
}
catch (std::exception e)
{
auto msg = e.what();
cout<<"This happend: "<<msg<<endl<<endl;
parsed.push_back(std::move(*(params + i)));
}
return parsed;
@@ -148,21 +111,6 @@ namespace Managers
cout<<"Action is "<<action<<endl;
}
}
void ActionManager::printFlags(vector<string> flagVals)
{
if (flagVals.empty())
{
printf("Flags and values are empty\n");
}
else
{
printf("Printing flags and values..\n");
for (auto flgVal : flagVals)
{
cout<<flgVal<<endl;
}
}
}
void ActionManager::printFlags()
{
cout<<"\nPrinting flags..."<<endl;
+4 -15
View File
@@ -34,11 +34,8 @@ using Syncers::Upload;
namespace Managers
{
#pragma
CommitManager::CommitManager(IcarusAction icaAct)
{
icaAction = icaAct;
initializeMapActions();
}
CommitManager::CommitManager(IcarusAction& icaAct) : icaAction(std::move(icaAct))
{ }
#pragma Constructors;
@@ -46,7 +43,7 @@ namespace Managers
void CommitManager::commitAction()
{
auto action = icaAction.action;
cout<<"Commitning "<<action<<" action"<<endl;
cout<<"Commiting "<<action<<" action"<<endl;
switch (mapActions[action])
{
case deleteAct:
@@ -55,7 +52,7 @@ namespace Managers
case downloadAct:
downloadSong();
break;
case retrieveAct: // No plans to imeplement
case retrieveAct:
retrieveObjects();
break;
case uploadAct:
@@ -75,14 +72,6 @@ namespace Managers
return tk.requestToken();
}
void CommitManager::initializeMapActions()
{
mapActions = map<string, ActionValues>{
{"delete", deleteAct}, {"download", downloadAct},
{"retrieve", retrieveAct},
{"upload", uploadAct}
};
}
void CommitManager::deleteSong()
{
APIParser apiPrs{icaAction};