From 721d36a2568e5949544560a10e286a813caede0e Mon Sep 17 00:00:00 2001
From: eric <ericmenezesn@gmail.com>
Date: Mon, 29 Sep 2014 17:14:42 -0300
Subject: [PATCH] Incluindo algumas rotinas que estavam em falta no installcacic.

---
 cacic-daemon/cacicD/cacictimer.cpp |  6 +-----
 install-cacic/installcacic.cpp     | 58 +++++++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/cacic-daemon/cacicD/cacictimer.cpp b/cacic-daemon/cacicD/cacictimer.cpp
index a8562d5..24164ff 100644
--- a/cacic-daemon/cacicD/cacictimer.cpp
+++ b/cacic-daemon/cacicD/cacictimer.cpp
@@ -216,11 +216,7 @@ bool CacicTimer::Md5IsEqual(QVariant document01,QVariant document02){
                                        (document01.toByteArray()),QCryptographicHash::Md5).toHex());
     QString getconfigMD52 = QString(QCryptographicHash::hash(
                                         (document02.toByteArray()),QCryptographicHash::Md5).toHex());
-    if(getconfigMD5 == getconfigMD52){
-        return true;
-    }else{
-        return false;
-    }
+    return getconfigMD5 == getconfigMD52;
 }
 
 void CacicTimer::iniciarInstancias(){
diff --git a/install-cacic/installcacic.cpp b/install-cacic/installcacic.cpp
index 2710b63..049cfbc 100644
--- a/install-cacic/installcacic.cpp
+++ b/install-cacic/installcacic.cpp
@@ -4,7 +4,7 @@ InstallCacic::InstallCacic(QObject *parent) :
     QObject(parent)
 {
     logManager = QLogger::QLoggerManager::getInstance();
-    logManager->addDestination("./log.txt","Install",QLogger::DebugLevel);
+    logManager->addDestination("./install.log","Install",QLogger::DebugLevel);
 }
 
 InstallCacic::~InstallCacic()
@@ -28,31 +28,51 @@ void InstallCacic::run(QStringList argv, int argc) {
         oCacicComm->setPassword(this->argumentos["password"]);
         QJsonObject jsonLogin = oCacicComm->login(&ok);
         if (ok){
+            QJsonObject jsonComm;
+            QLogger::QLog_Debug("Install", "Login: " + jsonLogin["reply"].toObject()["chavecript"].toString());
             //conectado, grava a chave na classe;
             oCacic.setChaveCrypt(jsonLogin["reply"].toObject()["chavecrip"].toString());
+            jsonComm["computador"] = oCacicComputer.toJsonObject();
+            QJsonObject configs = oCacicComm->comm("/ws/neo/config", &ok, jsonComm);
+            qDebug () << configs;
+            if (ok){
+                oCacicComm->setUrlGerente(configs["reply"].toObject()["applicationUrl"].toString());
 #ifdef Q_OS_WIN
-            oCacic.setCacicMainFolder("c:/cacic/");
+                oCacic.setCacicMainFolder(configs["reply"].toObject()["cacic_main_folder"].isString() ?
+                                          configs["reply"].toObject()["cacic_main_folder"].toString() :
+                                          "c:/cacic/");
 #elif defined(Q_OS_LINUX)
-            oCacic.setCacicMainFolder("/home/cacic");
+                oCacic.setCacicMainFolder(configs["reply"].toObject()["cacic_main_folder"].isString() ?
+                                          configs["reply"].toObject()["cacic_main_folder"].toString() :
+                                          "/usr/cacic");
 #endif
-            oCacic.createFolder(oCacic.getCacicMainFolder());
-            //grava chave em registro;
 
-            QVariantMap registro;
-            registro["key"] = oCacic.getChaveCrypt();
-            registro["mainFolder"] = oCacic.getCacicMainFolder();
-            oCacic.setValueToRegistry("Lightbase", "Cacic", registro);
-            //starta o processo do cacic.
+                oCacic.createFolder(oCacic.getCacicMainFolder());
+                //grava chave em registro;
+                QVariantMap registro;
+                registro["key"] = oCacic.getChaveCrypt();
+                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
+                oCacicComm->ftpDownload("agentes/cacic.exe");
+                QString exitStatus = oCacic.startProcess(oCacic.getCacicMainFolder() + "cacic.exe", false, &ok, QStringList("-install"));
+    #else
+                oCacicComm->ftpDownload("agentes/cacic");
+                QString exitStatus = oCacic.startProcess(oCacic.getCacicMainFolder() + "cacic", false, &ok, QStringList("-install"));
+    #endif
+                if (!ok)
+                    std::cout << "Erro ao iniciar o processo: "
+                              << exitStatus.toStdString() << "\n";
+                else {
+                    std::cout << "Instalação realizada com sucesso.";
+                }
+            } else {
+                std::cout << "Falha ao pegar configurações: " << configs["error"].toString();
+            }
 
-            //TO DO: Fazer download do serviço
-#ifdef Q_OS_WIN
-            QString exitStatus = oCacic.startProcess(oCacic.getCacicMainFolder() + "cacic.exe", false, &ok);
-#else
-            QString exitStatus = oCacic.startProcess(oCacic.getCacicMainFolder() + "cacic", false, &ok);
-#endif
-            if (!ok)
-                std::cout << "Erro ao iniciar o processo: "
-                          << exitStatus.toStdString() << "\n";
         } else
             std::cout << "Nao foi possivel realizar o login.\n  "
                       << jsonLogin["error"].toString().toStdString();
--
libgit2 0.21.2