Modificação do instalador e testes.

Eric Menezes Noronha
1 parent a04f5df4
Showing 6 changed files with 51 additions and 26 deletions Show diff stats
cacic-teste/testcacic.cpp
install-cacic/installcacic.cpp
install-cacic/installcacic.h
src/cacic_comm.cpp
src/cacic_comm.h
src/ccoleta.cpp
@@ -326,6 +326,7 @@ void CTestCacic::testEnviaColeta()
 {
     bool ok;
     QJsonObject coletaEnvio = oColeta.toJsonObject();
+    OCacic.setJsonToFile(oColeta.toJsonObject(), "coleta.json");
 //    qDebug() << coletaEnvio;
     qDebug() << OCacicComm->comm("/ws/neo/coleta", &ok, coletaEnvio, true);
     QVERIFY(ok);
@@ -39,14 +39,15 @@ void InstallCacic::run(QStringList argv, int argc) {
             jsonComm["computador"] = oCacicComputer.toJsonObject();
             QJsonObject configs = oCacicComm->comm("/ws/neo/config", &ok, jsonComm);
             if (ok){
-                oCacicComm->setUrlGerente(configs["reply"].toObject()["applicationUrl"].toString());
+                QJsonObject configsJson = configs["reply"].toObject();
+                oCacicComm->setUrlGerente(configsJson["applicationUrl"].toString());
 #ifdef Q_OS_WIN
-                oCacic.setCacicMainFolder(configs["reply"].toObject()["cacic_main_folder"].isString() ?
-                                          configs["reply"].toObject()["cacic_main_folder"].toString() :
+                oCacic.setCacicMainFolder(configsJson["cacic_main_folder"].isString() ?
+                                          configsJson["cacic_main_folder"].toString() :
                                           "c:/cacic/");
 #elif defined(Q_OS_LINUX)
-                oCacic.setCacicMainFolder(configs["reply"].toObject()["cacic_main_folder"].isString() ?
-                                          configs["reply"].toObject()["cacic_main_folder"].toString() :
+                oCacic.setCacicMainFolder(configsJson["cacic_main_folder"].isString() ?
+                                          configsJson["cacic_main_folder"].toString() :
                                           "/usr/cacic");
 #endif
@@ -59,28 +60,43 @@ void InstallCacic::run(QStringList argv, int argc) {
                 //starta o processo do cacic.
                 //TO DO: Fazer download do serviço
+                QJsonObject metodoDownload;
+                metodoDownload = configsJson["agentcomputer"].toObject()["metodoDownload"].toObject();
     #ifdef Q_OS_WIN
-                oCacicComm->ftpDownload("agentes/cacic-service.exe", oCacic.getCacicMainFolder());
+                oCacicComm->fileDownload(metodoDownload["tipo"].toString(),
+                                         metodoDownload["url"].toString(),
+                                         metodoDownload["path"].toString() + "/cacic-service.exe",
+                                         oCacic.getCacicMainFolder());
-                QString exitStatus = oCacic.startProcess(oCacic.getCacicMainFolder() + "cacic-service.exe",
+                QString exitStatus = oCacic.startProcess(oCacic.getCacicMainFolder() + "/cacic-service.exe",
                                                          false,
                                                          &ok,
                                                          QStringList("-install");
     #else
-                oCacicComm->ftpDownload("agentes/cacic-service", oCacic.getCacicMainFolder());
-                QJsonObject configsJson = configs["reply"].toObject();
-                QString senhaAgente;
-                if ( !configsJson["te_senha_adm_agente"].isNull() )
-                    senhaAgente = configsJson["te_senha_adm_agente"].toString();
-                else
-                    senhaAgente = QString("ADMINCACIC");
+                oCacicComm->fileDownload(metodoDownload["tipo"].toString(),
+                                         metodoDownload["url"].toString(),
+                                         metodoDownload["path"].toString() + "/cacic-service",
+                                        oCacic.getCacicMainFolder());
+
+                oCacicComm->fileDownload(metodoDownload["tipo"].toString(),
+                                         metodoDownload["url"].toString(),
+                                         metodoDownload["path"].toString() + "/cacic-script.sh",
+                                         oCacic.getCacicMainFolder());
+
+                QFile fileScript(oCacic.getCacicMainFolder()+"/cacic-script.sh");
+                QFile fileService(oCacic.getCacicMainFolder()+"/cacic-service");
+                if ((!fileScript.exists()  || !fileScript.size()  > 0) &&
+                    (!fileService.exists() || !fileService.size() > 0)) {
+                    this->uninstall();
+                    return;
+                }
+                fileScript.close();
+                fileService.close();
                 QStringList arguments;
-                arguments.append(QString("-install"));
-                arguments.append(QString("cacic"));
-                arguments.append(senhaAgente);
-                QString exitStatus = oCacic.startProcess(oCacic.getCacicMainFolder() + "cacic-service",
+                arguments.append(QString("start"));
+                QString exitStatus = oCacic.startProcess("/etc/init.d/cacic",
                                                          false,
                                                          &ok,
                                                          arguments);
@@ -91,6 +107,7 @@ void InstallCacic::run(QStringList argv, int argc) {
                 else {
                     std::cout << "Instalação realizada com sucesso." << "\n";
                 }
+
             } else {
                 std::cout << "Falha ao pegar configurações: " << configs["error"].toString().toStdString() << "\n";
             }
@@ -100,9 +117,7 @@ void InstallCacic::run(QStringList argv, int argc) {
                       << "  Código: " << jsonLogin["codestatus"].toString().toStdString() << "\n"
                       << "  " << jsonLogin["error"].toString().toStdString() << "\n";
     } else if ((param.contains("default")) && (param["default"] == "uninstall")){
-        oCacic.deleteFolder("c:/cacic");
-        oCacic.removeRegistry("Lightbase", "Cacic");
-        std::cout << "Cacic desinstalado com sucesso.\n";
+        this->uninstall();
     } else {
         std::cout << "\nInstalador do Agente Cacic.\n\n"
                   << "Parametros incorretos. (<obrigatorios> [opcional])\n\n"
@@ -135,6 +150,14 @@ QMap&lt;QString, QString&gt; InstallCacic::validaParametros(QStringList argv, int argc
     return map;
 }
+void InstallCacic::uninstall()
+{
+    oCacic.deleteFolder("c:/cacic");
+    oCacic.removeRegistry("Lightbase", "Cacic");
+    std::cout << "\nCacic desinstalado com sucesso.\n";
+    emit finished();
+}
+
 QMap<QString, QString> InstallCacic::getArgumentos()
 {
     return argumentos;
@@ -24,6 +24,7 @@ public:
     void registro();
 private:
+    void uninstall();
     QMap<QString, QString> argumentos;
     CacicComm *oCacicComm;
     CACIC_Computer oCacicComputer;
@@ -192,7 +192,7 @@ bool CacicComm::fileDownload(const QString &amp;mode, const QString &amp;urlServer, cons
     QStringList splitPath = path.split("/");
-    fileHandler = new QFile(pathDownload + splitPath[splitPath.size() - 1]);
+    fileHandler = new QFile(pathDownload + "/" + splitPath[splitPath.size() - 1]);
     if( !fileHandler->open(QIODevice::WriteOnly) ) {
         qDebug() << "ftpDownload: fileHandler nâo pode abrir arquivo.";
         return false;
@@ -31,6 +31,9 @@ public:
     bool ftpDownload(const QString &urlServer, const QString &path, const QString &pathDownload);
     bool httpDownload(const QString &path, const QString &pathDownload);
     bool httpDownload(const QString &urlServer, const QString &path,const QString &pathDownload);
+    bool fileDownload(const QString &mode, const QString &path, const QString &pathDownload);
+    bool fileDownload(const QString &mode, const QString &urlServer, const QString &path, const QString &pathDownload);
+
     QString getUrlSsl ();
     void setUrlSsl(const QString &value);
     QString getUrlGerente ();
@@ -53,9 +56,6 @@ private slots:
 private:
-    bool fileDownload(const QString &mode, const QString &path, const QString &pathDownload);
-    bool fileDownload(const QString &mode, const QString &urlServer, const QString &path, const QString &pathDownload);
-
     QUrlQuery params;
     QString urlGerente;
     QString urlSsl;
@@ -65,8 +65,8 @@ QJsonObject CColeta::toJsonObject()
     QJsonObject coletaJson;
     if (this->hardwareIsFinish && this->softwareIsFinish){
         coletaJson["computador"] = oComputer.toJsonObject();
-        coletaJson["software"] = oSoftware.toJsonObject();
         coletaJson["hardware"] = oHardware.toJsonObject();
+        coletaJson["software"] = oSoftware.toJsonObject();
     }
     return coletaJson;
 }
	@@ -24,6 +24,7 @@ public:		@@ -24,6 +24,7 @@ public:
24	void registro();	24	void registro();
25		25
26	private:	26	private:
		27	+ void uninstall();
27	QMap<QString, QString> argumentos;	28	QMap<QString, QString> argumentos;
28	CacicComm *oCacicComm;	29	CacicComm *oCacicComm;
29	CACIC_Computer oCacicComputer;	30	CACIC_Computer oCacicComputer;
	@@ -192,7 +192,7 @@ bool CacicComm::fileDownload(const QString &mode, const QString &urlServer, cons		@@ -192,7 +192,7 @@ bool CacicComm::fileDownload(const QString &mode, const QString &urlServer, cons
192		192
193	QStringList splitPath = path.split("/");	193	QStringList splitPath = path.split("/");
194		194
195	- fileHandler = new QFile(pathDownload + splitPath[splitPath.size() - 1]);	195	+ fileHandler = new QFile(pathDownload + "/" + splitPath[splitPath.size() - 1]);
196	if( !fileHandler->open(QIODevice::WriteOnly) ) {	196	if( !fileHandler->open(QIODevice::WriteOnly) ) {
197	qDebug() << "ftpDownload: fileHandler nâo pode abrir arquivo.";	197	qDebug() << "ftpDownload: fileHandler nâo pode abrir arquivo.";
198	return false;	198	return false;