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

refactor: simplify sources processing

Browse Source 
Also fix desktop source
This commit is contained in:
Evgenii Alekseev 2024-03-28 11:14:45 +02:00
parent 0bcceefd47
commit a35b57e5d2
69 changed files with 552 additions and 1087 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources/3rdparty/qreplytimeout/qreplytimeout.cpp vendored
View File

@ -12,7 +12,7 @@ QReplyTimeout::QReplyTimeout(QNetworkReply *reply, const int timeout)
void QReplyTimeout::timeout()
{
auto *reply = dynamic_cast<QNetworkReply *>(parent());
auto reply = dynamic_cast<QNetworkReply *>(parent());
if (reply->isRunning())
reply->close();
}

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

@ -91,7 +91,7 @@ void AWAbstractPairConfig::updateUi()
// remove current selector if it is empty and does not last
if (sender() == m_selectors.last())
return;
auto *selector = m_selectors.takeAt(index);
auto selector = m_selectors.takeAt(index);
ui->verticalLayout->removeWidget(selector);
selector->deleteLater();
} else {
@ -109,7 +109,7 @@ void AWAbstractPairConfig::addSelector(const QStringList &_keys, const QStringLi
{
qCDebug(LOG_AW) << "Add selector with keys" << _keys << "values" << _values << "and current ones" << _current;
auto *selector = new AWAbstractSelector(ui->scrollAreaWidgetContents, m_editable);
auto selector = new AWAbstractSelector(ui->scrollAreaWidgetContents, m_editable);
selector->init(_keys, _values, _current);
ui->verticalLayout->insertWidget(ui->verticalLayout->count() - 1, selector);
connect(selector, &AWAbstractSelector::selectionChanged, this, &AWAbstractPairConfig::updateUi);

2
sources/awesome-widget/plugin/awactions.cpp
View File

@ -90,7 +90,7 @@ void AWActions::showReadme()
void AWActions::showLegacyInfo()
{
auto *msgBox = new QMessageBox(nullptr);
auto msgBox = new QMessageBox(nullptr);
msgBox->setAttribute(Qt::WA_DeleteOnClose);
msgBox->setModal(false);
msgBox->setWindowTitle(i18n("Not supported"));

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

@ -71,7 +71,7 @@ void AWBugReporter::sendBugReport(const QString &_title, const QString &_body)
{
qCDebug(LOG_AW) << "Send bug report with title" << _title << "and body" << _body;
auto *manager = new QNetworkAccessManager(nullptr);
auto manager = new QNetworkAccessManager(nullptr);
connect(manager, &QNetworkAccessManager::finished, this, &AWBugReporter::issueReplyReceived);
auto request = QNetworkRequest(QUrl(BUGTRACKER_API));
@ -121,7 +121,7 @@ void AWBugReporter::showInformation(const int _number, const QString &_url)
// cache url first
m_lastBugUrl = _url;
auto *msgBox = new QMessageBox(nullptr);
auto msgBox = new QMessageBox(nullptr);
msgBox->setAttribute(Qt::WA_DeleteOnClose);
msgBox->setModal(false);
msgBox->setWindowTitle(i18n("Issue created"));

2
sources/awesome-widget/plugin/awconfighelper.cpp
View File

@ -72,7 +72,7 @@ bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig, const QString &
QSettings settings(_fileName, QSettings::IniFormat);
// plasmoid configuration
const auto *configuration = dynamic_cast<const QQmlPropertyMap *>(_nativeConfig);
auto configuration = dynamic_cast<const QQmlPropertyMap *>(_nativeConfig);
settings.beginGroup("plasmoid");
for (auto &key : configuration->keys()) {
QVariant value = configuration->value(key);

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

@ -210,11 +210,11 @@ QString AWKeyOperations::infoByKey(const QString &_key) const
QString output;
if (_key.startsWith("bar")) {
auto *item = m_graphicalItems->itemByTag(_key, stripped);
auto item = m_graphicalItems->itemByTag(_key, stripped);
if (item)
output = item->uniq();
} else if (_key.startsWith("custom")) {
auto *item = m_extScripts->itemByTag(_key, stripped);
auto item = m_extScripts->itemByTag(_key, stripped);
if (item)
output = item->uniq();
} else if (_key.contains(QRegularExpression("^hdd[rw]"))) {
@ -230,15 +230,15 @@ QString AWKeyOperations::infoByKey(const QString &_key) const
index.remove(QRegularExpression("^(down|up)"));
output = m_devices["net"][index.toInt()];
} else if (_key.startsWith("pkgcount")) {
auto *item = m_extUpgrade->itemByTag(_key, stripped);
auto item = m_extUpgrade->itemByTag(_key, stripped);
if (item)
output = item->uniq();
} else if (_key.contains(QRegularExpression("(^|perc)(ask|bid|price)(chg|)"))) {
auto *item = m_extQuotes->itemByTag(_key, stripped);
auto item = m_extQuotes->itemByTag(_key, stripped);
if (item)
output = item->uniq();
} else if (_key.contains(QRegularExpression("(weather|weatherId|humidity|pressure|temperature)"))) {
auto *item = m_extWeather->itemByTag(_key, stripped);
auto item = m_extWeather->itemByTag(_key, stripped);
if (item)
output = item->uniq();
} else if (_key.startsWith("temp")) {
@ -246,7 +246,7 @@ QString AWKeyOperations::infoByKey(const QString &_key) const
index.remove("temp");
output = m_devices["temp"][index.toInt()];
} else if (_key.startsWith("response")) {
auto *item = m_extNetRequest->itemByTag(_key, stripped);
auto item = m_extNetRequest->itemByTag(_key, stripped);
if (item)
output = item->uniq();
} else {

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

@ -37,7 +37,7 @@ AWPairConfigFactory::~AWPairConfigFactory()
void AWPairConfigFactory::showFormatterDialog(const QStringList &_keys)
{
auto *config = new AWFormatterConfig(nullptr, _keys);
auto config = new AWFormatterConfig(nullptr, _keys);
config->showDialog();
config->deleteLater();
}
@ -45,7 +45,7 @@ void AWPairConfigFactory::showFormatterDialog(const QStringList &_keys)
void AWPairConfigFactory::showKeysDialog(const QStringList &_keys)
{
auto *config = new AWCustomKeysConfig(nullptr, _keys);
auto config = new AWCustomKeysConfig(nullptr, _keys);
config->showDialog();
config->deleteLater();
}

2
sources/awesome-widget/plugin/awtelemetryhandler.cpp
View File

@ -126,7 +126,7 @@ void AWTelemetryHandler::uploadTelemetry(const QString &_group, const QString &_
return;
}
auto *manager = new QNetworkAccessManager(nullptr);
auto manager = new QNetworkAccessManager(nullptr);
connect(manager, &QNetworkAccessManager::finished, this, &AWTelemetryHandler::telemetryReplyReceived);
QUrl url(REMOTE_TELEMETRY_URL);

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

@ -52,7 +52,7 @@ void AWUpdateHelper::checkUpdates(const bool _showAnyway)
// showAnyway options requires to show message if no updates found on direct
// request. In case of automatic check no message will be shown
auto *manager = new QNetworkAccessManager(nullptr);
auto manager = new QNetworkAccessManager(nullptr);
connect(manager, &QNetworkAccessManager::finished,
[_showAnyway, this](QNetworkReply *reply) { return versionReplyReceived(reply, _showAnyway); });
@ -163,7 +163,7 @@ QMessageBox *AWUpdateHelper::genMessageBox(const QString &_title, const QString
{
qCDebug(LOG_AW) << "Construct message box with title" << _title << "and body" << _body;
auto *msgBox = new QMessageBox(nullptr);
auto msgBox = new QMessageBox(nullptr);
msgBox->setAttribute(Qt::WA_DeleteOnClose);
msgBox->setModal(false);
msgBox->setWindowTitle(_title);

12
sources/awesomewidgets/extitemaggregator.h
View File

@ -65,7 +65,7 @@ public:
m_activeItems.clear();
m_items = getItems();
for (auto &item : m_items) {
for (auto item : m_items) {
if (!item->isActive())
continue;
m_activeItems.append(static_cast<T *>(item));
@ -77,7 +77,7 @@ public:
// HACK as soon as per one widget instance we have two objects each of
// them will try to control socket, whereas actually only one of them
// should be owner of the socket
for (auto &item : m_items)
for (auto item : m_items)
item->initSocket();
}
@ -86,7 +86,7 @@ public:
qCDebug(LOG_LIB) << "Tag" << _tag << "with used type" << _type;
T *found = nullptr;
for (auto &item : m_items) {
for (auto item : m_items) {
if (item->tag(_type) != _tag)
continue;
found = static_cast<T *>(item);
@ -103,7 +103,7 @@ public:
qCDebug(LOG_LIB) << "Number" << _number;
T *found = nullptr;
for (auto &item : m_items) {
for (auto item : m_items) {
if (item->number() != _number)
continue;
found = static_cast<T *>(item);
@ -129,7 +129,7 @@ private:
auto dirs = directories();
for (auto &dir : dirs) {
QStringList files = QDir(dir).entryList(QDir::Files, QDir::Name);
auto files = QDir(dir).entryList(QDir::Files, QDir::Name);
for (auto &file : files) {
// check filename
if (!file.endsWith(".desktop"))
@ -145,7 +145,7 @@ private:
}
// sort items
std::sort(items.begin(), items.end(), [](auto *lhs, auto *rhs) { return lhs->number() < rhs->number(); });
std::sort(items.begin(), items.end(), [](auto lhs, auto rhs) { return lhs->number() < rhs->number(); });
return items;
};
};

4
sources/desktop-panel/plugin/dpadds.cpp
View File

@ -111,8 +111,8 @@ QString DPAdds::toolTipImage(const int _desktop) const
}
// init
auto *toolTipScene = new QGraphicsScene();
auto *toolTipView = new QGraphicsView(toolTipScene);
auto toolTipScene = new QGraphicsScene();
auto toolTipView = new QGraphicsView(toolTipScene);
toolTipView->setStyleSheet("background: transparent");
toolTipView->setContentsMargins(0, 0, 0, 0);
toolTipView->setFrameShape(QFrame::NoFrame);

29
sources/extsysmon/extsysmonaggregator.cpp
View File

@ -57,34 +57,33 @@ void ExtSysMonAggregator::init(const QHash<QString, QString> &_config)
qCDebug(LOG_ESM) << "Configuration" << _config;
// battery
createSensor("battery", i18n("Battery"), new BatterySource(this, {_config["ACPIPATH"]}));
createSensor("battery", i18n("Battery"), new BatterySource(this, _config["ACPIPATH"]));
// custom
createSensor("custom", i18n("Scripts"), new CustomSource(this, {}));
createSensor("custom", i18n("Scripts"), new CustomSource(this));
// desktop
// FIXME causes segfault in kde libs
// createSensor("desktop", i18n("Desktop"), new DesktopSource(this, {}));
createSensor("desktop", i18n("Desktop"), new DesktopSource(this));
// network
createSensor("network", i18n("Network"), new NetworkSource(this, {}));
createSensor("network", i18n("Network"), new NetworkSource(this));
// player
createSensor("player", i18n("Music player"),
new PlayerSource(this, {_config["PLAYER"], _config["MPDADDRESS"], _config["MPDPORT"], _config["MPRIS"],
_config["PLAYERSYMBOLS"]}));
new PlayerSource(this, _config["PLAYER"], _config["MPDADDRESS"], _config["MPDPORT"].toInt(),
_config["MPRIS"], _config["PLAYERSYMBOLS"].toInt()));
// processes
createSensor("ps", i18n("Processes"), new ProcessesSource(this, {}));
createSensor("ps", i18n("Processes"), new ProcessesSource(this));
// network request
createSensor("requests", i18n("Network requests"), new RequestSource(this, {}));
createSensor("requests", i18n("Network requests"), new RequestSource(this));
// quotes
createSensor("quotes", i18n("Quotes"), new QuotesSource(this, {}));
createSensor("quotes", i18n("Quotes"), new QuotesSource(this));
// system
createSensor("system", i18n("System"), new SystemInfoSource(this, {}));
createSensor("system", i18n("System"), new SystemInfoSource(this));
// current time
createSensor("time", i18n("Time"), new TimeSource(this, {}));
createSensor("time", i18n("Time"), new TimeSource(this));
// upgrade
createSensor("upgrade", i18n("Upgrades"), new UpgradeSource(this, {}));
createSensor("upgrade", i18n("Upgrades"), new UpgradeSource(this));
// weather
createSensor("weather", i18n("Weather"), new WeatherSource(this, {}));
createSensor("weather", i18n("Weather"), new WeatherSource(this));
#ifdef BUILD_LOAD
// additional load source
createSensor("load", i18n("Load"), new LoadSource(this, {}));
createSensor("load", i18n("Load"), new LoadSource(this));
#endif /* BUILD_LOAD */
}

49
sources/extsysmonsources/abstractextsysmonsource.h
View File

@ -17,33 +17,58 @@
#pragma once
#include <ksysguard/systemstats/SensorInfo.h>
#include <QObject>
#include <QRegularExpression>
#include <QVariant>
namespace KSysGuard
{
class SensorInfo;
}
class AbstractExtSysMonSource : public QObject
{
Q_OBJECT
public:
explicit AbstractExtSysMonSource(QObject *_parent, const QStringList &)
inline static QRegularExpression NUMBER_REGEX = QRegularExpression("\\d+$");
explicit AbstractExtSysMonSource(QObject *_parent)
: QObject(_parent){};
~AbstractExtSysMonSource() override = default;
virtual QVariant data(const QString &_source) = 0;
[[nodiscard]] virtual KSysGuard::SensorInfo *initialData(const QString &_source) const = 0;
virtual void run() = 0;
[[nodiscard]] virtual QStringList sources() const = 0;
[[nodiscard]] virtual QHash<QString, KSysGuard::SensorInfo *> sources() const = 0;
// used by extensions
// This method returns -1 in case of invalid source name (like if there is no number)
static int index(const QString &_source)
{
QRegularExpression rx("\\d+");
return rx.match(_source).captured().toInt();
auto match = NUMBER_REGEX.match(_source);
return match.hasMatch() ? match.captured().toInt() : -1;
}
// safe value extractor
template <class T> static QVariantHash dataByItem(T *_extension, const QString &_source)
{
auto idx = index(_source);
if (idx == -1)
return {};
auto item = _extension->itemByTagNumber(idx);
return item ? item->run() : QVariantHash();
}
static KSysGuard::SensorInfo *makeSensorInfo(const QString &_name, const QVariant::Type type,
const KSysGuard::Unit unit = KSysGuard::UnitNone, const double min = 0,
const double max = 0)
{
auto info = new KSysGuard::SensorInfo();
info->name = _name;
info->variantType = type;
info->unit = unit;
info->min = min;
info->max = max;
return info;
}
signals:

152
sources/extsysmonsources/batterysource.cpp
View File

@ -15,12 +15,8 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "batterysource.h"
#include <ksysguard/formatter/Unit.h>
#include <ksysguard/systemstats/SensorInfo.h>
#include <QDir>
#include <cmath>
@ -28,51 +24,15 @@
#include "awdebug.h"
BatterySource::BatterySource(QObject *_parent, const QStringList &_args)
: AbstractExtSysMonSource(_parent, _args)
{
Q_ASSERT(_args.count() == 1);
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
m_acpiPath = _args.at(0);
m_sources = getSources();
}
BatterySource::~BatterySource()
BatterySource::BatterySource(QObject *_parent, QString _acpiPath)
: AbstractExtSysMonSource(_parent)
, m_acpiPath(std::move(_acpiPath))
{
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
}
QStringList BatterySource::getSources()
{
QStringList sources;
sources.append("ac");
sources.append("bat");
sources.append("batleft");
sources.append("batnow");
sources.append("batrate");
sources.append("battotal");
auto directory = QDir(m_acpiPath);
if (directory.exists()) {
m_batteriesCount
= directory.entryList(QStringList({"BAT*"}), QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name).count();
m_batteriesCount = directory.entryList(QStringList({"BAT*"}), QDir::Dirs | QDir::NoDotAndDotDot).count();
qCInfo(LOG_ESS) << "Init batteries count as" << m_batteriesCount;
for (int i = 0; i < m_batteriesCount; i++) {
sources.append(QString("bat%1").arg(i));
sources.append(QString("batleft%1").arg(i));
sources.append(QString("batnow%1").arg(i));
sources.append(QString("batrate%1").arg(i));
sources.append(QString("battotal%1").arg(i));
}
}
qCInfo(LOG_ESS) << "Sources list" << sources;
return sources;
}
@ -81,86 +41,11 @@ QVariant BatterySource::data(const QString &_source)
qCDebug(LOG_ESS) << "Source" << _source;
if (!m_values.contains(_source))
run();
run(); // syncronous update of all values
return m_values.take(_source);
}
KSysGuard::SensorInfo *BatterySource::initialData(const QString &_source) const
{
qCDebug(LOG_ESS) << "Source" << _source;
auto data = new KSysGuard::SensorInfo();
if (_source == "ac") {
data->name = "Is AC online or not";
data->variantType = QVariant::Bool;
data->unit = KSysGuard::UnitNone;
} else if (_source == "bat") {
data->min = 0;
data->max = 100;
data->name = "Average battery usage";
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitPercent;
} else if (_source == "batleft") {
data->min = 0;
data->max = 0;
data->name = "Battery discharge time";
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitSecond;
} else if (_source == "batnow") {
data->min = 0;
data->max = 0;
data->name = "Current battery capacity";
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitNone;
} else if (_source == "batrate") {
data->min = 0;
data->max = 0;
data->name = "Average battery discharge rate";
data->variantType = QVariant::Double;
data->unit = KSysGuard::UnitRate;
} else if (_source == "battotal") {
data->min = 0;
data->max = 0;
data->name = "Full battery capacity";
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitNone;
} else if (_source.startsWith("batleft")) {
data->min = 0;
data->max = 0;
data->name = QString("Battery %1 discharge time").arg(index(_source));
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitSecond;
} else if (_source.startsWith("batnow")) {
data->min = 0;
data->max = 0;
data->name = QString("Battery %1 capacity").arg(index(_source));
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitNone;
} else if (_source.startsWith("battotal")) {
data->min = 0;
data->max = 0;
data->name = QString("Battery %1 full capacity").arg(index(_source));
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitNone;
} else if (_source.startsWith("batrate")) {
data->min = 0;
data->max = 0;
data->name = QString("Battery %1 discharge rate").arg(index(_source));
data->variantType = QVariant::Double;
data->unit = KSysGuard::UnitRate;
} else if (_source.startsWith("bat")) {
data->min = 0;
data->max = 100;
data->name = QString("Battery %1 usage").arg(index(_source));
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitPercent;
}
return data;
}
void BatterySource::run()
{
// adaptor
@ -203,9 +88,32 @@ void BatterySource::run()
}
QStringList BatterySource::sources() const
QHash<QString, KSysGuard::SensorInfo *> BatterySource::sources() const
{
return m_sources;
auto result = QHash<QString, KSysGuard::SensorInfo *>();
// fixed fields
result.insert("ac", makeSensorInfo("Is AC online or not", QVariant::Bool));
result.insert("bat", makeSensorInfo("Average battery usage", QVariant::Int, KSysGuard::UnitPercent, 0, 100));
result.insert("batleft", makeSensorInfo("Battery discharge time", QVariant::Int, KSysGuard::UnitSecond));
result.insert("batnow", makeSensorInfo("Current battery capacity", QVariant::Int));
result.insert("batrate", makeSensorInfo("Average battery discharge rate", QVariant::Double, KSysGuard::UnitRate));
result.insert("battotal", makeSensorInfo("Full battery capacity", QVariant::Int));
// generators
for (auto i = 0; i < m_batteriesCount; i++) {
result.insert(QString("bat%1").arg(i), makeSensorInfo(QString("Battery %1 usage").arg(i), QVariant::Int,
KSysGuard::UnitPercent, 0, 100));
result.insert(QString("batleft%1").arg(i), makeSensorInfo(QString("Battery %1 discharge time").arg(i),
QVariant::Int, KSysGuard::UnitSecond));
result.insert(QString("batnow%1").arg(i), makeSensorInfo(QString("Battery %1 capacity").arg(i), QVariant::Int));
result.insert(QString("batrate%1").arg(i), makeSensorInfo(QString("Battery %1 discharge rate").arg(i),
QVariant::Double, KSysGuard::UnitRate));
result.insert(QString("battotal%1").arg(i),
makeSensorInfo(QString("Battery %1 full capacity").arg(i), QVariant::Int));
}
return result;
}

10
sources/extsysmonsources/batterysource.h
View File

@ -30,13 +30,11 @@ class BatterySource : public AbstractExtSysMonSource
public:
const int TREND_LIMIT = 20;
explicit BatterySource(QObject *_parent, const QStringList &_args);
~BatterySource() override;
QStringList getSources();
explicit BatterySource(QObject *_parent, QString _acpiPath);
~BatterySource() override = default;
QVariant data(const QString &_source) override;
[[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
void run() override;
[[nodiscard]] QStringList sources() const override;
void run();
[[nodiscard]] QHash<QString, KSysGuard::SensorInfo *> sources() const override;
private:
static double approximate(const QList<int> &_trend);

46
sources/extsysmonsources/customsource.cpp
View File

@ -17,28 +17,17 @@
#include "customsource.h"
#include <ksysguard/formatter/Unit.h>
#include <ksysguard/systemstats/SensorInfo.h>
#include "awdebug.h"
#include "extscript.h"
CustomSource::CustomSource(QObject *_parent, const QStringList &_args)
: AbstractExtSysMonSource(_parent, _args)
CustomSource::CustomSource(QObject *_parent)
: AbstractExtSysMonSource(_parent)
{
Q_ASSERT(_args.count() == 0);
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
m_extScripts = new ExtItemAggregator<ExtScript>(nullptr, "scripts");
m_extScripts = new ExtItemAggregator<ExtScript>(this, "scripts");
m_extScripts->initSockets();
m_sources = getSources();
}
CustomSource::~CustomSource()
{
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
}
@ -47,34 +36,17 @@ QVariant CustomSource::data(const QString &_source)
qCDebug(LOG_ESS) << "Source" << _source;
// there are only one value
return m_extScripts->itemByTagNumber(index(_source))->run().values().first();
return dataByItem(m_extScripts, _source).values().first();
}
KSysGuard::SensorInfo *CustomSource::initialData(const QString &_source) const
QHash<QString, KSysGuard::SensorInfo *> CustomSource::sources() const
{
qCDebug(LOG_ESS) << "Source" << _source;
auto result = QHash<QString, KSysGuard::SensorInfo *>();
auto data = new KSysGuard::SensorInfo();
data->name = QString("Custom command '%1' output").arg(m_extScripts->itemByTagNumber(index(_source))->uniq());
data->variantType = QVariant::String;
data->unit = KSysGuard::UnitNone;
return data;
}
QStringList CustomSource::sources() const
{
return m_sources;
}
QStringList CustomSource::getSources()
{
QStringList sources;
for (auto &item : m_extScripts->activeItems())
sources.append(item->tag("custom"));
result.insert(item->tag("custom"),
makeSensorInfo(QString("Custom command '%1' output").arg(item->uniq()), QVariant::String));
return sources;
return result;
}

10
sources/extsysmonsources/customsource.h
View File

@ -30,16 +30,12 @@ class CustomSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit CustomSource(QObject *_parent, const QStringList &_args);
~CustomSource() override;
explicit CustomSource(QObject *_parent);
~CustomSource() override = default;
QVariant data(const QString &_source) override;
[[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
void run() override{};
[[nodiscard]] QStringList sources() const override;
[[nodiscard]] QHash<QString, KSysGuard::SensorInfo *> sources() const override;
private:
QStringList getSources();
// configuration and values
ExtItemAggregator<ExtScript> *m_extScripts = nullptr;
QStringList m_sources;
};

108
sources/extsysmonsources/desktopsource.cpp
View File

@ -17,29 +17,17 @@
#include "desktopsource.h"
#include <KWindowSystem/KWindowSystem>
#include <ksysguard/formatter/Unit.h>
#include <ksysguard/systemstats/SensorInfo.h>
#include <taskmanager/virtualdesktopinfo.h>
#include <QDBusConnection>
#include <QDBusMessage>
#include <QDBusVariant>
#include "awdebug.h"
DesktopSource::DesktopSource(QObject *_parent, const QStringList &_args)
: AbstractExtSysMonSource(_parent, _args)
{
Q_ASSERT(_args.count() == 0);
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
m_vdi = new TaskManager::VirtualDesktopInfo(this);
}
DesktopSource::~DesktopSource()
DesktopSource::DesktopSource(QObject *_parent)
: AbstractExtSysMonSource(_parent)
{
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
m_vdi->deleteLater();
}
@ -47,60 +35,72 @@ QVariant DesktopSource::data(const QString &_source)
{
qCDebug(LOG_ESS) << "Source" << _source;
auto nativeIndex = m_vdi->position(m_vdi->currentDesktop());
auto decrement = KWindowSystem::isPlatformX11() ? 1 : 0;
auto current = nativeIndex - decrement;
auto current = getDBusProperty({"org.kde.KWin.VirtualDesktopManager", "current"}).toString();
auto desktops
= extractDesktops(getDBusProperty({"org.kde.KWin.VirtualDesktopManager", "desktops"}).value<QDBusArgument>());
if (_source == "name") {
return m_vdi->desktopNames().at(current);
return desktops[current].second;
} else if (_source == "number") {
return current + 1;
} else if (_source == "names") {
return m_vdi->desktopNames();
return desktops[current].first + 1;
} else if (_source == "count") {
return m_vdi->numberOfDesktops();
return desktops.count();
}
return {};
}
KSysGuard::SensorInfo *DesktopSource::initialData(const QString &_source) const
QHash<QString, KSysGuard::SensorInfo *> DesktopSource::sources() const
{
qCDebug(LOG_ESS) << "Source" << _source;
auto result = QHash<QString, KSysGuard::SensorInfo *>();
auto data = new KSysGuard::SensorInfo();
if (_source == "name") {
data->name = "Current desktop name";
data->variantType = QVariant::String;
data->unit = KSysGuard::UnitNone;
} else if (_source == "number") {
data->min = 0;
data->name = "Current desktop number";
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitNone;
} else if (_source == "names") {
data->name = "All desktops by name";
data->variantType = QVariant::StringList;
data->unit = KSysGuard::UnitNone;
} else if (_source == "count") {
data->min = 0;
data->name = "Desktops count";
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitNone;
result.insert("name", makeSensorInfo("Current desktop name", QVariant::String));
result.insert("number", makeSensorInfo("Current desktop number", QVariant::Int));
result.insert("count", makeSensorInfo("Desktops count", QVariant::Int));
return result;
}
QHash<QString, QPair<int, QString>> DesktopSource::extractDesktops(const QDBusArgument &_result)
{
QHash<QString, QPair<int, QString>> result;
_result.beginArray();
while (!_result.atEnd()) {
_result.beginStructure();
int index;
QString uuid, name;
_result >> index >> uuid >> name;
_result.endStructure();
result[uuid] = {index, name};
}
_result.endArray();
return data;
return result;
}
QStringList DesktopSource::sources() const
QVariant DesktopSource::getDBusProperty(const QVariantList &_args)
{
QStringList sources;
sources.append("name");
sources.append("number");
sources.append("names");
sources.append("count");
qCDebug(LOG_ESS) << "Get VDI property" << _args;
return sources;
auto bus = QDBusConnection::sessionBus();
auto request
= QDBusMessage::createMethodCall(KWinDBusAdapter, VDIDBusPath, PropertyDBusInterface, PropertyDBusMethod);
request.setArguments(_args);
auto response = bus.call(request, QDBus::BlockWithGui, REQUEST_TIMEOUT);
if ((response.type() != QDBusMessage::ReplyMessage) || (response.arguments().isEmpty())) {
qCWarning(LOG_ESS) << "Error message" << response.errorMessage();
return {};
} else {
auto value = response.arguments().first();
return value.value<QDBusVariant>().variant();
}
}

21
sources/extsysmonsources/desktopsource.h
View File

@ -22,22 +22,23 @@
#include "abstractextsysmonsource.h"
namespace TaskManager
{
class VirtualDesktopInfo;
}
class DesktopSource : public AbstractExtSysMonSource
{
Q_OBJECT
public:
explicit DesktopSource(QObject *_parent, const QStringList &_args);
~DesktopSource() override;
static constexpr auto KWinDBusAdapter = "org.kde.KWin";
static constexpr auto VDIDBusPath = "/VirtualDesktopManager";
static constexpr auto PropertyDBusInterface = "org.freedesktop.DBus.Properties";
static constexpr auto PropertyDBusMethod = "Get";
explicit DesktopSource(QObject *_parent);
~DesktopSource() override = default;
QVariant data(const QString &_source) override;
[[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
void run() override{};
[[nodiscard]] QStringList sources() const override;
[[nodiscard]] QHash<QString, KSysGuard::SensorInfo *> sources() const override;
private:
TaskManager::VirtualDesktopInfo *m_vdi = nullptr;
static QHash<QString, QPair<int, QString>> extractDesktops(const QDBusArgument &_result);
static QVariant getDBusProperty(const QVariantList &_args);
};

19
sources/extsysmonsources/extsysmonsensor.cpp
View File

@ -33,8 +33,8 @@ ExtSysMonSensor::ExtSysMonSensor(KSysGuard::SensorContainer *_parent, const QStr
loadProperties();
connect(this, &SensorObject::subscribedChanged, [this](bool _state) { changeSubscription(_state); });
connect(m_timer, &QTimer::timeout, [this]() { update(); });
connect(this, &SensorObject::subscribedChanged, this, &ExtSysMonSensor::changeSubscription);
connect(m_timer, &QTimer::timeout, this, &ExtSysMonSensor::update);
}
@ -61,21 +61,22 @@ void ExtSysMonSensor::changeSubscription(bool _subscribed)
void ExtSysMonSensor::update()
{
for (auto &source : m_source->sources()) {
auto property = sensor(source);
if (!property->isSubscribed())
for (auto sensor : sensors()) {
if (!sensor->isSubscribed())
continue; // skip properties which are not explicitly subscribed
auto value = m_source->data(source);
property->setValue(value);
auto value = m_source->data(sensor->id());
sensor->setValue(value);
}
}
void ExtSysMonSensor::loadProperties()
{
for (auto &source : m_source->sources()) {
auto info = m_source->initialData(source);
auto sensors = m_source->sources();
for (auto sensor = sensors.cbegin(); sensor != sensors.cend(); ++sensor) {
auto source = sensor.key();
auto info = sensor.value();
auto property = new KSysGuard::SensorProperty(source, info->name, this);
property->setUnit(info->unit);

2
sources/extsysmonsources/extsysmonsensor.h
View File

@ -31,6 +31,8 @@ public:
explicit ExtSysMonSensor(KSysGuard::SensorContainer *_parent, const QString &_id, const QString &_name,
AbstractExtSysMonSource *_source);
~ExtSysMonSensor() override;
public slots:
void changeSubscription(bool _subscribed);
void update();

41
sources/extsysmonsources/loadsource.cpp
View File

@ -15,26 +15,15 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "loadsource.h"
#include <ksysguard/formatter/Unit.h>
#include <ksysguard/systemstats/SensorInfo.h>
#include <QRandomGenerator>
#include "awdebug.h"
LoadSource::LoadSource(QObject *_parent, const QStringList &_args)
: AbstractExtSysMonSource(_parent, _args)
{
Q_ASSERT(_args.count() == 0);
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
}
LoadSource::~LoadSource()
LoadSource::LoadSource(QObject *_parent)
: AbstractExtSysMonSource(_parent)
{
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
}
@ -48,28 +37,12 @@ QVariant LoadSource::data(const QString &_source)
}
KSysGuard::SensorInfo *LoadSource::initialData(const QString &_source) const
QHash<QString, KSysGuard::SensorInfo *> LoadSource::sources() const
{
qCDebug(LOG_ESS) << "Source" << _source;
auto result = QHash<QString, KSysGuard::SensorInfo *>();
auto data = new KSysGuard::SensorInfo();
if (_source.startsWith("load")) {
data->min = 0;
data->max = 0;
data->name = "Simple sources for load tests";
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitNone;
}
for (auto i = 0; i < 1000; i++)
result.insert(QString("load%1").arg(i), makeSensorInfo("Simple sources for load tests", QVariant::Int));
return data;
}
QStringList LoadSource::sources() const
{
QStringList sources;
for (int i = 0; i < 1000; i++)
sources.append(QString("load%1").arg(i));
return sources;
return result;
}

8
sources/extsysmonsources/loadsource.h
View File

@ -27,10 +27,8 @@ class LoadSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit LoadSource(QObject *_parent, const QStringList &_args);
~LoadSource() override;
explicit LoadSource(QObject *_parent);
~LoadSource() override = default;
QVariant data(const QString &_source) override;
[[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
void run() override{};
[[nodiscard]] QStringList sources() const override;
[[nodiscard]] QHash<QString, KSysGuard::SensorInfo *> sources() const override;
};

54
sources/extsysmonsources/networksource.cpp
View File

@ -15,22 +15,17 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "networksource.h"
#include <ksysguard/formatter/Unit.h>
#include <ksysguard/systemstats/SensorInfo.h>
#include <QNetworkInterface>
#include <QProcess>
#include "awdebug.h"
NetworkSource::NetworkSource(QObject *_parent, const QStringList &_args)
: AbstractExtSysMonSource(_parent, _args)
NetworkSource::NetworkSource(QObject *_parent)
: AbstractExtSysMonSource(_parent)
{
Q_ASSERT(_args.count() == 0);
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
m_process = new QProcess(nullptr);
@ -54,47 +49,26 @@ QVariant NetworkSource::data(const QString &_source)
{
qCDebug(LOG_ESS) << "Source" << _source;
if (!m_values.contains(_source))
run();
return m_values.take(_source);
}
KSysGuard::SensorInfo *NetworkSource::initialData(const QString &_source) const
{
qCDebug(LOG_ESS) << "Source" << _source;
auto data = new KSysGuard::SensorInfo();
if (_source == "device") {
data->name = "Current network device name";
data->variantType = QVariant::String;
data->unit = KSysGuard::UnitNone;
return NetworkSource::getCurrentDevice();
} else if (_source == "ssid") {
data->name = "Current SSID name";
data->variantType = QVariant::String;
data->unit = KSysGuard::UnitNone;
}
return data;
}
void NetworkSource::run()
{
m_values["device"] = NetworkSource::getCurrentDevice();
if (m_process->state() == QProcess::ProcessState::NotRunning) {
if (m_process->state() == QProcess::ProcessState::NotRunning)
m_process->start("iwgetid", {"-r"});
return m_currentSsid;
}
return {};
}
QStringList NetworkSource::sources() const
QHash<QString, KSysGuard::SensorInfo *> NetworkSource::sources() const
{
QStringList sources;
sources.append("device");
sources.append("ssid");
auto result = QHash<QString, KSysGuard::SensorInfo *>();
return sources;
result.insert("device", makeSensorInfo("Current network device name", QVariant::String));
result.insert("ssid", makeSensorInfo("Current SSID name", QVariant::String));
return result;
}
@ -106,7 +80,7 @@ void NetworkSource::updateSsid()
QString qoutput = QString::fromUtf8(m_process->readAllStandardOutput()).trimmed();
qCInfo(LOG_ESS) << "Output" << qoutput;
m_values["ssid"] = qoutput;
m_currentSsid = qoutput;
}

9
sources/extsysmonsources/networksource.h
View File

@ -29,18 +29,17 @@ class NetworkSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit NetworkSource(QObject *_parent, const QStringList &_args);
explicit NetworkSource(QObject *_parent);
~NetworkSource() override;
QVariant data(const QString &_source) override;
[[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
void run() override;
[[nodiscard]] QStringList sources() const override;
void run();
[[nodiscard]] QHash<QString, KSysGuard::SensorInfo *> sources() const override;
private slots:
void updateSsid();
private:
QVariantHash m_values;
QString m_currentSsid;
QProcess *m_process = nullptr;
static QString getCurrentDevice();
};

141
sources/extsysmonsources/playersource.cpp
View File

@ -15,12 +15,8 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "playersource.h"
#include <ksysguard/formatter/Unit.h>
#include <ksysguard/systemstats/SensorInfo.h>
#include <QDBusArgument>
#include <QDBusConnection>
#include <QDBusConnectionInterface>
@ -30,18 +26,17 @@
#include "awdebug.h"
PlayerSource::PlayerSource(QObject *_parent, const QStringList &_args)
: AbstractExtSysMonSource(_parent, _args)
PlayerSource::PlayerSource(QObject *_parent, QString _player, QString _mpdAddress, int _mpdPort, QString _mpris,
int _symbols)
: AbstractExtSysMonSource(_parent)
, m_mpdAddress(std::move(_mpdAddress))
, m_mpdPort(_mpdPort)
, m_mpris(std::move(_mpris))
, m_player(std::move(_player))
, m_symbols(_symbols)
{
Q_ASSERT(_args.count() == 5);
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
m_player = _args.at(0);
m_mpdAddress = _args.at(1);
m_mpdPort = _args.at(2).toInt();
m_mpris = _args.at(3);
m_symbols = _args.at(4).toInt();
connect(&m_mpdSocket, &QTcpSocket::connected, this, &PlayerSource::mpdSocketConnected);
connect(&m_mpdSocket, &QTcpSocket::readyRead, this, &PlayerSource::mpdSocketReadyRead);
connect(&m_mpdSocket, &QTcpSocket::bytesWritten, this, &PlayerSource::mpdSocketWritten);
@ -62,26 +57,25 @@ QVariant PlayerSource::data(const QString &_source)
qCDebug(LOG_ESS) << "Source" << _source;
if (!m_values.contains(_source))
run();
QVariant value = m_values.take(_source);
return value;
run(); // syncronous update of all values
return m_values.take(_source);
}
QString PlayerSource::getAutoMpris()
{
QDBusMessage listServices = QDBusConnection::sessionBus().interface()->call(QDBus::BlockWithGui, "ListNames");
auto listServices = QDBusConnection::sessionBus().interface()->call(QDBus::BlockWithGui, "ListNames");
if (listServices.arguments().isEmpty()) {
qCWarning(LOG_ESS) << "Could not find any DBus service";
return "";
}
QStringList arguments = listServices.arguments().first().toStringList();
auto arguments = listServices.arguments().first().toStringList();
for (auto &arg : arguments) {
if (!arg.startsWith("org.mpris.MediaPlayer2."))
for (auto &service : arguments) {
if (!service.startsWith("org.mpris.MediaPlayer2."))
continue;
qCInfo(LOG_ESS) << "Service found" << arg;
QString service = arg;
qCInfo(LOG_ESS) << "Service found" << service;
service.remove("org.mpris.MediaPlayer2.");
return service;
}
@ -90,65 +84,6 @@ QString PlayerSource::getAutoMpris()
}
KSysGuard::SensorInfo *PlayerSource::initialData(const QString &_source) const
{
qCDebug(LOG_ESS) << "Source" << _source;
auto data = new KSysGuard::SensorInfo();
if (_source == "album") {
data->name = "Current song album";
data->variantType = QVariant::String;
data->unit = KSysGuard::UnitNone;
} else if (_source == "salbum") {
data->name = QString("Current song album (%1 symbols)").arg(m_symbols);
data->variantType = QVariant::String;
data->unit = KSysGuard::UnitNone;
} else if (_source == "dalbum") {
data->name = QString("Current song album (%1 symbols, dynamic)").arg(m_symbols);
data->variantType = QVariant::String;
data->unit = KSysGuard::UnitNone;
} else if (_source == "artist") {
data->name = "Current song artist";
data->variantType = QVariant::String;
data->unit = KSysGuard::UnitNone;
} else if (_source == "sartist") {
data->name = QString("Current song artist (%1 symbols)").arg(m_symbols);
data->variantType = QVariant::String;
data->unit = KSysGuard::UnitNone;
} else if (_source == "dartist") {
data->name = QString("Current song artist (%1 symbols, dynamic)").arg(m_symbols);
data->variantType = QVariant::String;
data->unit = KSysGuard::UnitNone;
} else if (_source == "duration") {
data->min = 0;
data->max = 0;
data->name = "Current song duration";
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitSecond;
} else if (_source == "progress") {
data->min = 0;
data->max = 0;
data->name = "Current song progress";
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitSecond;
} else if (_source == "title") {
data->name = "Current song title";
data->variantType = QVariant::String;
data->unit = KSysGuard::UnitNone;
} else if (_source == "stitle") {
data->name = QString("Current song title (%1 symbols)").arg(m_symbols);
data->variantType = QVariant::String;
data->unit = KSysGuard::UnitNone;
} else if (_source == "dtitle") {
data->name = QString("Current song title (%1 symbols, dynamic)").arg(m_symbols);
data->variantType = QVariant::String;
data->unit = KSysGuard::UnitNone;
}
return data;
}
void PlayerSource::run()
{
// initial data
@ -176,22 +111,29 @@ void PlayerSource::run()
}
QStringList PlayerSource::sources() const
QHash<QString, KSysGuard::SensorInfo *> PlayerSource::sources() const
{
QStringList sources;
sources.append("album");
sources.append("dalbum");
sources.append("salbum");
sources.append("artist");
sources.append("dartist");
sources.append("sartist");
sources.append("duration");
sources.append("progress");
sources.append("title");
sources.append("dtitle");
sources.append("stitle");
auto result = QHash<QString, KSysGuard::SensorInfo *>();
return sources;
result.insert("album", makeSensorInfo("Current song album", QVariant::String));
result.insert("salbum",
makeSensorInfo(QString("Current song album (%1 symbols)").arg(m_symbols), QVariant::String));
result.insert("dalbum",
makeSensorInfo(QString("Current song album (%1 symbols, dynamic)").arg(m_symbols), QVariant::String));
result.insert("artist", makeSensorInfo("Current song artist", QVariant::String));
result.insert("sartist",
makeSensorInfo(QString("Current song artist (%1 symbols)").arg(m_symbols), QVariant::String));
result.insert("dartist", makeSensorInfo(QString("Current song artist (%1 symbols, dynamic)").arg(m_symbols),
QVariant::String));
result.insert("duration", makeSensorInfo("Current song duration", QVariant::Int, KSysGuard::UnitSecond));
result.insert("progress", makeSensorInfo("Current song progress", QVariant::Int, KSysGuard::UnitSecond));
result.insert("title", makeSensorInfo("Current song title", QVariant::String));
result.insert("stitle",
makeSensorInfo(QString("Current song title (%1 symbols)").arg(m_symbols), QVariant::String));
result.insert("dtitle",
makeSensorInfo(QString("Current song title (%1 symbols, dynamic)").arg(m_symbols), QVariant::String));
return result;
}
@ -199,7 +141,7 @@ QString PlayerSource::buildString(const QString &_current, const QString &_value
{
qCDebug(LOG_ESS) << "Current value" << _current << "received" << _value << "will be stripped after" << _s;
int index = _value.indexOf(_current);
auto index = _value.indexOf(_current);
if ((_current.isEmpty()) || ((index + _s + 1) > _value.length()))
return QString("%1").arg(_value.left(_s), -_s, QLatin1Char(' '));
else
@ -230,7 +172,7 @@ void PlayerSource::mpdSocketConnected()
void PlayerSource::mpdSocketReadyRead()
{
QString qoutput = QString::fromUtf8(m_mpdSocket.readAll()).trimmed();
auto qoutput = QString::fromUtf8(m_mpdSocket.readAll()).trimmed();
qCInfo(LOG_ESS) << "Output" << qoutput;
// parse
@ -307,9 +249,8 @@ QVariantHash PlayerSource::getPlayerMprisInfo(const QString &_mpris)
// /org/mpris/MediaPlayer2 org.freedesktop.DBus.Properties.Get
// string:'org.mpris.MediaPlayer2.Player' string:'Metadata'
auto args = QVariantList({"org.mpris.MediaPlayer2.Player", "Metadata"});
QDBusMessage request
= QDBusMessage::createMethodCall(QString("org.mpris.MediaPlayer2.%1").arg(_mpris), "/org/mpris/MediaPlayer2",
"org.freedesktop.DBus.Properties", "Get");
auto request = QDBusMessage::createMethodCall(QString("org.mpris.MediaPlayer2.%1").arg(_mpris),
"/org/mpris/MediaPlayer2", "org.freedesktop.DBus.Properties", "Get");
request.setArguments(args);
auto response = bus.call(request, QDBus::BlockWithGui, REQUEST_TIMEOUT);
if ((response.type() != QDBusMessage::ReplyMessage) || (response.arguments().isEmpty())) {

8
sources/extsysmonsources/playersource.h
View File

@ -33,13 +33,13 @@ class PlayerSource : public AbstractExtSysMonSource
public:
const char *MPD_STATUS_REQUEST = "currentsong\nstatus\n";
explicit PlayerSource(QObject *_parent, const QStringList &_args);
explicit PlayerSource(QObject *_parent, QString _player, QString _mpdAddress, int _mpdPort, QString _mpris,
int _symbols);
~PlayerSource() override;
QVariant data(const QString &_source) override;
static QString getAutoMpris();
[[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
void run() override;
[[nodiscard]] QStringList sources() const override;
void run();
[[nodiscard]] QHash<QString, KSysGuard::SensorInfo *> sources() const override;
// additional method to build dynamic tags
static QString buildString(const QString &_current, const QString &_value, int _s);
static QString stripString(const QString &_value, int _s);

67
sources/extsysmonsources/processessource.cpp
View File

@ -15,26 +15,15 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "processessource.h"
#include <ksysguard/formatter/Unit.h>
#include <ksysguard/systemstats/SensorInfo.h>
#include <QDir>
#include "awdebug.h"
ProcessesSource::ProcessesSource(QObject *_parent, const QStringList &_args)
: AbstractExtSysMonSource(_parent, _args)
{
Q_ASSERT(_args.count() == 0);
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
}
ProcessesSource::~ProcessesSource()
ProcessesSource::ProcessesSource(QObject *_parent)
: AbstractExtSysMonSource(_parent)
{
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
}
@ -45,45 +34,18 @@ QVariant ProcessesSource::data(const QString &_source)
qCDebug(LOG_ESS) << "Source" << _source;
if (!m_values.contains(_source))
run();
QVariant value = m_values.take(_source);
return value;
}
run(); // syncronous update of all values
KSysGuard::SensorInfo *ProcessesSource::initialData(const QString &_source) const
{
qCDebug(LOG_ESS) << "Source" << _source;
auto data = new KSysGuard::SensorInfo();
if (_source == "running") {
data->min = 0;
data->max = 0;
data->name = "Count of running processes";
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitNone;
} else if (_source == "list") {
data->name = "All running processes list";
data->variantType = QVariant::StringList;
data->unit = KSysGuard::UnitNone;
} else if (_source == "count") {
data->min = 0;
data->max = 0;
data->name = "Total count of processes";
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitNone;
}
return data;
return m_values.take(_source);
}
void ProcessesSource::run()
{
QStringList allDirectories = QDir("/proc").entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
QStringList directories = allDirectories.filter(QRegularExpression("(\\d+)"));
QStringList running;
auto allDirectories = QDir("/proc").entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
auto directories = allDirectories.filter(QRegularExpression("(\\d+)"));
QStringList running;
for (auto &dir : directories) {
QFile statusFile(QString("/proc/%1/status").arg(dir));
if (!statusFile.open(QIODevice::ReadOnly | QIODevice::Text))
@ -92,7 +54,7 @@ void ProcessesSource::run()
if (!cmdFile.open(QIODevice::ReadOnly | QIODevice::Text))
continue;
QString output = statusFile.readAll();
auto output = statusFile.readAll();
if (output.contains("running"))
running.append(cmdFile.readAll());
statusFile.close();
@ -105,12 +67,13 @@ void ProcessesSource::run()
}
QStringList ProcessesSource::sources() const
QHash<QString, KSysGuard::SensorInfo *> ProcessesSource::sources() const
{
QStringList sources;
sources.append("running");
sources.append("list");
sources.append("count");
auto result = QHash<QString, KSysGuard::SensorInfo *>();
return sources;
result.insert("running", makeSensorInfo("Count of running processes", QVariant::Int));
result.insert("list", makeSensorInfo("All running processes list", QVariant::StringList));
result.insert("count", makeSensorInfo("Total count of processes", QVariant::Int));
return result;
}

9
sources/extsysmonsources/processessource.h
View File

@ -27,12 +27,11 @@ class ProcessesSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit ProcessesSource(QObject *_parent, const QStringList &_args);
~ProcessesSource() override;
explicit ProcessesSource(QObject *_parent);
~ProcessesSource() override = default;
QVariant data(const QString &_source) override;
[[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
void run() override;
[[nodiscard]] QStringList sources() const override;
void run();
[[nodiscard]] QHash<QString, KSysGuard::SensorInfo *> sources() const override;
private:
// configuration and values

105
sources/extsysmonsources/quotessource.cpp
View File

@ -15,31 +15,19 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "quotessource.h"
#include <ksysguard/formatter/Unit.h>
#include <ksysguard/systemstats/SensorInfo.h>
#include "awdebug.h"
#include "extquotes.h"
QuotesSource::QuotesSource(QObject *_parent, const QStringList &_args)
: AbstractExtSysMonSource(_parent, _args)
QuotesSource::QuotesSource(QObject *_parent)
: AbstractExtSysMonSource(_parent)
{
Q_ASSERT(_args.count() == 0);
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
m_extQuotes = new ExtItemAggregator<ExtQuotes>(nullptr, "quotes");
m_extQuotes->initSockets();
m_sources = getSources();
}
QuotesSource::~QuotesSource()
{
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
}
@ -47,82 +35,31 @@ QVariant QuotesSource::data(const QString &_source)
{
qCDebug(LOG_ESS) << "Source" << _source;
int ind = index(_source);
if (!m_values.contains(_source)) {
QVariantHash data = m_extQuotes->itemByTagNumber(ind)->run();
for (auto &key : data.keys())
m_values[key] = data[key];
}
QVariant value = m_values.take(_source);
return value;
if (!m_values.contains(_source))
m_values = dataByItem(m_extQuotes, _source);
return m_values.take(_source);
}
KSysGuard::SensorInfo *QuotesSource::initialData(const QString &_source) const
QHash<QString, KSysGuard::SensorInfo *> QuotesSource::sources() const
{
qCDebug(LOG_ESS) << "Source" << _source;
auto result = QHash<QString, KSysGuard::SensorInfo *>();
int ind = index(_source);
auto data = new KSysGuard::SensorInfo;
if (_source.startsWith("pricechg")) {
data->min = 0.0;
data->max = 0.0;
data->name = QString("Absolute price changes for '%1'").arg(m_extQuotes->itemByTagNumber(ind)->uniq());
data->variantType = QVariant::Double;
data->unit = KSysGuard::UnitNone;
} else if (_source.startsWith("price")) {
data->min = 0.0;
data->max = 0.0;
data->name = QString("Price for '%1'").arg(m_extQuotes->itemByTagNumber(ind)->uniq());
data->variantType = QVariant::Double;
data->unit = KSysGuard::UnitNone;
} else if (_source.startsWith("percpricechg")) {
data->min = -100.0;
data->max = 100.0;
data->name = QString("Price changes for '%1'").arg(m_extQuotes->itemByTagNumber(ind)->uniq());
data->variantType = QVariant::Double;
data->unit = KSysGuard::UnitPercent;
} else if (_source.startsWith("volumechg")) {
data->min = 0;
data->max = 0;
data->name = QString("Absolute volume changes for '%1'").arg(m_extQuotes->itemByTagNumber(ind)->uniq());
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitNone;
} else if (_source.startsWith("volume")) {
data->min = 0;
data->max = 0;
data->name = QString("Volume for '%1'").arg(m_extQuotes->itemByTagNumber(ind)->uniq());
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitNone;
} else if (_source.startsWith("percvolumechg")) {
data->min = -100.0;
data->max = 100.0;
data->name = QString("Volume changes for '%1'").arg(m_extQuotes->itemByTagNumber(ind)->uniq());
data->variantType = QVariant::Double;
data->unit = KSysGuard::UnitPercent;
}
return data;
}
QStringList QuotesSource::sources() const
{
return m_sources;
}
QStringList QuotesSource::getSources()
{
QStringList sources;
for (auto &item : m_extQuotes->activeItems()) {
sources.append(item->tag("price"));
sources.append(item->tag("pricechg"));
sources.append(item->tag("percpricechg"));
sources.append(item->tag("volume"));
sources.append(item->tag("volumechg"));
sources.append(item->tag("percvolumechg"));
result.insert(item->tag("pricechg"),
makeSensorInfo(QString("Absolute price changes for '%1'").arg(item->uniq()), QVariant::Double));
result.insert(item->tag("price"),
makeSensorInfo(QString("Price for '%1'").arg(item->uniq()), QVariant::Double));
result.insert(item->tag("percpricechg"), makeSensorInfo(QString("Price changes for '%1'").arg(item->uniq()),
QVariant::Double, KSysGuard::UnitPercent, 0, 100));
result.insert(item->tag("volumechg"),
makeSensorInfo(QString("Absolute volume changes for '%1'").arg(item->uniq()), QVariant::Double));
result.insert(item->tag("volume"),
makeSensorInfo(QString("Volume for '%1'").arg(item->uniq()), QVariant::Double));
result.insert(item->tag("percvolumechg"), makeSensorInfo(QString("Volume changes for '%1'").arg(item->uniq()),
QVariant::Double, KSysGuard::UnitPercent, 0, 100));
}
return sources;
return result;
}

10
sources/extsysmonsources/quotessource.h
View File

@ -30,17 +30,13 @@ class QuotesSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit QuotesSource(QObject *_parent, const QStringList &_args);
~QuotesSource() override;
explicit QuotesSource(QObject *_parent);
~QuotesSource() override = default;
QVariant data(const QString &_source) override;
[[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
void run() override{};
[[nodiscard]] QStringList sources() const override;
[[nodiscard]] QHash<QString, KSysGuard::SensorInfo *> sources() const override;
private:
QStringList getSources();
// configuration and values
ExtItemAggregator<ExtQuotes> *m_extQuotes = nullptr;
QStringList m_sources;
QVariantHash m_values;
};

56
sources/extsysmonsources/requestsource.cpp
View File

@ -15,31 +15,19 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "requestsource.h"
#include <ksysguard/formatter/Unit.h>
#include <ksysguard/systemstats/SensorInfo.h>
#include "awdebug.h"
#include "extnetworkrequest.h"
RequestSource::RequestSource(QObject *_parent, const QStringList &_args)
: AbstractExtSysMonSource(_parent, _args)
RequestSource::RequestSource(QObject *_parent)
: AbstractExtSysMonSource(_parent)
{
Q_ASSERT(_args.count() == 0);
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
m_extNetRequest = new ExtItemAggregator<ExtNetworkRequest>(nullptr, "requests");
m_extNetRequest->initSockets();
m_sources = getSources();
}
RequestSource::~RequestSource()
{
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
}
@ -47,44 +35,18 @@ QVariant RequestSource::data(const QString &_source)
{
qCDebug(LOG_ESS) << "Source" << _source;
int ind = index(_source);
if (!m_values.contains(_source)) {
QVariantHash data = m_extNetRequest->itemByTagNumber(ind)->run();
for (auto &key : data.keys())
m_values[key] = data[key];
}
QVariant value = m_values.take(_source);
return value;
// there are only one value
return dataByItem(m_extNetRequest, _source).values().first();
}
KSysGuard::SensorInfo *RequestSource::initialData(const QString &_source) const
QHash<QString, KSysGuard::SensorInfo *> RequestSource::sources() const
{
qCDebug(LOG_ESS) << "Source" << _source;
auto result = QHash<QString, KSysGuard::SensorInfo *>();
int ind = index(_source);
auto data = new KSysGuard::SensorInfo();
if (_source.startsWith("response")) {
data->name = QString("Network response for %1").arg(m_extNetRequest->itemByTagNumber(ind)->uniq());
data->variantType = QVariant::String;
data->unit = KSysGuard::UnitNone;
}
return data;
}
QStringList RequestSource::sources() const
{
return m_sources;
}
QStringList RequestSource::getSources()
{
QStringList sources;
for (auto &item : m_extNetRequest->activeItems())
sources.append(item->tag("response"));
result.insert(item->tag("response"),
makeSensorInfo(QString("Network response for %1").arg(item->uniq()), QVariant::String));
return sources;
return result;
}

10
sources/extsysmonsources/requestsource.h
View File

@ -30,17 +30,13 @@ class RequestSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit RequestSource(QObject *_parent, const QStringList &_args);
~RequestSource() override;
explicit RequestSource(QObject *_parent);
~RequestSource() override = default;
QVariant data(const QString &_source) override;
[[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
void run() override{};
[[nodiscard]] QStringList sources() const override;
[[nodiscard]] QHash<QString, KSysGuard::SensorInfo *> sources() const override;
private:
QStringList getSources();
// configuration and values
ExtItemAggregator<ExtNetworkRequest> *m_extNetRequest = nullptr;
QStringList m_sources;
QVariantHash m_values;
};

89
sources/extsysmonsources/systeminfosource.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "systeminfosource.h"
#include <ksysguard/formatter/Unit.h>
@ -30,15 +29,8 @@
#include "awdebug.h"
SystemInfoSource::SystemInfoSource(QObject *_parent, const QStringList &_args)
: AbstractExtSysMonSource(_parent, _args)
{
Q_ASSERT(_args.count() == 0);
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
}
SystemInfoSource::~SystemInfoSource()
SystemInfoSource::SystemInfoSource(QObject *_parent)
: AbstractExtSysMonSource(_parent)
{
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
}
@ -48,55 +40,30 @@ QVariant SystemInfoSource::data(const QString &_source)
{
qCDebug(LOG_ESS) << "Source" << _source;
if (!m_values.contains(_source))
run();
return m_values.take(_source);
}
KSysGuard::SensorInfo *SystemInfoSource::initialData(const QString &_source) const
{
qCDebug(LOG_ESS) << "Source" << _source;
auto data = new KSysGuard::SensorInfo();
if (_source == "brightness") {
data->min = 0.0;
data->max = 100.0;
data->name = "Screen brightness";
data->variantType = QVariant::Double;
data->unit = KSysGuard::UnitPercent;
return SystemInfoSource::getCurrentBrightness();
} else if (_source == "volume") {
data->min = 0.0;
data->max = 100.0;
data->name = "Master volume";
data->variantType = QVariant::Double;
data->unit = KSysGuard::UnitPercent;
return SystemInfoSource::getCurrentVolume();
}
return data;
return {};
}
void SystemInfoSource::run()
QHash<QString, KSysGuard::SensorInfo *> SystemInfoSource::sources() const
{
m_values["brightness"] = SystemInfoSource::getCurrentBrightness();
m_values["volume"] = SystemInfoSource::getCurrentVolume();
auto result = QHash<QString, KSysGuard::SensorInfo *>();
result.insert("brightness", makeSensorInfo("Screen brightness", QVariant::Double, KSysGuard::UnitPercent, 0, 100));
result.insert("volume", makeSensorInfo("Master volume", QVariant::Double, KSysGuard::UnitNone));
return result;
}
QStringList SystemInfoSource::sources() const
QVariant SystemInfoSource::fromDBusVariant(const QVariant &_value)
{
QStringList sources;
sources.append("brightness");
sources.append("volume");
return sources;
}
QVariant SystemInfoSource::fromDBusVariant(const QVariant &value)
{
return value.value<QDBusVariant>().variant();
return _value.value<QDBusVariant>().variant();
}
@ -122,9 +89,8 @@ double SystemInfoSource::getCurrentVolume()
qCDebug(LOG_ESS) << "Get current volume";
// current device first
auto currentMixer
= fromDBusVariant(sendDBusRequest("org.kde.kmix", "/Mixers", "org.freedesktop.DBus.Properties", "Get",
QVariantList({"org.kde.KMix.MixSet", "currentMasterMixer"})))
auto currentMixer = fromDBusVariant(sendDBusRequest("org.kde.kmix", "/Mixers", "org.freedesktop.DBus.Properties",
"Get", {"org.kde.KMix.MixSet", "currentMasterMixer"}))
.toString();
if (currentMixer.isEmpty()) {
@ -134,9 +100,8 @@ double SystemInfoSource::getCurrentVolume()
currentMixer.replace(":", "_").replace(".", "_").replace("-", "_");
// get capture device
auto currentControl
= fromDBusVariant(sendDBusRequest("org.kde.kmix", "/Mixers", "org.freedesktop.DBus.Properties", "Get",
QVariantList({"org.kde.KMix.MixSet", "currentMasterControl"})))
auto currentControl = fromDBusVariant(sendDBusRequest("org.kde.kmix", "/Mixers", "org.freedesktop.DBus.Properties",
"Get", {"org.kde.KMix.MixSet", "currentMasterControl"}))
.toString();
if (currentControl.isEmpty()) {
qCWarning(LOG_ESS) << "Control is empty";
@ -144,28 +109,28 @@ double SystemInfoSource::getCurrentVolume()
}
currentControl.replace(":", "_").replace(".", "_").replace("-", "_");
auto path = QString("/Mixers/%1/%2").arg(currentMixer).arg(currentControl);
auto path = QString("/Mixers/%1/%2").arg(currentMixer, currentControl);
return fromDBusVariant(sendDBusRequest("org.kde.kmix", path, "org.freedesktop.DBus.Properties", "Get",
QVariantList({"org.kde.KMix.Control", "volume"})))
{"org.kde.KMix.Control", "volume"}))
.toDouble();
}
QVariant SystemInfoSource::sendDBusRequest(const QString &destination, const QString &path, const QString &interface,
const QString &method, const QVariantList &args)
QVariant SystemInfoSource::sendDBusRequest(const QString &_destination, const QString &_path, const QString &_interface,
const QString &_method, const QVariantList &_args)
{
qCDebug(LOG_ESS) << "Send dbus request" << destination << path << interface << method << args;
qCDebug(LOG_ESS) << "Send dbus request" << _destination << _path << _interface << _method << _args;
auto bus = QDBusConnection::sessionBus();
auto request = QDBusMessage::createMethodCall(destination, path, interface, method);
if (!args.isEmpty())
request.setArguments(args);
auto request = QDBusMessage::createMethodCall(_destination, _path, _interface, _method);
if (!_args.isEmpty())
request.setArguments(_args);
auto response = bus.call(request, QDBus::BlockWithGui, REQUEST_TIMEOUT);
if ((response.type() != QDBusMessage::ReplyMessage) || (response.arguments().isEmpty())) {
qCWarning(LOG_ESS) << "Error message" << response.errorMessage();
return QVariant();
return {};
} else {
return response.arguments().first();
}

15
sources/extsysmonsources/systeminfosource.h
View File

@ -27,19 +27,16 @@ class SystemInfoSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit SystemInfoSource(QObject *_parent, const QStringList &_args);
~SystemInfoSource() override;
explicit SystemInfoSource(QObject *_parent);
~SystemInfoSource() override = default;
QVariant data(const QString &_source) override;
[[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
void run() override;
[[nodiscard]] QStringList sources() const override;
[[nodiscard]] QHash<QString, KSysGuard::SensorInfo *> sources() const override;
private:
// configuration and values
QVariantHash m_values;
static QVariant fromDBusVariant(const QVariant &value);
static QVariant fromDBusVariant(const QVariant &_value);
static double getCurrentBrightness();
static double getCurrentVolume();
static QVariant sendDBusRequest(const QString &destination, const QString &path, const QString &interface,
const QString &method, const QVariantList &args = QVariantList());
static QVariant sendDBusRequest(const QString &_destination, const QString &_path, const QString &_interface,
const QString &_method, const QVariantList &_args = {});
};

25
sources/extsysmonsources/timesource.cpp
View File

@ -17,16 +17,12 @@
#include "timesource.h"
#include <ksysguard/formatter/Unit.h>
#include <ksysguard/systemstats/SensorInfo.h>
#include "awdebug.h"
TimeSource::TimeSource(QObject *_parent, const QStringList &_args)
: AbstractExtSysMonSource(_parent, _args)
TimeSource::TimeSource(QObject *_parent)
: AbstractExtSysMonSource(_parent)
{
Q_ASSERT(_args.count() == 0);
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
}
@ -43,20 +39,11 @@ QVariant TimeSource::data(const QString &_source)
}
KSysGuard::SensorInfo *TimeSource::initialData(const QString &_source) const
QHash<QString, KSysGuard::SensorInfo *> TimeSource::sources() const
{
qCDebug(LOG_ESS) << "Source" << _source;
auto result = QHash<QString, KSysGuard::SensorInfo *>();
auto data = new KSysGuard::SensorInfo();
data->name = "Current time";
data->variantType = QVariant::LongLong;
data->unit = KSysGuard::UnitSecond;
result.insert("now", makeSensorInfo("Current time", QVariant::LongLong, KSysGuard::UnitSecond));
return data;
}
QStringList TimeSource::sources() const
{
return QStringList({"now"});
return result;
}

7
sources/extsysmonsources/timesource.h
View File

@ -27,9 +27,8 @@ class TimeSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit TimeSource(QObject *_parent, const QStringList &_args);
explicit TimeSource(QObject *_parent);
~TimeSource() override = default;
QVariant data(const QString &_source) override;
[[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
void run() override{};
[[nodiscard]] QStringList sources() const override;
[[nodiscard]] QHash<QString, KSysGuard::SensorInfo *> sources() const override;
};

45
sources/extsysmonsources/upgradesource.cpp
View File

@ -15,31 +15,19 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "upgradesource.h"
#include <ksysguard/formatter/Unit.h>
#include <ksysguard/systemstats/SensorInfo.h>
#include "awdebug.h"
#include "extupgrade.h"
UpgradeSource::UpgradeSource(QObject *_parent, const QStringList &_args)
: AbstractExtSysMonSource(_parent, _args)
UpgradeSource::UpgradeSource(QObject *_parent)
: AbstractExtSysMonSource(_parent)
{
Q_ASSERT(_args.count() == 0);
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
m_extUpgrade = new ExtItemAggregator<ExtUpgrade>(nullptr, "upgrade");
m_extUpgrade->initSockets();
m_sources = getSources();
}
UpgradeSource::~UpgradeSource()
{
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
}
@ -48,34 +36,17 @@ QVariant UpgradeSource::data(const QString &_source)
qCDebug(LOG_ESS) << "Source" << _source;
// there are only one value
return m_extUpgrade->itemByTagNumber(index(_source))->run().values().first();
return dataByItem(m_extUpgrade, _source).values().first();
}
KSysGuard::SensorInfo *UpgradeSource::initialData(const QString &_source) const
QHash<QString, KSysGuard::SensorInfo *> UpgradeSource::sources() const
{
qCDebug(LOG_ESS) << "Source" << _source;
auto result = QHash<QString, KSysGuard::SensorInfo *>();
auto data = new KSysGuard::SensorInfo();
data->name = QString("Package manager '%1' metadata").arg(m_extUpgrade->itemByTagNumber(index(_source))->uniq());
data->variantType = QVariant::String;
data->unit = KSysGuard::UnitNone;
return data;
}
QStringList UpgradeSource::sources() const
{
return m_sources;
}
QStringList UpgradeSource::getSources()
{
QStringList sources;
for (auto &item : m_extUpgrade->activeItems())
sources.append(item->tag("pkgcount"));
result.insert(item->tag("pkgcount"),
makeSensorInfo(QString("Package manager '%1' metadata").arg(item->uniq()), QVariant::Int));
return sources;
return result;
}

10
sources/extsysmonsources/upgradesource.h
View File

@ -30,16 +30,12 @@ class UpgradeSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit UpgradeSource(QObject *_parent, const QStringList &_args);
~UpgradeSource() override;
explicit UpgradeSource(QObject *_parent);
~UpgradeSource() override = default;
QVariant data(const QString &_source) override;
[[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
void run() override{};
[[nodiscard]] QStringList sources() const override;
[[nodiscard]] QHash<QString, KSysGuard::SensorInfo *> sources() const override;
private:
QStringList getSources();
// configuration and values
ExtItemAggregator<ExtUpgrade> *m_extUpgrade = nullptr;
QStringList m_sources;
};

97
sources/extsysmonsources/weathersource.cpp
View File

@ -15,31 +15,19 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "weathersource.h"
#include <ksysguard/formatter/Unit.h>
#include <ksysguard/systemstats/SensorInfo.h>
#include "awdebug.h"
#include "extweather.h"
WeatherSource::WeatherSource(QObject *_parent, const QStringList &_args)
: AbstractExtSysMonSource(_parent, _args)
WeatherSource::WeatherSource(QObject *_parent)
: AbstractExtSysMonSource(_parent)
{
Q_ASSERT(_args.count() == 0);
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
m_extWeather = new ExtItemAggregator<ExtWeather>(nullptr, "weather");
m_extWeather->initSockets();
m_sources = getSources();
}
WeatherSource::~WeatherSource()
{
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
}
@ -47,76 +35,31 @@ QVariant WeatherSource::data(const QString &_source)
{
qCDebug(LOG_ESS) << "Source" << _source;
int ind = index(_source);
if (!m_values.contains(_source)) {
auto data = m_extWeather->itemByTagNumber(ind)->run();
m_values.insert(data);
}
if (!m_values.contains(_source))
m_values = dataByItem(m_extWeather, _source);
return m_values.take(_source);
}
KSysGuard::SensorInfo *WeatherSource::initialData(const QString &_source) const
QHash<QString, KSysGuard::SensorInfo *> WeatherSource::sources() const
{
qCDebug(LOG_ESS) << "Source" << _source;
auto result = QHash<QString, KSysGuard::SensorInfo *>();
int ind = index(_source);
auto data = new KSysGuard::SensorInfo();
if (_source.startsWith("weatherId")) {
data->min = 0;
data->max = 1000;
data->name = QString("Numeric weather ID for '%1'").arg(m_extWeather->itemByTagNumber(ind)->uniq());
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitNone;
} else if (_source.startsWith("weather")) {
data->name = QString("ID string map for '%1'").arg(m_extWeather->itemByTagNumber(ind)->uniq());
data->variantType = QVariant::String;
data->unit = KSysGuard::UnitNone;
} else if (_source.startsWith("humidity")) {
data->min = 0;
data->max = 100;
data->name = QString("Humidity for '%1'").arg(m_extWeather->itemByTagNumber(ind)->uniq());
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitPercent;
} else if (_source.startsWith("pressure")) {
data->min = 0;
data->max = 0;
data->name = QString("Atmospheric pressure for '%1'").arg(m_extWeather->itemByTagNumber(ind)->uniq());
data->variantType = QVariant::Int;
data->unit = KSysGuard::UnitNone;
} else if (_source.startsWith("temperature")) {
data->min = 0.0;
data->max = 0.0;
data->name = QString("Temperature for '%1'").arg(m_extWeather->itemByTagNumber(ind)->uniq());
data->variantType = QVariant::Double;
data->unit = KSysGuard::UnitCelsius;
} else if (_source.startsWith("timestamp")) {
data->name = QString("Timestamp for '%1'").arg(m_extWeather->itemByTagNumber(ind)->uniq());
data->variantType = QVariant::DateTime;
data->unit = KSysGuard::UnitNone;
}
return data;
}
QStringList WeatherSource::sources() const
{
return m_sources;
}
QStringList WeatherSource::getSources()
{
QStringList sources;
for (auto &item : m_extWeather->activeItems()) {
sources.append(item->tag("weatherId"));
sources.append(item->tag("weather"));
sources.append(item->tag("humidity"));
sources.append(item->tag("pressure"));
sources.append(item->tag("temperature"));
sources.append(item->tag("timestamp"));
result.insert(item->tag("weatherId"), makeSensorInfo(QString("Numeric weather ID for '%1'").arg(item->uniq()),
QVariant::Int, KSysGuard::UnitNone, 0, 1000));
result.insert(item->tag("weather"),
makeSensorInfo(QString("ID string map for '%1'").arg(item->uniq()), QVariant::String));
result.insert(item->tag("humidity"), makeSensorInfo(QString("Humidity for '%1'").arg(item->uniq()),
QVariant::Int, KSysGuard::UnitPercent, 0, 100));
result.insert(item->tag("pressure"),
makeSensorInfo(QString("Atmospheric pressure for '%1'").arg(item->uniq()), QVariant::Int));
result.insert(item->tag("temperature"), makeSensorInfo(QString("Temperature for '%1'").arg(item->uniq()),
QVariant::Double, KSysGuard::UnitCelsius));
result.insert(item->tag("timestamp"), makeSensorInfo(QString("Timestamp for '%1'").arg(item->uniq()),
QVariant::DateTime, KSysGuard::UnitNone));
}
return sources;
return result;
}

10
sources/extsysmonsources/weathersource.h
View File

@ -30,17 +30,13 @@ class WeatherSource : public AbstractExtSysMonSource
Q_OBJECT
public:
explicit WeatherSource(QObject *_parent, const QStringList &_args);
~WeatherSource() override;
explicit WeatherSource(QObject *_parent);
~WeatherSource() override = default;
QVariant data(const QString &_source) override;
[[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
void run() override{};
[[nodiscard]] QStringList sources() const override;
[[nodiscard]] QHash<QString, KSysGuard::SensorInfo *> sources() const override;
private:
QStringList getSources();
// configuration and values
ExtItemAggregator<ExtWeather> *m_extWeather = nullptr;
QStringList m_sources;
QVariantHash m_values;
};

7
sources/test/testabstractextitem.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testabstractextitem.h"
#include <QtTest>
@ -75,7 +74,7 @@ void TestAbstractExtItem::test_configuration()
{
extItem->writeConfiguration();
ExtUpgrade *newExtItem = new ExtUpgrade(nullptr, writeFileName);
auto newExtItem = new ExtUpgrade(nullptr, writeFileName);
QCOMPARE(newExtItem->isActive(), extItem->isActive());
QCOMPARE(newExtItem->comment(), extItem->comment());
QCOMPARE(newExtItem->fileName(), writeFileName);
@ -98,7 +97,7 @@ void TestAbstractExtItem::test_bumpApi()
void TestAbstractExtItem::test_delete()
{
ExtUpgrade *newExtItem = new ExtUpgrade(nullptr, writeFileName);
auto newExtItem = new ExtUpgrade(nullptr, writeFileName);
QVERIFY(newExtItem->tryDelete());
QVERIFY(!QFile::exists(writeFileName));
@ -109,7 +108,7 @@ void TestAbstractExtItem::test_delete()
void TestAbstractExtItem::test_copy()
{
ExtUpgrade *newExtItem = extItem->copy("/dev/null", 1);
auto newExtItem = extItem->copy("/dev/null", 1);
QCOMPARE(newExtItem->isActive(), extItem->isActive());
QCOMPARE(newExtItem->apiVersion(), extItem->apiVersion());

5
sources/test/testabstractformatter.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testabstractformatter.h"
#include <QtTest>
@ -42,7 +41,7 @@ void TestAbstractFormatter::test_values() {}
void TestAbstractFormatter::test_type()
{
QString type = AWTestLibrary::randomString();
auto type = AWTestLibrary::randomString();
QEXPECT_FAIL("", "Will fail because of invalid format", Continue);
formatter->setStrType(type);
QCOMPARE(formatter->strType(), type);
@ -54,7 +53,7 @@ void TestAbstractFormatter::test_type()
void TestAbstractFormatter::test_copy()
{
AWNoFormatter *newFormatter = formatter->copy("/dev/null", 1);
auto newFormatter = formatter->copy("/dev/null", 1);
QCOMPARE(newFormatter->type(), formatter->type());
QCOMPARE(newFormatter->name(), formatter->name());

2
sources/test/testawbugreporter.cpp
View File

@ -40,7 +40,7 @@ void TestAWBugReporter::cleanupTestCase()
void TestAWBugReporter::test_generateText()
{
data = AWTestLibrary::randomStringList(4);
QString output = plugin->generateText(data.at(0), data.at(1), data.at(2), data.at(3));
auto output = plugin->generateText(data.at(0), data.at(1), data.at(2), data.at(3));
for (auto &string : data)
QVERIFY(output.contains(string));

5
sources/test/testawconfighelper.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testawconfighelper.h"
#include <QtTest>
@ -45,7 +44,7 @@ void TestAWConfigHelper::test_configurationDirectory()
void TestAWConfigHelper::test_exportConfiguration()
{
QStringList keys = AWTestLibrary::randomStringList();
auto keys = AWTestLibrary::randomStringList();
for (auto &key : keys)
map[key] = AWTestLibrary::randomString();
filename = AWTestLibrary::randomFilenames().first;
@ -56,7 +55,7 @@ void TestAWConfigHelper::test_exportConfiguration()
void TestAWConfigHelper::test_importConfiguration()
{
QVariantMap imported = plugin->importConfiguration(filename, true, true, true);
auto imported = plugin->importConfiguration(filename, true, true, true);
QVariantMap converted;
for (auto &key : map.keys())
converted[key] = map.value(key);

1
sources/test/testawkeycache.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testawkeycache.h"
#include <QtTest>

38
sources/test/testawkeys.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testawkeys.h"
#include <QDBusConnection>
@ -82,10 +81,10 @@ void TestAWKeys::test_hddDevices()
void TestAWKeys::test_dictKeys()
{
QStringList keys = plugin->dictKeys();
auto keys = plugin->dictKeys();
QVERIFY(!keys.isEmpty());
QStringList sorted = plugin->dictKeys(true);
auto sorted = plugin->dictKeys(true);
QVERIFY(!sorted.isEmpty());
QEXPECT_FAIL("", "Sorted and non-sorted lists should differ", Continue);
QCOMPARE(keys, sorted);
@ -101,11 +100,11 @@ void TestAWKeys::test_pattern()
QVERIFY(spy.wait(5 * interval));
QVERIFY(spy.wait(5 * interval));
QString text = spy.takeFirst().at(0).toString();
auto text = spy.takeFirst().at(0).toString();
QEXPECT_FAIL("", "Pattern should be parsed", Continue);
QCOMPARE(text, pattern);
QStringList keys = plugin->dictKeys(true);
auto keys = plugin->dictKeys(true);
for (auto &key : keys)
QVERIFY(!text.contains(key));
}
@ -119,7 +118,7 @@ void TestAWKeys::test_tooltip()
QSignalSpy spy(plugin, SIGNAL(needToolTipToBeUpdated(const QString)));
QVERIFY(spy.wait(5 * interval));
QString text = spy.takeFirst().at(0).toString();
auto text = spy.takeFirst().at(0).toString();
QVERIFY(text.startsWith("<img"));
}
@ -129,7 +128,7 @@ void TestAWKeys::test_wrapNewLines()
QSignalSpy spy(plugin, SIGNAL(needTextToBeUpdated(const QString)));
QVERIFY(spy.wait(5 * interval));
QString text = spy.takeFirst().at(0).toString();
auto text = spy.takeFirst().at(0).toString();
QVERIFY(!text.contains("<br>") && text.contains("\n"));
plugin->setWrapNewLines(true);
@ -141,10 +140,10 @@ void TestAWKeys::test_wrapNewLines()
void TestAWKeys::test_infoByKey()
{
int notEmpty = 0;
QStringList keys = plugin->dictKeys(true);
auto notEmpty = 0;
auto keys = plugin->dictKeys(true);
for (auto &key : keys) {
QString info = plugin->infoByKey(key);
auto info = plugin->infoByKey(key);
QVERIFY(!info.isEmpty());
// append non-empty field count
if (info != "(none)")
@ -156,8 +155,8 @@ void TestAWKeys::test_infoByKey()
void TestAWKeys::test_valueByKey()
{
int notEmpty = 0;
QStringList keys = plugin->dictKeys(true);
auto notEmpty = 0;
auto keys = plugin->dictKeys(true);
for (auto &key : keys) {
if (!plugin->valueByKey(key).isEmpty())
notEmpty++;
@ -169,26 +168,25 @@ void TestAWKeys::test_valueByKey()
void TestAWKeys::test_dbus()
{
// get id
qlonglong id = reinterpret_cast<qlonglong>(plugin);
auto id = reinterpret_cast<qlonglong>(plugin);
// create connection and message
QDBusConnection bus = QDBusConnection::sessionBus();
auto bus = QDBusConnection::sessionBus();
// check if there is active sessions first
QDBusMessage sessions
= QDBusMessage::createMethodCall(AWDBUS_SERVICE, AWDBUS_PATH, AWDBUS_SERVICE, "ActiveServices");
QDBusMessage sessionsResponse = bus.call(sessions, QDBus::BlockWithGui);
auto sessions = QDBusMessage::createMethodCall(AWDBUS_SERVICE, AWDBUS_PATH, AWDBUS_SERVICE, "ActiveServices");
auto sessionsResponse = bus.call(sessions, QDBus::BlockWithGui);
if (sessionsResponse.arguments().isEmpty())
QSKIP("No active sessions found, skip DBus tests");
// dbus checks
QDBusMessage request = QDBusMessage::createMethodCall(QString("%1.i%2").arg(AWDBUS_SERVICE).arg(id), AWDBUS_PATH,
auto request = QDBusMessage::createMethodCall(QString("%1.i%2").arg(AWDBUS_SERVICE).arg(id), AWDBUS_PATH,
AWDBUS_SERVICE, "WhoAmI");
// send message to dbus
QDBusMessage response = bus.call(request, QDBus::BlockWithGui);
auto response = bus.call(request, QDBus::BlockWithGui);
// parse result
QList<QVariant> arguments = response.arguments();
auto arguments = response.arguments();
QVERIFY(!arguments.isEmpty());
QCOMPARE(arguments.at(0).toLongLong(), id);
}

39
sources/test/testawpatternfunctions.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testawpatternfunctions.h"
#include <QRegularExpression>
@ -36,12 +35,12 @@ void TestAWPatternFunctions::cleanupTestCase() {}
void TestAWPatternFunctions::test_findFunctionCalls()
{
QString name = QString("aw_%1").arg(AWTestLibrary::randomString(1, 10));
QString code = AWTestLibrary::randomString(1, 20);
QStringList args = AWTestLibrary::randomStringList(20);
QString function = QString("$%1<%2>{{%3}}").arg(name).arg(args.join(',')).arg(code);
auto name = QString("aw_%1").arg(AWTestLibrary::randomString(1, 10));
auto code = AWTestLibrary::randomString(1, 20);
auto args = AWTestLibrary::randomStringList(20);
auto function = QString("$%1<%2>{{%3}}").arg(name).arg(args.join(',')).arg(code);
QString pattern = AWTestLibrary::randomString() + function + AWTestLibrary::randomString();
auto pattern = AWTestLibrary::randomString() + function + AWTestLibrary::randomString();
QList<AWPatternFunctions::AWFunction> found = AWPatternFunctions::findFunctionCalls(name, pattern);
QCOMPARE(found.count(), 1);
@ -54,9 +53,9 @@ void TestAWPatternFunctions::test_findFunctionCalls()
void TestAWPatternFunctions::test_findKeys()
{
int count = AWTestLibrary::randomInt(200);
auto count = AWTestLibrary::randomInt(200);
QStringList allKeys;
for (int i = 0; i < count; i++) {
for (auto i = 0; i < count; i++) {
auto key = AWTestLibrary::randomString(1, 20);
while (allKeys.indexOf(QRegularExpression(QString("^%1.*").arg(key))) != -1)
key = AWTestLibrary::randomString(1, 20);
@ -65,8 +64,8 @@ void TestAWPatternFunctions::test_findKeys()
auto keys = AWTestLibrary::randomSelect(allKeys);
auto bars = AWTestLibrary::randomSelect(allKeys);
std::for_each(bars.begin(), bars.end(), [](QString &bar) { bar.prepend("bar"); });
QString pattern = QString("$%1 $%2").arg(keys.join(" $")).arg(bars.join(" $"));
std::for_each(bars.begin(), bars.end(), [](auto &bar) { bar.prepend("bar"); });
auto pattern = QString("$%1 $%2").arg(keys.join(" $")).arg(bars.join(" $"));
allKeys.append(bars);
allKeys.sort();
@ -74,9 +73,9 @@ void TestAWPatternFunctions::test_findKeys()
keys.sort();
bars.sort();
QStringList foundKeys = AWPatternFunctions::findKeys(pattern, allKeys, false);
auto foundKeys = AWPatternFunctions::findKeys(pattern, allKeys, false);
foundKeys.sort();
QStringList foundBars = AWPatternFunctions::findKeys(pattern, allKeys, true);
auto foundBars = AWPatternFunctions::findKeys(pattern, allKeys, true);
foundBars.sort();
QCOMPARE(foundKeys, keys);
@ -86,8 +85,8 @@ void TestAWPatternFunctions::test_findKeys()
void TestAWPatternFunctions::test_findLambdas()
{
QStringList lambdas = AWTestLibrary::randomStringList(20);
QString pattern
auto lambdas = AWTestLibrary::randomStringList(20);
auto pattern
= AWTestLibrary::randomString() + QString("${{%1}}").arg(lambdas.join("}}${{")) + AWTestLibrary::randomString();
QCOMPARE(AWPatternFunctions::findLambdas(pattern), lambdas);
@ -96,12 +95,12 @@ void TestAWPatternFunctions::test_findLambdas()
void TestAWPatternFunctions::test_expandTemplates()
{
int firstValue = AWTestLibrary::randomInt();
int secondValue = AWTestLibrary::randomInt();
int result = firstValue + secondValue;
QString code = QString("$template{{%1+%2}}").arg(firstValue).arg(secondValue);
QString prefix = AWTestLibrary::randomString();
QString pattern = prefix + code;
auto firstValue = AWTestLibrary::randomInt();
auto secondValue = AWTestLibrary::randomInt();
auto result = firstValue + secondValue;
auto code = QString("$template{{%1+%2}}").arg(firstValue).arg(secondValue);
auto prefix = AWTestLibrary::randomString();
auto pattern = prefix + code;
QCOMPARE(AWPatternFunctions::expandTemplates(pattern), QString("%1%2").arg(prefix).arg(result));
}

5
sources/test/testawtelemetryhandler.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testawtelemetryhandler.h"
#include <QtTest>
@ -48,7 +47,7 @@ void TestAWTelemetryHandler::test_put()
void TestAWTelemetryHandler::test_get()
{
QStringList output = plugin->get(telemetryGroup);
auto output = plugin->get(telemetryGroup);
QVERIFY(!output.isEmpty());
QCOMPARE(QSet<QString>(output.cbegin(), output.cend()).count(), output.count());
@ -70,7 +69,7 @@ void TestAWTelemetryHandler::test_uploadTelemetry()
plugin->uploadTelemetry(telemetryValidGroup, telemetryData);
QVERIFY(spy.wait(5000));
QVariantList arguments = spy.takeFirst();
auto arguments = spy.takeFirst();
QCOMPARE(arguments.at(0).toString(), telemetryStatus);
}

1
sources/test/testawupdatehelper.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testawupdatehelper.h"
#include <QtTest>

12
sources/test/testbatterysource.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testbatterysource.h"
#include <QtTest>
@ -29,7 +28,7 @@
void TestBatterySource::initTestCase()
{
AWTestLibrary::init();
source = new BatterySource(this, QStringList() << acpiPath);
source = new BatterySource(this, acpiPath);
}
@ -41,8 +40,7 @@ void TestBatterySource::cleanupTestCase()
void TestBatterySource::test_sources()
{
//
QVERIFY(source->sources().length() >= 6);
QVERIFY(source->sources().count() >= 6);
}
@ -51,9 +49,9 @@ void TestBatterySource::test_battery()
if (source->sources().count() == 6)
QSKIP("No battery found, test will be skipped");
QStringList batteries = source->sources();
std::for_each(batteries.begin(), batteries.end(), [this](const QString &bat) {
QVariant value = source->data(bat);
auto batteries = source->sources().keys();
std::for_each(batteries.cbegin(), batteries.cend(), [this](auto bat) {
auto value = source->data(bat);
if (bat == "ac")
QCOMPARE(value.type(), QVariant::Bool);
else if (bat.startsWith("batrate") || bat.startsWith("batleft"))

3
sources/test/testdatetimeformatter.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testdatetimeformatter.h"
#include <QtTest>
@ -57,7 +56,7 @@ void TestAWDateTimeFormatter::test_conversion()
void TestAWDateTimeFormatter::test_copy()
{
formatter->setTranslateString(false);
auto *newFormatter = formatter->copy("/dev/null", 1);
auto newFormatter = formatter->copy("/dev/null", 1);
QCOMPARE(newFormatter->format(), formatter->format());
QCOMPARE(newFormatter->translateString(), formatter->translateString());

16
sources/test/testdesktopsource.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testdesktopsource.h"
#include <QtTest>
@ -27,7 +26,8 @@
void TestDesktopSource::initTestCase()
{
AWTestLibrary::init();
source = new DesktopSource(this, QStringList());
source = new DesktopSource(this);
m_isKwinActive = AWTestLibrary::isKWinActive();
}
@ -39,18 +39,18 @@ void TestDesktopSource::cleanupTestCase()
void TestDesktopSource::test_sources()
{
QCOMPARE(source->sources().count(), 4);
QCOMPARE(source->sources().count(), 3);
}
void TestDesktopSource::test_values()
{
QSKIP("Tests are failing with current api");
if (!m_isKwinActive)
QSKIP("KWin inactive, skip desktop tests");
QVERIFY(source->data("desktop/current/name").toString().length() > 0);
QVERIFY(source->data("desktop/current/number").toInt() >= 0);
QVERIFY(source->data("desktop/total/name").toStringList().count() > 0);
QVERIFY(source->data("desktop/total/number").toInt() > 0);
QVERIFY(source->data("name").toString().length() > 0);
QVERIFY(source->data("number").toInt() >= 0);
QVERIFY(source->data("count").toInt() > 0);
}

1
sources/test/testdesktopsource.h
View File

@ -36,4 +36,5 @@ private slots:
private:
DesktopSource *source = nullptr;
bool m_isKwinActive = false;
};

9
sources/test/testdpplugin.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testdpplugin.h"
#include <KWindowSystem>
@ -44,8 +43,8 @@ void TestDPPlugin::test_desktops()
if (!m_isKwinActive)
QSKIP("KWin inactive, skip Destkop panel tests");
int current = plugin->currentDesktop();
int total = plugin->numberOfDesktops();
auto current = plugin->currentDesktop();
auto total = plugin->numberOfDesktops();
QVERIFY(total != 0);
QVERIFY(current <= total);
@ -90,7 +89,7 @@ void TestDPPlugin::test_parsePattern()
if (!m_isKwinActive)
QSKIP("KWin inactive, skip Destkop panel tests");
QString result = plugin->parsePattern(pattern, plugin->currentDesktop());
auto result = plugin->parsePattern(pattern, plugin->currentDesktop());
QVERIFY(!result.isEmpty());
QVERIFY(result != pattern);
for (auto &key : plugin->dictKeys())
@ -109,7 +108,7 @@ void TestDPPlugin::test_tooltipImage()
data["tooltipWidth"] = 300;
plugin->setToolTipData(data);
QString image = plugin->toolTipImage(plugin->currentDesktop());
auto image = plugin->toolTipImage(plugin->currentDesktop());
QVERIFY(image.startsWith("<img src=\""));
QVERIFY(image.endsWith("\"/>"));
}

1
sources/test/testextitemaggregator.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testextitemaggregator.h"
#include <QtTest>

11
sources/test/testextquotes.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testextquotes.h"
#include <QtTest>
@ -54,11 +53,11 @@ void TestExtQuotes::test_run()
{
// init spy
QSignalSpy spy(extQuotes, SIGNAL(dataReceived(const QVariantHash &)));
QVariantHash firstValue = extQuotes->run();
auto firstValue = extQuotes->run();
// check values
QVERIFY(spy.wait(5000));
QList<QVariant> arguments = spy.takeFirst();
auto arguments = spy.takeFirst();
for (auto &type : types)
cache[type] = arguments.at(0).toHash()[extQuotes->tag(type)];
@ -73,11 +72,11 @@ void TestExtQuotes::test_derivatives()
{
// init spy
QSignalSpy spy(extQuotes, SIGNAL(dataReceived(const QVariantHash &)));
QVariantHash firstValue = extQuotes->run();
auto firstValue = extQuotes->run();
// check values
QVERIFY(spy.wait(5000));
QList<QVariant> arguments = spy.takeFirst();
auto arguments = spy.takeFirst();
QVariantHash values;
for (auto &type : types)
values[type] = arguments.at(0).toHash()[extQuotes->tag(type)];
@ -91,7 +90,7 @@ void TestExtQuotes::test_derivatives()
void TestExtQuotes::test_copy()
{
ExtQuotes *newExtQuotes = extQuotes->copy("/dev/null", 1);
auto newExtQuotes = extQuotes->copy("/dev/null", 1);
QCOMPARE(newExtQuotes->interval(), extQuotes->interval());
QCOMPARE(newExtQuotes->ticker(), extQuotes->ticker());

9
sources/test/testextscript.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testextscript.h"
#include <QtTest>
@ -58,11 +57,11 @@ void TestExtScript::test_run()
{
// init spy
QSignalSpy spy(extScript, SIGNAL(dataReceived(const QVariantHash &)));
QVariantHash firstValue = extScript->run();
auto firstValue = extScript->run();
// check values
QVERIFY(spy.wait(5000));
QList<QVariant> arguments = spy.takeFirst();
auto arguments = spy.takeFirst();
QCOMPARE(firstValue[extScript->tag("custom")].toString(), QString());
QCOMPARE(arguments.at(0).toHash()[extScript->tag("custom")].toString(), QString("\n%1").arg(randomString));
@ -81,14 +80,14 @@ void TestExtScript::test_filters()
// check values
QVERIFY(spy.wait(5000));
QList<QVariant> arguments = spy.takeFirst();
auto arguments = spy.takeFirst();
QCOMPARE(arguments.at(0).toHash()[extScript->tag("custom")].toString(), QString("<br>%1").arg(randomString));
}
void TestExtScript::test_copy()
{
ExtScript *newExtScript = extScript->copy("/dev/null", 1);
auto newExtScript = extScript->copy("/dev/null", 1);
QCOMPARE(newExtScript->interval(), extScript->interval());
QCOMPARE(newExtScript->executable(), extScript->executable());

15
sources/test/testextupgrade.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testextupgrade.h"
#include <QtTest>
@ -57,11 +56,11 @@ void TestExtUpgrade::test_run()
{
// init spy
QSignalSpy spy(extUpgrade, SIGNAL(dataReceived(const QVariantHash &)));
QVariantHash firstValue = extUpgrade->run();
auto firstValue = extUpgrade->run();
// check values
QVERIFY(spy.wait(5000));
QList<QVariant> arguments = spy.takeFirst();
auto arguments = spy.takeFirst();
QCOMPARE(firstValue[extUpgrade->tag("pkgcount")].toInt(), 0);
QCOMPARE(arguments.at(0).toHash()[extUpgrade->tag("pkgcount")].toInt(), randomStrings.count());
@ -70,21 +69,21 @@ void TestExtUpgrade::test_run()
void TestExtUpgrade::test_null()
{
int null = AWTestLibrary::randomInt(randomStrings.count());
auto null = AWTestLibrary::randomInt(randomStrings.count());
extUpgrade->setNull(null);
QSignalSpy spy(extUpgrade, SIGNAL(dataReceived(const QVariantHash &)));
extUpgrade->run();
// check values
QVERIFY(spy.wait(5000));
QList<QVariant> arguments = spy.takeFirst();
auto arguments = spy.takeFirst();
QCOMPARE(arguments.at(0).toHash()[extUpgrade->tag("pkgcount")].toInt(), randomStrings.count() - null);
}
void TestExtUpgrade::test_filter()
{
QStringList filters = AWTestLibrary::randomSelect(randomStrings);
auto filters = AWTestLibrary::randomSelect(randomStrings);
extUpgrade->setFilter(QString("(^%1$)").arg(filters.join("$|^")));
// init spy
QSignalSpy spy(extUpgrade, SIGNAL(dataReceived(const QVariantHash &)));
@ -92,14 +91,14 @@ void TestExtUpgrade::test_filter()
// check values
QVERIFY(spy.wait(5000));
QList<QVariant> arguments = spy.takeFirst();
auto arguments = spy.takeFirst();
QCOMPARE(arguments.at(0).toHash()[extUpgrade->tag("pkgcount")].toInt(), filters.count());
}
void TestExtUpgrade::test_copy()
{
ExtUpgrade *newExtUpgrade = extUpgrade->copy("/dev/null", 1);
auto newExtUpgrade = extUpgrade->copy("/dev/null", 1);
QCOMPARE(newExtUpgrade->interval(), extUpgrade->interval());
QCOMPARE(newExtUpgrade->executable(), extUpgrade->executable());

11
sources/test/testextweather.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testextweather.h"
#include <QtTest>
@ -75,18 +74,18 @@ void TestExtWeather::test_image()
extWeather->setImage(true);
// init spy
QSignalSpy spy(extWeather, SIGNAL(dataReceived(const QVariantHash &)));
QVariantHash firstValue = extWeather->run();
auto firstValue = extWeather->run();
// check values
QVERIFY(spy.wait(5000));
QVariantHash arguments = spy.takeFirst().at(0).toHash();
auto arguments = spy.takeFirst().at(0).toHash();
QVERIFY(arguments[extWeather->tag("weather")].toString().startsWith("<img"));
}
void TestExtWeather::test_copy()
{
ExtWeather *newExtWeather = extWeather->copy("/dev/null", 1);
auto newExtWeather = extWeather->copy("/dev/null", 1);
QCOMPARE(newExtWeather->interval(), extWeather->interval());
QCOMPARE(newExtWeather->city(), extWeather->city());
@ -104,11 +103,11 @@ void TestExtWeather::run()
{
// init spy
QSignalSpy spy(extWeather, SIGNAL(dataReceived(const QVariantHash &)));
QVariantHash firstValue = extWeather->run();
auto firstValue = extWeather->run();
// check values
QVERIFY(spy.wait(5000));
QVariantHash arguments = spy.takeFirst().at(0).toHash();
auto arguments = spy.takeFirst().at(0).toHash();
QEXPECT_FAIL("", "WeatherID should not be 0", Continue);
QCOMPARE(arguments[extWeather->tag("weatherId")].toInt(), 0);
QVERIFY((arguments[extWeather->tag("humidity")].toInt() >= humidity.first)

29
sources/test/testfloatformatter.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testfloatformatter.h"
#include <QRandomGenerator>
@ -44,12 +43,12 @@ void TestAWFloatFormatter::test_values() {}
void TestAWFloatFormatter::test_count()
{
// assign
int count = 10 + AWTestLibrary::randomInt();
auto count = 10 + AWTestLibrary::randomInt();
formatter->setCount(count);
QCOMPARE(formatter->count(), count);
// test
QString output = formatter->convert(QRandomGenerator::global()->generateDouble());
auto output = formatter->convert(QRandomGenerator::global()->generateDouble());
QCOMPARE(output.length(), count);
// reset
@ -60,13 +59,13 @@ void TestAWFloatFormatter::test_count()
void TestAWFloatFormatter::test_fillChar()
{
// assign
char c = AWTestLibrary::randomChar();
auto c = AWTestLibrary::randomChar();
formatter->setFillChar(c);
QCOMPARE(formatter->fillChar(), QChar(c));
formatter->setCount(101);
// test
QString output = formatter->convert(AWTestLibrary::randomInt());
auto output = formatter->convert(AWTestLibrary::randomInt());
QVERIFY(output.startsWith(c));
// reset
@ -78,13 +77,13 @@ void TestAWFloatFormatter::test_fillChar()
void TestAWFloatFormatter::test_forceWidth()
{
// assign
int count = AWTestLibrary::randomInt(6);
auto count = AWTestLibrary::randomInt(6);
formatter->setForceWidth(true);
formatter->setCount(count);
QCOMPARE(formatter->forceWidth(), true);
// test
QString output = formatter->convert(QRandomGenerator::global()->generateDouble());
auto output = formatter->convert(QRandomGenerator::global()->generateDouble());
QCOMPARE(output.length(), count);
// reset
@ -103,7 +102,7 @@ void TestAWFloatFormatter::test_format()
QCOMPARE(formatter->format(), 'e');
// test
QString output = formatter->convert(QRandomGenerator::global()->generateDouble());
auto output = formatter->convert(QRandomGenerator::global()->generateDouble());
QVERIFY(output.contains('e'));
// reset
@ -114,12 +113,12 @@ void TestAWFloatFormatter::test_format()
void TestAWFloatFormatter::test_precision()
{
// assign
int precision = 1 + AWTestLibrary::randomInt(5);
auto precision = 1 + AWTestLibrary::randomInt(5);
formatter->setPrecision(precision);
QCOMPARE(formatter->precision(), precision);
// test
QString output = formatter->convert(QRandomGenerator::global()->generateDouble());
auto output = formatter->convert(QRandomGenerator::global()->generateDouble());
output.remove("0.");
QCOMPARE(output.length(), precision);
@ -133,12 +132,12 @@ void TestAWFloatFormatter::test_multiplier()
formatter->setPrecision(6);
// assign
double multiplier = QRandomGenerator::global()->generateDouble();
auto multiplier = QRandomGenerator::global()->generateDouble();
formatter->setMultiplier(multiplier);
QCOMPARE(formatter->multiplier(), multiplier);
// test
double value = QRandomGenerator::global()->generateDouble();
auto value = QRandomGenerator::global()->generateDouble();
QCOMPARE(formatter->convert(value), QString::number(value * multiplier, 'f', 6));
// reset
@ -149,12 +148,12 @@ void TestAWFloatFormatter::test_multiplier()
void TestAWFloatFormatter::test_summand()
{
// assign
double summand = QRandomGenerator::global()->generateDouble();
auto summand = QRandomGenerator::global()->generateDouble();
formatter->setSummand(summand);
QCOMPARE(formatter->summand(), summand);
// test
double value = QRandomGenerator::global()->generateDouble();
auto value = QRandomGenerator::global()->generateDouble();
QCOMPARE(formatter->convert(value), QString::number(value + summand, 'f', 6));
// reset
@ -165,7 +164,7 @@ void TestAWFloatFormatter::test_summand()
void TestAWFloatFormatter::test_copy()
{
doRandom();
AWFloatFormatter *newFormatter = formatter->copy("/dev/null", 1);
auto newFormatter = formatter->copy("/dev/null", 1);
QCOMPARE(newFormatter->count(), formatter->count());
QCOMPARE(newFormatter->fillChar(), formatter->fillChar());

17
sources/test/testjsonformatter.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testjsonformatter.h"
#include <QtTest>
@ -54,7 +53,7 @@ void TestAWJsonFormatter::test_conversion()
void TestAWJsonFormatter::test_copy()
{
AWJsonFormatter *newFormatter = formatter->copy("/dev/null", 1);
auto newFormatter = formatter->copy("/dev/null", 1);
QCOMPARE(newFormatter->path(), formatter->path());
QCOMPARE(newFormatter->number(), 1);
@ -68,25 +67,25 @@ void TestAWJsonFormatter::generate()
value = AWTestLibrary::randomString();
QVariantMap first;
QString firstKey = AWTestLibrary::randomString();
auto firstKey = AWTestLibrary::randomString();
first[firstKey] = value;
int listCount = AWTestLibrary::randomInt(5) + 1;
int validCount = AWTestLibrary::randomInt(listCount);
auto listCount = AWTestLibrary::randomInt(5) + 1;
auto validCount = AWTestLibrary::randomInt(listCount);
QVariantList second;
for (int i = 0; i < listCount; i++) {
for (auto i = 0; i < listCount; i++) {
if (i == validCount) {
second.append(first);
} else {
QString key = AWTestLibrary::randomString();
QString val = AWTestLibrary::randomString();
auto key = AWTestLibrary::randomString();
auto val = AWTestLibrary::randomString();
QVariantMap dict;
dict[key] = val;
second.append(dict);
}
}
QString thirdKey = AWTestLibrary::randomString();
auto thirdKey = AWTestLibrary::randomString();
QVariantMap output;
output[thirdKey] = second;

13
sources/test/testlistformatter.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testlistformatter.h"
#include <QtTest>
@ -50,7 +49,7 @@ void TestAWListFormatter::test_values()
void TestAWListFormatter::test_conversion()
{
QStringList value = AWTestLibrary::randomStringList();
auto value = AWTestLibrary::randomStringList();
QCOMPARE(formatter->convert(value), value.join(separator));
}
@ -58,8 +57,8 @@ void TestAWListFormatter::test_conversion()
void TestAWListFormatter::test_sorted()
{
formatter->setSorted(true);
QStringList value = AWTestLibrary::randomStringList();
QString received = formatter->convert(value);
auto value = AWTestLibrary::randomStringList();
auto received = formatter->convert(value);
value.sort();
QCOMPARE(received, value.join(separator));
@ -68,8 +67,8 @@ void TestAWListFormatter::test_sorted()
void TestAWListFormatter::test_filter()
{
QStringList value = AWTestLibrary::randomStringList();
QStringList filters = AWTestLibrary::randomSelect(value);
auto value = AWTestLibrary::randomStringList();
auto filters = AWTestLibrary::randomSelect(value);
value.sort();
formatter->setFilter(QString("(^%1$)").arg(filters.join("$|^")));
@ -79,7 +78,7 @@ void TestAWListFormatter::test_filter()
void TestAWListFormatter::test_copy()
{
AWListFormatter *newFormatter = formatter->copy("/dev/null", 1);
auto newFormatter = formatter->copy("/dev/null", 1);
QCOMPARE(newFormatter->number(), 1);
QCOMPARE(newFormatter->filter(), formatter->filter());

7
sources/test/testnetworksource.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testnetworksource.h"
#include <QtTest>
@ -27,7 +26,7 @@
void TestNetworkSource::initTestCase()
{
AWTestLibrary::init();
source = new NetworkSource(this, QStringList());
source = new NetworkSource(this);
}
@ -39,7 +38,9 @@ void TestNetworkSource::cleanupTestCase()
void TestNetworkSource::test_sources()
{
QCOMPARE(source->sources(), QStringList({"device", "ssid"}));
auto sources = source->sources();
QVERIFY(sources.contains("device"));
QVERIFY(sources.contains("ssid"));
}

7
sources/test/testnoformatter.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testnoformatter.h"
#include <QtTest>
@ -43,19 +42,19 @@ void TestAWNoFormatter::test_values() {}
void TestAWNoFormatter::test_conversion()
{
// integer
int randomInt = AWTestLibrary::randomInt();
auto randomInt = AWTestLibrary::randomInt();
QCOMPARE(formatter->convert(randomInt), QString::number(randomInt));
// float
QWARN("Float conversion isn't tested here due to possible rounding errors");
// string
QString randomString = AWTestLibrary::randomString();
auto randomString = AWTestLibrary::randomString();
QCOMPARE(formatter->convert(randomString), randomString);
}
void TestAWNoFormatter::test_copy()
{
AWNoFormatter *newFormatter = formatter->copy("/dev/null", 1);
auto newFormatter = formatter->copy("/dev/null", 1);
QCOMPARE(newFormatter->number(), 1);

32
sources/test/testplayersource.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testplayersource.h"
#include <QtTest>
@ -41,8 +40,8 @@ void TestPlayerSource::_test_sources(const PlayerSource *_source)
void TestPlayerSource::test_buildString()
{
QString randomString = AWTestLibrary::randomString(1, 40);
QString str = PlayerSource::buildString("", randomString, 20);
auto randomString = AWTestLibrary::randomString(1, 40);
auto str = PlayerSource::buildString("", randomString, 20);
QCOMPARE(str.length(), 20);
str = PlayerSource::buildString(str, randomString, 20);
@ -55,7 +54,7 @@ void TestPlayerSource::test_buildString()
void TestPlayerSource::test_stripString()
{
QString str = PlayerSource::buildString("", AWTestLibrary::randomString(1, 40), 20);
auto str = PlayerSource::buildString("", AWTestLibrary::randomString(1, 40), 20);
QCOMPARE(str.length(), 20);
str = PlayerSource::buildString("", AWTestLibrary::randomString(1, 10), 20);
@ -65,11 +64,9 @@ void TestPlayerSource::test_stripString()
void TestPlayerSource::test_autoMpris()
{
QStringList args(QStringList() << "mpris" << mpdAddress << QString::number(mpdPort) << "auto"
<< QString::number(10));
PlayerSource *source = new PlayerSource(this, args);
auto source = new PlayerSource(this, "mpris", mpdAddress, mpdPort, "auto", 10);
bool empty = source->getAutoMpris().isEmpty();
auto empty = source->getAutoMpris().isEmpty();
if (empty)
QWARN("No MPRIS found, manual check required");
else
@ -79,20 +76,19 @@ void TestPlayerSource::test_autoMpris()
void TestPlayerSource::test_mpd()
{
QStringList args(QStringList() << "mpd" << mpdAddress << QString::number(mpdPort) << "auto" << QString::number(10));
PlayerSource *source = new PlayerSource(this, args);
auto source = new PlayerSource(this, "mpd", mpdAddress, mpdPort, "auto", 10);
_test_sources(source);
// init spy
QSignalSpy spy(source, SIGNAL(dataReceived(const QVariantHash &)));
QVariant firstValue = source->data("title");
auto firstValue = source->data("title");
if (!source->isMpdSocketConnected())
QSKIP("No mpd found");
// check values
QVERIFY(spy.wait(5000));
QList<QVariant> arguments = spy.takeFirst();
QVariantHash secondValue = arguments.at(0).toHash();
auto arguments = spy.takeFirst();
auto secondValue = arguments.at(0).toHash();
// actually nothing to test here just print warning if no information found
if (secondValue["title"].toString() == "unknown")
@ -104,14 +100,12 @@ void TestPlayerSource::test_mpd()
void TestPlayerSource::test_mpris()
{
QStringList args(QStringList() << "mpris" << mpdAddress << QString::number(mpdPort) << "auto"
<< QString::number(10));
PlayerSource *source = new PlayerSource(this, args);
auto source = new PlayerSource(this, "mpris", mpdAddress, mpdPort, "auto", 10);
_test_sources(source);
QString value = source->data("title").toString();
int progress = source->data("progress").toInt();
int duration = source->data("duration").toInt();
auto value = source->data("title").toString();
auto progress = source->data("progress").toInt();
auto duration = source->data("duration").toInt();
// actually nothing to test here just print warning if no information found
if (value == "unknown")

3
sources/test/testprocessessource.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testprocessessource.h"
#include <QtTest>
@ -27,7 +26,7 @@
void TestProcessesSource::initTestCase()
{
AWTestLibrary::init();
source = new ProcessesSource(this, QStringList());
source = new ProcessesSource(this);
}

5
sources/test/testscriptformatter.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "testscriptformatter.h"
#include <QtTest>
@ -52,7 +51,7 @@ void TestAWScriptFormatter::test_values()
void TestAWScriptFormatter::test_conversion()
{
QString string = AWTestLibrary::randomString();
auto string = AWTestLibrary::randomString();
QCOMPARE(formatter->convert(string), string);
}
@ -93,7 +92,7 @@ void TestAWScriptFormatter::test_hasReturn()
void TestAWScriptFormatter::test_copy()
{
AWScriptFormatter *newFormatter = formatter->copy("/dev/null", 1);
auto newFormatter = formatter->copy("/dev/null", 1);
QCOMPARE(newFormatter->appendCode(), formatter->appendCode());
QCOMPARE(newFormatter->code(), formatter->code());

15
sources/test/teststringformatter.cpp
View File

@ -15,7 +15,6 @@
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "teststringformatter.h"
#include <QtTest>
@ -43,7 +42,7 @@ void TestAWStringFormatter::test_values() {}
void TestAWStringFormatter::test_count()
{
// assign
int count = 10 + AWTestLibrary::randomInt();
auto count = 10 + AWTestLibrary::randomInt();
formatter->setCount(count);
QCOMPARE(formatter->count(), count);
@ -51,7 +50,7 @@ void TestAWStringFormatter::test_count()
auto testString = AWTestLibrary::randomString();
while (testString.length() > count)
testString = AWTestLibrary::randomString();
QString output = formatter->convert(testString);
auto output = formatter->convert(testString);
QCOMPARE(output.length(), count);
// reset
@ -62,13 +61,13 @@ void TestAWStringFormatter::test_count()
void TestAWStringFormatter::test_fillChar()
{
// assign
char c = AWTestLibrary::randomChar();
auto c = AWTestLibrary::randomChar();
formatter->setFillChar(c);
QCOMPARE(formatter->fillChar(), QChar(c));
formatter->setCount(101);
// test
QString output = formatter->convert(AWTestLibrary::randomString());
auto output = formatter->convert(AWTestLibrary::randomString());
QVERIFY(output.startsWith(c));
// reset
@ -80,13 +79,13 @@ void TestAWStringFormatter::test_fillChar()
void TestAWStringFormatter::test_forceWidth()
{
// assign
int count = AWTestLibrary::randomInt();
auto count = AWTestLibrary::randomInt();
formatter->setForceWidth(true);
formatter->setCount(count);
QCOMPARE(formatter->forceWidth(), true);
// test
QString output = formatter->convert(AWTestLibrary::randomString());
auto output = formatter->convert(AWTestLibrary::randomString());
QCOMPARE(output.length(), count);
// reset
@ -98,7 +97,7 @@ void TestAWStringFormatter::test_forceWidth()
void TestAWStringFormatter::test_copy()
{
doRandom();
AWStringFormatter *newFormatter = formatter->copy("/dev/null", 1);
auto newFormatter = formatter->copy("/dev/null", 1);
QCOMPARE(newFormatter->count(), formatter->count());
QCOMPARE(newFormatter->fillChar(), formatter->fillChar());