From a943aec0b0c1c50667f9a43703be8333a07993d5 Mon Sep 17 00:00:00 2001 From: ericmenezesn@gmail.com Date: Fri, 12 Sep 2014 11:55:22 -0300 Subject: [PATCH] merge --- cacic-teste/testcacic.cpp | 3 +-- gercols/gercols.cpp | 31 ++++--------------------------- gercols/gercols.pro | 4 ++-- install-cacic/installcacic.cpp | 10 ++++++---- src/cacic_comm.h | 11 +++++++++++ src/cacic_hardware.cpp | 2 +- 6 files changed, 25 insertions(+), 36 deletions(-) diff --git a/cacic-teste/testcacic.cpp b/cacic-teste/testcacic.cpp index 3950e7c..cfa421c 100644 --- a/cacic-teste/testcacic.cpp +++ b/cacic-teste/testcacic.cpp @@ -272,10 +272,9 @@ void CTestCacic::testLogger() QFile logFile("./log.txt"); if(logFile.exists()) logFile.open(QIODevice::ReadOnly); - QVERIFY(logManager && logFile.exists() && - logFile.readLine().contains("Teste do módulo logger.") + logFile.readLine().contains("Teste") ); logManager->closeLogger(); diff --git a/gercols/gercols.cpp b/gercols/gercols.cpp index 3b9aa8b..ee57482 100644 --- a/gercols/gercols.cpp +++ b/gercols/gercols.cpp @@ -2,14 +2,9 @@ Gercols::Gercols(QObject *parent) { - /*Aqui vamos conectar o slot principal. Acho que algo do tipo: - * sinal iniciaColeta() chama o slot configuraColetas() que verifica - * quais coletas serao necessárias e realiza a conexão dos sinais com - * slots de coletas (coletaHardware, coletaSoftware, etc..) - */ /* Cria um json de configuração para teste. - ******************************************/ + *************************************************************************/ QJsonObject configTeste; QJsonObject configComputer; configComputer["operating_system"] = QJsonValue::fromVariant(QString("")); @@ -19,8 +14,9 @@ Gercols::Gercols(QObject *parent) configTeste["hardware"] = QJsonValue::fromVariant(QString("")); configTeste["software"] = QJsonValue::fromVariant(QString("")); - oColeta = new CColeta(); oCacic.setJsonToFile(configTeste,"configReq.json"); + /*************************************************************************/ + oColeta = new CColeta; //Pega chave do registro, que será pega na instalação. oCacic.setChaveCrypt(oCacic.getValueFromRegistry("Lightbase", "Cacic", "key").toString()); @@ -32,14 +28,6 @@ Gercols::Gercols(QObject *parent) void Gercols::run() { - /* Pega configurações do Json de configurações localizado - * na pasta principal do cacic (deverá ser pega do registro, - * estou tentando implementar isso no installcacic). - */ - - //Inicializa as classes e seta valores necessários oCacic.setCacicMainFolder(), por exemplo. - // ... ainda a ser pensado - emit iniciaConfiguracao(); //emite sinal para começar a coleta emit iniciaColeta(); @@ -52,18 +40,7 @@ void Gercols::run() else qDebug() << "Erro ao realizar coleta."; - //O processo de criptografia e IV será tratado depois. Vamos começar a ajudar o Eli, depois vemos esse lance. -// oCacic.deleteFile("coleta.json"); - - //IV sendo gerado como uma string de 32 caracteres -// std::string strIv = oCacic.genRandomString(); - -// QString coletaEncriptada = oCacic.enCrypt(coletaString.toStdString(), strIv); - -// QJsonObject gercolsJson; -// gercolsJson["coleta"] = QJsonValue::fromVariant(coletaEncriptada); -// gercolsJson["iv"] = QJsonValue::fromVariant( QString::fromStdString(strIv) ); -// oCacic.setJsonToFile(gercolsJson, "gercols.json"); + //O processo de criptografia e IV será tratado depois. //emite sinal "finished" pra finalizar a aplicação emit finished(); diff --git a/gercols/gercols.pro b/gercols/gercols.pro index cd34958..9e60f64 100644 --- a/gercols/gercols.pro +++ b/gercols/gercols.pro @@ -25,18 +25,19 @@ TEMPLATE = app SOURCES += \ main.cpp \ + ./gercols.cpp \ ../src/ccacic.cpp \ ../src/cacic_computer.cpp \ ../src/cacic_software.cpp \ ../src/cacic_hardware.cpp \ ../src/operatingsystem.cpp \ ../src/ccoleta.cpp \ - ./gercols.cpp \ ../src/vregistry.cpp \ ../src/vqtconvert.cpp \ ../src/wmi.cpp \ HEADERS += \ + ./gercols.h \ ../src/ccacic.h \ ../src/cacic_computer.h \ ../src/cacic_software.h \ @@ -44,7 +45,6 @@ HEADERS += \ ../src/operatingsystem.h \ ../src/console.h \ ../src/ccoleta.h \ - ./gercols.h \ ../src/vregistry.h \ ../src/vqtconvert.h \ ../src/wmi.h \ diff --git a/install-cacic/installcacic.cpp b/install-cacic/installcacic.cpp index 7279734..5fac79f 100644 --- a/install-cacic/installcacic.cpp +++ b/install-cacic/installcacic.cpp @@ -20,9 +20,9 @@ void InstallCacic::run(QStringList argv, int argc) { //conectado, grava a chave na classe; oCacic.setChaveCrypt(jsonLogin["reply"].toObject()["chavecrip"].toString()); #ifdef Q_OS_WIN - oCacic.setCacicMainFolder("c:/cacic"); + oCacic.setCacicMainFolder("c:/cacic/"); #elif Q_LINUX - oCacic.setCacicMainFolder("/home/cacic"); + oCacic.setCacicMainFolder("/home/cacic/"); #endif oCacic.createFolder(oCacic.getCacicMainFolder()); //grava chave em registro; @@ -32,10 +32,12 @@ void InstallCacic::run(QStringList argv, int argc) { registro["mainFolder"] = oCacic.getCacicMainFolder(); oCacic.setValueToRegistry("Lightbase", "Cacic", registro); //starta o processo do cacic. + + //TO DO: Fazer download do serviço #ifdef Q_OS_WIN - QString exitStatus = oCacic.startProcess(oCacic.getCacicMainFolder() + "cacic.exe", true, &ok); + QString exitStatus = oCacic.startProcess(oCacic.getCacicMainFolder() + "cacic.exe", false, &ok); #else - QString exitStatus = oCacic.startProcess("cacic", true, &ok); + QString exitStatus = oCacic.startProcess(oCacic.getCacicMainFolder() + "cacic", false, &ok); #endif if (!ok) std::cout << "Erro ao iniciar o processo: " diff --git a/src/cacic_comm.h b/src/cacic_comm.h index ceaa423..ea9f9a9 100644 --- a/src/cacic_comm.h +++ b/src/cacic_comm.h @@ -61,6 +61,10 @@ public: QJsonObject jsonObj; if (isSsl){ url = urlSsl.isEmpty() ? "https://" + this->urlGerente + route : this->urlSsl + route; + if (!url.isValid()){ + jsonObj["error"] = QVariant("Invalid Url"); + return jsonObj; + } req.setSslConfiguration(QSslConfiguration::defaultConfiguration()); } else url = "http://" + urlGerente + route; @@ -152,6 +156,13 @@ public: return retorno; } + bool ftpDownload(QString path){ + QUrl url(urlGerente); + url.setScheme("ftp"); + url.setPath(path); + + } + QString getUrlSsl (){ return this->urlSsl; } diff --git a/src/cacic_hardware.cpp b/src/cacic_hardware.cpp index 1b3edd5..88a8b36 100644 --- a/src/cacic_hardware.cpp +++ b/src/cacic_hardware.cpp @@ -47,8 +47,8 @@ QJsonObject cacic_hardware::coletaWin() // (Verifica se é notebook) params.clear(); wmiResult = wmi::wmiSearch("Win32_PortableBattery", params); + hardware["IsNotebook"] = QJsonValue::fromVariant(!wmiResult.isNull()); if (!wmiResult.isNull()){ - hardware["IsNotebook"] = QJsonValue::fromVariant(!wmiResult.isNull()); hardware["PortableBattery"] = wmiResult; } //Win32_Bios -- libgit2 0.21.2