soutade
/
libgourou
2
4
Fork 2
Code Issues Pull Requests Packages Releases 4 Activity

Fix bad utils return value on error. Build network errors with a message and not just an error code.

This commit is contained in:
Grégory Soutadé 2021-07-29 21:14:48 +02:00
parent b5eb0efd31
commit bdaceba2e0
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
utils/acsmdownloader.cpp
View File

@ -66,6 +66,7 @@ public:
void run() void run()
{ {
int ret = 0;
try try
{ {
DRMProcessorClientImpl client; DRMProcessorClientImpl client;
@ -99,10 +100,10 @@ public:
} catch(std::exception& e) } catch(std::exception& e)
{ {
std::cout << e.what() << std::endl; std::cout << e.what() << std::endl;
this->app->exit(1); ret = 1;
} }
this->app->exit(0); this->app->exit(ret);
} }
private: private:

11
utils/adept_activate.cpp
View File

@ -100,10 +100,10 @@ static std::string getpass(const char *prompt, bool show_asterisk=false)
} }
class Activate: public QRunnable class ADEPTActivate: public QRunnable
{ {
public: public:
Activate(QCoreApplication* app): ADEPTActivate(QCoreApplication* app):
app(app) app(app)
{ {
setAutoDelete(false); setAutoDelete(false);
@ -111,6 +111,7 @@ public:
void run() void run()
{ {
int ret = 0;
try try
{ {
DRMProcessorClientImpl client; DRMProcessorClientImpl client;
@ -124,10 +125,10 @@ public:
} catch(std::exception& e) } catch(std::exception& e)
{ {
std::cout << e.what() << std::endl; std::cout << e.what() << std::endl;
this->app->exit(1); ret = 1;
} }
this->app->exit(0); this->app->exit(ret);
} }
private: private:
@ -262,7 +263,7 @@ int main(int argc, char** argv)
QCoreApplication app(argc, argv); QCoreApplication app(argc, argv);
Activate activate(&app); ADEPTActivate activate(&app);
QThreadPool::globalInstance()->start(&activate); QThreadPool::globalInstance()->start(&activate);
ret = app.exec(); ret = app.exec();

2
utils/drmprocessorclientimpl.cpp
View File

@ -119,7 +119,7 @@ std::string DRMProcessorClientImpl::sendHTTPRequest(const std::string& URL, cons
} }
if (reply->error() != QNetworkReply::NoError) if (reply->error() != QNetworkReply::NoError)
EXCEPTION(gourou::CLIENT_NETWORK_ERROR, "Error " << reply->error()); EXCEPTION(gourou::CLIENT_NETWORK_ERROR, "Error " << reply->errorString().toStdString());
if (gourou::logLevel >= gourou::DEBUG) if (gourou::logLevel >= gourou::DEBUG)
{ {