Mirrors/lgogdownloader
2
0
Fork 0
mirror of https://github.com/Sude-/lgogdownloader.git synced 2025-02-08 16:33:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/grepwood/lgogdownloader into master

Browse Source
This commit is contained in:
Sude 2020-09-26 21:50:12 +03:00
commit f6d020b807
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/downloader.cpp
View File

@ -246,6 +246,7 @@ int Downloader::login()
{ {
std::string email; std::string email;
std::string password; std::string password;
bool headless = false;
if (!Globals::globalConfig.sEmail.empty() && !Globals::globalConfig.sPassword.empty()) if (!Globals::globalConfig.sEmail.empty() && !Globals::globalConfig.sPassword.empty())
{ {
@ -255,9 +256,16 @@ int Downloader::login()
else else
{ {
if (!isatty(STDIN_FILENO)) { if (!isatty(STDIN_FILENO)) {
/* Attempt to read this stuff from elsewhere */
bool cookie_gone = !(boost::filesystem::exists(Globals::globalConfig.curlConf.sCookiePath));
bool tokens_gone = !(boost::filesystem::exists(Globals::globalConfig.sConfigDirectory + "/galaxy_tokens.json"));
std::cout << Globals::globalConfig.curlConf.sCookiePath << std::endl;
std::cout << (Globals::globalConfig.sConfigDirectory + "/galaxy_tokens.json") << std::endl;
if(cookie_gone || tokens_gone) {
std::cerr << "Unable to read email and password" << std::endl; std::cerr << "Unable to read email and password" << std::endl;
return 0; return 0;
} } else headless = true;
} else {
std::cerr << "Email: "; std::cerr << "Email: ";
std::getline(std::cin,email); std::getline(std::cin,email);
@ -271,8 +279,9 @@ int Downloader::login()
tcsetattr(STDIN_FILENO, TCSANOW, &termios_old); // Restore old terminal attributes tcsetattr(STDIN_FILENO, TCSANOW, &termios_old); // Restore old terminal attributes
std::cerr << std::endl; std::cerr << std::endl;
} }
}
if (email.empty() || password.empty()) if ((email.empty() || password.empty()) && !headless)
{ {
std::cerr << "Email and/or password empty" << std::endl; std::cerr << "Email and/or password empty" << std::endl;
return 0; return 0;