Mirrors/lgogdownloader
2
0
Fork 0
mirror of https://github.com/Sude-/lgogdownloader.git synced 2024-11-20 11:49:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't reset options set in config file on --login

Browse Source
This commit is contained in:
Sude 2014-07-06 17:20:06 +03:00
parent 2aeca35097
commit ce26a4b020
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
main.cpp
View File

@ -21,6 +21,11 @@
namespace bpo = boost::program_options; namespace bpo = boost::program_options;
template<typename T> void set_vm_value(std::map<std::string, bpo::variable_value>& vm, const std::string& option, const T& value)
{
vm[option].value() = boost::any(value);
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
Config config; Config config;
@ -288,10 +293,22 @@ int main(int argc, char *argv[])
Downloader downloader(config); Downloader downloader(config);
int result = downloader.init(); int result = downloader.init();
int iLoginResult = 0;
if (config.bLogin) if (config.bLogin)
return result;
else if (config.bSaveConfig)
{ {
iLoginResult = result;
if (iLoginResult == 0)
return 1;
}
if (config.bSaveConfig || iLoginResult == 1)
{
if (iLoginResult == 1)
{
set_vm_value(vm, "token", downloader.config.sToken);
set_vm_value(vm, "secret", downloader.config.sSecret);
bpo::notify(vm);
}
std::ofstream ofs(config.sConfigFilePath.c_str()); std::ofstream ofs(config.sConfigFilePath.c_str());
if (ofs) if (ofs)
{ {

24
src/downloader.cpp
View File

@ -102,8 +102,8 @@ int Downloader::init()
} }
/* Login /* Login
returns 1 if login fails returns 0 if login fails
returns 0 if successful returns 1 if successful
*/ */
int Downloader::login() int Downloader::login()
{ {
@ -116,7 +116,7 @@ int Downloader::login()
if (email.empty() || password.empty()) if (email.empty() || password.empty())
{ {
std::cout << "Email and/or password empty" << std::endl; std::cout << "Email and/or password empty" << std::endl;
return 1; return 0;
} }
else else
{ {
@ -124,7 +124,7 @@ int Downloader::login()
if (!HTTP_Login(email, password)) if (!HTTP_Login(email, password))
{ {
std::cout << "HTTP: Login failed" << std::endl; std::cout << "HTTP: Login failed" << std::endl;
return 1; return 0;
} }
else else
{ {
@ -134,26 +134,16 @@ int Downloader::login()
if (!gogAPI->login(email, password)) if (!gogAPI->login(email, password))
{ {
std::cout << "API: Login failed" << std::endl; std::cout << "API: Login failed" << std::endl;
return 1;
}
else
{
std::cout << "API: Login successful" << std::endl;
// Save token and secret to config file
std::ofstream ofs(config.sConfigFilePath.c_str());
if (ofs)
{
ofs << "token = " << gogAPI->getToken() << std::endl << "secret = " << gogAPI->getSecret() << std::endl;
ofs.close();
return 0; return 0;
} }
else else
{ {
std::cout << "Failed to create config: " << config.sConfigFilePath << std::endl; std::cout << "API: Login successful" << std::endl;
config.sToken = gogAPI->getToken();
config.sSecret = gogAPI->getSecret();
return 1; return 1;
} }
} }
}
} }
void Downloader::updateCheck() void Downloader::updateCheck()