arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-04-24 15:37:23 +00:00
Code Issues Projects Releases Wiki Activity

small refactoring in matchers

Browse Source
This commit is contained in:
Evgenii Alekseev 2024-04-30 17:20:29 +03:00
parent 985737564e
commit 54a29e8cb3
12 changed files with 26 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sources/awesome-widget/plugin/matchers/awpluginmatcher.h
View File

@ -53,6 +53,12 @@ public:
[[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;
};

6
sources/awesome-widget/plugin/matchers/awpluginmatchergpucore.cpp
View File

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

6
sources/awesome-widget/plugin/matchers/awpluginmatchergputemperature.cpp
View File

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

5
sources/awesome-widget/plugin/matchers/awpluginmatcherhdd.cpp
View File

@ -25,11 +25,10 @@
QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherHDD::keys(const QString &_source, const KSysGuard::Unit,
const AWPluginMatcherSettings &_settings) const
{
auto device = AWPluginMatcher::device(_source);
auto index = _settings.disk.indexOf(device);
auto index = AWPluginMatcher::index(_source, _settings.disk);
if (index == -1)
return {};
return {{QString("hdd%1").arg(index), AWPluginFormatterFloat::instance()}};
}

5
sources/awesome-widget/plugin/matchers/awpluginmatcherhddfree.cpp
View File

@ -25,11 +25,10 @@
QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherHDDFree::keys(const QString &_source, const KSysGuard::Unit,
const AWPluginMatcherSettings &_settings) const
{
auto device = AWPluginMatcher::device(_source);
auto index = _settings.disk.indexOf(device);
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()},

5
sources/awesome-widget/plugin/matchers/awpluginmatcherhddread.cpp
View File

@ -25,11 +25,10 @@
QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherHDDRead::keys(const QString &_source, const KSysGuard::Unit,
const AWPluginMatcherSettings &_settings) const
{
auto device = AWPluginMatcher::device(_source);
auto index = _settings.disk.indexOf(device);
auto index = AWPluginMatcher::index(_source, _settings.disk);
if (index == -1)
return {};
return {{QString("hddr%1").arg(index), AWPluginFormatterMemory::instance()}};
}

5
sources/awesome-widget/plugin/matchers/awpluginmatcherhddtotal.cpp
View File

@ -26,11 +26,10 @@ QHash<QString, AWPluginFormaterInterface *>
AWPluginMatcherHDDTotal::keys(const QString &_source, const KSysGuard::Unit,
const AWPluginMatcherSettings &_settings) const
{
auto device = AWPluginMatcher::device(_source);
auto index = _settings.disk.indexOf(device);
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()},

5
sources/awesome-widget/plugin/matchers/awpluginmatcherhddused.cpp
View File

@ -25,11 +25,10 @@
QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherHDDUsed::keys(const QString &_source, const KSysGuard::Unit,
const AWPluginMatcherSettings &_settings) const
{
auto device = AWPluginMatcher::device(_source);
auto index = _settings.disk.indexOf(device);
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()},

5
sources/awesome-widget/plugin/matchers/awpluginmatcherhddwrite.cpp
View File

@ -26,11 +26,10 @@ QHash<QString, AWPluginFormaterInterface *>
AWPluginMatcherHDDWrite::keys(const QString &_source, const KSysGuard::Unit,
const AWPluginMatcherSettings &_settings) const
{
auto device = AWPluginMatcher::device(_source);
auto index = _settings.disk.indexOf(device);
auto index = AWPluginMatcher::index(_source, _settings.disk);
if (index == -1)
return {};
return {{QString("hddw%1").arg(index), AWPluginFormatterMemory::instance()}};
}

6
sources/awesome-widget/plugin/matchers/awpluginmatchernetwork.cpp
View File

@ -25,13 +25,11 @@
QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherNetwork::keys(const QString &_source, const KSysGuard::Unit,
const AWPluginMatcherSettings &_settings) const
{
auto type = _source.endsWith("download") ? "down" : "up";
auto device = AWPluginMatcher::device(_source);
auto index = _settings.network.indexOf(device);
auto index = AWPluginMatcher::index(_source, _settings.network);
if (index == -1)
return {};
auto type = _source.endsWith("download") ? "down" : "up";
return {
{QString("%1%2").arg(type).arg(index), AWPluginFormatterNet::instance()},
{QString("%1kb%2").arg(type).arg(index), AWPluginFormatterMemory::instance()},

6
sources/awesome-widget/plugin/matchers/awpluginmatchernetworktotal.cpp
View File

@ -26,13 +26,11 @@ QHash<QString, AWPluginFormaterInterface *>
AWPluginMatcherNetworkTotal::keys(const QString &_source, const KSysGuard::Unit,
const AWPluginMatcherSettings &_settings) const
{
auto type = _source.endsWith("Download") ? "down" : "up";
auto device = AWPluginMatcher::device(_source);
auto index = _settings.network.indexOf(device);
auto index = AWPluginMatcher::index(_source, _settings.network);
if (index == -1)
return {};
auto type = _source.endsWith("Download") ? "down" : "up";
return {
{QString("%1tot%2").arg(type).arg(index), AWPluginFormatterMemoryMB::instance()},
{QString("%1totkb%2").arg(type).arg(index), AWPluginFormatterMemory::instance()},

1
sources/awesome-widget/plugin/matchers/awpluginmatchersensors.cpp
View File

@ -28,7 +28,6 @@ QHash<QString, AWPluginFormaterInterface *> AWPluginMatcherSensors::keys(const Q
// temperature
auto index = _settings.sensors.indexOf(_source);
auto key = QString("temp%1").arg(index);
if (index == -1)
return {};