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

dataengine fixes

Browse Source
This commit is contained in:
arcan1s 2015-01-25 17:26:54 +03:00
parent c850aaf2a3
commit cce37d66e5
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,10 +52,7 @@ ExtendedSysMon::ExtendedSysMon(QObject* parent, const QVariantList& args)
// debug // debug
QProcessEnvironment environment = QProcessEnvironment::systemEnvironment(); QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
QString debugEnv = environment.value(QString("DEBUG"), QString("no")); QString debugEnv = environment.value(QString("DEBUG"), QString("no"));
if (debugEnv == QString("yes")) debug = (debugEnv == QString("yes"));
debug = true;
else
debug = false;
setMinimumPollingInterval(333); setMinimumPollingInterval(333);
readConfiguration(); readConfiguration();
@ -67,15 +64,10 @@ QString ExtendedSysMon::getAllHdd()
{ {
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
QStringList devices; QStringList allDevices = QDir(QString("/dev")).entryList(QDir::System, QDir::Name);
QString cmd = QString("find /dev -name [hms]d[a-z]"); QStringList devices = allDevices.filter(QRegExp(QString("^[hms]d[a-z]$")));
if (debug) qDebug() << PDEBUG << ":" << "cmd" << cmd; for (int i=0; i<devices.count(); i++)
TaskResult process = runTask(cmd); devices[i] = QString("/dev/") + devices[i];
if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;
QString qoutput = QTextCodec::codecForMib(106)->toUnicode(process.output);
for (int i=0; i<qoutput.split(QChar('\n'), QString::SkipEmptyParts).count(); i++)
devices.append(qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i]);
if (debug) qDebug() << PDEBUG << ":" << "Device list" << devices; if (debug) qDebug() << PDEBUG << ":" << "Device list" << devices;
return devices.join(QChar(',')); return devices.join(QChar(','));
@ -554,12 +546,8 @@ int ExtendedSysMon::getUpgradeInfo(const QString cmd)
if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode; if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;
QString qoutput = QTextCodec::codecForMib(106)->toUnicode(process.output).trimmed(); QString qoutput = QTextCodec::codecForMib(106)->toUnicode(process.output).trimmed();
int count = 0;
for (int i=0; i<qoutput.split(QChar('\n')).count(); i++)
if (!qoutput.isEmpty())
count++;
return count; return qoutput.split(QChar('\n'), QString::SkipEmptyParts).count();
} }