From ccaca2a725522e51a5c09300738b815882423854 Mon Sep 17 00:00:00 2001
From: arcan1s <esalexeev@gmail.com>
Date: Mon, 18 Nov 2013 19:51:57 +0400
Subject: [PATCH] Edited for 1.5 ext-sysmon

---
 PKGBUILD                       |   5 +++--
 ext-sysmon-1.5.zip             | Bin 5155 -> 5206 bytes
 ext-sysmon/CMakeLists.txt      |   2 +-
 ext-sysmon/extsysmon.cpp       |  31 ++++++++++++++++++-------------
 py-text-monitor-1.5.1.plasmoid | Bin 21954 -> 21954 bytes
 5 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 0d4723d..b9c868b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,8 +22,9 @@ makedepends=('automoc4' 'cmake')
 source=(https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_pkgname}-${pkgver}.plasmoid
         https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_dtengine}-${_dtver}.zip)
 install=${pkgname}.install
-md5sums=('9872eedca313768f18de0facc2fc135d'
-         '29a0fbc2014b0b7cacfab8186a56a1b6')
+md5sums=('3e128738a0fcb90f41c57bd6cc4a249c'
+         'ff3144a9f0d74f80a5ab6bf2f3bdf9a1')
+backup=('usr/share/config/extsysmon.conf')
 
 build ()
 {
diff --git a/ext-sysmon-1.5.zip b/ext-sysmon-1.5.zip
index 3203b4253f06500fea0e3224f4069bec38ee079f..14e1296f6bdfcb35f04d2063886e6400758f8725 100644
GIT binary patch
delta 3115
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
BxNiUe

delta 3061
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
DFBQEf

diff --git a/ext-sysmon/CMakeLists.txt b/ext-sysmon/CMakeLists.txt
index a5ed7f7..7a4c687 100644
--- a/ext-sysmon/CMakeLists.txt
+++ b/ext-sysmon/CMakeLists.txt
@@ -23,4 +23,4 @@ target_link_libraries (${PLUGIN_NAME} ${KDE4_KDECORE_LIBS} ${KDE4_PLASMA_LIBS})
 # install
 install (TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGIN_INSTALL_DIR})
 install (FILES ${PROJECT_DESKTOP} DESTINATION ${SERVICES_INSTALL_DIR})
-install (FILES ${PROJECT_CONF} DESTINATION ../etc/)
+install (FILES ${PROJECT_CONF} DESTINATION ${CONFIG_INSTALL_DIR})
diff --git a/ext-sysmon/extsysmon.cpp b/ext-sysmon/extsysmon.cpp
index 2964426..42f1efc 100644
--- a/ext-sysmon/extsysmon.cpp
+++ b/ext-sysmon/extsysmon.cpp
@@ -31,7 +31,7 @@ ExtendedSysMon::ExtendedSysMon(QObject* parent, const QVariantList& args)
   Q_UNUSED(args)
 
   setMinimumPollingInterval(333);
-  readConfiguration(QString("/etc/extsysmon.conf"));
+  readConfiguration(QString("/usr/share/config/extsysmon.conf"));
 }
 
 QStringList ExtendedSysMon::sources() const
@@ -86,30 +86,32 @@ bool ExtendedSysMon::readConfiguration(const QString confFileName)
       break;
     else if (fileStr[0] != '#')
     {
-      if (fileStr.split(QString("="), QString::SkipEmptyParts).count() == 1)
+      if (fileStr.split(QString("="), QString::SkipEmptyParts).count() == 2)
       {
         if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("GPUDEV"))
         {
-          if (fileStr.split(QString("="), QString::SkipEmptyParts)[1] == QString("ati"))
-            gpudev = fileStr.split(QString("="), QString::SkipEmptyParts)[1];
-          else if (fileStr.split(QString("="), QString::SkipEmptyParts)[1] == QString("nvidia"))
-            gpudev = fileStr.split(QString("="), QString::SkipEmptyParts)[1];
-          else if (fileStr.split(QString("="), QString::SkipEmptyParts)[1] == QString("ignore"))
+          if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0] == QString("ati"))
+            gpudev = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
+          else if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0] == QString("nvidia"))
+            gpudev = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
+          else if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0] != QString("auto"))
             gpudev = QString("ignore");
         }
         else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("HDDDEV"))
         {
-          if (fileStr.split(QString("="), QString::SkipEmptyParts)[1] != QString("all"))
+          if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0] != QString("all"))
           {
             hdddev.clear();
-            for (int i=0; i<fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString(","), QString::SkipEmptyParts).count(); i++)
-              hdddev.append(fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString(","), QString::SkipEmptyParts)[i]);
+            for (int i=0; i<fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), \
+                            QString::SkipEmptyParts)[0].split(QString(","), QString::SkipEmptyParts).count(); i++)
+              hdddev.append(fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), \
+                            QString::SkipEmptyParts)[0].split(QString(","), QString::SkipEmptyParts)[i]);
           }
         }
         else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("MPDADDRESS"))
-          mpdAddress = fileStr.split(QString("="), QString::SkipEmptyParts)[1];
+          mpdAddress = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
         else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("MPDPORT"))
-          mpdPort = fileStr.split(QString("="), QString::SkipEmptyParts)[1];
+          mpdPort = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
       }
     }
   }
@@ -288,7 +290,10 @@ bool ExtendedSysMon::updateSourceEvent(const QString &source)
     QString value_artist;
     value = QString("N\\A");
     value_artist = QString("N\\A");
-    f_out = popen("echo 'currentsong\nclose' | curl --connect-timeout 1 -fsm 3 telnet://localhost:6600 2> /dev/null", "r");
+    char commandStr[512];
+    sprintf (commandStr, "echo 'currentsong\nclose' | curl --connect-timeout 1 -fsm 3 telnet://%s:%s 2> /dev/null", \
+             mpdAddress.toUtf8().data(), mpdPort.toUtf8().data());
+    f_out = popen(commandStr, "r");
     while (true)
     {
       fgets(output, 256, f_out);
diff --git a/py-text-monitor-1.5.1.plasmoid b/py-text-monitor-1.5.1.plasmoid
index 248d8a769aa27f0249f3ec0218f11231b34725f3..784c86702158be7fe9687b7d08b8fe7506e09b2d 100644
GIT binary patch
delta 127
zcmX@Kn(@$T#t8;YVfqt|+(2ZNKXaIV*Tyr=JRo{=5N|IRnDIz_BNLc0O)7{D%y_L}
w#t3GpC_U!{Gx&7cn8A$c`ZW+;VpiQ;U{j?h?{l#L%l&k*0SRq3_wQx{0M$S$eE<Le

delta 127
zcmX@Kn(@$T#t8;YUV0Oa+(2ZNKXZL<!^ShsJRo{=5N|IRnDIz_BNLc0O)7{D%y_L}
y#t3GpC_U!{Gx&7cn8A$c`ZW+;VpiQ;U{j?h?{l$WE(MzS)5QiPwAtLhn+*W7N-g04