From 161ff64293c4fc7b0ba55d56f6fdad3ff10d4bfa Mon Sep 17 00:00:00 2001 From: Evgenii Alekseev Date: Mon, 25 Mar 2024 13:59:25 +0200 Subject: [PATCH] Release 4.0.0 --- .github/workflows/release.yml | 24 +++++++++---------- CHANGELOG | 4 +++- packages/PKGBUILD | 15 ++++++------ ...=> plasma6-applet-awesome-widgets.install} | 0 sources/CMakeLists.txt | 6 ++--- .../plugin/awdataenginemapper.cpp | 14 +++++------ .../awesome-widget/plugin/awkeyoperations.cpp | 12 +++++----- sources/extsysmon/extsysmonaggregator.cpp | 1 - sources/extsysmonsources/desktopsource.cpp | 24 +++++++++---------- sources/extsysmonsources/processessource.cpp | 18 +++++++------- sources/test/CMakeLists.txt | 4 ++-- 11 files changed, 62 insertions(+), 60 deletions(-) rename packages/{plasma5-applet-awesome-widgets.install => plasma6-applet-awesome-widgets.install} (100%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d1c371e..5700b7c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,17 +25,17 @@ jobs: env: VERSION: ${{ steps.version.outputs.VERSION }} - - name: build debian package - run: | - sudo apt update && \ - sudo apt install -yq cmake extra-cmake-modules g++ git gettext make && \ - sudo apt install -yq libkf5i18n-dev libkf5notifications-dev libkf5service-dev \ - libkf5windowsystem-dev libkf5plasma-dev qtbase5-dev qtdeclarative5-dev \ - plasma-workspace-dev && \ - cmake -B build-deb -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Optimization -DBUILD_FUTURE=ON -DBUILD_DEB_PACKAGE=ON sources && \ - cd build-deb && \ - make package && \ - cd .. +# - name: build debian package +# run: | +# sudo apt update && \ +# sudo apt install -yq cmake extra-cmake-modules g++ git gettext make && \ +# sudo apt install -yq libkf5i18n-dev libkf5notifications-dev libkf5service-dev \ +# libkf5windowsystem-dev libkf5plasma-dev qtbase5-dev qtdeclarative5-dev \ +# plasma-workspace-dev && \ +# cmake -B build-deb -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Optimization -DBUILD_FUTURE=ON -DBUILD_DEB_PACKAGE=ON sources && \ +# cd build-deb && \ +# make package && \ +# cd .. - name: release uses: softprops/action-gh-release@v1 @@ -45,7 +45,7 @@ jobs: ${{ steps.changelog.outputs.changelog }} files: | awesome-widgets-*-src.tar.xz - build-deb/plasma-widget-awesome-widgets-*.deb +# build-deb/plasma-widget-awesome-widgets-*.deb fail_on_unmatched_files: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CHANGELOG b/CHANGELOG index 2304459..7ae1951 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Ver.4.0.0: +* migration to plasma 6 + Ver.3.5.0: + wayland support * update code to latest standards @@ -12,7 +15,6 @@ Ver.3.4.2: * update to new qt api - fix non printable spaces (#142, #143) - Ver.3.3.3: + add custom keys support (#101) * DBus interface improvements diff --git a/packages/PKGBUILD b/packages/PKGBUILD index 746c035..1dfe05c 100644 --- a/packages/PKGBUILD +++ b/packages/PKGBUILD @@ -1,22 +1,21 @@ # Maintainer: Evgeniy Alekseev -pkgname=plasma5-applet-awesome-widgets +pkgname=plasma6-applet-awesome-widgets _pkgname=awesome-widgets -pkgver=3.4.3 +pkgver=4.0.0alpha1 pkgrel=1 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)" -arch=('i686' 'x86_64') +arch=('x86_64') url="https://arcanis.me/projects/awesome-widgets" license=('GPL3') -depends=('ksysguard' 'plasma-framework') +depends=('plasma-workspace') optdepends=("hddtemp: for HDD temperature monitor" "smartmontools: for HDD temperature monitor" "mpd: for music player monitor" "nvidia-utils: for GPU monitor") makedepends=('cmake' 'extra-cmake-modules' 'python') -source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz) -install=${pkgname}.install -md5sums=('5953ba518191bb6fff83cdb8633c735c') +source=(https://github.com/arcan1s/awesome-widgets/releases/download/${pkgver}/${_pkgname}-${pkgver}-src.tar.xz) +install="$pkgname.install" backup=('etc/xdg/plasma-dataengine-extsysmon.conf') build () { @@ -30,3 +29,5 @@ build () { package() { DESTDIR="$pkgdir" cmake --install build } + +sha256sums=('b2a7b07a1df6f710f4e0d6e5898933f4ddb131818b922dc4b8e48afe3e98a664') diff --git a/packages/plasma5-applet-awesome-widgets.install b/packages/plasma6-applet-awesome-widgets.install similarity index 100% rename from packages/plasma5-applet-awesome-widgets.install rename to packages/plasma6-applet-awesome-widgets.install diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 687f345..7c0cbcd 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -14,9 +14,9 @@ project(awesomewidgets) set(PROJECT_AUTHOR "Evgeniy Alekseev") set(PROJECT_CONTACT "esalexeev@gmail.com") set(PROJECT_LICENSE "GPL3") -set(PROJECT_VERSION_MAJOR "3") -set(PROJECT_VERSION_MINOR "5") -set(PROJECT_VERSION_PATCH "1") +set(PROJECT_VERSION_MAJOR "4") +set(PROJECT_VERSION_MINOR "0") +set(PROJECT_VERSION_PATCH "0") 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 "") diff --git a/sources/awesome-widget/plugin/awdataenginemapper.cpp b/sources/awesome-widget/plugin/awdataenginemapper.cpp index 197d9d4..09f4fab 100644 --- a/sources/awesome-widget/plugin/awdataenginemapper.cpp +++ b/sources/awesome-widget/plugin/awdataenginemapper.cpp @@ -131,15 +131,15 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy key.remove("extsysmon/custom/"); m_map.insert(_source, key); m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat; - } else if (_source == "extsysmon/desktop/current/name") { + } else if (_source == "extsysmon/desktop/name") { // current desktop name m_map.insert(_source, "desktop"); m_formatter["desktop"] = AWKeysAggregator::FormatterType::NoFormat; - } else if (_source == "extsysmon/desktop/current/number") { + } else if (_source == "extsysmon/desktop/number") { // current desktop number m_map.insert(_source, "ndesktop"); m_formatter["ndesktop"] = AWKeysAggregator::FormatterType::NoFormat; - } else if (_source == "extsysmon/desktop/total/number") { + } else if (_source == "extsysmon/desktop/count") { // desktop count m_map.insert(_source, "tdesktops"); m_formatter["tdesktops"] = AWKeysAggregator::FormatterType::NoFormat; @@ -217,7 +217,7 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy } else if (_source.startsWith("extsysmon/hdd/temperature")) { // hdd temperature QString device = _source; - device.remove("hdd/temperature"); + device.remove("extsysmon/hdd/temperature"); int index = m_devices["hdd"].indexOf(device); if (index > -1) { QString key = QString("hddtemp%1").arg(index); @@ -313,15 +313,15 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy key.remove("extsysmon/player/"); m_map.insert(_source, key); m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat; - } else if (_source == "extsysmon/ps/running/count") { + } else if (_source == "extsysmon/ps/running") { // running processes count m_map.insert(_source, "pscount"); m_formatter["pscount"] = AWKeysAggregator::FormatterType::NoFormat; - } else if (_source == "extsysmon/ps/running/list") { + } else if (_source == "extsysmon/ps/list") { // list of running processes m_map.insert(_source, "ps"); m_formatter["ps"] = AWKeysAggregator::FormatterType::List; - } else if (_source == "extsysmon/ps/total/count") { + } else if (_source == "extsysmon/ps/count") { // total processes count m_map.insert(_source, "pstot"); m_formatter["pstot"] = AWKeysAggregator::FormatterType::NoFormat; diff --git a/sources/awesome-widget/plugin/awkeyoperations.cpp b/sources/awesome-widget/plugin/awkeyoperations.cpp index 01abdf2..41456ef 100644 --- a/sources/awesome-widget/plugin/awkeyoperations.cpp +++ b/sources/awesome-widget/plugin/awkeyoperations.cpp @@ -302,17 +302,17 @@ void AWKeyOperations::addDevice(const QString &_source) { qCDebug(LOG_AW) << "Source" << _source; - auto diskRegexp = QRegularExpression("disk/(?:md|sd|hd)[a-z|0-9]_.*/Rate/(?:rblk)"); - auto mountRegexp = QRegularExpression("partitions/.*/filllevel"); + auto diskRegexp = QRegularExpression("disk/.*/read"); + auto mountRegexp = QRegularExpression("disk/.*/usedPercent"); auto cpuTempRegExp = QRegularExpression("^cpu/cpu.*/temperature$"); if (_source.contains(diskRegexp)) { - QString device = _source; - device.remove("/Rate/rblk"); + auto device = _source; + device.remove("disk/").remove("/read"); addKeyToCache("disk", device); } else if (_source.contains(mountRegexp)) { - QString device = _source; - device.remove("partitions").remove("/filllevel"); + auto device = _source; + device.remove("disk/").remove("/usedPercent"); addKeyToCache("mount", device); } else if (_source.startsWith("lmsensors") || _source.contains(cpuTempRegExp) || _source == "cpu/all/averageTemperature") { diff --git a/sources/extsysmon/extsysmonaggregator.cpp b/sources/extsysmon/extsysmonaggregator.cpp index 2849bdb..17b6f14 100644 --- a/sources/extsysmon/extsysmonaggregator.cpp +++ b/sources/extsysmon/extsysmonaggregator.cpp @@ -64,7 +64,6 @@ void ExtSysMonAggregator::init(const QHash &_config) // custom createSensor("custom", i18n("Scripts"), new CustomSource(this, {})); // desktop - // FIXME causes segfault createSensor("desktop", i18n("Desktop"), new DesktopSource(this, {})); // gpu load createSensor("gpuload", i18n("GPU load"), new GPULoadSource(this, {_config["GPUDEV"]})); diff --git a/sources/extsysmonsources/desktopsource.cpp b/sources/extsysmonsources/desktopsource.cpp index 3ee3f6d..149f475 100644 --- a/sources/extsysmonsources/desktopsource.cpp +++ b/sources/extsysmonsources/desktopsource.cpp @@ -51,13 +51,13 @@ QVariant DesktopSource::data(const QString &_source) auto decrement = KWindowSystem::isPlatformX11() ? 1 : 0; auto current = nativeIndex - decrement; - if (_source == "current/name") { + if (_source == "name") { return m_vdi->desktopNames().at(current); - } else if (_source == "current/number") { + } else if (_source == "number") { return current + 1; - } else if (_source == "total/name") { + } else if (_source == "names") { return m_vdi->desktopNames(); - } else if (_source == "total/number") { + } else if (_source == "count") { return m_vdi->numberOfDesktops(); } @@ -70,20 +70,20 @@ KSysGuard::SensorInfo *DesktopSource::initialData(const QString &_source) const qCDebug(LOG_ESS) << "Source" << _source; auto data = new KSysGuard::SensorInfo(); - if (_source == "current/name") { + if (_source == "name") { data->name = "Current desktop name"; data->variantType = QVariant::String; data->unit = KSysGuard::UnitNone; - } else if (_source == "current/number") { + } else if (_source == "number") { data->min = 0; data->name = "Current desktop number"; data->variantType = QVariant::Int; data->unit = KSysGuard::UnitNone; - } else if (_source == "total/name") { + } else if (_source == "names") { data->name = "All desktops by name"; data->variantType = QVariant::StringList; data->unit = KSysGuard::UnitNone; - } else if (_source == "total/number") { + } else if (_source == "count") { data->min = 0; data->name = "Desktops count"; data->variantType = QVariant::Int; @@ -97,10 +97,10 @@ KSysGuard::SensorInfo *DesktopSource::initialData(const QString &_source) const QStringList DesktopSource::sources() const { QStringList sources; - sources.append("current/name"); - sources.append("current/number"); - sources.append("total/name"); - sources.append("total/number"); + sources.append("name"); + sources.append("number"); + sources.append("names"); + sources.append("count"); return sources; } diff --git a/sources/extsysmonsources/processessource.cpp b/sources/extsysmonsources/processessource.cpp index 5af403c..e5792c0 100644 --- a/sources/extsysmonsources/processessource.cpp +++ b/sources/extsysmonsources/processessource.cpp @@ -56,17 +56,17 @@ KSysGuard::SensorInfo *ProcessesSource::initialData(const QString &_source) cons qCDebug(LOG_ESS) << "Source" << _source; auto data = new KSysGuard::SensorInfo(); - if (_source == "running/count") { + 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 == "running/list") { + } else if (_source == "list") { data->name = "All running processes list"; data->variantType = QVariant::StringList; data->unit = KSysGuard::UnitNone; - } else if (_source == "total/count") { + } else if (_source == "count") { data->min = 0; data->max = 0; data->name = "Total count of processes"; @@ -99,18 +99,18 @@ void ProcessesSource::run() cmdFile.close(); } - m_values["running/count"] = running.count(); - m_values["running/list"] = running; - m_values["total/count"] = directories.count(); + m_values["running"] = running.count(); + m_values["list"] = running; + m_values["count"] = directories.count(); } QStringList ProcessesSource::sources() const { QStringList sources; - sources.append("running/count"); - sources.append("running/list"); - sources.append("total/count"); + sources.append("running"); + sources.append("list"); + sources.append("count"); return sources; } diff --git a/sources/test/CMakeLists.txt b/sources/test/CMakeLists.txt index ffe3962..0d6d5f1 100644 --- a/sources/test/CMakeLists.txt +++ b/sources/test/CMakeLists.txt @@ -20,9 +20,9 @@ include_directories( set(AWTESTLIBRARY_HEADERS awtestlibrary.h) set(AWTESTLIBRARY_SOURCES awtestlibrary.cpp) add_library(${SUBPROJECT}-awtest STATIC ${AWTESTLIBRARY_SOURCES} ${AWTESTLIBRARY_HEADERS}) -target_link_libraries(${SUBPROJECT}-awtest ${Qt_LIBRARIES} ${Qt5Test_LIBRARIES} ${Kf6_LIBRARIES}) +target_link_libraries(${SUBPROJECT}-awtest ${Qt_LIBRARIES} ${Qt6Test_LIBRARIES} ${Kf6_LIBRARIES}) set(LIBRARY_TEST_SET ${SUBPROJECT}-awtest ${PROJECT_LIBRARY} ${PROJECT_MONITORSOURCES} - ${Qt_LIBRARIES} ${Kf6_LIBRARIES} ${Qt5Test_LIBRARIES}) + ${Qt_LIBRARIES} ${Kf6_LIBRARIES} ${Qt6Test_LIBRARIES}) # modules set(TEST_MODULES