Alteração no testConsole para passar somente no Linux e no coletaIdOs para retornar distribuição.

Thiago Rocha
1 parent bf68278d
Showing 4 changed files with 31 additions and 6 deletions Show diff stats
cacic-teste/testcacic.cpp
src/console.h
src/operatingsystem.cpp
src/operatingsystem.h
@@ -94,9 +94,11 @@ void CTestCacic::testpegarOS(){
 void CTestCacic::testConsole()
 {
     ConsoleObject console;
-
-//    QVERIFY(console("echo teste").toStdString() == "teste\n");
+#if defined(Q_OS_LINUX)
+    QVERIFY(console("echo teste").toStdString() == "teste\n");
+#else
     QVERIFY(false);
+#endif
 }
 void CTestCacic::testPegarUsu(){
@@ -11,14 +11,18 @@ class ConsoleObject:public std::unary_function&lt;std::string,QString&gt;
 public:
-#if defined(Q_OS_LINUX)
+
     QString operator() (std::string input)
     {
         QProcess* process = new QProcess();
+#if defined(Q_OS_LINUX)
         QStringList options;
         options << "-c" << QString::fromStdString(input);
         process->start("/bin/sh", options);
+#elif defined(Q_OS_WIN)
+        process->start(input);
+#endif
         process->waitForFinished();
         QString output = process->readAll();
 //        qDebug() << output;
@@ -26,7 +30,6 @@ public:
         delete process;
         return output;
     }
-#endif
 };
 #endif // CONSOLE_H
@@ -6,6 +6,7 @@ OperatingSystem::OperatingSystem()
     this->nomeOs = this->coletaNomeOs();
 }
+
 /*pegarOS
  * @return: int;
  *      retorna um id referente a versão do SO.
@@ -14,13 +15,28 @@ OperatingSystem::OperatingSystem()
  * 144 = Windows 7
  * 160 = Windows 8
  * 176 = Windows 8.1
- * 200 = Linux
+ * [enum] = Linux
  */
 int OperatingSystem::coletaIdOs(){
 #if defined (Q_OS_WIN)
     return QSysInfo::WindowsVersion;
 #elif defined (Q_OS_LINUX)
-    return LINUX_ARCH;
+
+    ConsoleObject console;
+    QStringList catOutput = console("cat /etc/*release").split("\n");
+
+    QString line;
+    foreach(line, catOutput) {
+        if(line.contains("PRETTY_NAME")) {
+            if( line.contains("Arch"))
+                return LINUX_ARCH;
+            else if( line.contains("Debian"))
+                return LINUX_DEBIAN;
+            else if( line.contains("Ubuntu"))
+                return LINUX_UBUNTU;
+        }
+    }
+
 #else
     return 0;
 #endif
@@ -2,8 +2,12 @@
 #define OPERATINGSYSTEM_H
 #include <QtCore>
+#include <QString>
+#include <QStringList>
 #include <QSysInfo>
+
 #include <ccacic.h>
+#include <console.h>
 class OperatingSystem
 {