From 5e0843483598ef892aa124e15d9e685348d3f4db Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Mon, 24 Jul 2017 15:07:36 +0300 Subject: [PATCH] fix issue with invalid (up|down)total($|kb) calculation (see #127) also renamed *total* tags to *tot* for consistency with other tags: * uptotal.* -> uptot.* * downtotal.* -> downtot.* * pstotal -> pstot --- sources/awesome-widget/plugin/awkeycache.cpp | 4 ++-- sources/awesome-widget/plugin/awkeyoperations.cpp | 8 ++++---- sources/awesome-widget/plugin/awkeys.cpp | 8 ++++---- sources/awesome-widget/plugin/awkeysaggregator.cpp | 12 ++++++++---- sources/awesome-widget/plugin/awkeysaggregator.h | 1 - .../awesomewidgets/configs/aw-example-standalonerc | 2 +- sources/version.h.in | 8 ++++---- 7 files changed, 23 insertions(+), 20 deletions(-) diff --git a/sources/awesome-widget/plugin/awkeycache.cpp b/sources/awesome-widget/plugin/awkeycache.cpp index ce3ff84..d72de54 100644 --- a/sources/awesome-widget/plugin/awkeycache.cpp +++ b/sources/awesome-widget/plugin/awkeycache.cpp @@ -147,8 +147,8 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, used << "swapgb" << "swapfreegb"; // network keys - QStringList netKeys({"up", "upkb", "uptotal", "uptotalkb", "upunits", - "down", "downkb", "downtotal", "downtotalkb", + QStringList netKeys({"up", "upkb", "uptot", "uptotkb", "upunits", + "down", "downkb", "downtot", "downtotkb", "downunits"}); for (auto &key : netKeys) { if (!used.contains(key)) diff --git a/sources/awesome-widget/plugin/awkeyoperations.cpp b/sources/awesome-widget/plugin/awkeyoperations.cpp index c4b4ed2..7f992da 100644 --- a/sources/awesome-widget/plugin/awkeyoperations.cpp +++ b/sources/awesome-widget/plugin/awkeyoperations.cpp @@ -122,12 +122,12 @@ QStringList AWKeyOperations::dictKeys() const for (int i = 0; i < m_devices["net"].count(); i++) { allKeys.append(QString("downunits%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("downtotkb%1").arg(i)); + allKeys.append(QString("downtot%1").arg(i)); allKeys.append(QString("downkb%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("uptotkb%1").arg(i)); + allKeys.append(QString("uptot%1").arg(i)); allKeys.append(QString("upkb%1").arg(i)); allKeys.append(QString("up%1").arg(i)); } diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp index e8d4745..385f2e1 100644 --- a/sources/awesome-widget/plugin/awkeys.cpp +++ b/sources/awesome-widget/plugin/awkeys.cpp @@ -291,13 +291,13 @@ void AWKeys::calculateValues() = m_keyOperator->devices("net").indexOf(m_values["netdev"].toString()); m_values["down"] = m_values[QString("down%1").arg(netIndex)]; m_values["downkb"] = m_values[QString("downkb%1").arg(netIndex)]; - m_values["downtotal"] = m_values[QString("downtotal%1").arg(netIndex)]; - m_values["downtotalkb"] = m_values[QString("downtotalkb%1").arg(netIndex)]; + m_values["downtot"] = m_values[QString("downtot%1").arg(netIndex)]; + m_values["downtotkb"] = m_values[QString("downtotkb%1").arg(netIndex)]; m_values["downunits"] = m_values[QString("downunits%1").arg(netIndex)]; m_values["up"] = m_values[QString("up%1").arg(netIndex)]; m_values["upkb"] = m_values[QString("upkb%1").arg(netIndex)]; - m_values["uptotal"] = m_values[QString("uptotal%1").arg(netIndex)]; - m_values["uptotalkb"] = m_values[QString("uptotalkb%1").arg(netIndex)]; + m_values["uptot"] = m_values[QString("uptot%1").arg(netIndex)]; + m_values["uptotkb"] = m_values[QString("uptotkb%1").arg(netIndex)]; m_values["upunits"] = m_values[QString("upunits%1").arg(netIndex)]; // swaptot* diff --git a/sources/awesome-widget/plugin/awkeysaggregator.cpp b/sources/awesome-widget/plugin/awkeysaggregator.cpp index c50f331..9837d2b 100644 --- a/sources/awesome-widget/plugin/awkeysaggregator.cpp +++ b/sources/awesome-widget/plugin/awkeysaggregator.cpp @@ -46,9 +46,13 @@ AWKeysAggregator::AWKeysAggregator(QObject *_parent) // network m_formatter["down"] = FormatterType::NetSmartFormat; m_formatter["downkb"] = FormatterType::Integer; + m_formatter["downtot"] = FormatterType::MemMBFormat; + m_formatter["downtotkb"] = FormatterType::Integer; m_formatter["downunits"] = FormatterType::NetSmartUnits; m_formatter["up"] = FormatterType::NetSmartFormat; m_formatter["upkb"] = FormatterType::Integer; + m_formatter["uptot"] = FormatterType::MemMBFormat; + m_formatter["uptotkb"] = FormatterType::Integer; m_formatter["upunits"] = FormatterType::NetSmartUnits; // swap m_formatter["swap"] = FormatterType::Float; @@ -468,11 +472,11 @@ QStringList AWKeysAggregator::registerSource(const QString &_source, int index = m_devices["net"].indexOf(_source.split('/')[2]); if (index > -1) { // kb - QString key = QString("%1totalkb%2").arg(type).arg(index); + QString key = QString("%1totkb%2").arg(type).arg(index); m_map[_source] = key; m_formatter[key] = FormatterType::Integer; // mb - key = QString("%1total%2").arg(type).arg(index); + key = QString("%1tot%2").arg(type).arg(index); m_map.insertMulti(_source, key); m_formatter[key] = FormatterType::MemMBFormat; } @@ -498,8 +502,8 @@ QStringList AWKeysAggregator::registerSource(const QString &_source, m_formatter["ps"] = FormatterType::List; } else if (_source == "ps/total/count") { // total processes count - m_map[_source] = "pstotal"; - m_formatter["pstotal"] = FormatterType::NoFormat; + m_map[_source] = "pstot"; + m_formatter["pstot"] = FormatterType::NoFormat; } else if (_source.startsWith("quotes")) { // quotes QString key = _source; diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h index d29672e..6157dc0 100644 --- a/sources/awesome-widget/plugin/awkeysaggregator.h +++ b/sources/awesome-widget/plugin/awkeysaggregator.h @@ -24,7 +24,6 @@ #include "version.h" - class AWFormatterHelper; class AWKeysAggregator : public QObject diff --git a/sources/awesomewidgets/configs/aw-example-standalonerc b/sources/awesomewidgets/configs/aw-example-standalonerc index 4ca37c7..666c91e 100644 --- a/sources/awesomewidgets/configs/aw-example-standalonerc +++ b/sources/awesomewidgets/configs/aw-example-standalonerc @@ -121,7 +121,7 @@ queueLimit=0 swapTooltip=true swapTooltipColor=#ffff00 tempUnits=Celsius -text="\n

Uptime: $cuptime
\nRAM:  $mem  $bar5
\nSwap: $swap  $bar6
\nCPU:  $cpu  $bar7
\nCPU Temp: $temp0°C
\nDown: $down$downunits    $downtotal
\n$bar8
\nUp:   $up$upunits    $uptotal
\n$bar9

\n\n" +text="\n

Uptime: $cuptime
\nRAM:  $mem  $bar5
\nSwap: $swap  $bar6
\nCPU:  $cpu  $bar7
\nCPU Temp: $temp0°C
\nDown: $down$downunits    $downtot
\n$bar8
\nUp:   $up$upunits    $uptot
\n$bar9

\n\n" textAlign=center tooltipBackground=#ffffff tooltipNumber=100 diff --git a/sources/version.h.in b/sources/version.h.in index a57ecc5..c0c3f91 100644 --- a/sources/version.h.in +++ b/sources/version.h.in @@ -57,10 +57,10 @@ const char STATIC_KEYS[] = "time,isotime,shorttime,longtime,tstime,ctime,uptime,cuptime,cpucl,cpu," "gputemp,gpu,memmb,memgb,memfreemb,memfreegb,memtotmb,memtotgb,memusedmb," "memusedgb,mem,swapmb,swapgb,swapfreemb,swapfreegb,swaptotmb,swaptotgb," - "swap,downunits,upunits,downkb,downtotalkb,downtotal,down,uptotalkb," - "uptotal,upkb,up,netdev,ac,bat,album,artist,duration,progress,title," - "dalbum,dartist,dtitle,salbum,sartist,stitle,pscount,pstotal,ps,desktop," - "ndesktop,tdesktops,la15,la5,la1"; + "swap,downunits,upunits,downkb,downtotkb,downtot,down,uptotkb,uptot,upkb," + "up,netdev,ac,bat,album,artist,duration,progress,title,dalbum,dartist," + "dtitle,salbum,sartist,stitle,pscount,pstot,ps,desktop,ndesktop," + "tdesktops,la15,la5,la1"; #cmakedefine BUILD_FUTURE #cmakedefine BUILD_LOAD #cmakedefine BUILD_TESTING