split data engine matchers to classes

sources/awesome-widget/plugin/awbugreporter.h

@@ -23,7 +23,7 @@
 class QNetworkAccessManager;
 class QNetworkReply;
 
-class __attribute__((visibility("default"))) AWBugReporter : public QObject
+class AWBugReporter : public QObject
 {
     Q_OBJECT
 

sources/awesome-widget/plugin/awconfighelper.h

@@ -23,7 +23,7 @@
 
 class QSettings;
 
-class __attribute__((visibility("default"))) AWConfigHelper : public QObject
+class AWConfigHelper : public QObject
 {
     Q_OBJECT
 

sources/awesome-widget/plugin/awdataenginemapper.cpp

@@ -32,6 +32,10 @@ AWDataEngineMapper::AWDataEngineMapper(QObject *_parent, AWFormatterHelper *_cus
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
     // default formatters
+    // memory
+    m_formatter["mem"] = AWPluginFormatterFloat::instance();
+    m_formatter["memtotmb"] = AWPluginFormatterMemoryMB::instance();
+    m_formatter["memtotgb"] = AWPluginFormatterMemoryGB::instance();
     // network
     m_formatter["down"] = AWPluginFormatterNet::instance();
     m_formatter["downkb"] = AWPluginFormatterMemory::instance();
@@ -43,6 +47,10 @@ AWDataEngineMapper::AWDataEngineMapper(QObject *_parent, AWFormatterHelper *_cus
     m_formatter["uptot"] = AWPluginFormatterMemoryMB::instance();
     m_formatter["uptotkb"] = AWPluginFormatterMemory::instance();
     m_formatter["upunits"] = AWPluginFormatterNetUnits::instance();
+    // swap
+    m_formatter["swap"] = AWPluginFormatterFloat::instance();
+    m_formatter["swaptotmb"] = AWPluginFormatterMemoryMB::instance();
+    m_formatter["swaptotgb"] = AWPluginFormatterMemoryGB::instance();
 }
 
 
@@ -69,15 +77,213 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
 {
     qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
 
+    // regular expressions
+    static auto cpuTempRegExp = QRegularExpression("^cpu/cpu.*/temperature$");
+    static auto mountFillRegExp = QRegularExpression("^disk/.*/usedPercent$");
+    static auto mountFreeRegExp = QRegularExpression("^disk/.*/free$");
+    static auto mountUsedRegExp = QRegularExpression("^disk/.*/used$");
+    static auto netRegExp = QRegularExpression("^network/.*/(download|upload)$");
+    static auto netTotalRegExp = QRegularExpression("^network/.*/(totalDownload|totalUpload)$");
+
     auto matchers = AWPluginMatchers::matchers;
-    auto matcher = std::find_if(matchers.cbegin(), matchers.cend(),
+    auto matcher = std::find_if(matchers.cbegin(), matchers.cend(), [&_source](auto matcher) { return matcher->matches(_source); });
-                                [&_source](auto matcher) { return matcher->matches(_source); });
+    if (matcher == std::end(matchers))
-    if (matcher == matchers.cend())
         return {};
 
     auto foundKeys = (*matcher)->keys(_source, _units, m_settings);
     auto keys = foundKeys.keys(); // speedup a little bit
 
+    if (_source.contains(mountFillRegExp)) {
+        // fill level
+        auto device = _source;
+        device.remove("disk/").remove("/usedPercent");
+        auto index = m_devices["mount"].indexOf(device);
+        if (index > -1) {
+            auto key = QString("hdd%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWPluginFormatterFloat::instance();
+            // additional keys
+            m_formatter[QString("hddtotmb%1").arg(index)] = AWPluginFormatterMemoryMB::instance();
+            m_formatter[QString("hddtotgb%1").arg(index)] = AWPluginFormatterMemoryGB::instance();
+        }
+    } else if (_source.contains(mountFreeRegExp)) {
+        // free space
+        auto device = _source;
+        device.remove("disk/").remove("/free");
+        auto index = m_devices["mount"].indexOf(device);
+        if (index > -1) {
+            // mb
+            auto key = QString("hddfreemb%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWPluginFormatterMemoryMB::instance();
+            // gb
+            key = QString("hddfreegb%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWPluginFormatterMemoryGB::instance();
+        }
+    } else if (_source.contains(mountUsedRegExp)) {
+        // used
+        auto device = _source;
+        device.remove("disk/").remove("/used");
+        auto index = m_devices["mount"].indexOf(device);
+        if (index > -1) {
+            // mb
+            auto key = QString("hddmb%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWPluginFormatterMemoryMB::instance();
+            // gb
+            key = QString("hddgb%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWPluginFormatterMemoryGB::instance();
+        }
+    } else if (_source.startsWith("extsysmon/requests/response")) {
+        // network response
+        auto key = _source;
+        key.remove("extsysmon/requests/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWPluginFormatterNoFormat::instance();
+    } else if (_source.contains(netRegExp)) {
+        // network speed
+        auto type = _source.endsWith("download") ? "down" : "up";
+        auto index = m_devices["net"].indexOf(_source.split('/')[1]);
+        if (index > -1) {
+            // kb
+            auto key = QString("%1kb%2").arg(type).arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWPluginFormatterMemory::instance();
+            // smart
+            key = QString("%1%2").arg(type).arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWPluginFormatterNet::instance();
+            // units
+            key = QString("%1units%2").arg(type).arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWPluginFormatterNetUnits::instance();
+        }
+    } else if (_source.contains(netTotalRegExp)) {
+        // network data total
+        auto type = _source.endsWith("Download") ? "down" : "up";
+        auto index = m_devices["net"].indexOf(_source.split('/')[1]);
+        if (index > -1) {
+            // kb
+            auto key = QString("%1totkb%2").arg(type).arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWPluginFormatterMemory::instance();
+            // mb
+            key = QString("%1tot%2").arg(type).arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWPluginFormatterMemoryMB::instance();
+        }
+    } else if (_source.startsWith("extsysmon/upgrade")) {
+        // package manager
+        auto key = _source;
+        key.remove("extsysmon/upgrade/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWPluginFormatterIntegerShort::instance();
+    } else if (_source.startsWith("extsysmon/player")) {
+        // player
+        auto key = _source;
+        key.remove("extsysmon/player/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWPluginFormatterNoFormat::instance();
+    } else if (_source == "extsysmon/ps/running") {
+        // running processes count
+        m_map.insert(_source, "pscount");
+        m_formatter["pscount"] = AWPluginFormatterNoFormat::instance();
+    } else if (_source == "extsysmon/ps/list") {
+        // list of running processes
+        m_map.insert(_source, "ps");
+        m_formatter["ps"] = AWPluginFormatterList::instance();
+    } else if (_source == "extsysmon/ps/count") {
+        // total processes count
+        m_map.insert(_source, "pstot");
+        m_formatter["pstot"] = AWPluginFormatterNoFormat::instance();
+    } else if (_source.startsWith("extsysmon/quotes")) {
+        // quotes
+        auto key = _source;
+        key.remove("extsysmon/quotes/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWPluginFormatterDouble::instance();
+    } else if (_source == "memory/swap/free") {
+        // free swap
+        // mb
+        m_map.insert(_source, "swapfreemb");
+        m_formatter["swapfreemb"] = AWPluginFormatterMemoryMB::instance();
+        // gb
+        m_map.insert(_source, "swapfreegb");
+        m_formatter["swapfreegb"] = AWPluginFormatterMemoryGB::instance();
+    } else if (_source == "memory/swap/used") {
+        // used swap
+        // mb
+        m_map.insert(_source, "swapmb");
+        m_formatter["swapmb"] = AWPluginFormatterMemoryMB::instance();
+        // gb
+        m_map.insert(_source, "swapgb");
+        m_formatter["swapgb"] = AWPluginFormatterMemoryGB::instance();
+    } else if (_source.startsWith("lmsensors/") || _source.contains(cpuTempRegExp)
+               || _source == "cpu/all/averageTemperature") {
+        // temperature
+        auto index = m_devices["temp"].indexOf(_source);
+        // HACK on DE initialization there are no units key
+        if (_units == KSysGuard::UnitInvalid)
+            return QStringList({QString("temp%1").arg(index)});
+        if (index > -1) {
+            auto key = QString("temp%1").arg(index);
+            m_map.insert(_source, key);
+            if (_units == KSysGuard::UnitCelsius)
+                m_formatter[key] = AWPluginFormatterTemperature::instance();
+            else
+                m_formatter[key] = AWPluginFormatterInteger::instance();
+        }
+    } else if (_source == "extsysmon/time/now") {
+        // time
+        m_map.insert(_source, "time");
+        m_formatter["time"] = AWPluginFormatterTime::instance();
+        // custom time
+        m_map.insert(_source, "ctime");
+        m_formatter["ctime"] = AWPluginFormatterTimeCustom::instance();
+        // ISO time
+        m_map.insert(_source, "isotime");
+        m_formatter["isotime"] = AWPluginFormatterTimeISO::instance();
+        // long time
+        m_map.insert(_source, "longtime");
+        m_formatter["longtime"] = AWPluginFormatterTimeLong::instance();
+        // short time
+        m_map.insert(_source, "shorttime");
+        m_formatter["shorttime"] = AWPluginFormatterTimeShort::instance();
+        // timestamp
+        m_map.insert(_source, "tstime");
+        m_formatter["tstime"] = AWPluginFormatterNoFormat::instance();
+    } else if (_source == "extsysmon/system/brightness") {
+        m_map.insert(_source, "brightness");
+        m_formatter["brightness"] = AWPluginFormatterIntegerShort::instance();
+    } else if (_source == "extsysmon/system/volume") {
+        m_map.insert(_source, "volume");
+        m_formatter["volume"] = AWPluginFormatterIntegerShort::instance();
+    } else if (_source == "os/system/uptime") {
+        // uptime
+        m_map.insert(_source, "uptime");
+        m_formatter["uptime"] = AWPluginFormatterUptime::instance();
+    } else if (_source.startsWith("extsysmon/weather/temperature")) {
+        // temperature
+        auto key = _source;
+        key.remove("extsysmon/weather/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWPluginFormatterTemperature::instance();
+    } else if (_source.startsWith("extsysmon/weather/")) {
+        // other weather
+        auto key = _source;
+        key.remove("extsysmon/weather/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWPluginFormatterNoFormat::instance();
+    } else if (_source.startsWith("extsysmon/load/load")) {
+        // load source
+        auto key = _source;
+        key.remove("extsysmon/load/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWPluginFormatterTemperature::instance();
+    }
+
     // rewrite formatters for custom ones
     QStringList customFormattersKeys;
     if (m_customFormatters)
@@ -91,8 +297,9 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
 
     // check if keys were actually requested
     qCInfo(LOG_AW) << "Looking for keys" << keys << "in" << _keys;
-    auto required = _keys.isEmpty()
+    auto required = _keys.isEmpty() || std::any_of(keys.cbegin(), keys.cend(), [&_keys](auto &key) {
-                    || std::any_of(keys.cbegin(), keys.cend(), [&_keys](auto &key) { return _keys.contains(key); });
+                        return _keys.contains(key);
+                    });
     if (!required)
         return {};
 

sources/awesome-widget/plugin/awkeycache.cpp

@@ -82,7 +82,47 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringL
         }
     }
 
-    // insert keys which depend on others, refer to AWKeys::calculateValues()
+    // insert depending keys, refer to AWKeys::calculateValues()
+    // hddtotmb*
+    for (auto &key : _allKeys.filter(QRegularExpression("^hddtotmb"))) {
+        if (!used.contains(key))
+            continue;
+        key.remove("hddtotmb");
+        auto index = key.toInt();
+        used << QString("hddfreemb%1").arg(index) << QString("hddmb%1").arg(index);
+    }
+    // hddtotgb*
+    for (auto &key : _allKeys.filter(QRegularExpression("^hddtotgb"))) {
+        if (!used.contains(key))
+            continue;
+        key.remove("hddtotgb");
+        auto index = key.toInt();
+        used << QString("hddfreegb%1").arg(index) << QString("hddgb%1").arg(index);
+    }
+    // mem
+    if (used.contains("mem"))
+        used << "memmb"
+             << "memtotmb";
+    // memtotmb
+    if (used.contains("memtotmb"))
+        used << "memusedmb"
+             << "memfreemb";
+    // memtotgb
+    if (used.contains("memtotgb"))
+        used << "memusedgb"
+             << "memfreegb";
+    // swap
+    if (used.contains("swap"))
+        used << "swapmb"
+             << "swaptotmb";
+    // swaptotmb
+    if (used.contains("swaptotmb"))
+        used << "swapmb"
+             << "swapfreemb";
+    // memtotgb
+    if (used.contains("swaptotgb"))
+        used << "swapgb"
+             << "swapfreegb";
     // network keys
     QStringList netKeys(
         {"up", "upkb", "uptot", "uptotkb", "upunits", "down", "downkb", "downtot", "downtotkb", "downunits"});
@@ -115,8 +155,11 @@ AWPluginMatcherSettings AWKeyCache::loadKeysFromCache()
 
     AWPluginMatcherSettings devices;
     QHash<QString, QStringList *> groups = {
-        {"disk", &devices.disk},   {"gpu", &devices.gpu},      {"mount", &devices.mount},
+            {"disk", &devices.disk},
-        {"net", &devices.network}, {"temp", &devices.sensors},
+            {"gpu", &devices.gpu},
+            {"mount", &devices.mount},
+            {"net", &devices.network},
+            {"temp", &devices.sensors},
     };
 
     for (auto [group, list] : groups.asKeyValueRange()) {

sources/awesome-widget/plugin/awkeys.cpp

@@ -233,6 +233,20 @@ void AWKeys::calculateValues()
 {
     auto devices = m_keyOperator->devices();
 
+    // hddtot*
+    for (auto i = 0; i < devices.mount.count(); ++i) {
+        m_values[QString("hddtotmb%1").arg(i)] = m_values[QString("hddfreemb%1").arg(i)].toDouble()
+                                                     + m_values[QString("hddmb%1").arg(i)].toDouble();
+        m_values[QString("hddtotgb%1").arg(i)] = m_values[QString("hddfreegb%1").arg(i)].toDouble()
+                                                     + m_values[QString("hddgb%1").arg(i)].toDouble();
+    }
+
+    // memtot*
+    m_values["memtotmb"] = m_values["memusedmb"].toLongLong() + m_values["memfreemb"].toLongLong();
+    m_values["memtotgb"] = m_values["memusedgb"].toDouble() + m_values["memfreegb"].toDouble();
+    // mem
+    m_values["mem"] = 100.0 * m_values["memmb"].toDouble() / m_values["memtotmb"].toDouble();
+
     // up, down, upkb, downkb, upunits, downunits
     auto netIndex = devices.network.indexOf(m_values["netdev"].toString());
     m_values["down"] = m_values[QString("down%1").arg(netIndex)];
@@ -246,6 +260,12 @@ void AWKeys::calculateValues()
     m_values["uptotkb"] = m_values[QString("uptotkb%1").arg(netIndex)];
     m_values["upunits"] = m_values[QString("upunits%1").arg(netIndex)];
 
+    // swaptot*
+    m_values["swaptotmb"] = m_values["swapmb"].toLongLong() + m_values["swapfreemb"].toLongLong();
+    m_values["swaptotgb"] = m_values["swapgb"].toDouble() + m_values["swapfreegb"].toDouble();
+    // swap
+    m_values["swap"] = 100.0 * m_values["swapmb"].toDouble() / m_values["swaptotmb"].toDouble();
+
     // user defined keys
     for (auto &key : m_keyOperator->userKeys())
         m_values[key] = m_values[m_keyOperator->userKeySource(key)];

sources/awesome-widget/plugin/awkeys.h

@@ -28,7 +28,7 @@ class AWKeyOperations;
 class AWKeysAggregator;
 class QTimer;
 
-class __attribute__((visibility("default"))) AWKeys : public QObject
+class AWKeys : public QObject
 {
     Q_OBJECT
 

sources/awesome-widget/plugin/awkeysaggregator.h

@@ -39,6 +39,7 @@ class AWKeysAggregator : public QObject
     Q_PROPERTY(bool translate READ translate WRITE setTranslate);
 
 public:
+
     explicit AWKeysAggregator(QObject *_parent = nullptr);
     ~AWKeysAggregator() override = default;
     void initFormatters();

sources/awesome-widget/plugin/awpairconfigfactory.h

@@ -29,4 +29,6 @@ public:
     ~AWPairConfigFactory() override = default;
     Q_INVOKABLE static void showFormatterDialog(const QStringList &_keys);
     Q_INVOKABLE static void showKeysDialog(const QStringList &_keys);
+
+private:
 };

sources/awesome-widget/plugin/awpatternfunctions.h

@@ -23,7 +23,7 @@
 
 class AWKeysAggregator;
 
-namespace __attribute__((visibility("default"))) AWPatternFunctions
+namespace AWPatternFunctions
 {
 typedef struct {
     QStringList args;

sources/awesome-widget/plugin/awtelemetryhandler.h

@@ -20,7 +20,7 @@
 #include <QObject>
 
 
-class __attribute__((visibility("default"))) AWTelemetryHandler : public QObject
+class AWTelemetryHandler : public QObject
 {
     Q_OBJECT
 

sources/awesome-widget/plugin/awupdatehelper.h

@@ -24,7 +24,7 @@
 class KNotification;
 class QNetworkReply;
 
-class __attribute__((visibility("default"))) AWUpdateHelper : public QObject
+class AWUpdateHelper : public QObject
 {
     Q_OBJECT
 

sources/awesome-widget/plugin/formatters/awpluginformatter.h

@@ -25,19 +25,16 @@
 #include "awpluginformatsettings.h"
 
 
-class AWPluginFormaterInterface
+class AWPluginFormaterInterface {
-{
 public:
     virtual ~AWPluginFormaterInterface() = default;
-    [[nodiscard]] virtual QString format(const QVariant &_value, const QString &_key,
+    virtual QString format(const QVariant &_value, const QString &_key, const AWPluginFormatSettings &_settings) const = 0;
-                                         const AWPluginFormatSettings &_settings) const
-        = 0;
     virtual void load() {};
 };
 
 
-template <typename Formatter> class AWPluginFormatter : public AWPluginFormaterInterface
+template<typename Formatter> class AWPluginFormatter : public AWPluginFormaterInterface {
-{
+
 public:
     static constexpr double KBinBytes = 1024.0;
     static constexpr double MBinBytes = 1024.0 * KBinBytes;
@@ -46,21 +43,19 @@ public:
     AWPluginFormatter(AWPluginFormatter &) = delete;
     void operator=(const AWPluginFormatter &) = delete;
 
-    [[nodiscard]] static Formatter *instance()
+    static Formatter *instance()
     {
         static auto instance = loadInstance();
         return instance.get();
     };
-
+    static QLocale locale(const AWPluginFormatSettings &_settings)
-    [[nodiscard]] static QLocale locale(const AWPluginFormatSettings &_settings)
     {
         return _settings.translate ? QLocale::system() : QLocale::c();
     };
 
 protected:
     AWPluginFormatter() = default;
-
+    static std::unique_ptr<Formatter> loadInstance()
-    [[nodiscard]] static std::unique_ptr<Formatter> loadInstance()
     {
         auto instance = std::make_unique<Formatter>();
         instance->load();

sources/awesome-widget/plugin/formatters/awpluginformatterac.cpp

@@ -18,8 +18,7 @@
 #include "awpluginformatterac.h"
 
 
-QString AWPluginFormatterAC::format(const QVariant &_value, const QString &,
+QString AWPluginFormatterAC::format(const QVariant &_value, const QString &, const AWPluginFormatSettings &_settings) const
-                                    const AWPluginFormatSettings &_settings) const
 {
     return _value.toBool() ? _settings.acOnline : _settings.acOffline;
 }

sources/awesome-widget/plugin/formatters/awpluginformatterac.h

@@ -20,9 +20,8 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterAC : public AWPluginFormatter<AWPluginFormatterAC>
+class AWPluginFormatterAC : public AWPluginFormatter<AWPluginFormatterAC> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &_settings) const override;
-                                 const AWPluginFormatSettings &_settings) const override;
 };

sources/awesome-widget/plugin/formatters/awpluginformattercustom.cpp

@@ -20,8 +20,7 @@
 #include "awformatterhelper.h"
 
 
-QString AWPluginFormatterCustom::format(const QVariant &_value, const QString &_key,
+QString AWPluginFormatterCustom::format(const QVariant &_value, const QString &_key, const AWPluginFormatSettings &_settings) const
-                                        const AWPluginFormatSettings &_settings) const
 {
     if (_settings.customFormatters)
         return _settings.customFormatters->convert(_value, _key);

sources/awesome-widget/plugin/formatters/awpluginformattercustom.h

@@ -20,9 +20,8 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterCustom : public AWPluginFormatter<AWPluginFormatterCustom>
+class AWPluginFormatterCustom : public AWPluginFormatter<AWPluginFormatterCustom> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &_key,
+    QString format(const QVariant &_value, const QString &_key, const AWPluginFormatSettings &_settings) const override;
-                                 const AWPluginFormatSettings &_settings) const override;
 };

sources/awesome-widget/plugin/formatters/awpluginformatterdouble.h

@@ -20,9 +20,8 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterDouble : public AWPluginFormatter<AWPluginFormatterDouble>
+class AWPluginFormatterDouble : public AWPluginFormatter<AWPluginFormatterDouble> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const override;
-                                 const AWPluginFormatSettings &) const override;
 };

sources/awesome-widget/plugin/formatters/awpluginformatterfloat.h

@@ -20,9 +20,8 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterFloat : public AWPluginFormatter<AWPluginFormatterFloat>
+class AWPluginFormatterFloat : public AWPluginFormatter<AWPluginFormatterFloat>{
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const override;
-                                 const AWPluginFormatSettings &) const override;
 };

sources/awesome-widget/plugin/formatters/awpluginformatterfloatprecise.cpp

@@ -18,8 +18,7 @@
 #include "awpluginformatterfloatprecise.h"
 
 
-QString AWPluginFormatterFloatPrecise::format(const QVariant &_value, const QString &,
+QString AWPluginFormatterFloatPrecise::format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const
-                                              const AWPluginFormatSettings &) const
 {
     return QString("%1").arg(_value.toDouble(), 5, 'f', 2);
 }

sources/awesome-widget/plugin/formatters/awpluginformatterfloatprecise.h

@@ -20,9 +20,8 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterFloatPrecise : public AWPluginFormatter<AWPluginFormatterFloatPrecise>
+class AWPluginFormatterFloatPrecise : public AWPluginFormatter<AWPluginFormatterFloatPrecise> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const override;
-                                 const AWPluginFormatSettings &) const override;
 };

sources/awesome-widget/plugin/formatters/awpluginformatterinteger.h

@@ -20,9 +20,8 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterInteger : public AWPluginFormatter<AWPluginFormatterInteger>
+class AWPluginFormatterInteger : public AWPluginFormatter<AWPluginFormatterInteger> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const override;
-                                 const AWPluginFormatSettings &) const override;
 };

sources/awesome-widget/plugin/formatters/awpluginformatterintegershort.cpp

@@ -18,8 +18,7 @@
 #include "awpluginformatterintegershort.h"
 
 
-QString AWPluginFormatterIntegerShort::format(const QVariant &_value, const QString &,
+QString AWPluginFormatterIntegerShort::format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const
-                                              const AWPluginFormatSettings &) const
 {
     return QString("%1").arg(_value.toDouble(), 3, 'f', 0);
 }

sources/awesome-widget/plugin/formatters/awpluginformatterintegershort.h

@@ -20,9 +20,8 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterIntegerShort : public AWPluginFormatter<AWPluginFormatterIntegerShort>
+class AWPluginFormatterIntegerShort : public AWPluginFormatter<AWPluginFormatterIntegerShort> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const override;
-                                 const AWPluginFormatSettings &) const override;
 };

sources/awesome-widget/plugin/formatters/awpluginformatterintegerwide.cpp

@@ -18,8 +18,7 @@
 #include "awpluginformatterintegerwide.h"
 
 
-QString AWPluginFormatterIntegerWide::format(const QVariant &_value, const QString &,
+QString AWPluginFormatterIntegerWide::format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const
-                                             const AWPluginFormatSettings &) const
 {
     return QString("%1").arg(_value.toDouble(), 5, 'f', 0);
 }

sources/awesome-widget/plugin/formatters/awpluginformatterintegerwide.h

@@ -20,9 +20,8 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterIntegerWide : public AWPluginFormatter<AWPluginFormatterIntegerWide>
+class AWPluginFormatterIntegerWide : public AWPluginFormatter<AWPluginFormatterIntegerWide> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const override;
-                                 const AWPluginFormatSettings &) const override;
 };

sources/awesome-widget/plugin/formatters/awpluginformatterlist.h

@@ -20,9 +20,8 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterList : public AWPluginFormatter<AWPluginFormatterList>
+class AWPluginFormatterList : public AWPluginFormatter<AWPluginFormatterList> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const override;
-                                 const AWPluginFormatSettings &) const override;
 };

sources/awesome-widget/plugin/formatters/awpluginformattermemory.h

@@ -20,9 +20,8 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterMemory : public AWPluginFormatter<AWPluginFormatterMemory>
+class AWPluginFormatterMemory : public AWPluginFormatter<AWPluginFormatterMemory> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const override;
-                                 const AWPluginFormatSettings &) const override;
 };

sources/awesome-widget/plugin/formatters/awpluginformattermemorygb.h

@@ -20,9 +20,8 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterMemoryGB : public AWPluginFormatter<AWPluginFormatterMemoryGB>
+class AWPluginFormatterMemoryGB : public AWPluginFormatter<AWPluginFormatterMemoryGB> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const override;
-                                 const AWPluginFormatSettings &) const override;
 };

sources/awesome-widget/plugin/formatters/awpluginformattermemorymb.h

@@ -20,9 +20,8 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterMemoryMB : public AWPluginFormatter<AWPluginFormatterMemoryMB>
+class AWPluginFormatterMemoryMB : public AWPluginFormatter<AWPluginFormatterMemoryMB> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const override;
-                                 const AWPluginFormatSettings &) const override;
 };

sources/awesome-widget/plugin/formatters/awpluginformatternet.h

@@ -20,13 +20,12 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterNet : public AWPluginFormatter<AWPluginFormatterNet>
+class AWPluginFormatterNet : public AWPluginFormatter<AWPluginFormatterNet> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const override;
-                                 const AWPluginFormatSettings &) const override;
 
 private:
-    [[nodiscard]] static QString formatKB(const double &_value);
+    static QString formatKB(const double &_value);
-    [[nodiscard]] static QString formatMB(const double &_value);
+    static QString formatMB(const double &_value);
 };

sources/awesome-widget/plugin/formatters/awpluginformatternetunits.cpp

@@ -20,8 +20,7 @@
 #include <KI18n/KLocalizedString>
 
 
-QString AWPluginFormatterNetUnits::format(const QVariant &_value, const QString &,
+QString AWPluginFormatterNetUnits::format(const QVariant &_value, const QString &, const AWPluginFormatSettings &_settings) const
-                                          const AWPluginFormatSettings &_settings) const
 {
     auto value = _value.toDouble();
     return (value > MBinBytes) ? formatMB(_settings) : formatKB(_settings);

sources/awesome-widget/plugin/formatters/awpluginformatternetunits.h

@@ -20,13 +20,12 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterNetUnits : public AWPluginFormatter<AWPluginFormatterNetUnits>
+class AWPluginFormatterNetUnits : public AWPluginFormatter<AWPluginFormatterNetUnits> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &_settings) const override;
-                                 const AWPluginFormatSettings &_settings) const override;
 
 private:
-    [[nodiscard]] static QString formatKB(const AWPluginFormatSettings &_settings);
+    static QString formatKB(const AWPluginFormatSettings &_settings);
-    [[nodiscard]] static QString formatMB(const AWPluginFormatSettings &_settings);
+    static QString formatMB(const AWPluginFormatSettings &_settings);
 };

sources/awesome-widget/plugin/formatters/awpluginformatternoformat.h

@@ -20,9 +20,8 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterNoFormat : public AWPluginFormatter<AWPluginFormatterNoFormat>
+class AWPluginFormatterNoFormat : public AWPluginFormatter<AWPluginFormatterNoFormat> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const override;
-                                 const AWPluginFormatSettings &) const override;
 };

sources/awesome-widget/plugin/formatters/awpluginformattertemperature.cpp

@@ -18,8 +18,7 @@
 #include "awpluginformattertemperature.h"
 
 
-QString AWPluginFormatterTemperature::format(const QVariant &_value, const QString &,
+QString AWPluginFormatterTemperature::format(const QVariant &_value, const QString &, const AWPluginFormatSettings &_settings) const
-                                             const AWPluginFormatSettings &_settings) const
 {
     auto converted = convert(_value.toDouble(), _settings.tempUnits);
     return QString("%1").arg(converted, 5, 'f', 1);

sources/awesome-widget/plugin/formatters/awpluginformattertemperature.h

@@ -20,12 +20,11 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterTemperature : public AWPluginFormatter<AWPluginFormatterTemperature>
+class AWPluginFormatterTemperature : public AWPluginFormatter<AWPluginFormatterTemperature> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &_settings) const override;
-                                 const AWPluginFormatSettings &_settings) const override;
 
 private:
-    [[nodiscard]] static double convert(const double &_value, const QString &_units);
+    static double convert(const double &_value, const QString &_units);
 };

sources/awesome-widget/plugin/formatters/awpluginformattertime.h

@@ -20,9 +20,8 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterTime : public AWPluginFormatter<AWPluginFormatterTime>
+class AWPluginFormatterTime : public AWPluginFormatter<AWPluginFormatterTime> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const override;
-                                 const AWPluginFormatSettings &) const override;
 };

sources/awesome-widget/plugin/formatters/awpluginformattertimecustom.cpp

@@ -20,8 +20,7 @@
 #include "awdebug.h"
 
 
-QString AWPluginFormatterTimeCustom::format(const QVariant &_value, const QString &,
+QString AWPluginFormatterTimeCustom::format(const QVariant &_value, const QString &, const AWPluginFormatSettings &_settings) const
-                                            const AWPluginFormatSettings &_settings) const
 {
     auto value = QDateTime::fromSecsSinceEpoch(_value.toLongLong());
     return format(value, _settings.customTime, locale(_settings));
@@ -36,8 +35,7 @@ void AWPluginFormatterTimeCustom::load()
 }
 
 
-QString AWPluginFormatterTimeCustom::format(const QDateTime &_value, QString _formatString,
+QString AWPluginFormatterTimeCustom::format(const QDateTime &_value, QString _formatString, const QLocale &_locale) const
-                                            const QLocale &_locale) const
 {
     for (auto &key : m_timeKeys)
         _formatString.replace(QString("$%1").arg(key), _locale.toString(_value, key));

sources/awesome-widget/plugin/formatters/awpluginformattertimecustom.h

@@ -22,14 +22,13 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterTimeCustom : public AWPluginFormatter<AWPluginFormatterTimeCustom>
+class AWPluginFormatterTimeCustom : public AWPluginFormatter<AWPluginFormatterTimeCustom> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &_settings) const override;
-                                 const AWPluginFormatSettings &_settings) const override;
     void load() override;
 
 private:
-    [[nodiscard]] QString format(const QDateTime &_value, QString _formatString, const QLocale &_locale) const;
+    QString format(const QDateTime &_value, QString _formatString, const QLocale &_locale) const;
     QStringList m_timeKeys;
 };

sources/awesome-widget/plugin/formatters/awpluginformattertimeiso.h

@@ -20,9 +20,8 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterTimeISO : public AWPluginFormatter<AWPluginFormatterTimeISO>
+class AWPluginFormatterTimeISO : public AWPluginFormatter<AWPluginFormatterTimeISO> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const override;
-                                 const AWPluginFormatSettings &) const override;
 };

sources/awesome-widget/plugin/formatters/awpluginformattertimelong.cpp

@@ -20,8 +20,7 @@
 #include <QDateTime>
 
 
-QString AWPluginFormatterTimeLong::format(const QVariant &_value, const QString &,
+QString AWPluginFormatterTimeLong::format(const QVariant &_value, const QString &, const AWPluginFormatSettings &_settings) const
-                                          const AWPluginFormatSettings &_settings) const
 {
     return locale(_settings).toString(QDateTime::fromSecsSinceEpoch(_value.toLongLong()), QLocale::LongFormat);
 }

sources/awesome-widget/plugin/formatters/awpluginformattertimelong.h

@@ -20,9 +20,8 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterTimeLong : public AWPluginFormatter<AWPluginFormatterTimeLong>
+class AWPluginFormatterTimeLong : public AWPluginFormatter<AWPluginFormatterTimeLong> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &_settings) const override;
-                                 const AWPluginFormatSettings &_settings) const override;
 };

sources/awesome-widget/plugin/formatters/awpluginformattertimeshort.cpp

@@ -20,8 +20,7 @@
 #include <QDateTime>
 
 
-QString AWPluginFormatterTimeShort::format(const QVariant &_value, const QString &,
+QString AWPluginFormatterTimeShort::format(const QVariant &_value, const QString &, const AWPluginFormatSettings &_settings) const
-                                           const AWPluginFormatSettings &_settings) const
 {
     return locale(_settings).toString(QDateTime::fromSecsSinceEpoch(_value.toLongLong()), QLocale::ShortFormat);
 }

sources/awesome-widget/plugin/formatters/awpluginformattertimeshort.h

@@ -20,9 +20,8 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterTimeShort : public AWPluginFormatter<AWPluginFormatterTimeShort>
+class AWPluginFormatterTimeShort : public AWPluginFormatter<AWPluginFormatterTimeShort> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &_settings) const override;
-                                 const AWPluginFormatSettings &_settings) const override;
 };

sources/awesome-widget/plugin/formatters/awpluginformatteruptime.cpp

@@ -18,8 +18,7 @@
 #include "awpluginformatteruptime.h"
 
 
-QString AWPluginFormatterUptime::format(const QVariant &_value, const QString &,
+QString AWPluginFormatterUptime::format(const QVariant &_value, const QString &, const AWPluginFormatSettings &_settings) const
-                                        const AWPluginFormatSettings &_settings) const
 {
     auto value = static_cast<long>(_value.toDouble());
     return format(value, _settings.customUptime);

sources/awesome-widget/plugin/formatters/awpluginformatteruptime.h

@@ -20,12 +20,11 @@
 #include "awpluginformatter.h"
 
 
-class AWPluginFormatterUptime : public AWPluginFormatter<AWPluginFormatterUptime>
+class AWPluginFormatterUptime : public AWPluginFormatter<AWPluginFormatterUptime> {
-{
+
 public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
+    QString format(const QVariant &_value, const QString &, const AWPluginFormatSettings &_settings) const override;
-                                 const AWPluginFormatSettings &_settings) const override;
 
 private:
-    [[nodiscard]] static QString format(const long &_value, QString _formatString);
+    static QString format(const long &_value, QString _formatString);
 };

sources/awesome-widget/plugin/matchers/awpluginmatcher.h

@@ -28,36 +28,26 @@
 
 class AWPluginFormaterInterface;
 
-class AWPluginMatcherInterface
+class AWPluginMatcherInterface {
-{
 public:
     virtual ~AWPluginMatcherInterface() = default;
-    [[nodiscard]] virtual QHash<QString, AWPluginFormaterInterface *>
+    [[nodiscard]] virtual QHash<QString, AWPluginFormaterInterface *> keys(const QString &_source, KSysGuard::Unit _units, const AWPluginMatcherSettings &_settings) const = 0;
-    keys(const QString &_source, KSysGuard::Unit _units, const AWPluginMatcherSettings &_settings) const = 0;
     [[nodiscard]] virtual bool matches(const QString &_source) const = 0;
 };
 
 
-template <typename Matcher> class AWPluginMatcher : public AWPluginMatcherInterface
+template<typename Matcher> class AWPluginMatcher : public AWPluginMatcherInterface {
-{
+
 public:
     AWPluginMatcher(AWPluginMatcher &) = delete;
     void operator=(const AWPluginMatcher &) = delete;
 
-    [[nodiscard]] static Matcher *instance()
+    static Matcher *instance()
     {
         static auto instance = std::make_unique<Matcher>();
         return instance.get();
     };
 
-    [[nodiscard]] static QString device(const QString &_source) { return _source.split('/')[1]; };
-
-    [[nodiscard]] static qsizetype index(const QString &_source, const QStringList &_devices)
-    {
-        auto device = AWPluginMatcher::device(_source);
-        return _devices.indexOf(device);
-    }
-
 protected:
     AWPluginMatcher() = default;
 };

sources/awesome-widget/plugin/matchers/awpluginmatcherac.cpp

@@ -20,8 +20,7 @@
 #include "formatters/formatters.h"
 
 
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherAC::keys(const QString &, const KSysGuard::Unit,
+QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherAC::keys(const QString &, const KSysGuard::Unit, const AWPluginMatcherSettings &) const
-                                                                    const AWPluginMatcherSettings &) const
 {
     return {{"ac", AWPluginFormatterAC::instance()}};
 }

sources/awesome-widget/plugin/matchers/awpluginmatcherac.h

@@ -20,10 +20,9 @@
 #include "awpluginmatcher.h"
 
 
-class AWPluginMatcherAC : public AWPluginMatcher<AWPluginMatcherAC>
+class AWPluginMatcherAC : public AWPluginMatcher<AWPluginMatcherAC> {
-{
+
 public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit,
+    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit, const AWPluginMatcherSettings &) const override;
-                                                                   const AWPluginMatcherSettings &) const override;
     [[nodiscard]] bool matches(const QString &_source) const override;
 };

sources/awesome-widget/plugin/matchers/awpluginmatcherbattery.cpp

@@ -20,8 +20,7 @@
 #include "formatters/formatters.h"
 
 
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherBattery::keys(const QString &_source, const KSysGuard::Unit,
+QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherBattery::keys(const QString &_source, const KSysGuard::Unit, const AWPluginMatcherSettings &) const
-                                                                         const AWPluginMatcherSettings &) const
 {
     auto key = _source;
     key.remove("extsysmon/battery/");

sources/awesome-widget/plugin/matchers/awpluginmatcherbattery.h

@@ -20,10 +20,9 @@
 #include "awpluginmatcher.h"
 
 
-class AWPluginMatcherBattery : public AWPluginMatcher<AWPluginMatcherBattery>
+class AWPluginMatcherBattery : public AWPluginMatcher<AWPluginMatcherBattery> {
-{
+
 public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &_source, KSysGuard::Unit,
+    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &_source, KSysGuard::Unit, const AWPluginMatcherSettings &) const override;
-                                                                   const AWPluginMatcherSettings &) const override;
     [[nodiscard]] bool matches(const QString &_source) const override;
 };

sources/awesome-widget/plugin/matchers/awpluginmatcherbrightness.cpp

@@ -1,33 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-#include "awpluginmatcherbrightness.h"
-
-#include "formatters/formatters.h"
-
-
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherBrightness::keys(const QString &, const KSysGuard::Unit,
-                                                                            const AWPluginMatcherSettings &) const
-{
-    return {{"brightness", AWPluginFormatterIntegerShort::instance()}};
-}
-
-
-bool AWPluginMatcherBrightness::matches(const QString &_source) const
-{
-    return _source == "extsysmon/system/brightness";
-}

sources/awesome-widget/plugin/matchers/awpluginmatcherbrightness.h

@@ -1,29 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-#pragma once
-
-#include "awpluginmatcher.h"
-
-
-class AWPluginMatcherBrightness : public AWPluginMatcher<AWPluginMatcherBrightness>
-{
-public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit,
-                                                                   const AWPluginMatcherSettings &) const override;
-    [[nodiscard]] bool matches(const QString &_source) const override;
-};

sources/awesome-widget/plugin/matchers/awpluginmatchercpu.cpp

@@ -20,8 +20,7 @@
 #include "formatters/formatters.h"
 
 
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherCPU::keys(const QString &, const KSysGuard::Unit,
+QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherCPU::keys(const QString &, const KSysGuard::Unit, const AWPluginMatcherSettings &) const
-                                                                     const AWPluginMatcherSettings &) const
 {
     return {{"cpu", AWPluginFormatterFloat::instance()}};
 }

sources/awesome-widget/plugin/matchers/awpluginmatchercpu.h

@@ -20,10 +20,9 @@
 #include "awpluginmatcher.h"
 
 
-class AWPluginMatcherCPU : public AWPluginMatcher<AWPluginMatcherCPU>
+class AWPluginMatcherCPU : public AWPluginMatcher<AWPluginMatcherCPU> {
-{
+
 public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit,
+    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit, const AWPluginMatcherSettings &) const override;
-                                                                   const AWPluginMatcherSettings &) const override;
     [[nodiscard]] bool matches(const QString &_source) const override;
 };

sources/awesome-widget/plugin/matchers/awpluginmatchercpucore.cpp

@@ -22,8 +22,7 @@
 #include "formatters/formatters.h"
 
 
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherCPUCore::keys(const QString &_source, const KSysGuard::Unit,
+QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherCPUCore::keys(const QString &_source, const KSysGuard::Unit, const AWPluginMatcherSettings &) const
-                                                                         const AWPluginMatcherSettings &) const
 {
     auto key = _source;
     key.remove("cpu/").remove("/usage");

sources/awesome-widget/plugin/matchers/awpluginmatchercpucore.h

@@ -20,10 +20,9 @@
 #include "awpluginmatcher.h"
 
 
-class AWPluginMatcherCPUCore : public AWPluginMatcher<AWPluginMatcherCPUCore>
+class AWPluginMatcherCPUCore : public AWPluginMatcher<AWPluginMatcherCPUCore> {
-{
+
 public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &_source, KSysGuard::Unit,
+    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &_source, KSysGuard::Unit, const AWPluginMatcherSettings &) const override;
-                                                                   const AWPluginMatcherSettings &) const override;
     [[nodiscard]] bool matches(const QString &_source) const override;
 };

sources/awesome-widget/plugin/matchers/awpluginmatchercpufrequency.cpp

@@ -20,8 +20,7 @@
 #include "formatters/formatters.h"
 
 
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherCPUFrequency::keys(const QString &, const KSysGuard::Unit,
+QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherCPUFrequency::keys(const QString &, const KSysGuard::Unit, const AWPluginMatcherSettings &) const
-                                                                              const AWPluginMatcherSettings &) const
 {
     return {{"cpucl", AWPluginFormatterInteger::instance()}};
 }

sources/awesome-widget/plugin/matchers/awpluginmatchercpufrequency.h

@@ -20,10 +20,9 @@
 #include "awpluginmatcher.h"
 
 
-class AWPluginMatcherCPUFrequency : public AWPluginMatcher<AWPluginMatcherCPUFrequency>
+class AWPluginMatcherCPUFrequency : public AWPluginMatcher<AWPluginMatcherCPUFrequency> {
-{
+
 public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit,
+    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit, const AWPluginMatcherSettings &) const override;
-                                                                   const AWPluginMatcherSettings &) const override;
     [[nodiscard]] bool matches(const QString &_source) const override;
 };

sources/awesome-widget/plugin/matchers/awpluginmatchercpufrequencycore.cpp

@@ -22,9 +22,7 @@
 #include "formatters/formatters.h"
 
 
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherCPUFrequencyCore::keys(const QString &_source,
+QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherCPUFrequencyCore::keys(const QString &_source, const KSysGuard::Unit, const AWPluginMatcherSettings &) const
-                                                                                  const KSysGuard::Unit,
-                                                                                  const AWPluginMatcherSettings &) const
 {
     auto index = _source;
     index.remove("cpu/cpu").remove("/frequency");

sources/awesome-widget/plugin/matchers/awpluginmatchercpufrequencycore.h

@@ -20,10 +20,9 @@
 #include "awpluginmatcher.h"
 
 
-class AWPluginMatcherCPUFrequencyCore : public AWPluginMatcher<AWPluginMatcherCPUFrequencyCore>
+class AWPluginMatcherCPUFrequencyCore : public AWPluginMatcher<AWPluginMatcherCPUFrequencyCore> {
-{
+
 public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &_source, KSysGuard::Unit,
+    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &_source, KSysGuard::Unit, const AWPluginMatcherSettings &) const override;
-                                                                   const AWPluginMatcherSettings &) const override;
     [[nodiscard]] bool matches(const QString &_source) const override;
 };

sources/awesome-widget/plugin/matchers/awpluginmatchercustom.cpp

@@ -20,8 +20,7 @@
 #include "formatters/formatters.h"
 
 
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherCustom::keys(const QString &_source, const KSysGuard::Unit,
+QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherCustom::keys(const QString &_source, const KSysGuard::Unit, const AWPluginMatcherSettings &) const
-                                                                        const AWPluginMatcherSettings &) const
 {
     auto key = _source;
     key.remove("extsysmon/custom/");

sources/awesome-widget/plugin/matchers/awpluginmatchercustom.h

@@ -20,10 +20,9 @@
 #include "awpluginmatcher.h"
 
 
-class AWPluginMatcherCustom : public AWPluginMatcher<AWPluginMatcherCustom>
+class AWPluginMatcherCustom : public AWPluginMatcher<AWPluginMatcherCustom> {
-{
+
 public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &_source, KSysGuard::Unit,
+    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &_source, KSysGuard::Unit, const AWPluginMatcherSettings &) const override;
-                                                                   const AWPluginMatcherSettings &) const override;
     [[nodiscard]] bool matches(const QString &_source) const override;
 };

sources/awesome-widget/plugin/matchers/awpluginmatcherdesktop.cpp

@@ -20,8 +20,7 @@
 #include "formatters/formatters.h"
 
 
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherDesktop::keys(const QString &, const KSysGuard::Unit,
+QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherDesktop::keys(const QString &, const KSysGuard::Unit, const AWPluginMatcherSettings &) const
-                                                                         const AWPluginMatcherSettings &) const
 {
     return {{"desktop", AWPluginFormatterNoFormat::instance()}};
 }

sources/awesome-widget/plugin/matchers/awpluginmatcherdesktop.h

@@ -20,10 +20,9 @@
 #include "awpluginmatcher.h"
 
 
-class AWPluginMatcherDesktop : public AWPluginMatcher<AWPluginMatcherDesktop>
+class AWPluginMatcherDesktop : public AWPluginMatcher<AWPluginMatcherDesktop> {
-{
+
 public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit,
+    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit, const AWPluginMatcherSettings &) const override;
-                                                                   const AWPluginMatcherSettings &) const override;
     [[nodiscard]] bool matches(const QString &_source) const override;
 };

sources/awesome-widget/plugin/matchers/awpluginmatcherdesktopcount.cpp

@@ -20,8 +20,7 @@
 #include "formatters/formatters.h"
 
 
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherDesktopCount::keys(const QString &, const KSysGuard::Unit,
+QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherDesktopCount::keys(const QString &, const KSysGuard::Unit, const AWPluginMatcherSettings &) const
-                                                                              const AWPluginMatcherSettings &) const
 {
     return {{"tdesktops", AWPluginFormatterNoFormat::instance()}};
 }

sources/awesome-widget/plugin/matchers/awpluginmatcherdesktopcount.h

@@ -20,10 +20,9 @@
 #include "awpluginmatcher.h"
 
 
-class AWPluginMatcherDesktopCount : public AWPluginMatcher<AWPluginMatcherDesktopCount>
+class AWPluginMatcherDesktopCount : public AWPluginMatcher<AWPluginMatcherDesktopCount> {
-{
+
 public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit,
+    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit, const AWPluginMatcherSettings &) const override;
-                                                                   const AWPluginMatcherSettings &) const override;
     [[nodiscard]] bool matches(const QString &_source) const override;
 };

sources/awesome-widget/plugin/matchers/awpluginmatcherdesktopnumber.cpp

@@ -20,8 +20,7 @@
 #include "formatters/formatters.h"
 
 
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherDesktopNumber::keys(const QString &, const KSysGuard::Unit,
+QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherDesktopNumber::keys(const QString &, const KSysGuard::Unit, const AWPluginMatcherSettings &) const
-                                                                               const AWPluginMatcherSettings &) const
 {
     return {{"ndesktop", AWPluginFormatterNoFormat::instance()}};
 }

sources/awesome-widget/plugin/matchers/awpluginmatcherdesktopnumber.h

@@ -20,10 +20,9 @@
 #include "awpluginmatcher.h"
 
 
-class AWPluginMatcherDesktopNumber : public AWPluginMatcher<AWPluginMatcherDesktopNumber>
+class AWPluginMatcherDesktopNumber : public AWPluginMatcher<AWPluginMatcherDesktopNumber> {
-{
+
 public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit,
+    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit, const AWPluginMatcherSettings &) const override;
-                                                                   const AWPluginMatcherSettings &) const override;
     [[nodiscard]] bool matches(const QString &_source) const override;
 };

sources/awesome-widget/plugin/matchers/awpluginmatchergpu.cpp

@@ -20,8 +20,7 @@
 #include "formatters/formatters.h"
 
 
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherGPU::keys(const QString &, const KSysGuard::Unit,
+QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherGPU::keys(const QString &, const KSysGuard::Unit, const AWPluginMatcherSettings &) const
-                                                                     const AWPluginMatcherSettings &) const
 {
     return {{"gpu", AWPluginFormatterFloat::instance()}};
 }

sources/awesome-widget/plugin/matchers/awpluginmatchergpu.h

@@ -20,10 +20,9 @@
 #include "awpluginmatcher.h"
 
 
-class AWPluginMatcherGPU : public AWPluginMatcher<AWPluginMatcherGPU>
+class AWPluginMatcherGPU : public AWPluginMatcher<AWPluginMatcherGPU> {
-{
+
 public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit,
+    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit, const AWPluginMatcherSettings &) const override;
-                                                                   const AWPluginMatcherSettings &) const override;
     [[nodiscard]] bool matches(const QString &_source) const override;
 };

sources/awesome-widget/plugin/matchers/awpluginmatchergpucore.cpp

@@ -22,13 +22,14 @@
 #include "formatters/formatters.h"
 
 
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherGPUCore::keys(const QString &_source, const KSysGuard::Unit,
+QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherGPUCore::keys(const QString &_source, const KSysGuard::Unit, const AWPluginMatcherSettings &_settings) const
-                                                                         const AWPluginMatcherSettings &_settings) const
 {
-    auto index = AWPluginMatcher::index(_source, _settings.gpu);
+    auto device = _source;
+    device.remove("gpu/").remove("/usage");
+
+    auto index = _settings.gpu.indexOf(device);
     if (index == -1)
         return {};
-
     return {{QString("gpu%1").arg(index), AWPluginFormatterFloat::instance()}};
 }
 

sources/awesome-widget/plugin/matchers/awpluginmatchergpucore.h

@@ -20,10 +20,9 @@
 #include "awpluginmatcher.h"
 
 
-class AWPluginMatcherGPUCore : public AWPluginMatcher<AWPluginMatcherGPUCore>
+class AWPluginMatcherGPUCore : public AWPluginMatcher<AWPluginMatcherGPUCore> {
-{
+
 public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *>
+    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &_source, KSysGuard::Unit, const AWPluginMatcherSettings &_settings) const override;
-    keys(const QString &_source, KSysGuard::Unit, const AWPluginMatcherSettings &_settings) const override;
     [[nodiscard]] bool matches(const QString &_source) const override;
 };

sources/awesome-widget/plugin/matchers/awpluginmatchergputemperature.cpp

@@ -22,14 +22,14 @@
 #include "formatters/formatters.h"
 
 
-QHash<QString, AWPluginFormaterInterface *>
+QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherGPUTemperature::keys(const QString &_source, const KSysGuard::Unit, const AWPluginMatcherSettings &_settings) const
-AWPluginMatcherGPUTemperature::keys(const QString &_source, const KSysGuard::Unit,
-                                    const AWPluginMatcherSettings &_settings) const
 {
-    auto index = AWPluginMatcher::index(_source, _settings.gpu);
+    auto device = _source;
+    device.remove("gpu/").remove("/temperature");
+
+    auto index = _settings.gpu.indexOf(device);
     if (index == -1)
         return {};
-
     return {{QString("gputemp%1").arg(index), AWPluginFormatterTemperature::instance()}};
 }
 

sources/awesome-widget/plugin/matchers/awpluginmatchergputemperature.h

@@ -20,10 +20,9 @@
 #include "awpluginmatcher.h"
 
 
-class AWPluginMatcherGPUTemperature : public AWPluginMatcher<AWPluginMatcherGPUTemperature>
+class AWPluginMatcherGPUTemperature : public AWPluginMatcher<AWPluginMatcherGPUTemperature> {
-{
+
 public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *>
+    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &_source, KSysGuard::Unit, const AWPluginMatcherSettings &_settings) const override;
-    keys(const QString &_source, KSysGuard::Unit, const AWPluginMatcherSettings &_settings) const override;
     [[nodiscard]] bool matches(const QString &_source) const override;
 };

sources/awesome-widget/plugin/matchers/awpluginmatcherhdd.cpp

@@ -1,40 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-#include "awpluginmatcherhdd.h"
-
-#include <QRegularExpression>
-
-#include "formatters/formatters.h"
-
-
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherHDD::keys(const QString &_source, const KSysGuard::Unit,
-                                                                     const AWPluginMatcherSettings &_settings) const
-{
-    auto index = AWPluginMatcher::index(_source, _settings.disk);
-    if (index == -1)
-        return {};
-
-    return {{QString("hdd%1").arg(index), AWPluginFormatterFloat::instance()}};
-}
-
-
-bool AWPluginMatcherHDD::matches(const QString &_source) const
-{
-    static auto regexp = QRegularExpression("^disk/.*/usedPercent$");
-    return _source.contains(regexp);
-}

sources/awesome-widget/plugin/matchers/awpluginmatcherhdd.h

@@ -1,29 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-#pragma once
-
-#include "awpluginmatcher.h"
-
-
-class AWPluginMatcherHDD : public AWPluginMatcher<AWPluginMatcherHDD>
-{
-public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *>
-    keys(const QString &_source, KSysGuard::Unit, const AWPluginMatcherSettings &_settings) const override;
-    [[nodiscard]] bool matches(const QString &_source) const override;
-};

sources/awesome-widget/plugin/matchers/awpluginmatcherhddfree.cpp

@@ -1,43 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-#include "awpluginmatcherhddfree.h"
-
-#include <QRegularExpression>
-
-#include "formatters/formatters.h"
-
-
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherHDDFree::keys(const QString &_source, const KSysGuard::Unit,
-                                                                         const AWPluginMatcherSettings &_settings) const
-{
-    auto index = AWPluginMatcher::index(_source, _settings.disk);
-    if (index == -1)
-        return {};
-
-    return {
-        {QString("hddfreemb%1").arg(index), AWPluginFormatterMemoryMB::instance()},
-        {QString("hddfreegb%1").arg(index), AWPluginFormatterMemoryGB::instance()},
-    };
-}
-
-
-bool AWPluginMatcherHDDFree::matches(const QString &_source) const
-{
-    static auto regexp = QRegularExpression("^disk/.*/free$");
-    return _source.contains(regexp);
-}

sources/awesome-widget/plugin/matchers/awpluginmatcherhddfree.h

@@ -1,29 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-#pragma once
-
-#include "awpluginmatcher.h"
-
-
-class AWPluginMatcherHDDFree : public AWPluginMatcher<AWPluginMatcherHDDFree>
-{
-public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *>
-    keys(const QString &_source, KSysGuard::Unit, const AWPluginMatcherSettings &_settings) const override;
-    [[nodiscard]] bool matches(const QString &_source) const override;
-};

sources/awesome-widget/plugin/matchers/awpluginmatcherhddread.cpp

@@ -22,13 +22,15 @@
 #include "formatters/formatters.h"
 
 
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherHDDRead::keys(const QString &_source, const KSysGuard::Unit,
+QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherHDDRead::keys(const QString &_source, const KSysGuard::Unit, const AWPluginMatcherSettings &_settings) const
-                                                                         const AWPluginMatcherSettings &_settings) const
 {
-    auto index = AWPluginMatcher::index(_source, _settings.disk);
+    // read speed
+    auto device = _source;
+    device.remove("disk/").remove("/read");
+
+    auto index = _settings.disk.indexOf(device);
     if (index == -1)
         return {};
-
     return {{QString("hddr%1").arg(index), AWPluginFormatterMemory::instance()}};
 }
 

sources/awesome-widget/plugin/matchers/awpluginmatcherhddread.h

@@ -20,10 +20,9 @@
 #include "awpluginmatcher.h"
 
 
-class AWPluginMatcherHDDRead : public AWPluginMatcher<AWPluginMatcherHDDRead>
+class AWPluginMatcherHDDRead : public AWPluginMatcher<AWPluginMatcherHDDRead> {
-{
+
 public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *>
+    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &_source, KSysGuard::Unit, const AWPluginMatcherSettings &_settings) const override;
-    keys(const QString &_source, KSysGuard::Unit, const AWPluginMatcherSettings &_settings) const override;
     [[nodiscard]] bool matches(const QString &_source) const override;
 };

sources/awesome-widget/plugin/matchers/awpluginmatcherhddtotal.cpp

@@ -1,44 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-#include "awpluginmatcherhddtotal.h"
-
-#include <QRegularExpression>
-
-#include "formatters/formatters.h"
-
-
-QHash<QString, AWPluginFormaterInterface *>
-AWPluginMatcherHDDTotal::keys(const QString &_source, const KSysGuard::Unit,
-                              const AWPluginMatcherSettings &_settings) const
-{
-    auto index = AWPluginMatcher::index(_source, _settings.disk);
-    if (index == -1)
-        return {};
-
-    return {
-        {QString("hddtotmb%1").arg(index), AWPluginFormatterMemoryMB::instance()},
-        {QString("hddtotgb%1").arg(index), AWPluginFormatterMemoryGB::instance()},
-    };
-}
-
-
-bool AWPluginMatcherHDDTotal::matches(const QString &_source) const
-{
-    static auto regexp = QRegularExpression("^disk/.*/total$");
-    return _source.contains(regexp);
-}

sources/awesome-widget/plugin/matchers/awpluginmatcherhddtotal.h

@@ -1,29 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-#pragma once
-
-#include "awpluginmatcher.h"
-
-
-class AWPluginMatcherHDDTotal : public AWPluginMatcher<AWPluginMatcherHDDTotal>
-{
-public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *>
-    keys(const QString &_source, KSysGuard::Unit, const AWPluginMatcherSettings &_settings) const override;
-    [[nodiscard]] bool matches(const QString &_source) const override;
-};

sources/awesome-widget/plugin/matchers/awpluginmatcherhddused.cpp

@@ -1,43 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-#include "awpluginmatcherhddused.h"
-
-#include <QRegularExpression>
-
-#include "formatters/formatters.h"
-
-
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherHDDUsed::keys(const QString &_source, const KSysGuard::Unit,
-                                                                         const AWPluginMatcherSettings &_settings) const
-{
-    auto index = AWPluginMatcher::index(_source, _settings.disk);
-    if (index == -1)
-        return {};
-
-    return {
-        {QString("hddmb%1").arg(index), AWPluginFormatterMemoryMB::instance()},
-        {QString("hddgb%1").arg(index), AWPluginFormatterMemoryGB::instance()},
-    };
-}
-
-
-bool AWPluginMatcherHDDUsed::matches(const QString &_source) const
-{
-    static auto regexp = QRegularExpression("^disk/.*/used$");
-    return _source.contains(regexp);
-}

sources/awesome-widget/plugin/matchers/awpluginmatcherhddused.h

@@ -1,29 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-#pragma once
-
-#include "awpluginmatcher.h"
-
-
-class AWPluginMatcherHDDUsed : public AWPluginMatcher<AWPluginMatcherHDDUsed>
-{
-public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *>
-    keys(const QString &_source, KSysGuard::Unit, const AWPluginMatcherSettings &_settings) const override;
-    [[nodiscard]] bool matches(const QString &_source) const override;
-};

sources/awesome-widget/plugin/matchers/awpluginmatcherhddwrite.cpp

@@ -22,14 +22,15 @@
 #include "formatters/formatters.h"
 
 
-QHash<QString, AWPluginFormaterInterface *>
+QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherHDDWrite::keys(const QString &_source, const KSysGuard::Unit, const AWPluginMatcherSettings &_settings) const
-AWPluginMatcherHDDWrite::keys(const QString &_source, const KSysGuard::Unit,
-                              const AWPluginMatcherSettings &_settings) const
 {
-    auto index = AWPluginMatcher::index(_source, _settings.disk);
+    // read speed
+    auto device = _source;
+    device.remove("disk/").remove("/write");
+
+    auto index = _settings.disk.indexOf(device);
     if (index == -1)
         return {};
-
     return {{QString("hddw%1").arg(index), AWPluginFormatterMemory::instance()}};
 }
 

sources/awesome-widget/plugin/matchers/awpluginmatcherhddwrite.h

@@ -20,10 +20,9 @@
 #include "awpluginmatcher.h"
 
 
-class AWPluginMatcherHDDWrite : public AWPluginMatcher<AWPluginMatcherHDDWrite>
+class AWPluginMatcherHDDWrite : public AWPluginMatcher<AWPluginMatcherHDDWrite> {
-{
+
 public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *>
+    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &_source, KSysGuard::Unit, const AWPluginMatcherSettings &_settings) const override;
-    keys(const QString &_source, KSysGuard::Unit, const AWPluginMatcherSettings &_settings) const override;
     [[nodiscard]] bool matches(const QString &_source) const override;
 };

sources/awesome-widget/plugin/matchers/awpluginmatcherload.cpp

@@ -1,35 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-#include "awpluginmatcherload.h"
-
-#include "formatters/formatters.h"
-
-
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherLoad::keys(const QString &_source, const KSysGuard::Unit,
-                                                                      const AWPluginMatcherSettings &) const
-{
-    auto key = _source;
-    key.remove("extsysmon/load/");
-    return {{key, AWPluginFormatterInteger::instance()}};
-}
-
-
-bool AWPluginMatcherLoad::matches(const QString &_source) const
-{
-    return _source.startsWith("extsysmon/load/");
-}

sources/awesome-widget/plugin/matchers/awpluginmatcherload.h

@@ -1,29 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-#pragma once
-
-#include "awpluginmatcher.h"
-
-
-class AWPluginMatcherLoad : public AWPluginMatcher<AWPluginMatcherLoad>
-{
-public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &_source, KSysGuard::Unit,
-                                                                   const AWPluginMatcherSettings &) const override;
-    [[nodiscard]] bool matches(const QString &_source) const override;
-};

sources/awesome-widget/plugin/matchers/awpluginmatcherloadaverage.cpp

@@ -20,8 +20,7 @@
 #include "formatters/formatters.h"
 
 
-QHash<QString, AWPluginFormaterInterface *>
+QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherLoadAverage::keys(const QString &_source, const KSysGuard::Unit, const AWPluginMatcherSettings &) const
-AWPluginMatcherLoadAverage::keys(const QString &_source, const KSysGuard::Unit, const AWPluginMatcherSettings &) const
 {
     auto time = _source;
     time.remove("cpu/loadaverages/loadaverage");

sources/awesome-widget/plugin/matchers/awpluginmatcherloadaverage.h

@@ -20,10 +20,9 @@
 #include "awpluginmatcher.h"
 
 
-class AWPluginMatcherLoadAverage : public AWPluginMatcher<AWPluginMatcherLoadAverage>
+class AWPluginMatcherLoadAverage : public AWPluginMatcher<AWPluginMatcherLoadAverage> {
-{
+
 public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &_source, KSysGuard::Unit,
+    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &_source, KSysGuard::Unit, const AWPluginMatcherSettings &) const override;
-                                                                   const AWPluginMatcherSettings &) const override;
     [[nodiscard]] bool matches(const QString &_source) const override;
 };

sources/awesome-widget/plugin/matchers/awpluginmatchermemory.cpp

@@ -1,33 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-#include "awpluginmatchermemory.h"
-
-#include "formatters/formatters.h"
-
-
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherMemory::keys(const QString &, const KSysGuard::Unit,
-                                                                        const AWPluginMatcherSettings &) const
-{
-    return {{"mem", AWPluginFormatterFloat::instance()}};
-}
-
-
-bool AWPluginMatcherMemory::matches(const QString &_source) const
-{
-    return _source == "memory/physical/usedPercent";
-}

sources/awesome-widget/plugin/matchers/awpluginmatchermemory.h

@@ -1,29 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-#pragma once
-
-#include "awpluginmatcher.h"
-
-
-class AWPluginMatcherMemory : public AWPluginMatcher<AWPluginMatcherMemory>
-{
-public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit,
-                                                                   const AWPluginMatcherSettings &) const override;
-    [[nodiscard]] bool matches(const QString &_source) const override;
-};

sources/awesome-widget/plugin/matchers/awpluginmatchermemoryapplication.cpp

@@ -20,8 +20,7 @@
 #include "formatters/formatters.h"
 
 
-QHash<QString, AWPluginFormaterInterface *>
+QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherMemoryApplication::keys(const QString &, const KSysGuard::Unit, const AWPluginMatcherSettings &) const
-AWPluginMatcherMemoryApplication::keys(const QString &, const KSysGuard::Unit, const AWPluginMatcherSettings &) const
 {
     return {
             {"memmb", AWPluginFormatterMemoryMB::instance()},

sources/awesome-widget/plugin/matchers/awpluginmatchermemoryapplication.h

@@ -20,10 +20,9 @@
 #include "awpluginmatcher.h"
 
 
-class AWPluginMatcherMemoryApplication : public AWPluginMatcher<AWPluginMatcherMemoryApplication>
+class AWPluginMatcherMemoryApplication : public AWPluginMatcher<AWPluginMatcherMemoryApplication> {
-{
+
 public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit,
+    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit, const AWPluginMatcherSettings &) const override;
-                                                                   const AWPluginMatcherSettings &) const override;
     [[nodiscard]] bool matches(const QString &_source) const override;
 };

sources/awesome-widget/plugin/matchers/awpluginmatchermemoryfree.cpp

@@ -20,8 +20,7 @@
 #include "formatters/formatters.h"
 
 
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherMemoryFree::keys(const QString &, const KSysGuard::Unit,
+QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherMemoryFree::keys(const QString &, const KSysGuard::Unit, const AWPluginMatcherSettings &) const
-                                                                            const AWPluginMatcherSettings &) const
 {
     return {
             {"memfreemb", AWPluginFormatterMemoryMB::instance()},

sources/awesome-widget/plugin/matchers/awpluginmatchermemoryfree.h

@@ -20,10 +20,9 @@
 #include "awpluginmatcher.h"
 
 
-class AWPluginMatcherMemoryFree : public AWPluginMatcher<AWPluginMatcherMemoryFree>
+class AWPluginMatcherMemoryFree : public AWPluginMatcher<AWPluginMatcherMemoryFree> {
-{
+
 public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit,
+    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit, const AWPluginMatcherSettings &) const override;
-                                                                   const AWPluginMatcherSettings &) const override;
     [[nodiscard]] bool matches(const QString &_source) const override;
 };

sources/awesome-widget/plugin/matchers/awpluginmatchermemorytotal.cpp

@@ -1,36 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-#include "awpluginmatchermemorytotal.h"
-
-#include "formatters/formatters.h"
-
-
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherMemoryTotal::keys(const QString &, const KSysGuard::Unit,
-                                                                             const AWPluginMatcherSettings &) const
-{
-    return {
-        {"memtotmb", AWPluginFormatterMemoryMB::instance()},
-        {"memtotgb", AWPluginFormatterMemoryGB::instance()},
-    };
-}
-
-
-bool AWPluginMatcherMemoryTotal::matches(const QString &_source) const
-{
-    return _source == "memory/physical/total";
-}

sources/awesome-widget/plugin/matchers/awpluginmatchermemorytotal.h

@@ -1,29 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-#pragma once
-
-#include "awpluginmatcher.h"
-
-
-class AWPluginMatcherMemoryTotal : public AWPluginMatcher<AWPluginMatcherMemoryTotal>
-{
-public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit,
-                                                                   const AWPluginMatcherSettings &) const override;
-    [[nodiscard]] bool matches(const QString &_source) const override;
-};

sources/awesome-widget/plugin/matchers/awpluginmatchermemoryused.cpp

@@ -20,8 +20,7 @@
 #include "formatters/formatters.h"
 
 
-QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherMemoryUsed::keys(const QString &, const KSysGuard::Unit,
+QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherMemoryUsed::keys(const QString &, const KSysGuard::Unit, const AWPluginMatcherSettings &) const
-                                                                            const AWPluginMatcherSettings &) const
 {
     return {
             {"memusedmb", AWPluginFormatterMemoryMB::instance()},

sources/awesome-widget/plugin/matchers/awpluginmatchermemoryused.h

@@ -20,10 +20,9 @@
 #include "awpluginmatcher.h"
 
 
-class AWPluginMatcherMemoryUsed : public AWPluginMatcher<AWPluginMatcherMemoryUsed>
+class AWPluginMatcherMemoryUsed : public AWPluginMatcher<AWPluginMatcherMemoryUsed> {
-{
+
 public:
-    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit,
+    [[nodiscard]] QHash<QString, AWPluginFormaterInterface *> keys(const QString &, KSysGuard::Unit, const AWPluginMatcherSettings &) const override;
-                                                                   const AWPluginMatcherSettings &) const override;
     [[nodiscard]] bool matches(const QString &_source) const override;
 };