diff --git a/cacic-daemon/cacicD/cacicd.cpp b/cacic-daemon/cacicD/cacicd.cpp index 350b44f..f01269a 100644 --- a/cacic-daemon/cacicD/cacicd.cpp +++ b/cacic-daemon/cacicD/cacicd.cpp @@ -4,7 +4,6 @@ cacicD::cacicD(int argc, char **argv) : QtService(argc, argv, { try{ this->createApplication(argc, argv); - Ocacictimer = new CacicTimer(application()->applicationDirPath()); ccacic = new CCacic; setServiceDescription("Cacic Daemon"); diff --git a/cacic-daemon/cacicD/cacicd.h b/cacic-daemon/cacicD/cacicd.h index 38b8712..5be373a 100644 --- a/cacic-daemon/cacicD/cacicd.h +++ b/cacic-daemon/cacicD/cacicd.h @@ -6,6 +6,7 @@ #include "cacictimer.h" #include "QLogger.h" +#define APP_VERSION "3.0" class cacicD : public QtService { diff --git a/cacic-teste/testcacic.cpp b/cacic-teste/testcacic.cpp index f5cd973..25c6d76 100644 --- a/cacic-teste/testcacic.cpp +++ b/cacic-teste/testcacic.cpp @@ -323,7 +323,7 @@ void CTestCacic::testLogger() void CTestCacic::testFtpDownload() { - OCacicComm->ftpDownload("ftp://ftp.unicamp.br", "/pub/gnu/Licenses/gpl-2.0.txt"); + OCacicComm->ftpDownload("ftp://ftp.unicamp.br", "/pub/gnu/Licenses/gpl-2.0.txt", ""); QFile downloaded("gpl-2.0.txt"); QVERIFY( downloaded.open(QIODevice::ReadOnly) ); diff --git a/install-cacic/installcacic.cpp b/install-cacic/installcacic.cpp index 2867c20..eb85cb7 100644 --- a/install-cacic/installcacic.cpp +++ b/install-cacic/installcacic.cpp @@ -25,7 +25,7 @@ void InstallCacic::run(QStringList argv, int argc) { if (ok){ oCacicComm->setUrlGerente(this->argumentos["host"]); oCacicComm->setUsuario(this->argumentos["user"]); - oCacicComm->setPassword(this->argumentos["password"]); + oCacicComm->setPassword(this->argumentos["pass"]); QJsonObject jsonLogin = oCacicComm->login(&ok); if (ok){ QJsonObject jsonComm; @@ -57,14 +57,14 @@ void InstallCacic::run(QStringList argv, int argc) { //TO DO: Fazer download do serviço #ifdef Q_OS_WIN - oCacicComm->ftpDownload("agentes/cacic-service.exe"); + oCacicComm->ftpDownload("agentes/cacic-service.exe", oCacic.getCacicMainFolder()); QString exitStatus = oCacic.startProcess(oCacic.getCacicMainFolder() + "cacic-service.exe", false, &ok, QStringList("-install"); #else - oCacicComm->ftpDownload("agentes/cacic-service"); + oCacicComm->ftpDownload("agentes/cacic-service", oCacic.getCacicMainFolder()); QJsonObject configsJson = configs["reply"].toObject(); QString senhaAgente; @@ -86,15 +86,15 @@ void InstallCacic::run(QStringList argv, int argc) { std::cout << "Erro ao iniciar o processo: " << exitStatus.toStdString() << "\n"; else { - std::cout << "Instalação realizada com sucesso."; + std::cout << "Instalação realizada com sucesso." << "\n"; } } else { - std::cout << "Falha ao pegar configurações: " << configs["error"].toString().toStdString(); + std::cout << "Falha ao pegar configurações: " << configs["error"].toString().toStdString() << "\n"; } } else std::cout << "Nao foi possivel realizar o login.\n " - << jsonLogin["error"].toString().toStdString(); + << jsonLogin["error"].toString().toStdString() << "\n"; } else if ((param.contains("default")) && (param["default"] == "uninstall")){ oCacic.deleteFolder("c:/cacic"); oCacic.removeRegistry("Lightbase", "Cacic"); @@ -105,7 +105,7 @@ void InstallCacic::run(QStringList argv, int argc) { << "<-host=url_gerente> <-user=usuario> <-password=senha> [-help]\n\n" << " <-host=url_gerente> url_gerente: Caminho para a aplicação do gerente.\n" << " <-user=usuario> usuario: usuário de login no gerente.\n" - << " <-password=senha> senha: senha de login no gerente\n" + << " <-pass=senha> senha: senha de login no gerente\n" << " [-help] Lista todos comandos.\n"; } @@ -124,7 +124,7 @@ QMap InstallCacic::validaParametros(QStringList argv, int argc else if (aux.at(0)== '-') map["default"] = aux.mid(1); } - *ok = (bool) map.contains("host") && map.contains("user") && map.contains("password"); + *ok = (bool) map.contains("host") && map.contains("user") && map.contains("pass"); if (*ok){ this->argumentos = map; } diff --git a/src/cacic_comm.cpp b/src/cacic_comm.cpp index e937c30..8e2d316 100644 --- a/src/cacic_comm.cpp +++ b/src/cacic_comm.cpp @@ -139,7 +139,7 @@ QJsonObject CacicComm::login(bool *ok) { * Faz o download de um arquivo usando o protocolo mode * a partir da url do gerente e do caminho até o arquivo. */ -bool CacicComm::fileDownload(const QString &mode, const QString &path){ +bool CacicComm::fileDownload(const QString &mode, const QString &path, const QString &pathDownload){ QEventLoop eventLoop; QNetworkAccessManager manager; QNetworkRequest request; @@ -150,7 +150,7 @@ bool CacicComm::fileDownload(const QString &mode, const QString &path){ QStringList splitPath = path.split("/"); - fileHandler = new QFile(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; @@ -176,7 +176,7 @@ bool CacicComm::fileDownload(const QString &mode, const QString &path){ * Faz o download de um arquivo usando o protocolo mode * a partir da url recebida e do caminho até o arquivo. */ -bool CacicComm::fileDownload(const QString &mode, const QString &urlServer, const QString &path){ +bool CacicComm::fileDownload(const QString &mode, const QString &urlServer, const QString &path, const QString &pathDownload){ QEventLoop eventLoop; QNetworkAccessManager manager; QNetworkRequest request; @@ -187,7 +187,7 @@ bool CacicComm::fileDownload(const QString &mode, const QString &urlServer, cons QStringList splitPath = path.split("/"); - fileHandler = new QFile(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; @@ -208,20 +208,20 @@ bool CacicComm::fileDownload(const QString &mode, const QString &urlServer, cons return true; } -bool CacicComm::ftpDownload( const QString &path ){ - return fileDownload("ftp", path); +bool CacicComm::ftpDownload( const QString &path, const QString &pathDownload ){ + return fileDownload("ftp", path, pathDownload); } -bool CacicComm::ftpDownload( const QString &urlServer, const QString &path ){ - return fileDownload("ftp", urlServer, path); +bool CacicComm::ftpDownload( const QString &urlServer, const QString &path, const QString &pathDownload ){ + return fileDownload("ftp", urlServer, path, pathDownload); } -bool CacicComm::httpDownload( const QString &path ){ - return fileDownload("http", path); +bool CacicComm::httpDownload( const QString &path, const QString &pathDownload ){ + return fileDownload("http", path, pathDownload); } -bool CacicComm::httpDownload( const QString &urlServer, const QString &path ){ - return fileDownload("http", urlServer, path); +bool CacicComm::httpDownload( const QString &urlServer, const QString &path,const QString &pathDownload ){ + return fileDownload("http", urlServer, path, pathDownload); } QString CacicComm::getUrlSsl (){ diff --git a/src/cacic_comm.h b/src/cacic_comm.h index 8d39219..d1e7c60 100644 --- a/src/cacic_comm.h +++ b/src/cacic_comm.h @@ -27,10 +27,10 @@ public: QJsonObject comm(QString route, bool *ok, const QJsonObject &json = QJsonObject(), bool isSsl = false); bool commStatus(); QJsonObject login(bool *ok); - bool ftpDownload(const QString &path); - bool ftpDownload(const QString &urlServer, const QString &path); - bool httpDownload(const QString &path); - bool httpDownload(const QString &urlServer, const QString &path); + bool ftpDownload(const QString &path, const QString &pathDownload); + 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); QString getUrlSsl (); void setUrlSsl(QString value); QString getUrlGerente (); @@ -51,8 +51,8 @@ private slots: private: - bool fileDownload(const QString &mode, const QString &path); - bool fileDownload(const QString &mode, const QString &urlServer, const QString &path); + 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; diff --git a/src/cacic_computer.cpp b/src/cacic_computer.cpp index 4a2b264..9a8ac07 100644 --- a/src/cacic_computer.cpp +++ b/src/cacic_computer.cpp @@ -2,8 +2,12 @@ CACIC_Computer::CACIC_Computer() { + struct utsname sysName; + uname(&sysName); networkInterface = networkInterfacesRunning(); usuario = pegarUsu(); + computerName = sysName.nodename; +// qDebug() << sysName.nodename << sysName.machine << sysName.sysname << sysName.release << sysName.version; } /*NetworkInterfacesRunning @@ -53,8 +57,8 @@ QJsonObject CACIC_Computer::toJsonObject() count++; } json["networkDevices"] = network; - json["nmComputador"] = QJsonValue::fromVariant(QString("TODO")); - json["versaoAgente"] = QJsonValue::fromVariant(QString("TODO")); + json["nmComputador"] = QJsonValue::fromVariant(QString::fromStdString(this->computerName)); + json["versaoAgente"] = QJsonValue::fromVariant(QString("3.0 (manual)")); return json; } diff --git a/src/cacic_computer.h b/src/cacic_computer.h index dabc725..07b9795 100644 --- a/src/cacic_computer.h +++ b/src/cacic_computer.h @@ -9,6 +9,7 @@ #include #include "operatingsystem.h" #include "console.h" +#include class CACIC_Computer { @@ -31,6 +32,7 @@ private: QList networkInterface; std::string usuario; + std::string computerName; }; diff --git a/src/cacic_hardware.cpp b/src/cacic_hardware.cpp index 0f1fcab..20cbbd5 100644 --- a/src/cacic_hardware.cpp +++ b/src/cacic_hardware.cpp @@ -375,11 +375,11 @@ void cacic_hardware::coletaLinuxBios(QJsonObject &hardware) } else if(line.contains("Version:")){ bios["version"] = QJsonValue::fromVariant( QString(line.split(":")[1].mid(1)) ); } else if(line.contains("Release Date:")){ - bios["release_date"] = QJsonValue::fromVariant( QString(line.split(":")[1].mid(1)) ); + bios["releaseDate"] = QJsonValue::fromVariant( QString(line.split(":")[1].mid(1)) ); } else if(line.contains("Runtime Size:")){ - bios["runtime_size"] = QJsonValue::fromVariant( QString(line.split(":")[1].mid(1)) ); + bios["runtimeSize"] = QJsonValue::fromVariant( QString(line.split(":")[1].mid(1)) ); } else if(line.contains("ROM Size:")){ - bios["rom_size"] = QJsonValue::fromVariant( QString(line.split(":")[1].mid(1)) ); + bios["romSize"] = QJsonValue::fromVariant( QString(line.split(":")[1].mid(1)) ); } else if(line.contains("BIOS Revision:")){ bios["revision"] = QJsonValue::fromVariant( QString(line.split(":")[1].mid(1)) ); } @@ -399,13 +399,13 @@ void cacic_hardware::coletaLinuxMotherboard(QJsonObject &hardware) if(line.contains("Manufacturer:") ){ motherboard["manufacturer"] = QJsonValue::fromVariant( QString(line.split(":")[1].mid(1)) ); } else if(line.contains("Product Name:")){ - motherboard["product_name"] = QJsonValue::fromVariant( QString(line.split(":")[1].mid(1)) ); + motherboard["productName"] = QJsonValue::fromVariant( QString(line.split(":")[1].mid(1)) ); } else if(line.contains("Version:")){ motherboard["version"] = QJsonValue::fromVariant( QString(line.split(":")[1].mid(1)) ); } else if(line.contains("Asset Tag:")){ - motherboard["asset_tag"] = QJsonValue::fromVariant( QString(line.split(":")[1].mid(1)) ); + motherboard["assetTag"] = QJsonValue::fromVariant( QString(line.split(":")[1].mid(1)) ); } else if(line.contains("Serial Number:")){ - motherboard["serial_number"] = QJsonValue::fromVariant( QString(line.split(":")[1].mid(1)) ); + motherboard["serialNumber"] = QJsonValue::fromVariant( QString(line.split(":")[1].mid(1)) ); } } @@ -419,7 +419,7 @@ void cacic_hardware::coletaLinuxMotherboard(QJsonObject &hardware) } - motherboard["onboard_capabilities"] = QJsonValue::fromVariant(onboardCapabilities); + motherboard["onboardCapabilities"] = QJsonValue::fromVariant(onboardCapabilities); hardware["motherboard"] = motherboard; } @@ -433,8 +433,8 @@ void cacic_hardware::coletaLinuxIsNotebook(QJsonObject &hardware) // qDebug() << consoleOutput; foreach(QString line, consoleOutput){ if(line.contains("Type:") - && line.contains("Notebook") ){ - hardware["is_notebook"] = QJsonValue::fromVariant(QString("true")); + && (line.contains("Notebook") || line.contains("Portable")) ){ + hardware["isNotebook"] = QJsonValue::fromVariant(QString("true")); } } -- libgit2 0.21.2