diff --git a/cacic-teste/testcacic.cpp b/cacic-teste/testcacic.cpp index d84766a..12eadb9 100644 --- a/cacic-teste/testcacic.cpp +++ b/cacic-teste/testcacic.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"); } diff --git a/src/cacic_comm.cpp b/src/cacic_comm.cpp index ff73374..8e48866 100644 --- a/src/cacic_comm.cpp +++ b/src/cacic_comm.cpp @@ -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(); diff --git a/src/checkmodules.cpp b/src/checkmodules.cpp index 8166ab3..5458f06 100644 --- a/src/checkmodules.cpp +++ b/src/checkmodules.cpp @@ -8,7 +8,7 @@ CheckModules::CheckModules(const QString &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 &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 &moduloName, const QString &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 &moduloName, const QString &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; -- libgit2 0.21.2