arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-15 06:45:48 +00:00
Code Issues Projects Releases Wiki Activity

add tests for awkeys

Browse Source
This commit is contained in:
Evgenii Alekseev
2016-06-28 11:19:33 +03:00
parent bee8e2f180
commit 5cd5272f10
7 changed files with 245 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sources/awesome-widget/plugin/awactions.h
View File

@ -19,6 +19,7 @@
#ifndef AWACTIONS_H
#define AWACTIONS_H
#include <QMap>
#include <QObject>

18
sources/awesome-widget/plugin/awkeyoperations.cpp
View File

@ -189,10 +189,16 @@ QString AWKeyOperations::infoByKey(QString key) const
{
qCDebug(LOG_AW) << "Requested key" << key;
QString stripped = key;
stripped.remove(QRegExp(QString("\\d+")));
QString output = QString("(none)");
// FIXME undefined behaviour
if (key.startsWith(QString("bar")))
return graphicalItems->itemByTag(key, QString("bar"))->uniq();
return graphicalItems->itemByTag(key, stripped)->uniq();
else if (key.startsWith(QString("custom")))
return extScripts->itemByTag(key, QString("custom"))->uniq();
return extScripts->itemByTag(key, stripped)->uniq();
else if (key.contains(QRegExp(QString("^hdd[rw]"))))
return QString("%1").arg(
m_devices[QString("disk")]
@ -213,17 +219,17 @@ QString AWKeyOperations::infoByKey(QString key) const
m_devices[QString("net")]
[key.remove(QRegExp(QString("^(down|up)"))).toInt()]);
else if (key.startsWith(QString("pkgcount")))
return extUpgrade->itemByTag(key, QString("pkgcount"))->uniq();
return extUpgrade->itemByTag(key, stripped)->uniq();
else if (key.contains(QRegExp(QString("(^|perc)(ask|bid|price)(chg|)"))))
return extQuotes->itemByTag(key, QString("ask"))->uniq();
return extQuotes->itemByTag(key, stripped)->uniq();
else if (key.contains(QRegExp(
QString("(weather|weatherId|humidity|pressure|temperature)"))))
return extWeather->itemByTag(key, QString("weather"))->uniq();
return extWeather->itemByTag(key, stripped)->uniq();
else if (key.startsWith(QString("temp")))
return QString("%1").arg(
m_devices[QString("temp")][key.remove(QString("temp")).toInt()]);
return QString("(none)");
return output;
}

6
sources/awesome-widget/plugin/awkeys.cpp
View File

@ -177,8 +177,10 @@ QString AWKeys::valueByKey(QString key) const
{
qCDebug(LOG_AW) << "Requested value for key" << key;
key.remove(QRegExp(QString("^bar[0-9]{1,}")));
return aggregator->formatter(values[key], key);
QString trueKey
= key.startsWith(QString("bar")) ? keyOperator->infoByKey(key) : key;
return aggregator->formatter(values[trueKey], trueKey);
}