Consertos para rodar no Linux/Ubuntu.

Thiago Rocha
1 parent f78ed3f8
Showing 7 changed files with 32 additions and 13 deletions Show diff stats
gercols/gercols.cpp
src/cacic_software.cpp
src/cacic_software.h
src/vqtconvert.cpp
src/vqtconvert.h
src/vregistry.cpp
src/vregistry.h
@@ -12,12 +12,12 @@ Gercols::Gercols(QObject *parent)
      ******************************************/
     QJsonObject configTeste;
     QJsonObject configComputer;
-    configComputer["operating_system"] = "";
-    configComputer["user"] = "";
-    configComputer["network_interface"] = "";
+    configComputer["operating_system"] = QJsonValue::fromVariant(QString(""));
+    configComputer["user"] = QJsonValue::fromVariant(QString(""));
+    configComputer["network_interface"] = QJsonValue::fromVariant(QString(""));
     configTeste["computer"] = configComputer;
-    configTeste["hardware"] = "";
-    configTeste["software"] = "";
+    configTeste["hardware"] = QJsonValue::fromVariant(QString(""));
+    configTeste["software"] = QJsonValue::fromVariant(QString(""));
     oCacic.setJsonToFile(configTeste,"configReq.json");
     /******************************************/
@@ -16,6 +16,7 @@ void cacic_software::iniciaColeta()
 #endif
 }
+#if defined(Q_OS_WIN)
 QJsonObject cacic_software::coletaWin()
 {
     QJsonObject softwaresJson;
@@ -54,6 +55,7 @@ QJsonObject cacic_software::coletaWin()
     return softwaresJson;
 }
+#elif defined(Q_OS_LINUX)
 QJsonObject cacic_software::coletaLinux()
 {
@@ -115,10 +117,10 @@ QJsonObject cacic_software::coletaDebian()
     ConsoleObject console;
     QJsonObject softwaresJson;
-    QStringList packages = console("dpkg --get-selections").split("\n");
+    QStringList packages = console("dpkg --get-selections | grep -v '\^lib\\|\^fonts'").split("\n");
     foreach(QString package, packages) {
-        QString packageName = package.split(" ")[0];
+        QString packageName = package.split("\t")[0];
         QJsonObject packageJson;
         QStringList packageInfo = console(QString("apt-cache show ").append(packageName)).split("\n");
@@ -126,11 +128,11 @@ QJsonObject cacic_software::coletaDebian()
         packageJson["name"] = QJsonValue::fromVariant(QString(packageName));
         foreach(QString line, packageInfo) {
-            if(line.contains("Version"))
+            if(line.contains("Version:"))
                 packageJson["version"] = line.split(":")[1].mid(1);
-            if(line.contains("Description"))
+            if(line.contains("Description-en:"))
                 packageJson["description"] = line.split(":")[1].mid(1);
-            if(line.contains("Homepage")) {
+            if(line.contains("Homepage:")) {
                 QStringList url = line.split(":");
                 QString urlString;
@@ -141,14 +143,16 @@ QJsonObject cacic_software::coletaDebian()
                 packageJson["url"] = urlString.mid(1);
             }
-            if(line.contains("Installed-Size"))
+            if(line.contains("Installed-Size:"))
                 packageJson["installed_size"] = line.split(":")[1].mid(1);
         }
         softwaresJson[packageName] = packageJson;
+        int counterPackages = softwaresJson.size();
     }
     return softwaresJson;
 }
+#endif
 QJsonObject cacic_software::toJsonObject()
 {
@@ -4,8 +4,11 @@
 #include <ccacic.h>
 #include <console.h>
 #include <operatingsystem.h>
-#include <vqtconvert.h>
-#include <vregistry.h>
+
+#if defined(Q_OS_WIN)
+    #include <vqtconvert.h>
+    #include <vregistry.h>
+#endif
 class cacic_software
 {
+#if defined(Q_OS_WIN)
+
 #include "vqtconvert.h"
 #include <QString>
@@ -58,3 +60,4 @@ namespace voidrealms
     } //end voidrealms::win32 namespace
 } //end voidrealms namespace
+#endif
+#if defined(Q_OS_WIN)
+
 #ifndef VQTCONVERT_H
 #define VQTCONVERT_H
@@ -49,3 +51,4 @@ namespace voidrealms
     } //end voidrealms::win32 namespace
 } //end voidrealms namespace
 #endif // VQTCONVERT_H
+#endif
+#if defined(Q_OS_WIN)
+
 /*
 Wrapper for the Windows Registry
 Version: 1.0
@@ -475,3 +477,4 @@ namespace voidrealms
     } //end voidrealms::win32 namespace
 } //end voidrealms namespace
+#endif
+#if defined(Q_OS_WIN)
+
 /*
 Wrapper for the Windows Registry
 Version: 1.0
@@ -125,3 +127,4 @@ namespace voidrealms
     } //end voidrealms::win32 namespace
 } //end voidrealms namespace
 #endif // VREGISTRY_H
+#endif