Release 4.0.4

Previous implementation has used implicit logic with empty keys arrays,
which might lead to some errors in processing

CHANGELOG

@@ -1,3 +1,6 @@
+Ver.4.0.3:
+- drop qml definition to avoid compile errors
+
 Ver.4.0.2:
 + German translation (#172, thanks to daveedmee)
 

packages/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=plasma6-applet-awesome-widgets
 _pkgname=awesome-widgets
-pkgver=4.0.2
+pkgver=4.0.4
 pkgrel=1
 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)"
 arch=('x86_64')
@@ -27,5 +27,3 @@ build () {
 package() {
       DESTDIR="$pkgdir" cmake --install build
 }
-
-sha256sums=('b2a7b07a1df6f710f4e0d6e5898933f4ddb131818b922dc4b8e48afe3e98a664')

sources/CMakeLists.txt

@@ -19,7 +19,7 @@ set(PROJECT_CONTACT "esalexeev@gmail.com")
 set(PROJECT_LICENSE "GPL3")
 set(PROJECT_VERSION_MAJOR "4")
 set(PROJECT_VERSION_MINOR "0")
-set(PROJECT_VERSION_PATCH "2")
+set(PROJECT_VERSION_PATCH "4")
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 # append git version if any
 set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "")

sources/awesome-widget/package/metadata.json

@@ -19,7 +19,7 @@
         "Id": "org.kde.plasma.awesomewidget",
         "License": "GPLv3",
         "Name": "Awesome Widget",
-        "Version": "4.0.2",
+        "Version": "4.0.4",
         "Website": "https://arcanis.me/projects/awesome-widgets/"
     },
     "X-Plasma-API-Minimum-Version": "6.0"

sources/awesome-widget/plugin/awdataenginemapper.cpp

@@ -65,7 +65,7 @@ QStringList AWDataEngineMapper::keysFromSource(const QString &_source) const
 // HACK units required to define should the value be calculated as temperature
 // or fan data
 QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSysGuard::Unit _units,
-                                               const QStringList &_keys)
+                                               const QStringList &_keys, const bool _disconnectUnused)
 {
     qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
 
@@ -91,7 +91,7 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
 
     // check if keys were actually requested
     qCInfo(LOG_AW) << "Looking for keys" << keys << "in" << _keys;
-    auto required = _keys.isEmpty()
+    auto required = !_disconnectUnused
                     || std::any_of(keys.cbegin(), keys.cend(), [&_keys](auto &key) { return _keys.contains(key); });
     if (!required)
         return {};

sources/awesome-widget/plugin/awdataenginemapper.h

@@ -39,7 +39,8 @@ public:
     [[nodiscard]] AWPluginFormaterInterface *formatter(const QString &_key) const;
     [[nodiscard]] QStringList keysFromSource(const QString &_source) const;
     // set methods
-    QStringList registerSource(const QString &_source, KSysGuard::Unit _units, const QStringList &_keys);
+    QStringList registerSource(const QString &_source, KSysGuard::Unit _units, const QStringList &_keys,
+                               const bool _disconnectUnused);
     void setDevices(const AWPluginMatcherSettings &_settings);
 
 private:

sources/awesome-widget/plugin/awkeys.cpp

@@ -206,9 +206,8 @@ void AWKeys::reinitKeys(const QStringList &_currentKeys)
         barKeys.append(item->usedKeys());
     }
     // get required keys
-    m_requiredKeys = m_optimize ? AWKeyCache::getRequiredKeys(m_foundKeys, barKeys, m_tooltipParams,
+    m_requiredKeys = AWKeyCache::getRequiredKeys(m_foundKeys, barKeys, m_tooltipParams,
-                                                              m_keyOperator->requiredUserKeys(), _currentKeys)
+                                                 m_keyOperator->requiredUserKeys(), _currentKeys);
-                                : QStringList();
 
     // set key data to m_aggregator
     m_aggregator->setDevices(m_keyOperator->devices());
@@ -317,7 +316,7 @@ void AWKeys::setDataBySource(const QString &_source, const KSysGuard::SensorInfo
     // first list init
     auto tags = m_aggregator->keysFromSource(_source);
     if (tags.isEmpty())
-        tags = m_aggregator->registerSource(_source, _sensor.unit, m_requiredKeys);
+        tags = m_aggregator->registerSource(_source, _sensor.unit, m_requiredKeys, m_optimize);
 
     // update data or drop source if there are no matches and exit
     if (tags.isEmpty()) {

sources/awesome-widget/plugin/awkeysaggregator.cpp

@@ -151,9 +151,9 @@ void AWKeysAggregator::setTranslate(const bool _translate)
 
 
 QStringList AWKeysAggregator::registerSource(const QString &_source, const KSysGuard::Unit _units,
-                                             const QStringList &_keys)
+                                             const QStringList &_keys, const bool _disconnectUnused)
 {
     qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
 
-    return m_mapper->registerSource(_source, _units, _keys);
+    return m_mapper->registerSource(_source, _units, _keys, _disconnectUnused);
 }

sources/awesome-widget/plugin/awkeysaggregator.h

@@ -61,7 +61,8 @@ public:
     void setTranslate(bool _translate);
 
 public slots:
-    QStringList registerSource(const QString &_source, KSysGuard::Unit _units, const QStringList &_keys);
+    QStringList registerSource(const QString &_source, KSysGuard::Unit _units, const QStringList &_keys,
+                               const bool _disconnectUnused);
 
 private:
     AWPluginFormatSettings m_settings;

sources/desktop-panel/package/metadata.json

@@ -19,7 +19,7 @@
         "Id": "org.kde.plasma.desktoppanel",
         "License": "GPLv3",
         "Name": "Desktop Panel",
-        "Version": "4.0.2",
+        "Version": "4.0.4",
         "Website": "https://arcanis.me/projects/awesome-widgets/"
     },
     "X-Plasma-API-Minimum-Version": "6.0"

sources/extsysmonsources/systeminfosource.cpp

@@ -128,8 +128,8 @@ QVariant SystemInfoSource::sendDBusRequest(const QString &_destination, const QS
 
     auto response = bus.call(request, QDBus::BlockWithGui, REQUEST_TIMEOUT);
 
-    if ((response.type() != QDBusMessage::ReplyMessage) || (response.arguments().isEmpty())) {
+    if (response.type() != QDBusMessage::ReplyMessage || response.arguments().isEmpty()) {
-        qCWarning(LOG_ESS) << "Error message" << response.errorMessage();
+        qCWarning(LOG_ESS) << "Error" << response.errorName() << "with message" << response.errorMessage();
         return {};
     } else {
         return response.arguments().first();

sources/libraries.cmake

@@ -5,7 +5,7 @@ find_package(Gettext REQUIRED)
 find_package(Qt6 6.6.0 REQUIRED COMPONENTS Core Concurrent DBus Network Qml Test Widgets)
 add_definitions(
         ${Qt6Core_DEFINITIONS} ${Qt6DBus_DEFINITIONS} ${Qt6Network_DEFINITIONS}
-        ${Qt6Qml_DEFINITIONS} ${Qt6Widgets_DEFINITIONS}
+        ${Qt6Widgets_DEFINITIONS}
 )
 set(Qt_INCLUDE
         ${Qt6Core_INCLUDE_DIRS} ${Qt6Concurrent_INCLUDE_DIRS} ${Qt6DBus_INCLUDE_DIRS} ${Qt6Network_INCLUDE_DIRS}