release 2.0.4

battery fixes

CHANGELOG

@@ -1,3 +1,6 @@
+V.2.0.4:
+* more correct work with batteries
+
 Ver.2.0.3:
 + add support of several $bat tags
 * edit layout

CHANGELOG-RU

@@ -1,3 +1,6 @@
+Вер.2.0.4:
+* более корректная работа с батареями
+
 Вер.2.0.3:
 + добавлена поддержка нескольких тегов $bat
 * отредактирована разметка

PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=kdeplasma-applets-awesome-widgets
 _pkgname=awesome-widgets
-pkgver=2.0.3
+pkgver=2.0.4
 pkgrel=1
 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ optdepends=("amarok: for music player monitor"
 makedepends=('automoc4' 'cmake')
 source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
 install=${pkgname}.install
-md5sums=('238e8418672b92bca0ac8431c6f085fb')
+md5sums=('706c71a403b6dc058de9de31c9c2e67e')
 backup=('usr/share/config/extsysmon.conf')
 
 prepare() {

README.md

@@ -57,7 +57,8 @@ For edited output you must open Settings window and setup output format in lines
 * tag `$down` - download speed, *KB/s*
 * tag `$up` - upload speed, *KB/s*
 * tag `$netdev` - current network device
-* tag `$batN` - battery N charge, *%*. `$bat0` is average value
+* tag `$bat` - average battery charge, *%*
+* tag `$batN` - battery N charge, *%*
 * tag `$ac` - status AC device. Return (\*) if AC device is online or *( )* if offline
 * tag `$album` - current song album. One of supported music players must be installed
 * tag `$artist` - current song artist. One of supported music players must be installed

sources/CMakeLists.txt

@@ -8,7 +8,7 @@ cmake_policy (SET CMP0015 NEW)
 project (awesome-widgets)
 set (PROJECT_VERSION_MAJOR 2)
 set (PROJECT_VERSION_MINOR 0)
-set (PROJECT_VERSION_PATCH 3)
+set (PROJECT_VERSION_PATCH 4)
 set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 set (PROJECT_TRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty)
 

sources/awesome-widget/awesome-widget.cpp

@@ -324,9 +324,9 @@ QStringList AwesomeWidget::getKeys()
     allKeys.append(QString("netdev"));
     // battery
     allKeys.append(QString("ac"));
-    allKeys.append(QString("bat0"));
     for (int i=0; i<counts[QString("bat")]; i++)
-        allKeys.append(QString("bat") + QString::number(i+1));
+        allKeys.append(QString("bat") + QString::number(i));
+    allKeys.append(QString("bat"));
     // player
     allKeys.append(QString("album"));
     allKeys.append(QString("artist"));

sources/awesome-widget/configuration.cpp

@@ -641,7 +641,12 @@ void AwesomeWidget::configChanged()
 
     // counts
     QMap<QString, QString> deSettings = readDataEngineConfiguration();
-    counts[QString("bat")] = QDir(deSettings[QString("ACPIPATH")]).entryList(QDir::Dirs | QDir::NoDotAndDotDot).count();
+    counts[QString("bat")] = 0;
+    QStringList acpiDevices = QDir(deSettings[QString("ACPIPATH")]).entryList(QDir::Dirs | QDir::NoDotAndDotDot);
+    QRegExp batRegexp = QRegExp(QString("BAT.*"));
+    for (int i=0; i<acpiDevices.count(); i++)
+        if (acpiDevices[i].indexOf(batRegexp) > -1)
+            counts[QString("bat")]++;
     counts[QString("cpu")] = getNumberCpus();
     counts[QString("custom")] = deSettings[QString("CUSTOM")].split(QString("@@")).count();
     counts[QString("disk")] = configuration[QString("disk")].split(QString("@@")).count();

sources/ext-sysmon/extsysmon.cpp

@@ -285,7 +285,7 @@ QMap<QString, QVariant> ExtendedSysMon::getBattery(const QString acpiPath)
 
     QMap<QString, QVariant> battery;
     battery[QString("ac")] = false;
-    battery[QString("bat0")] = 0;
+    battery[QString("bat")] = 0;
     QFile acFile(acpiPath + QString("/AC/online"));
     if (acFile.open(QIODevice::ReadOnly)) {
         if (QString(acFile.readLine()).trimmed().toInt() == 1)
@@ -293,7 +293,7 @@ QMap<QString, QVariant> ExtendedSysMon::getBattery(const QString acpiPath)
     }
     acFile.close();
     // batterites
-    QStringList allDevices = QDir(acpiPath).entryList(QDir::Dirs | QDir::NoDotAndDotDot);
+    QStringList allDevices = QDir(acpiPath).entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
     QStringList batDevices;
     QRegExp batRegexp = QRegExp(QString("BAT.*"));
     for (int i=0; i<allDevices.count(); i++)
@@ -302,18 +302,18 @@ QMap<QString, QVariant> ExtendedSysMon::getBattery(const QString acpiPath)
     for (int i=0; i<batDevices.count(); i++) {
         QFile batFile(acpiPath + QString("/") + batDevices[i] + QString("/capacity"));
         if (batFile.open(QIODevice::ReadOnly))
-            battery[QString("bat") + QString::number(i+1)] = QString(batFile.readLine()).trimmed().toInt();
+            battery[QString("bat") + QString::number(i)] = QString(batFile.readLine()).trimmed().toInt();
         batFile.close();
     }
     float number = 0.0;
     float average = 0.0;
     for (int i=0; i<battery.keys().count(); i++) {
         if (battery.keys()[i] == QString("ac")) continue;
-        if (battery.keys()[i] == QString("bat0")) continue;
+        if (battery.keys()[i] == QString("bat")) continue;
         average += battery[battery.keys()[i]].toInt();
         number++;
     }
-    battery[QString("bat0")] = int(average / number);
+    battery[QString("bat")] = int(average / number);
 
     return battery;
 }