arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-14 22:35:49 +00:00
Code Issues Projects Releases Wiki Activity

migrate to ksystemstats

Browse Source
This commit is contained in:
Evgenii Alekseev
2023-07-11 11:48:46 +03:00
parent eecb128865
commit 2bf8270cb0
23 changed files with 330 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sources/extsysmon/extsysmon.cpp
View File

@ -41,6 +41,9 @@ ExtendedSysMon::ExtendedSysMon(QObject *_parent, const QVariantList &_args)
// init aggregator
m_aggregator = new ExtSysMonAggregator(this, m_configuration);
connect(m_aggregator, SIGNAL(sourceAdded(const QString &)), this, SIGNAL(sourceAdded(const QString &)));
connect(m_aggregator, SIGNAL(sourceRemoved(const QString &)), this, SIGNAL(sourceRemoved(const QString &)));
for (auto &source : m_aggregator->sources())
setData(source, m_aggregator->initialData(source));
}
@ -127,7 +130,7 @@ QHash<QString, QString> ExtendedSysMon::updateConfiguration(QHash<QString, QStri
} else {
QStringList deviceList = _rawConfig["HDDDEV"].split(',', Qt::SkipEmptyParts);
QStringList devices;
QRegExp diskRegexp = QRegExp("^/dev/[hms]d[a-z]$");
auto diskRegexp = QRegularExpression("^/dev/[hms]d[a-z]$");
for (auto &device : deviceList)
if ((QFile::exists(device)) && (device.contains(diskRegexp)))
devices.append(device);

7
sources/extsysmon/extsysmonaggregator.cpp
View File

@ -24,6 +24,7 @@
#include "gpuloadsource.h"
#include "gputempsource.h"
#include "hddtempsource.h"
#include "ksystemstatssource.h"
#include "loadsource.h"
#include "networksource.h"
#include "playersource.h"
@ -111,6 +112,12 @@ void ExtSysMonAggregator::init(const QHash<QString, QString> &_config)
= new HDDTemperatureSource(this, QStringList({_config["HDDDEV"], _config["HDDTEMPCMD"]}));
for (auto &source : hddTempItem->sources())
m_map[source] = hddTempItem;
// ksystemstats adapter
AbstractExtSysMonSource *ksystemstatsItem = new KSystemStatsSource(this, {});
connect(ksystemstatsItem, SIGNAL(sourceAdded(const QString &)), this, SIGNAL(sourceAdded(const QString &)));
connect(ksystemstatsItem, SIGNAL(sourceRemoved(const QString &)), this, SIGNAL(sourceRemoved(const QString &)));
for (auto &source : ksystemstatsItem->sources())
m_map[source] = ksystemstatsItem;
// network
AbstractExtSysMonSource *networkItem = new NetworkSource(this, QStringList());
for (auto &source : networkItem->sources())

4
sources/extsysmon/extsysmonaggregator.h
View File

@ -35,6 +35,10 @@ public:
[[nodiscard]] QVariantMap initialData(const QString &_source) const;
[[nodiscard]] QStringList sources() const;
signals:
void sourceAdded(const QString &_source);
void sourceRemoved(const QString &_source);
private:
void init(const QHash<QString, QString> &_config);
QHash<QString, AbstractExtSysMonSource *> m_map;