From e32a37043ab901d50dd3cd412f83f684a53c41cf Mon Sep 17 00:00:00 2001 From: arcan1s Date: Mon, 2 Jun 2014 14:44:48 +0400 Subject: [PATCH] debug settings for dataengine is read now from environment --- PKGBUILD | 2 +- sources/ext-sysmon/extsysmon.conf | 3 --- sources/ext-sysmon/extsysmon.cpp | 17 +++++++++-------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index f950174..fd63357 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -21,7 +21,7 @@ optdepends=("amarok: for music player monitor" makedepends=('automoc4' 'cmake') source=(https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz) install=${pkgname}.install -md5sums=('7366d3a97c2426f3ffe769e74f83a86b') +md5sums=('8b88e0095c91dc4b0dec0f308c6528fa') backup=('usr/share/config/extsysmon.conf') prepare() { diff --git a/sources/ext-sysmon/extsysmon.conf b/sources/ext-sysmon/extsysmon.conf index 35391c3..89cf825 100644 --- a/sources/ext-sysmon/extsysmon.conf +++ b/sources/ext-sysmon/extsysmon.conf @@ -30,6 +30,3 @@ # Player name. Supported players are amarok, clementine, mpd, qmmp #PLAYER=amarok - -# Enable some debug information (yes or no) -#DEBUG=no diff --git a/sources/ext-sysmon/extsysmon.cpp b/sources/ext-sysmon/extsysmon.cpp index 3794893..42944b4 100644 --- a/sources/ext-sysmon/extsysmon.cpp +++ b/sources/ext-sysmon/extsysmon.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -33,8 +34,15 @@ ExtendedSysMon::ExtendedSysMon(QObject* parent, const QVariantList& args) { Q_UNUSED(args) + // debug + QProcessEnvironment environment = QProcessEnvironment::systemEnvironment(); + QString debugEnv = environment.value(QString("PTM_DE_DEBUG"), QString("no")); + if (debugEnv == QString("yes")) + debug = true; + else + debug = false; + setMinimumPollingInterval(333); - debug = true; readConfiguration(); } @@ -101,7 +109,6 @@ void ExtendedSysMon::readConfiguration() // pre-setup QMap rawConfig; rawConfig[QString("CUSTOM")] = QString("wget -qO- http://ifconfig.me/ip"); - rawConfig[QString("DEBUG")] = QString("no"); rawConfig[QString("GPUDEV")] = QString("auto"); rawConfig[QString("HDDDEV")] = QString("all"); rawConfig[QString("HDDTEMPCMD")] = QString("sudo hddtemp"); @@ -154,12 +161,6 @@ QMap ExtendedSysMon::updateConfiguration(const QMap