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

initial support of total sent/received data

Browse Source 
Tags {up,down}total{,kb}[0-9]?+
This commit is contained in:
Evgenii Alekseev 2016-04-25 16:06:37 +03:00
parent d01d8f95e5
commit 77388deab6
5 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sources/awesome-widget/plugin/awkeycache.cpp
View File

@ -138,10 +138,12 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &keys,
if (used.contains(QString("swaptotgb"))) if (used.contains(QString("swaptotgb")))
used << QString("swapgb") << QString("swapfreegb"); used << QString("swapgb") << QString("swapfreegb");
// network keys // network keys
QStringList netKeys(QStringList() << QString("up") << QString("upkb") QStringList netKeys(QStringList()
<< QString("up") << QString("upkb")
<< QString("uptotal") << QString("uptotalkb")
<< QString("upunits") << QString("down") << QString("upunits") << QString("down")
<< QString("downkb") << QString("downkb") << QString("downtotal")
<< QString("downunits")); << QString("downtotalkb") << QString("downunits"));
for (auto key : netKeys) { for (auto key : netKeys) {
if (!used.contains(key)) if (!used.contains(key))
continue; continue;

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

@ -124,8 +124,12 @@ QStringList AWKeyOperations::dictKeys() const
for (int i = m_devices[QString("net")].count() - 1; i >= 0; i--) { for (int i = m_devices[QString("net")].count() - 1; i >= 0; i--) {
allKeys.append(QString("downunits%1").arg(i)); allKeys.append(QString("downunits%1").arg(i));
allKeys.append(QString("upunits%1").arg(i)); allKeys.append(QString("upunits%1").arg(i));
allKeys.append(QString("downtotalkb%1").arg(i));
allKeys.append(QString("downtotal%1").arg(i));
allKeys.append(QString("downkb%1").arg(i)); allKeys.append(QString("downkb%1").arg(i));
allKeys.append(QString("down%1").arg(i)); allKeys.append(QString("down%1").arg(i));
allKeys.append(QString("uptotalkb%1").arg(i));
allKeys.append(QString("uptotal%1").arg(i));
allKeys.append(QString("upkb%1").arg(i)); allKeys.append(QString("upkb%1").arg(i));
allKeys.append(QString("up%1").arg(i)); allKeys.append(QString("up%1").arg(i));
} }

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

@ -268,9 +268,14 @@ void AWKeys::calculateValues()
.indexOf(values[QString("netdev")].toString()); .indexOf(values[QString("netdev")].toString());
values[QString("down")] = values[QString("down%1").arg(netIndex)]; values[QString("down")] = values[QString("down%1").arg(netIndex)];
values[QString("downkb")] = values[QString("downkb%1").arg(netIndex)]; values[QString("downkb")] = values[QString("downkb%1").arg(netIndex)];
values[QString("downtotal")] = values[QString("downtotal%1").arg(netIndex)];
values[QString("downtotalkb")]
= values[QString("downtotalkb%1").arg(netIndex)];
values[QString("downunits")] = values[QString("downunits%1").arg(netIndex)]; values[QString("downunits")] = values[QString("downunits%1").arg(netIndex)];
values[QString("up")] = values[QString("up%1").arg(netIndex)]; values[QString("up")] = values[QString("up%1").arg(netIndex)];
values[QString("upkb")] = values[QString("upkb%1").arg(netIndex)]; values[QString("upkb")] = values[QString("upkb%1").arg(netIndex)];
values[QString("uptotal")] = values[QString("uptotal%1").arg(netIndex)];
values[QString("uptotalkb")] = values[QString("uptotalkb%1").arg(netIndex)];
values[QString("upunits")] = values[QString("upunits%1").arg(netIndex)]; values[QString("upunits")] = values[QString("upunits%1").arg(netIndex)];
// swaptot* // swaptot*

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

@ -247,6 +247,8 @@ QStringList AWKeysAggregator::registerSource(const QString &source,
QRegExp mountUsedRegExp = QRegExp(QString("partitions/.*/usedspace")); QRegExp mountUsedRegExp = QRegExp(QString("partitions/.*/usedspace"));
QRegExp netRegExp = QRegExp( QRegExp netRegExp = QRegExp(
QString("network/interfaces/.*/(receiver|transmitter)/data$")); QString("network/interfaces/.*/(receiver|transmitter)/data$"));
QRegExp netTotalRegExp = QRegExp(
QString("network/interfaces/.*/(receiver|transmitter)/dataTotal$"));
if (source == QString("battery/ac")) { if (source == QString("battery/ac")) {
// AC // AC
@ -435,6 +437,22 @@ QStringList AWKeysAggregator::registerSource(const QString &source,
m_map.insertMulti(source, key); m_map.insertMulti(source, key);
m_formater[key] = FormaterType::NetSmartUnits; m_formater[key] = FormaterType::NetSmartUnits;
} }
} else if (source.contains(netTotalRegExp)) {
// network data total
QString type = source.contains(QString("receiver")) ? QString("down")
: QString("up");
int index
= m_devices[QString("net")].indexOf(source.split(QChar('/'))[2]);
if (index > -1) {
// kb
QString key = QString("%1totalkb%2").arg(type).arg(index);
m_map[source] = key;
m_formater[key] = FormaterType::Integer;
// mb
key = QString("%1total%2").arg(type).arg(index);
m_map.insertMulti(source, key);
m_formater[key] = FormaterType::MemMBFormat;
}
} else if (source.startsWith(QString("upgrade"))) { } else if (source.startsWith(QString("upgrade"))) {
// package manager // package manager
QString key = source; QString key = source;

7
sources/version.h.in
View File

@ -43,9 +43,10 @@
"time,isotime,shorttime,longtime,ctime,uptime,cuptime,cpucl,cpu,gputemp," \ "time,isotime,shorttime,longtime,ctime,uptime,cuptime,cpucl,cpu,gputemp," \
"gpu,memmb,memgb,memfreemb,memfreegb,memtotmb,memtotgb,memusedmb," \ "gpu,memmb,memgb,memfreemb,memfreegb,memtotmb,memtotgb,memusedmb," \
"memusedgb,mem,swapmb,swapgb,swapfreemb,swapfreegb,swaptotmb,swaptotgb," \ "memusedgb,mem,swapmb,swapgb,swapfreemb,swapfreegb,swaptotmb,swaptotgb," \
"swap,downunits,upunits,downkb,down,upkb,up,netdev,ac,bat,album,artist," \ "swap,downunits,upunits,downkb,downtotalkb,downtotal,down,uptotalkb," \
"duration,progress,title,dalbum,dartist,dtitle,salbum,sartist,stitle," \ "uptotal,upkb,up,netdev,ac,bat,album,artist,duration,progress,title," \
"pscount,pstotal,ps,desktop,ndesktop,tdesktops,la15,la5,la1" "dalbum,dartist,dtitle,salbum,sartist,stitle,pscount,pstotal,ps,desktop," \
"ndesktop,tdesktops,la15,la5,la1"
#cmakedefine BUILD_FUTURE #cmakedefine BUILD_FUTURE
#cmakedefine BUILD_TESTING #cmakedefine BUILD_TESTING