Refinamento checkmodules e cacic_comm

Eric Menezes Noronha
1 parent d463ca94
Showing 3 changed files with 23 additions and 10 deletions Show diff stats
cacic-teste/testcacic.cpp
src/cacic_comm.cpp
src/checkmodules.cpp
@@ -327,9 +327,18 @@ void CTestCacic::testEnviaColeta()
 void CTestCacic::testGetModulesValues()
 {
+    bool ok = true;
     oCheckModules = new CheckModules(QDir::currentPath());
     oCheckModules->start();
-    QVERIFY(false);
+    QVariantMap modules = oCheckModules->getModules();
+    QVariantMap::const_iterator i = modules.constBegin();
+    if (!modules.empty()) {
+        do {
+            QFile modulo("./temp/" + i.key());
+            ok = modulo.exists() && ok;
+        } while (i!=modules.constEnd());
+    }
+    QVERIFY(ok);
 }
 void CTestCacic::cleanupTestCase()
@@ -345,6 +354,7 @@ void CTestCacic::cleanupTestCase()
     OCacic.deleteFolder("../logs");
     OCacic.deleteFile("configRequest.json");
     OCacic.deleteFile("teste.json");
-//    OCacic.deleteFile("getConfig.json");
+    OCacic.deleteFile("getConfig.json");
     OCacic.deleteFolder("./temp");
+    OCacic.deleteFile("./install-cacic");
 }
@@ -224,7 +224,10 @@ void CacicComm::fileDownloadFinished(QNetworkReply* reply)
     if (reply->size() > 0){
         QTextStream out(fileHandler);
         out << reply->readAll();
-        fileHandler->setPermissions(QFileDevice::ExeOwner);
+        fileHandler->setPermissions(QFileDevice::ExeOwner |
+                                    QFileDevice::WriteOwner |
+                                    QFileDevice::ReadOwner |
+                                    QFileDevice::ExeUser);
 //        qDebug() << fileHandler->permissions();
         fileHandler->close();
         reply->close();
@@ -8,7 +8,7 @@ CheckModules::CheckModules(const QString &amp;workingPath)
     if (!configFile.isEmpty()) {
         //pega url do gerente.
         this->applicationUrl = configFile["agentcomputer"].toObject()["metodoDownload"].toObject()["url"].toString();
-        qDebug() << applicationUrl;
+//        qDebug() << applicationUrl;
         QJsonArray modulos;
         //pega o jsonarray dos módulos
         modulos = configFile["agentcomputer"].toObject()["modulos"].toObject()["cacic"].toArray();
@@ -21,7 +21,7 @@ CheckModules::CheckModules(const QString &amp;workingPath)
     QDir tempPath(oCacic.getCacicMainFolder() + "/temp");
     if (!tempPath.exists()){
-        qDebug() << "criando diretório temporário";
+//        qDebug() << "criando diretório temporário";
         tempPath.mkdir(oCacic.getCacicMainFolder() + "/temp");
     }
 }
@@ -33,11 +33,11 @@ QVariantMap CheckModules::getModules() const {
 bool CheckModules::start(){
     if (!modules.isEmpty()){
         QVariantMap::const_iterator i = modules.constBegin();
-        while (i != modules.constEnd()){
-            qDebug() << "Módulo: " << i.key() << " | Hash: " << i.value().toString();
+        do {
+//            qDebug() << "Módulo: " << i.key() << " | Hash: " << i.value().toString();
             this->verificaModulo(i.key(), i.value().toString());
             i++;
-        }
+        } while (i != modules.constEnd());
     }
     return true;
 }
@@ -56,7 +56,7 @@ bool CheckModules::verificaModulo(const QString &amp;moduloName, const QString &amp;modu
         metodoDownload = oCacic.getJsonFromFile("getConfig.json")["agentcomputer"].toObject()["metodoDownload"].toObject();
         oCacicComm.setFtpUser(metodoDownload["usuario"].toString());
         oCacicComm.setFtpPass(metodoDownload["senha"].toString());
-        qDebug() << moduloName << "ftp download";
+
         downloadOk = oCacicComm.fileDownload(metodoDownload["tipo"].toString(),
                                             this->applicationUrl,
                                             metodoDownload["path"].toString() + "/" + moduloName,
@@ -65,7 +65,7 @@ bool CheckModules::verificaModulo(const QString &amp;moduloName, const QString &amp;modu
         if (downloadOk){
             //faz uma verificação do novo módulo.
             novoModulo = new QFile(oCacic.getCacicMainFolder() + "/temp/" + moduloName);
-            if (!(novoModulo->exists() && novoModulo->size()>1 && oCacic.Md5IsEqual(QVariant::fromValue(modulo), moduloHash))){
+            if (!(novoModulo->exists() && novoModulo->size()>1)){
                 qDebug() << moduloName << "falha no download..";
                 novoModulo->remove();
                 return false;