* fix hddtemp definition (create workaround)

* create git pkgbuild * fix plugin build * replace hddtemp to smartctl by default
2025-07-04 01:15:52 +00:00 · 2015-05-19 09:41:15 +03:00
parent b82d78bcbe
commit 3bac9ac09f
8 changed files with 71 additions and 13 deletions
--- a/arch/PKGBUILD-git
+++ b/arch/PKGBUILD-git
@ -0,0 +1,54 @@
+# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
+
+pkgname=plasma5-applet-awesome-widgets
+_pkgname=awesome-widgets
+pkgver=2.2.1.r12.gb82d78b
+pkgrel=1
+pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor). Git version"
+arch=('i686' 'x86_64')
+url="http://arcanis.name/projects/awesome-widgets"
+license=('GPL3')
+depends=('plasma-framework')
+optdepends=("amarok: for music player monitor"
+            "clementine: for music player monitor"
+            "catalyst: for GPU monitor"
+            "hddtemp: for HDD temperature monitor"
+            "smartmontools: for HDD temperature monitor"
+            "mpd: for music player monitor"
+            "nvidia-utils: for GPU monitor"
+            "qmmp: for music player monitor")
+makedepends=('cmake' 'extra-cmake-modules')
+source=(${_pkgname}::git+https://github.com/arcan1s/awesome-widgets/)
+install=${pkgname}.install
+md5sums=('SKIP')
+backup=('etc/xdg/plasma-dataengine-extsysmon.conf')
+
+pkgver() {
+  cd "${srcdir}/${_pkgname}"
+  git describe --tags --long | sed 's/V\.//' | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+  rm -rf "${srcdir}/${_pkgname}/build"
+  mkdir "${srcdir}/${_pkgname}/build"
+
+  # update submobules
+  cd "${srcdir}/${_pkgname}"
+  git submodule init
+  git submodule update --recursive
+  echo "$pkgver"
+}
+
+build () {
+  cd "${srcdir}/${_pkgname}/build"
+  cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        "../sources"
+  make
+}
+
+package() {
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
+}
--- a/sources/.kdev4/awesomewidgets.kdev4
+++ b/sources/.kdev4/awesomewidgets.kdev4
@ -8,7 +8,7 @@ ProjectRootRelative=./

 [CMake][CMake Build Directory 0]
 Build Directory Path=file:///home/arcanis/Documents/github/awesome-widgets/build
-Build Type=Debug
+Build Type=Release
 CMake Binary=file:///usr/bin/cmake
 Environment Profile=
 Extra Arguments=
--- a/sources/.kdev4/sources.kdev4
+++ b/sources/.kdev4/sources.kdev4
@ -8,7 +8,7 @@ ProjectRootRelative=./

 [CMake][CMake Build Directory 0]
 Build Directory Path=file:///home/arcanis/Documents/github/awesome-widgets/build
-Build Type=Debug
+Build Type=Release
 CMake Binary=file:///usr/bin/cmake
 Environment Profile=
 Extra Arguments=
--- a/sources/awesome-widget-kf5/package/contents/ui/main.qml
+++ b/sources/awesome-widget-kf5/package/contents/ui/main.qml
@ -82,6 +82,8 @@ Item {

        onNewData: {
            if (debug) console.log("[main::onNewData] : Update source " + sourceName)
+            // FIXME: ugly workaround to make some sources working
+            systemmonitorDE.interval = plasmoid.configuration.interval

            if (AWKeys.setDataBySource(sourceName, data, settings)) disconnectSource(sourceName)
        }
@ -96,12 +98,13 @@ Item {
    PlasmaCore.DataSource {
        id: extsysmonDE
        engine: "extsysmon"
-        connectedSources: ["battery", "custom", "desktop", "netdev", "gpu", "gputemp",
-                           "hddtemp", "quotes", "pkg", "player", "ps", "update"]
+        connectedSources: extsysmonDE.sources
        interval: plasmoid.configuration.interval

        onNewData: {
            if (debug) console.log("[main::onNewData] : Update source " + sourceName)
+            // FIXME: ugly workaround to make some sources working
+            extsysmonDE.interval = plasmoid.configuration.interval

            if (AWKeys.setDataBySource(sourceName, data, settings)) needUpdate()
        }
--- a/sources/awesome-widget-kf5/plugin/CMakeLists.txt
+++ b/sources/awesome-widget-kf5/plugin/CMakeLists.txt
@ -35,7 +35,7 @@ file (GLOB SUBPROJECT_NOTIFY *.notifyrc)
 set (SUBPROJECT_DESKTOP ${CMAKE_CURRENT_SOURCE_DIR}/desktops)

 qt5_wrap_ui (SUBPROJECT_UI_HEADER ${SUBPROJECT_UI})
-add_library (${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE})
+add_library (${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE} ${SUBPROJECT_UI_HEADER})
 target_link_libraries (${PLUGIN_NAME} ${Qt_LIBRARIES} ${Kf5_LIBRARIES})

 install (TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/awesomewidget)
--- a/sources/awesome-widget-kf5/plugin/awactions.cpp
+++ b/sources/awesome-widget-kf5/plugin/awactions.cpp
@ -161,7 +161,7 @@ QMap<QString, QVariant> AWActions::readDataEngineConfiguration()
    configuration[QString("ACPIPATH")] = settings.value(QString("ACPIPATH"), QString("/sys/class/power_supply/"));
    configuration[QString("GPUDEV")] = settings.value(QString("GPUDEV"), QString("auto"));
    configuration[QString("HDDDEV")] = settings.value(QString("HDDDEV"), QString("all"));
-    configuration[QString("HDDTEMPCMD")] = settings.value(QString("HDDTEMPCMD"), QString("sudo hddtemp"));
+    configuration[QString("HDDTEMPCMD")] = settings.value(QString("HDDTEMPCMD"), QString("sudo smartctl -a"));
    configuration[QString("MPDADDRESS")] = settings.value(QString("MPDADDRESS"), QString("localhost"));
    configuration[QString("MPDPORT")] = settings.value(QString("MPDPORT"), QString("6600"));
    configuration[QString("MPRIS")] = settings.value(QString("MPRIS"), QString("auto"));
--- a/sources/extsysmon/extsysmon.cpp
+++ b/sources/extsysmon/extsysmon.cpp
@ -290,7 +290,7 @@ void ExtendedSysMon::readConfiguration()
    rawConfig[QString("ACPIPATH")] = settings.value(QString("ACPIPATH"), QString("/sys/class/power_supply/")).toString();
    rawConfig[QString("GPUDEV")] = settings.value(QString("GPUDEV"), QString("auto")).toString();
    rawConfig[QString("HDDDEV")] = settings.value(QString("HDDDEV"), QString("all")).toString();
-    rawConfig[QString("HDDTEMPCMD")] = settings.value(QString("HDDTEMPCMD"), QString("sudo hddtemp")).toString();
+    rawConfig[QString("HDDTEMPCMD")] = settings.value(QString("HDDTEMPCMD"), QString("sudo smartctl -a")).toString();
    rawConfig[QString("MPDADDRESS")] = settings.value(QString("MPDADDRESS"), QString("localhost")).toString();
    rawConfig[QString("MPDPORT")] = settings.value(QString("MPDPORT"), QString("6600")).toString();
    rawConfig[QString("MPRIS")] = settings.value(QString("MPRIS"), QString("auto")).toString();
@ -504,10 +504,10 @@ float ExtendedSysMon::getHddTemp(const QString cmd, const QString device)

    QString qoutput = QTextCodec::codecForMib(106)->toUnicode(process.output).trimmed();
    if (smartctl) {
-        for (int i=0; i<qoutput.split(QChar(':'), QString::SkipEmptyParts).count(); i++) {
-            if (qoutput.split(QChar(':'), QString::SkipEmptyParts)[i].split(QChar(' '))[0] != QString("194")) continue;
-            if (qoutput.split(QChar(':'), QString::SkipEmptyParts)[i].split(QChar(' '), QString::SkipEmptyParts).count() < 9) break;
-            value = qoutput.split(QChar(':'), QString::SkipEmptyParts)[i].split(QChar(' '), QString::SkipEmptyParts)[9].toFloat();
+        for (int i=0; i<qoutput.split(QChar('\n'), QString::SkipEmptyParts).count(); i++) {
+            if (!qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i].startsWith(QString("194"))) continue;
+            if (qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i].split(QChar(' '), QString::SkipEmptyParts).count() < 9) break;
+            value = qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i].split(QChar(' '), QString::SkipEmptyParts)[9].toFloat();
            break;
        }
    } else {
@ -728,9 +728,10 @@ bool ExtendedSysMon::updateSourceEvent(const QString &source)
        for (int i=0; i<allHddDevices.count(); i++)
            setData(source, allHddDevices[i], 0.0);
        QStringList deviceList = configuration[QString("HDDDEV")].split(QChar(','), QString::SkipEmptyParts);
-        for (int i=0; i<deviceList.count(); i++)
+        for (int i=0; i<deviceList.count(); i++) {
            setData(source, deviceList[i],
                    getHddTemp(configuration[QString("HDDTEMPCMD")], deviceList[i]));
+        }
    } else if (source == QString("netdev")) {
        setData(source, QString("value"), getNetworkDevice());
    } else if (source == QString("pkg")) {
--- a/sources/extsysmon/plasma-dataengine-extsysmon.conf
+++ b/sources/extsysmon/plasma-dataengine-extsysmon.conf
@ -7,7 +7,7 @@ GPUDEV=auto
 ## Set block device for hddtemp comma separated or use 'all' or 'disable'
 HDDDEV=all
 # cmd
-HDDTEMPCMD=sudo hddtemp
+HDDTEMPCMD=sudo smartctl -a
 # mpd server settings
 MPDADDRESS=localhost
 MPDPORT=6600