3 Commits

Author SHA1 Message Date
Grégory Soutadé
7f5a4900e0 Typo fix 2021-08-21 20:37:07 +02:00
Grégory Soutadé
d8f882a277 Fix a bug : gmtime() should used in place of localtime() to keep date in UTC and not local timezone 2021-08-12 21:11:40 +02:00
Grégory Soutadé
bdaceba2e0 Fix bad utils return value on error. Build network errors with a message and not just an error code. 2021-07-29 21:14:48 +02:00
15 changed files with 25 additions and 24 deletions

View File

@@ -48,7 +48,7 @@ namespace gourou
const unsigned char* getDeviceKey(); const unsigned char* getDeviceKey();
/** /**
* @brief Get one value of device.xml (deviceClass, deviceSerial, deviceName, deviceType, jobbes, clientOS, clientLocale) * @brief Get one value of device.xml (deviceClass, deviceSerial, deviceName, deviceType, hobbes, clientOS, clientLocale)
*/ */
std::string getProperty(const std::string& property, const std::string& _default=std::string("")); std::string getProperty(const std::string& property, const std::string& _default=std::string(""));
std::string operator[](const std::string& property); std::string operator[](const std::string& property);

View File

@@ -40,7 +40,7 @@
#define ACS_SERVER "http://adeactivate.adobe.com/adept" #define ACS_SERVER "http://adeactivate.adobe.com/adept"
#endif #endif
#define LIBGOUROU_VERSION "0.3.1" #define LIBGOUROU_VERSION "0.3.2"
namespace gourou namespace gourou
{ {

View File

@@ -109,7 +109,6 @@ namespace gourou
CLIENT_ZIP_ERROR, CLIENT_ZIP_ERROR,
CLIENT_GENERIC_EXCEPTION, CLIENT_GENERIC_EXCEPTION,
CLIENT_NETWORK_ERROR, CLIENT_NETWORK_ERROR,
}; };
/** /**

View File

@@ -291,7 +291,7 @@ namespace gourou
appendTextElem(root, "adept:nonce", nonce.toBase64().data()); appendTextElem(root, "adept:nonce", nonce.toBase64().data());
time_t _time = time(0) + 10*60; // Cur time + 10 minutes time_t _time = time(0) + 10*60; // Cur time + 10 minutes
struct tm* tm_info = localtime(&_time); struct tm* tm_info = gmtime(&_time);
char buffer[32]; char buffer[32];
strftime(buffer, sizeof(buffer), "%Y-%m-%dT%H:%M:%SZ", tm_info); strftime(buffer, sizeof(buffer), "%Y-%m-%dT%H:%M:%SZ", tm_info);

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:

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();

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)
{ {