Merge branch 'master' of https://github.com/lightbase/cacic-agente

Conflicts: cacic-teste/testcacic.cpp cacic-teste/testcacic.h src/cacic_hardware.cpp src/cacic_hardware.h src/cacic_software.h

Merge branch 'master' of https://github.com/lightbase/cacic-agente
Conflicts: cacic-teste/testcacic.cpp cacic-teste/testcacic.h src/cacic_hardware.cpp src/cacic_hardware.h src/cacic_software.h
Eric Menezes Noronha
2 parents ba316028 c87d0f3e
Showing 17 changed files with 351 additions and 45 deletions Show diff stats
cacic-teste/cacic-teste.pro
cacic-teste/testcacic.cpp
cacic-teste/testcacic.h
cacicD/Readme.txt
cacicD/cacicd.cpp
cacicD/cacicd.h
cacicD/main.cpp
gercols/gercols.cpp
gercols/gercols.pro
src/cacic_hardware.cpp
src/cacic_hardware.h
src/cacic_software.cpp
src/cacic_software.h
src/ccacic.cpp
src/ccacic.h
src/ccoleta.cpp
src/ccoleta.h
@@ -24,6 +24,7 @@ SOURCES += \
     ../src/cacic_hardware.cpp \
     ../src/operatingsystem.cpp \
     ../src/cacic_software.cpp \
+    ../src/cacic_hardware.cpp \
 #    ../src/qtservice/src/qtservice.cpp \
 #    ../src/qtservice/src/qtservice_unix.cpp \
 #    ../src/qtservice/src/qtservice_win.cpp \
@@ -40,10 +41,12 @@ HEADERS += \
     ../src/console.h \
     ../src/operatingsystem.h \
     ../src/cacic_software.h \
+    ../src/cacic_hardware.h \
 #    ../src/qtservice/src/qtservice.h \
 #    ../src/qtservice/src/qtservice_p.h \
 #    ../src/qtservice/src/qtunixserversocket.h \
 #    ../src/qtservice/src/qtunixsocket.h
+    ../src/cacic_hardware.h
 INCLUDEPATH += ../src \
                ../src/crypto++/include/
@@ -248,6 +248,14 @@ void CTestCacic::testColetaHardware()
     OCacicHardware.iniciaColeta();
     QVERIFY(false);
 }
+void CTestCacic::testConvertDouble()
+{
+    double number = 4.0905;
+
+    QString converted = OCacic.convertDouble(number);
+
+    QVERIFY(converted.toDouble() == number);
+}
 void CTestCacic::cleanupTestCase()
 {
@@ -73,6 +73,7 @@ private slots:
   void testIniciarDaemon();
   void testColetaSoftware();
   void testColetaHardware();
+  void testConvertDouble();
   void cleanupTestCase();
 };
@@ -0,0 +1,6 @@
+Para instalar um serviço no Windows:
+	~$ sc create "CacicD" binPath= "C:\endereco\do\cacicd\CacicD.exe" start= auto
+
+Para instalar um serviço no Linux:
+	Usar o Upstart
+
 #include "cacicd.h"
-cacicD::cacicD()
+cacicD::cacicD(int argc, char **argv) : QtService<QCoreApplication>(argc, argv, "CacicD")
 {
+    try{
+        setServiceDescription("Cacic Daemon");
+        setServiceFlags(QtServiceBase::CannotBeStopped);
+    } catch (...){
+        qCritical() << "Error desconhecido no construtor.";
+    }
+}
+
+cacicD::~cacicD()
+{
+    try{
+
+    } catch (...){
+        qCritical() << "Error desconhecido no desconstrutor.";
+    }
+}
+
+void cacicD::start()
+{
+    try{
+        QCoreApplication *app = application();
+        qDebug() << "Serviço iniciado.";
+        qDebug() << app->applicationDirPath();
+
+    } catch (...){
+        qCritical() << "Error desconhecido no desconstrutor.";
+    }
+}
+
+void cacicD::pause()
+{
+    try{
+        qDebug() << "Serviço pausado.";
+    } catch (...){
+        qCritical() << "Error desconhecido ao pausar o serviço.";
+    }
+}
+
+void cacicD::resume()
+{
+    try{
+        qDebug() << "Serviço resumido.";
+    } catch (...){
+        qCritical() << "Error desconhecido ao resumir o serviço.";
+    }
+}
+
+void cacicD::stop()
+{
+    try{
+        qDebug() << "Serviço parado.";
+    } catch (...){
+        qCritical() << "Error desconhecido ao parar o serviço.";
+    }
 }
 #ifndef CACICD_H
 #define CACICD_H
-class cacicD
+#include <QCoreApplication>
+#include <QObject>
+#include <QDebug>
+#include "qtservice.h"
+
+
+class cacicD : public QtService<QCoreApplication>
 {
 public:
-    cacicD();
+    /**
+     * @brief cacicD Construtor
+     * @param argc
+     * @param argv
+     */
+    cacicD(int argc, char **argv);
+    /**
+     * @brief cacicD Desconstrutor
+     */
+    ~cacicD();
+    /**
+     * @brief inicia o serviço
+     */
+    void start();
+    /**
+     * @brief pausa o serviço
+     */
+    void pause();
+    /**
+     * @brief resume a execução do serviço
+     */
+    void resume();
+    /**
+     * @brief para a execução do serviço
+     */
+    void stop();
+
+
 };
 #endif // CACICD_H
 #include <QCoreApplication>
-#include <QStringList>
-#include <QDir>
-#include <QSettings>
-#include <qtservice/src/qtservice.h>
+#include "cacicd.h"
 int main(int argc, char **argv)
 {
-#if !defined(Q_OS_WIN)
-    QSettings::setPath(QSettings::NativeFormat, QSettings::SystemScope, QDir::tempPath());
-    qWarning("(Example uses dummy settings file: %s/QtSoftware.conf)", QDir::tempPath().toLatin1().constData());
-#endif
-    //int result = processArgs(argc, argv);
-    if (QString::fromLocal8Bit(argv[argc-1]) == QLatin1String("-w") ||
-            QString::fromLocal8Bit(argv[argc-1]) == QLatin1String("-wait")) {
-        printf("\nPress Enter to continue...");
-        QFile input;
-        input.open(stdin, QIODevice::ReadOnly);
-        input.readLine();
-        printf("\n");
-    }
-    //return result;
+    cacicD sevice(argc, argv);
+    return sevice.exec();
 }
-
-
@@ -32,7 +32,7 @@ qDebug() &lt;&lt; &quot;TESTE&quot;;
 void Gercols::run()
 {
-    QJsonObject coleta;
+
     /* 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).
@@ -40,7 +40,8 @@ HEADERS += \
     ../src/operatingsystem.h \
     ../src/console.h \
     ../src/ccoleta.h \
-    ./gercols.h
+    ./gercols.h \
+    ../src/cacic_hardware.h
 INCLUDEPATH += ../src \
                ../src/crypto++/include/
@@ -8,16 +8,17 @@ void cacic_hardware::iniciaColeta()
 {
 #ifdef Q_OS_WIN
     this->coletaHardware = coletaWin();
-#else
+#elif defined(Q_OS_LINUX)
     this->coletaHardware = coletaLinux();
 #endif
 }
 QJsonObject cacic_hardware::coletaWin()
 {
-    QJsonObject coleta;
-    wmi();
-    return coleta;
+#if defined(Q_OS_WIN)
+    // Implementação seguindo as definições na documentação WMI.
+#endif
+    return QJsonObject();
 }
 QJsonObject cacic_hardware::coletaLinux()
@@ -187,4 +188,89 @@ int cacic_hardware::wmi()
 //    CoUninitialize();
     return 0;   // Program successfully completed.
+=======
+
+    OperatingSystem operatingSystem;
+    ConsoleObject console;
+
+    QJsonObject hardware;
+
+    QFile lshwFile("lshwJson.json");
+    if( lshwFile.exists() )
+        lshwFile.remove();
+
+    console("lshw -json >> lshwJson.json");
+
+
+    QJsonObject lshwJson = oCacic.getJsonFromFile("lshwJson.json")["children"].toArray().first().toObject();
+
+    if( lshwJson.contains("id") && lshwJson["id"] == "core") {
+        if ( lshwJson["children"].isArray() ){
+            qDebug() << "IS ARRAY!!";
+            QJsonArray componentsArray =  lshwJson["children"].toArray();
+
+            foreach(QJsonValue componentValue, componentsArray ) {
+                QJsonObject component = componentValue.toObject();
+
+                /* TODO:
+                 * - Formatar direito as quantidades (memória,clock do cpu)
+                 * com unidades mais amigáveis para humanos em todos métodos.
+                 *
+                 * coletaLinuxMem
+                 * coletaLinuxCpu
+                 * coletaLinuxPci - a fazer
+                 */
+
+                if( component["id"] == "memory" ) {
+                    coletaLinuxMem(hardware,component);
+                } else if ( component["id"] == "cpu" ) {
+                    coletaLinuxCpu(hardware,component);
+                } else if ( component["id"] == "pci" ) {
+                    QJsonArray pciArray = component["children"].toArray();
+
+                    foreach(QJsonValue pciValue, pciArray){
+                        QJsonObject pciObject = pciValue.toObject();
+
+                        coletaLinuxPci(hardware, pciObject);
+                    }
+
+                }
+
+            }
+        }
+
+    }
+
+
+    return hardware;
+}
+
+void cacic_hardware::coletaLinuxMem(QJsonObject &hardware, const QJsonObject &component)
+{
+    QJsonObject memory;
+
+    memory["size"] = QJsonValue::fromVariant(oCacic.convertDouble(component["size"].toDouble(),0) + " bytes");
+
+    hardware["memory"] = memory;
+}
+
+void cacic_hardware::coletaLinuxCpu(QJsonObject &hardware, const QJsonObject &component)
+{
+    QJsonObject cpu;
+
+    cpu["name"] = component["product"];
+    cpu["vendor"] = component["vendor"];
+    cpu["clock"] = QJsonValue::fromVariant(oCacic.convertDouble(component["capacity"].toDouble(),0) + " Hz");
+
+    hardware["cpu"] = cpu;
+}
+
+void cacic_hardware::coletaLinuxPci(QJsonObject &hardware, const QJsonObject &pciJson)
+{
+
+}
+
+QJsonObject cacic_hardware::toJsonObject() {
+    return coletaHardware;
+>>>>>>> c87d0f3e5ae47bd0d7f7f8c5f5583bb46dd7235b
 }
 #ifndef CACIC_HARDWARE_H
 #define CACIC_HARDWARE_H
 #include <ccacic.h>
-#include <wbemidl.h>
 #include <querysink.h>
-#include <iostream>
-using namespace std;
-#include <comutil.h>
-# pragma comment(lib, "wbemuuid.lib")
+#include <QtCore>
+#include <QJsonArray>
+#include <QJsonArray>
+#include <cmath>
+#include <ccacic.h>
+#include <console.h>
+#include <operatingsystem.h>
+
+#if defined(Q_OS_WIN)
+    #define _WIN32_DCOM
+    #include <iostream>
+    //using namespace std;
+    #include <wbemidl.h>
+    #include <windows.h>
+    # pragma comment(lib, "wbemuuid.lib")
+
+#endif
 class cacic_hardware
 {
@@ -14,13 +26,19 @@ public:
     cacic_hardware();
     void iniciaColeta();
     QJsonObject toJsonObject();
+    QJsonObject coletaWin();
+    QJsonObject coletaLinux();
 private:
-    QJsonObject coletaHardware;
     int wmi();
-
     QJsonObject coletaWin();
     QJsonObject coletaLinux();
+    void coletaLinuxMem(QJsonObject &hardware, const QJsonObject &component);
+    void coletaLinuxCpu(QJsonObject &hardware, const QJsonObject &component);
+    void coletaLinuxPci(QJsonObject &hardware, const QJsonObject &pciJson);
+
+    CCacic oCacic;
+    QJsonObject coletaHardware;
 };
 #endif // CACIC_HARDWARE_H
@@ -8,8 +8,9 @@ void cacic_software::iniciaColeta()
 {
 #ifdef Q_OS_WIN
     this->coletaSoftware = coletaWin();
-#else
+#elif defined(Q_OS_LINUX)
     this->coletaSoftware = coletaLinux();
+
 #endif
 }
@@ -48,10 +49,102 @@ QJsonObject cacic_software::coletaWin()
     return softwaresJson;
 }
-void cacic_software::coletaLinux()
+QJsonObject cacic_software::coletaLinux()
+{
+
+    OperatingSystem operatingSystem;
+
+    if( operatingSystem.getIdOs() == OperatingSystem::LINUX_ARCH ) {
+        return coletaArch();
+    } else if ( operatingSystem.getIdOs() == OperatingSystem::LINUX_DEBIAN ||
+                operatingSystem.getIdOs() == OperatingSystem::LINUX_UBUNTU ) {
+        return coletaDebian();
+    }
+
+    return QJsonObject();
+}
+
+QJsonObject cacic_software::coletaArch()
+{
+    ConsoleObject console;
+    QJsonObject softwaresJson;
+
+    QStringList packages = console("pacman -Qe").split("\n");
+
+    foreach(QString package, packages) {
+        QString packageName = package.split(" ")[0];
+        QJsonObject packageJson;
+
+        QStringList packageInfo = console(QString("pacman -Qi ").append(packageName)).split("\n");
+//            qDebug() << packageInfo;
+
+        packageJson["name"] = QJsonValue::fromVariant(QString(packageName));
+        foreach(QString line, packageInfo) {
+            if(line.contains("Version"))
+                packageJson["version"] = line.split(":")[1].mid(1);
+            if(line.contains("Description"))
+                packageJson["description"] = line.split(":")[1].mid(1);
+            if(line.contains("URL")) {
+                QStringList url = line.split(":");
+                QString urlString;
+
+                for(int i = 1 ; i < url.size() ; ++i){
+                    urlString.append(url[i]);
+                    if(i == 1 ) urlString.append(":");
+                }
+
+                packageJson["url"] = urlString.mid(1);
+            }
+            if(line.contains("Installed size"))
+                packageJson["installed_size"] = line.split(":")[1].mid(1);
+            if(line.contains("Install Date"))
+                packageJson["install_date"] = line.split(":")[1].mid(1);
+        }
+        softwaresJson[packageName] = packageJson;
+    }
+    return softwaresJson;
+}
+
+QJsonObject cacic_software::coletaDebian()
 {
+    ConsoleObject console;
+    QJsonObject softwaresJson;
+
+    QStringList packages = console("dpkg --get-selections").split("\n");
+
+    foreach(QString package, packages) {
+        QString packageName = package.split(" ")[0];
+        QJsonObject packageJson;
+        QStringList packageInfo = console(QString("apt-cache show ").append(packageName)).split("\n");
+//            qDebug() << packageInfo;
+
+        packageJson["name"] = QJsonValue::fromVariant(QString(packageName));
+        foreach(QString line, packageInfo) {
+            if(line.contains("Version"))
+                packageJson["version"] = line.split(":")[1].mid(1);
+            if(line.contains("Description"))
+                packageJson["description"] = line.split(":")[1].mid(1);
+            if(line.contains("Homepage")) {
+                QStringList url = line.split(":");
+                QString urlString;
+
+                for(int i = 1 ; i < url.size() ; ++i){
+                    urlString.append(url[i]);
+                    if(i == 1 ) urlString.append(":");
+                }
+
+                packageJson["url"] = urlString.mid(1);
+            }
+            if(line.contains("Installed-Size"))
+                packageJson["installed_size"] = line.split(":")[1].mid(1);
+        }
+        softwaresJson[packageName] = packageJson;
+    }
+
+    return softwaresJson;
 }
+
 QJsonObject cacic_software::toJsonObject()
 {
     return coletaSoftware;
@@ -2,7 +2,8 @@
 #define CACIC_SOFTWARE_H
 #include <QtCore>
 #include <ccacic.h>
-
+#include <console.h>
+#include <operatingsystem.h>
 class cacic_software
 {
 public:
@@ -12,7 +13,9 @@ public:
 private:
     QJsonObject coletaWin();
-    void coletaLinux();
+    QJsonObject coletaLinux();
+    QJsonObject coletaArch();
+    QJsonObject coletaDebian();
     CCacic oCacic;
     QJsonObject coletaSoftware;
@@ -286,6 +286,14 @@ void CCacic::setChaveCrypt(const QString &amp;value)
     chaveCrypt = value;
 }
+QString CCacic::convertDouble(const double &number, const int &precision)
+{
+    std::ostringstream ss;
+    ss.precision(precision);
+    ss << std::fixed << number;
+
+    return QString::fromStdString(ss.str());
+}
 /*Getters/Setters
  * End.
@@ -11,6 +11,8 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>
+#include <sstream>
+#include <iostream>
 #include "../src/crypto++/include/aes.h"
 #include "../src/crypto++/include/base64.h"
 #include "../src/crypto++/include/modes.h"
@@ -38,7 +40,7 @@ public:
     void setValueToRegistry(QString organization, QString application, QVariantMap values);
     QVariant getValueFromRegistry(QString organization, QString application, QString key);
     void removeRegistry(QString organization, QString application);
-
+    QString convertDouble(const double &number, const int &precision = 10);
 //Geters/seters:
@@ -8,7 +8,7 @@ CColeta::CColeta(QObject *parent)
 void CColeta::coletaHardware()
 {
     qDebug() << "coletaHardware() executado";
-//    oHardware.iniciaColeta();
+    oHardware.iniciaColeta();
 }
@@ -16,6 +16,7 @@ void CColeta::coletaSoftware()
 {
     qDebug() << "coletaSoftware() executado";
     oSoftware.iniciaColeta();
+
 }
 void CColeta::configuraColetas(){
@@ -33,6 +34,11 @@ cacic_software CColeta::getOSoftware() const
     return oSoftware;
 }
+cacic_hardware CColeta::getOHardware() const
+{
+    return oHardware;
+}
+
 void CColeta::run()
 {
     QJsonObject coleta = oCacic.getJsonFromFile("configReq.json");
@@ -49,5 +55,6 @@ QJsonObject CColeta::toJsonObject()
     QJsonObject coletaJson;
     coletaJson["computer"] = oComputer.toJsonObject();
     coletaJson["software"] = oSoftware.toJsonObject();
+    coletaJson["hardware"] = oHardware.toJsonObject();
     return coletaJson;
 }
@@ -7,6 +7,7 @@
 #include <ccacic.h>
 #include <cacic_computer.h>
 #include <cacic_software.h>
+#include <cacic_hardware.h>
 class CColeta : public QObject
@@ -17,12 +18,14 @@ private:
     CCacic oCacic;
     CACIC_Computer oComputer;
     cacic_software oSoftware;
+    cacic_hardware oHardware;
 public:
     explicit CColeta(QObject *parent = 0);
     CACIC_Computer getOComputer() const;
     cacic_software getOSoftware() const;
+    cacic_hardware getOHardware() const;
     QJsonObject toJsonObject();
@@ -35,10 +38,7 @@ public slots:
 signals:
     void beginComputer();
     void beginHardware();
-    void beginNetworkInterfaces();
-    void beginOperatingSystem();
     void beginSoftware();
-    void beginUser();
     void finished();
 };
	@@ -248,6 +248,14 @@ void CTestCacic::testColetaHardware()		@@ -248,6 +248,14 @@ void CTestCacic::testColetaHardware()
248	OCacicHardware.iniciaColeta();	248	OCacicHardware.iniciaColeta();
249	QVERIFY(false);	249	QVERIFY(false);
250	}	250	}
		251	+void CTestCacic::testConvertDouble()
		252	+{
		253	+ double number = 4.0905;
		254	+
		255	+ QString converted = OCacic.convertDouble(number);
		256	+
		257	+ QVERIFY(converted.toDouble() == number);
		258	+}
251		259
252	void CTestCacic::cleanupTestCase()	260	void CTestCacic::cleanupTestCase()
253	{	261	{
	@@ -73,6 +73,7 @@ private slots:		@@ -73,6 +73,7 @@ private slots:
73	void testIniciarDaemon();	73	void testIniciarDaemon();
74	void testColetaSoftware();	74	void testColetaSoftware();
75	void testColetaHardware();	75	void testColetaHardware();
		76	+ void testConvertDouble();
76	void cleanupTestCase();	77	void cleanupTestCase();
77	};	78	};
78		79
@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
	1	+Para instalar um serviço no Windows:
	2	+ ~$ sc create "CacicD" binPath= "C:\endereco\do\cacicd\CacicD.exe" start= auto
	3	+
	4	+Para instalar um serviço no Linux:
	5	+ Usar o Upstart
	6	+
1	#include "cacicd.h"	1	#include "cacicd.h"
2		2
3	-cacicD::cacicD()	3	+cacicD::cacicD(int argc, char **argv) : QtService<QCoreApplication>(argc, argv, "CacicD")
4	{	4	{
		5	+ try{
		6	+ setServiceDescription("Cacic Daemon");
		7	+ setServiceFlags(QtServiceBase::CannotBeStopped);
		8	+ } catch (...){
		9	+ qCritical() << "Error desconhecido no construtor.";
		10	+ }
		11	+}
		12	+
		13	+cacicD::~cacicD()
		14	+{
		15	+ try{
		16	+
		17	+ } catch (...){
		18	+ qCritical() << "Error desconhecido no desconstrutor.";
		19	+ }
		20	+}
		21	+
		22	+void cacicD::start()
		23	+{
		24	+ try{
		25	+ QCoreApplication *app = application();
		26	+ qDebug() << "Serviço iniciado.";
		27	+ qDebug() << app->applicationDirPath();
		28	+
		29	+ } catch (...){
		30	+ qCritical() << "Error desconhecido no desconstrutor.";
		31	+ }
		32	+}
		33	+
		34	+void cacicD::pause()
		35	+{
		36	+ try{
		37	+ qDebug() << "Serviço pausado.";
		38	+ } catch (...){
		39	+ qCritical() << "Error desconhecido ao pausar o serviço.";
		40	+ }
		41	+}
		42	+
		43	+void cacicD::resume()
		44	+{
		45	+ try{
		46	+ qDebug() << "Serviço resumido.";
		47	+ } catch (...){
		48	+ qCritical() << "Error desconhecido ao resumir o serviço.";
		49	+ }
		50	+}
		51	+
		52	+void cacicD::stop()
		53	+{
		54	+ try{
		55	+ qDebug() << "Serviço parado.";
		56	+ } catch (...){
		57	+ qCritical() << "Error desconhecido ao parar o serviço.";
		58	+ }
5	}	59	}
1	#ifndef CACICD_H	1	#ifndef CACICD_H
2	#define CACICD_H	2	#define CACICD_H
3		3
4	-class cacicD	4	+#include <QCoreApplication>
		5	+#include <QObject>
		6	+#include <QDebug>
		7	+#include "qtservice.h"
		8	+
		9	+
		10	+class cacicD : public QtService<QCoreApplication>
5	{	11	{
6	public:	12	public:
7	- cacicD();	13	+ /**
		14	+ * @brief cacicD Construtor
		15	+ * @param argc
		16	+ * @param argv
		17	+ */
		18	+ cacicD(int argc, char **argv);
		19	+ /**
		20	+ * @brief cacicD Desconstrutor
		21	+ */
		22	+ ~cacicD();
		23	+ /**
		24	+ * @brief inicia o serviço
		25	+ */
		26	+ void start();
		27	+ /**
		28	+ * @brief pausa o serviço
		29	+ */
		30	+ void pause();
		31	+ /**
		32	+ * @brief resume a execução do serviço
		33	+ */
		34	+ void resume();
		35	+ /**
		36	+ * @brief para a execução do serviço
		37	+ */
		38	+ void stop();
		39	+
		40	+
8	};	41	};
9		42
10	#endif // CACICD_H	43	#endif // CACICD_H
1	#include <QCoreApplication>	1	#include <QCoreApplication>
2	-#include <QStringList>
3	-#include <QDir>
4	-#include <QSettings>
5	-#include <qtservice/src/qtservice.h>	2	+#include "cacicd.h"
6		3
7	int main(int argc, char **argv)	4	int main(int argc, char **argv)
8	{	5	{
9	-#if !defined(Q_OS_WIN)
10	- QSettings::setPath(QSettings::NativeFormat, QSettings::SystemScope, QDir::tempPath());
11	- qWarning("(Example uses dummy settings file: %s/QtSoftware.conf)", QDir::tempPath().toLatin1().constData());
12	-#endif
13	- //int result = processArgs(argc, argv);
14	- if (QString::fromLocal8Bit(argv[argc-1]) == QLatin1String("-w") \|\|
15	- QString::fromLocal8Bit(argv[argc-1]) == QLatin1String("-wait")) {
16	- printf("\nPress Enter to continue...");
17	- QFile input;
18	- input.open(stdin, QIODevice::ReadOnly);
19	- input.readLine();
20	- printf("\n");
21	- }
22	- //return result;	6	+ cacicD sevice(argc, argv);
		7	+ return sevice.exec();
23	}	8	}
24	-
25	-
	@@ -32,7 +32,7 @@ qDebug() << "TESTE";		@@ -32,7 +32,7 @@ qDebug() << "TESTE";
32		32
33	void Gercols::run()	33	void Gercols::run()
34	{	34	{
35	- QJsonObject coleta;	35	+
36	/* Pega configurações do Json de configurações localizado	36	/* Pega configurações do Json de configurações localizado
37	* na pasta principal do cacic (deverá ser pega do registro,	37	* na pasta principal do cacic (deverá ser pega do registro,
38	* estou tentando implementar isso no installcacic).	38	* estou tentando implementar isso no installcacic).
	@@ -8,16 +8,17 @@ void cacic_hardware::iniciaColeta()		@@ -8,16 +8,17 @@ void cacic_hardware::iniciaColeta()
8	{	8	{
9	#ifdef Q_OS_WIN	9	#ifdef Q_OS_WIN
10	this->coletaHardware = coletaWin();	10	this->coletaHardware = coletaWin();
11	-#else	11	+#elif defined(Q_OS_LINUX)
12	this->coletaHardware = coletaLinux();	12	this->coletaHardware = coletaLinux();
13	#endif	13	#endif
14	}	14	}
15		15
16	QJsonObject cacic_hardware::coletaWin()	16	QJsonObject cacic_hardware::coletaWin()
17	{	17	{
18	- QJsonObject coleta;
19	- wmi();
20	- return coleta;	18	+#if defined(Q_OS_WIN)
		19	+ // Implementação seguindo as definições na documentação WMI.
		20	+#endif
		21	+ return QJsonObject();
21	}	22	}
22		23
23	QJsonObject cacic_hardware::coletaLinux()	24	QJsonObject cacic_hardware::coletaLinux()
	@@ -187,4 +188,89 @@ int cacic_hardware::wmi()		@@ -187,4 +188,89 @@ int cacic_hardware::wmi()
187	// CoUninitialize();	188	// CoUninitialize();
188		189
189	return 0; // Program successfully completed.	190	return 0; // Program successfully completed.
		191	+=======
		192	+
		193	+ OperatingSystem operatingSystem;
		194	+ ConsoleObject console;
		195	+
		196	+ QJsonObject hardware;
		197	+
		198	+ QFile lshwFile("lshwJson.json");
		199	+ if( lshwFile.exists() )
		200	+ lshwFile.remove();
		201	+
		202	+ console("lshw -json >> lshwJson.json");
		203	+
		204	+
		205	+ QJsonObject lshwJson = oCacic.getJsonFromFile("lshwJson.json")["children"].toArray().first().toObject();
		206	+
		207	+ if( lshwJson.contains("id") && lshwJson["id"] == "core") {
		208	+ if ( lshwJson["children"].isArray() ){
		209	+ qDebug() << "IS ARRAY!!";
		210	+ QJsonArray componentsArray = lshwJson["children"].toArray();
		211	+
		212	+ foreach(QJsonValue componentValue, componentsArray ) {
		213	+ QJsonObject component = componentValue.toObject();
		214	+
		215	+ /* TODO:
		216	+ * - Formatar direito as quantidades (memória,clock do cpu)
		217	+ * com unidades mais amigáveis para humanos em todos métodos.
		218	+ *
		219	+ * coletaLinuxMem
		220	+ * coletaLinuxCpu
		221	+ * coletaLinuxPci - a fazer
		222	+ */
		223	+
		224	+ if( component["id"] == "memory" ) {
		225	+ coletaLinuxMem(hardware,component);
		226	+ } else if ( component["id"] == "cpu" ) {
		227	+ coletaLinuxCpu(hardware,component);
		228	+ } else if ( component["id"] == "pci" ) {
		229	+ QJsonArray pciArray = component["children"].toArray();
		230	+
		231	+ foreach(QJsonValue pciValue, pciArray){
		232	+ QJsonObject pciObject = pciValue.toObject();
		233	+
		234	+ coletaLinuxPci(hardware, pciObject);
		235	+ }
		236	+
		237	+ }
		238	+
		239	+ }
		240	+ }
		241	+
		242	+ }
		243	+
		244	+
		245	+ return hardware;
		246	+}
		247	+
		248	+void cacic_hardware::coletaLinuxMem(QJsonObject &hardware, const QJsonObject &component)
		249	+{
		250	+ QJsonObject memory;
		251	+
		252	+ memory["size"] = QJsonValue::fromVariant(oCacic.convertDouble(component["size"].toDouble(),0) + " bytes");
		253	+
		254	+ hardware["memory"] = memory;
		255	+}
		256	+
		257	+void cacic_hardware::coletaLinuxCpu(QJsonObject &hardware, const QJsonObject &component)
		258	+{
		259	+ QJsonObject cpu;
		260	+
		261	+ cpu["name"] = component["product"];
		262	+ cpu["vendor"] = component["vendor"];
		263	+ cpu["clock"] = QJsonValue::fromVariant(oCacic.convertDouble(component["capacity"].toDouble(),0) + " Hz");
		264	+
		265	+ hardware["cpu"] = cpu;
		266	+}
		267	+
		268	+void cacic_hardware::coletaLinuxPci(QJsonObject &hardware, const QJsonObject &pciJson)
		269	+{
		270	+
		271	+}
		272	+
		273	+QJsonObject cacic_hardware::toJsonObject() {
		274	+ return coletaHardware;
		275	+>>>>>>> c87d0f3e5ae47bd0d7f7f8c5f5583bb46dd7235b
190	}	276	}
	@@ -8,8 +8,9 @@ void cacic_software::iniciaColeta()		@@ -8,8 +8,9 @@ void cacic_software::iniciaColeta()
8	{	8	{
9	#ifdef Q_OS_WIN	9	#ifdef Q_OS_WIN
10	this->coletaSoftware = coletaWin();	10	this->coletaSoftware = coletaWin();
11	-#else	11	+#elif defined(Q_OS_LINUX)
12	this->coletaSoftware = coletaLinux();	12	this->coletaSoftware = coletaLinux();
		13	+
13	#endif	14	#endif
14	}	15	}
15		16
	@@ -48,10 +49,102 @@ QJsonObject cacic_software::coletaWin()		@@ -48,10 +49,102 @@ QJsonObject cacic_software::coletaWin()
48	return softwaresJson;	49	return softwaresJson;
49	}	50	}
50		51
51	-void cacic_software::coletaLinux()	52	+QJsonObject cacic_software::coletaLinux()
		53	+{
		54	+
		55	+ OperatingSystem operatingSystem;
		56	+
		57	+ if( operatingSystem.getIdOs() == OperatingSystem::LINUX_ARCH ) {
		58	+ return coletaArch();
		59	+ } else if ( operatingSystem.getIdOs() == OperatingSystem::LINUX_DEBIAN \|\|
		60	+ operatingSystem.getIdOs() == OperatingSystem::LINUX_UBUNTU ) {
		61	+ return coletaDebian();
		62	+ }
		63	+
		64	+ return QJsonObject();
		65	+}
		66	+
		67	+QJsonObject cacic_software::coletaArch()
		68	+{
		69	+ ConsoleObject console;
		70	+ QJsonObject softwaresJson;
		71	+
		72	+ QStringList packages = console("pacman -Qe").split("\n");
		73	+
		74	+ foreach(QString package, packages) {
		75	+ QString packageName = package.split(" ")[0];
		76	+ QJsonObject packageJson;
		77	+
		78	+ QStringList packageInfo = console(QString("pacman -Qi ").append(packageName)).split("\n");
		79	+// qDebug() << packageInfo;
		80	+
		81	+ packageJson["name"] = QJsonValue::fromVariant(QString(packageName));
		82	+ foreach(QString line, packageInfo) {
		83	+ if(line.contains("Version"))
		84	+ packageJson["version"] = line.split(":")[1].mid(1);
		85	+ if(line.contains("Description"))
		86	+ packageJson["description"] = line.split(":")[1].mid(1);
		87	+ if(line.contains("URL")) {
		88	+ QStringList url = line.split(":");
		89	+ QString urlString;
		90	+
		91	+ for(int i = 1 ; i < url.size() ; ++i){
		92	+ urlString.append(url[i]);
		93	+ if(i == 1 ) urlString.append(":");
		94	+ }
		95	+
		96	+ packageJson["url"] = urlString.mid(1);
		97	+ }
		98	+ if(line.contains("Installed size"))
		99	+ packageJson["installed_size"] = line.split(":")[1].mid(1);
		100	+ if(line.contains("Install Date"))
		101	+ packageJson["install_date"] = line.split(":")[1].mid(1);
		102	+ }
		103	+ softwaresJson[packageName] = packageJson;
		104	+ }
		105	+ return softwaresJson;
		106	+}
		107	+
		108	+QJsonObject cacic_software::coletaDebian()
52	{	109	{
		110	+ ConsoleObject console;
		111	+ QJsonObject softwaresJson;
		112	+
		113	+ QStringList packages = console("dpkg --get-selections").split("\n");
		114	+
		115	+ foreach(QString package, packages) {
		116	+ QString packageName = package.split(" ")[0];
		117	+ QJsonObject packageJson;
53		118
		119	+ QStringList packageInfo = console(QString("apt-cache show ").append(packageName)).split("\n");
		120	+// qDebug() << packageInfo;
		121	+
		122	+ packageJson["name"] = QJsonValue::fromVariant(QString(packageName));
		123	+ foreach(QString line, packageInfo) {
		124	+ if(line.contains("Version"))
		125	+ packageJson["version"] = line.split(":")[1].mid(1);
		126	+ if(line.contains("Description"))
		127	+ packageJson["description"] = line.split(":")[1].mid(1);
		128	+ if(line.contains("Homepage")) {
		129	+ QStringList url = line.split(":");
		130	+ QString urlString;
		131	+
		132	+ for(int i = 1 ; i < url.size() ; ++i){
		133	+ urlString.append(url[i]);
		134	+ if(i == 1 ) urlString.append(":");
		135	+ }
		136	+
		137	+ packageJson["url"] = urlString.mid(1);
		138	+ }
		139	+ if(line.contains("Installed-Size"))
		140	+ packageJson["installed_size"] = line.split(":")[1].mid(1);
		141	+ }
		142	+ softwaresJson[packageName] = packageJson;
		143	+ }
		144	+
		145	+ return softwaresJson;
54	}	146	}
		147	+
55	QJsonObject cacic_software::toJsonObject()	148	QJsonObject cacic_software::toJsonObject()
56	{	149	{
57	return coletaSoftware;	150	return coletaSoftware;
	@@ -286,6 +286,14 @@ void CCacic::setChaveCrypt(const QString &value)		@@ -286,6 +286,14 @@ void CCacic::setChaveCrypt(const QString &value)
286	chaveCrypt = value;	286	chaveCrypt = value;
287	}	287	}
288		288
		289	+QString CCacic::convertDouble(const double &number, const int &precision)
		290	+{
		291	+ std::ostringstream ss;
		292	+ ss.precision(precision);
		293	+ ss << std::fixed << number;
		294	+
		295	+ return QString::fromStdString(ss.str());
		296	+}
289		297
290	/*Getters/Setters	298	/*Getters/Setters
291	* End.	299	* End.