arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-04-25 16:07:19 +00:00
Code Issues Projects Releases Wiki Activity

fix pkg

Browse Source
This commit is contained in:
arcan1s 2014-06-09 15:04:40 +04:00
parent 61e2a380b9
commit 79cbfc4b32
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sources/ext-sysmon/extsysmon.cpp
View File

@ -23,7 +23,6 @@
#include <KDE/KStandardDirs> #include <KDE/KStandardDirs>
#include <QDebug> #include <QDebug>
#include <QFile> #include <QFile>
#include <QProcess>
#include <QProcessEnvironment> #include <QProcessEnvironment>
#include <QRegExp> #include <QRegExp>
#include <QTextCodec> #include <QTextCodec>
@ -157,10 +156,10 @@ void ExtendedSysMon::setProcesses()
} }
// gpu // gpu
processes[QString("gpu")].append(new QProcess); processes[QString("gpu")].append(new QProcess);
connect(processes[QString("gpu")][0], SIGNAL(readyReadStandardOutput()), this, SLOT(getGpu())); connect(processes[QString("gpu")][0], SIGNAL(readyReadStandardOutput()), this, SLOT(setGpu()));
// gputemp // gputemp
processes[QString("gputemp")].append(new QProcess); processes[QString("gputemp")].append(new QProcess);
connect(processes[QString("gputemp")][0], SIGNAL(readyReadStandardOutput()), this, SLOT(getGpuTemp())); connect(processes[QString("gputemp")][0], SIGNAL(readyReadStandardOutput()), this, SLOT(setGpuTemp()));
// hddtemp // hddtemp
for (int i=0; i<configuration[QString("HDDDEV")].split(QChar(','), QString::SkipEmptyParts).count(); i++) { for (int i=0; i<configuration[QString("HDDDEV")].split(QChar(','), QString::SkipEmptyParts).count(); i++) {
processes[QString("hddtemp")].append(new QProcess); processes[QString("hddtemp")].append(new QProcess);
@ -169,7 +168,8 @@ void ExtendedSysMon::setProcesses()
// pkg // pkg
for (int i=0; i<configuration[QString("PKGCMD")].split(QString(","), QString::SkipEmptyParts).count(); i++) { for (int i=0; i<configuration[QString("PKGCMD")].split(QString(","), QString::SkipEmptyParts).count(); i++) {
processes[QString("pkg")].append(new QProcess); processes[QString("pkg")].append(new QProcess);
connect(processes[QString("pkg")][i], SIGNAL(readyReadStandardOutput()), this, SLOT(setPkg())); connect(processes[QString("pkg")][i], SIGNAL(finished(int, QProcess::ExitStatus)),
this, SLOT(setUpgradeInfo(int, QProcess::ExitStatus)));
} }
// player // player
// two processes because amarok and clementine requires two commands // two processes because amarok and clementine requires two commands
@ -185,7 +185,7 @@ void ExtendedSysMon::setProcesses()
connect(processes[QString("ps")][0], SIGNAL(readyReadStandardOutput()), this, SLOT(setPs())); connect(processes[QString("ps")][0], SIGNAL(readyReadStandardOutput()), this, SLOT(setPs()));
// pstotal // pstotal
processes[QString("ps")].append(new QProcess); processes[QString("ps")].append(new QProcess);
connect(processes[QString("ps")][2], SIGNAL(readyReadStandardOutput()), this, SLOT(setPs())); connect(processes[QString("ps")][1], SIGNAL(readyReadStandardOutput()), this, SLOT(setPs()));
} }
@ -199,7 +199,9 @@ QMap<QString, QString> ExtendedSysMon::updateConfiguration(const QMap<QString, Q
key = rawConfig.keys()[i]; key = rawConfig.keys()[i];
value = rawConfig[key]; value = rawConfig[key];
key.remove(QChar(' ')); key.remove(QChar(' '));
if ((key != QString("CUSTOM")) && (key != QString("PKGCMD"))) if ((key != QString("CUSTOM")) &&
(key != QString("HDDTEMPCMD")) &&
(key != QString("PKGCMD")))
value.remove(QChar(' ')); value.remove(QChar(' '));
config[key] = value; config[key] = value;
} }
@ -253,6 +255,7 @@ void ExtendedSysMon::getCustomCmd(const QString cmd, const int number)
{ {
if (debug) qDebug() << "[DE]" << "[getCustomCmd]"; if (debug) qDebug() << "[DE]" << "[getCustomCmd]";
if (debug) qDebug() << "[DE]" << "[getCustomCmd]" << ":" << "Run function with cmd" << cmd; if (debug) qDebug() << "[DE]" << "[getCustomCmd]" << ":" << "Run function with cmd" << cmd;
if (debug) qDebug() << "[DE]" << "[getCustomCmd]" << ":" << "Run function with number" << number;
if (debug) qDebug() << "[DE]" << "[getCustomCmd]" << ":" << "Run cmd" << QString("bash -c \"") + cmd + QString("\""); if (debug) qDebug() << "[DE]" << "[getCustomCmd]" << ":" << "Run cmd" << QString("bash -c \"") + cmd + QString("\"");
processes[QString("custom")][number]->start(QString("bash -c \"") + cmd + QString("\"")); processes[QString("custom")][number]->start(QString("bash -c \"") + cmd + QString("\""));
} }
@ -386,6 +389,7 @@ void ExtendedSysMon::getHddTemp(const QString cmd, const QString device, const i
if (debug) qDebug() << "[DE]" << "[getHddTemp]"; if (debug) qDebug() << "[DE]" << "[getHddTemp]";
if (debug) qDebug() << "[DE]" << "[getHddTemp]" << ":" << "Run function with cmd" << cmd; if (debug) qDebug() << "[DE]" << "[getHddTemp]" << ":" << "Run function with cmd" << cmd;
if (debug) qDebug() << "[DE]" << "[getHddTemp]" << ":" << "Run function with device" << device; if (debug) qDebug() << "[DE]" << "[getHddTemp]" << ":" << "Run function with device" << device;
if (debug) qDebug() << "[DE]" << "[getHddTemp]" << ":" << "Run function with number" << number;
if (debug) qDebug() << "[DE]" << "[getHddTemp]" << ":" << "Run cmd" << cmd + QString(" ") + device; if (debug) qDebug() << "[DE]" << "[getHddTemp]" << ":" << "Run cmd" << cmd + QString(" ") + device;
processes[QString("hddtemp")][number]->start(cmd + QString(" ") + device); processes[QString("hddtemp")][number]->start(cmd + QString(" ") + device);
} }
@ -630,15 +634,19 @@ void ExtendedSysMon::getUpgradeInfo(const QString pkgCommand, const int number)
{ {
if (debug) qDebug() << "[DE]" << "[getUpgradeInfo]"; if (debug) qDebug() << "[DE]" << "[getUpgradeInfo]";
if (debug) qDebug() << "[DE]" << "[getUpgradeInfo]" << ":" << "Run function with cmd" << pkgCommand; if (debug) qDebug() << "[DE]" << "[getUpgradeInfo]" << ":" << "Run function with cmd" << pkgCommand;
QString cmd = QString("bash -c \"") + pkgCommand + QString("\""); if (debug) qDebug() << "[DE]" << "[getUpgradeInfo]" << ":" << "Run function with number" << number;
QString cmd = QString("bash -c \"") + pkgCommand + QString(" | wc -l\"");
if (debug) qDebug() << "[DE]" << "[getUpgradeInfo]" << ":" << "Run cmd" << cmd; if (debug) qDebug() << "[DE]" << "[getUpgradeInfo]" << ":" << "Run cmd" << cmd;
processes[QString("pkg")][number]->start(cmd); processes[QString("pkg")][number]->start(cmd);
} }
void ExtendedSysMon::setUpgradeInfo() void ExtendedSysMon::setUpgradeInfo(int exitCode, QProcess::ExitStatus exitStatus)
{ {
Q_UNUSED(exitStatus)
if (debug) qDebug() << "[DE]" << "[setUpgradeInfo]"; if (debug) qDebug() << "[DE]" << "[setUpgradeInfo]";
if (debug) qDebug() << "[DE]" << "[setUpgradeInfo]" << ":" << "Cmd returns" << exitCode;
int pkgNull = 0; int pkgNull = 0;
int value = 0; int value = 0;
QString qoutput = QString(""); QString qoutput = QString("");
@ -647,7 +655,7 @@ void ExtendedSysMon::setUpgradeInfo()
if (!qoutput.isEmpty()) { if (!qoutput.isEmpty()) {
if (debug) qDebug() << "[DE]" << "[setUpgradeInfo]" << ":" << "Found data for cmd" << i; if (debug) qDebug() << "[DE]" << "[setUpgradeInfo]" << ":" << "Found data for cmd" << i;
pkgNull = configuration[QString("PKGNULL")].split(QString(","), QString::SkipEmptyParts)[i].toInt(); pkgNull = configuration[QString("PKGNULL")].split(QString(","), QString::SkipEmptyParts)[i].toInt();
value = qoutput.split(QChar('\n'), QString::SkipEmptyParts).count(); value = qoutput.toInt();
if (debug) qDebug() << "[DE]" << "[setUpgradeInfo]" << ":" << "Return" << value; if (debug) qDebug() << "[DE]" << "[setUpgradeInfo]" << ":" << "Return" << value;
QString source = QString("pkg"); QString source = QString("pkg");
QString key = QString("pkgCount") + QString::number(i); QString key = QString("pkgCount") + QString::number(i);
@ -669,12 +677,10 @@ bool ExtendedSysMon::updateSourceEvent(const QString &source)
{ {
if (debug) qDebug() << "[DE]" << "[updateSourceEvent]"; if (debug) qDebug() << "[DE]" << "[updateSourceEvent]";
if (debug) qDebug() << "[DE]" << "[updateSourceEvent]" << ":" << "Run function with source name" << source; if (debug) qDebug() << "[DE]" << "[updateSourceEvent]" << ":" << "Run function with source name" << source;
QString key;
if (source == QString("custom")) { if (source == QString("custom")) {
for (int i=0; i<configuration[QString("CUSTOM")].split(QString("@@"), QString::SkipEmptyParts).count(); i++) { for (int i=0; i<configuration[QString("CUSTOM")].split(QString("@@"), QString::SkipEmptyParts).count(); i++)
getCustomCmd(configuration[QString("CUSTOM")].split(QString("@@"), QString::SkipEmptyParts)[i], i); getCustomCmd(configuration[QString("CUSTOM")].split(QString("@@"), QString::SkipEmptyParts)[i], i);
} }
}
else if (source == QString("gpu")) { else if (source == QString("gpu")) {
getGpu(configuration[QString("GPUDEV")]); getGpu(configuration[QString("GPUDEV")]);
} }
@ -683,15 +689,13 @@ bool ExtendedSysMon::updateSourceEvent(const QString &source)
} }
else if (source == QString("hddtemp")) { else if (source == QString("hddtemp")) {
QStringList deviceList = configuration[QString("HDDDEV")].split(QChar(','), QString::SkipEmptyParts); QStringList deviceList = configuration[QString("HDDDEV")].split(QChar(','), QString::SkipEmptyParts);
for (int i=0; i<deviceList.count(); i++) { for (int i=0; i<deviceList.count(); i++)
getHddTemp(configuration[QString("HDDTEMPCMD")], deviceList[i], i); getHddTemp(configuration[QString("HDDTEMPCMD")], deviceList[i], i);
} }
}
else if (source == QString("pkg")) { else if (source == QString("pkg")) {
for (int i=0; i<configuration[QString("PKGCMD")].split(QString(","), QString::SkipEmptyParts).count(); i++) { for (int i=0; i<configuration[QString("PKGCMD")].split(QString(","), QString::SkipEmptyParts).count(); i++)
getUpgradeInfo(configuration[QString("PKGCMD")].split(QString(","), QString::SkipEmptyParts)[i], i); getUpgradeInfo(configuration[QString("PKGCMD")].split(QString(","), QString::SkipEmptyParts)[i], i);
} }
}
else if (source == QString("player")) { else if (source == QString("player")) {
getPlayerInfo(configuration[QString("PLAYER")], getPlayerInfo(configuration[QString("PLAYER")],
configuration[QString("MPDADDRESS")], configuration[QString("MPDADDRESS")],

5
sources/ext-sysmon/extsysmon.h
View File

@ -19,8 +19,7 @@
#define EXTSYSMON_H #define EXTSYSMON_H
#include <Plasma/DataEngine> #include <Plasma/DataEngine>
#include <QProcess>
class QProcess;
class ExtendedSysMon : public Plasma::DataEngine class ExtendedSysMon : public Plasma::DataEngine
{ {
@ -52,7 +51,7 @@ private slots:
void setGpu(); void setGpu();
void setGpuTemp(); void setGpuTemp();
void setHddTemp(); void setHddTemp();
void setUpgradeInfo(); void setUpgradeInfo(int exitCode, QProcess::ExitStatus exitStatus);
void setPlayer(); void setPlayer();
void setPs(); void setPs();