Add files via upload

Author: AleksElixir

README.md

@@ -337,8 +337,6 @@ default, you must create it manually.
             "showOnHover": true
         },
         "clock": {
-            "background": false,
-            "showDate": false,
             "showIcon": true
         },
         "dragThreshold": 20,
@@ -577,7 +575,57 @@ default, you must create it manually.
         },
         "showOnHover": false,
         "favouriteApps": [],
-        "hiddenApps": []
+        "hiddenApps": [],
+        "categories": [
+            {
+                "name": "Development",
+                "icon": "code",
+                "apps": ["code-oss"]
+            },
+            {
+                "name": "Graphics",
+                "icon": "palette",
+                "apps": []
+            },
+            {
+                "name": "Communication",
+                "icon": "chat",
+                "apps": ["vesktop", "discord"]
+            },
+            {
+                "name": "Media",
+                "icon": "play_circle",
+                "apps": ["spotify", "obs"]
+            },
+            {
+                "name": "Games",
+                "icon": "sports_esports",
+                "apps": ["steam"]
+            },
+            {
+                "name": "Utilities",
+                "icon": "build",
+                "apps": ["obs"]
+            }
+        ],
+        "contextMenuMain": [
+            {"launch": {"text": "Launch", "icon": "play_arrow", "bold": true}},
+            {"terminal": {"parent": "launch"}},
+            "separator",
+            "favorites",
+            "categories",
+            "hide",
+            "workspaces"
+        ],
+        "contextMenuAdvanced": [
+            "open-path",
+            "desktop-file",
+            "separator",
+            {"custom-submenu": {"text": "Advanced Options", "icon": "settings"}},
+            {"kill": {"parent": "custom-submenu"}},
+            {"separator": {"parent": "custom-submenu"}},
+            {"copy-exec": {"parent": "custom-submenu"}}
+        ]
     },
     "lock": {
         "recolourLogo": false,
@@ -600,8 +648,7 @@ default, you must create it manually.
     "paths": {
         "mediaGif": "root:/assets/bongocat.gif",
         "sessionGif": "root:/assets/kurukuru.gif",
-        "wallpaperDir": "~/Pictures/Wallpapers",
-        "lyricsDir": "~/Music/lyrics"
+        "wallpaperDir": "~/Pictures/Wallpapers"
     },
     "services": {
         "audioIncrement": 0.1,

plugin/src/Caelestia/Internal/cachingimagemanager.cpp

@@ -105,26 +105,34 @@ void CachingImageManager::updateSource(const QString& path) {
 
     m_shaPath = path;
 
-    QtConcurrent::run(&CachingImageManager::sha256sum, path).then(this, [path, this](const QString& sha) {
+    const auto future = QtConcurrent::run(&CachingImageManager::sha256sum, path);
+
+    const auto watcher = new QFutureWatcher<QString>(this);
+
+    connect(watcher, &QFutureWatcher<QString>::finished, this, [watcher, path, this]() {
         if (m_path != path) {
+            // Object is destroyed or path has changed, ignore
+            watcher->deleteLater();
             return;
         }
 
         const QSize size = effectiveSize();
 
         if (!m_item || !size.width() || !size.height()) {
+            watcher->deleteLater();
             return;
         }
 
         const QString fillMode = m_item->property("fillMode").toString();
         // clang-format off
         const QString filename = QString("%1@%2x%3-%4.png")
-            .arg(sha).arg(size.width()).arg(size.height())
+            .arg(watcher->result()).arg(size.width()).arg(size.height())
             .arg(fillMode == "PreserveAspectCrop" ? "crop" : fillMode == "PreserveAspectFit" ? "fit" : "stretch");
         // clang-format on
 
         const QUrl cache = m_cacheDir.resolved(QUrl(filename));
         if (m_cachePath == cache) {
+            watcher->deleteLater();
             return;
         }
 
@@ -133,6 +141,7 @@ void CachingImageManager::updateSource(const QString& path) {
 
         if (!cache.isLocalFile()) {
             qWarning() << "CachingImageManager::updateSource: cachePath" << cache << "is not a local file";
+            watcher->deleteLater();
             return;
         }
 
@@ -148,7 +157,11 @@ void CachingImageManager::updateSource(const QString& path) {
         if (m_shaPath == path) {
             m_shaPath = QString();
         }
+
+        watcher->deleteLater();
     });
+
+    watcher->setFuture(future);
 }
 
 QUrl CachingImageManager::cachePath() const {

plugin/src/Caelestia/Internal/cachingimagemanager.hpp

@@ -2,7 +2,6 @@
 
 #include <QtQuick/qquickitem.h>
 #include <qobject.h>
-#include <qpointer.h>
 #include <qqmlintegration.h>
 
 namespace caelestia::internal {
@@ -19,7 +18,8 @@ class CachingImageManager : public QObject {
 
 public:
     explicit CachingImageManager(QObject* parent = nullptr)
-        : QObject(parent) {}
+        : QObject(parent)
+        , m_item(nullptr) {}
 
     [[nodiscard]] QQuickItem* item() const;
     void setItem(QQuickItem* item);
@@ -46,7 +46,7 @@ class CachingImageManager : public QObject {
 private:
     QString m_shaPath;
 
-    QPointer<QQuickItem> m_item;
+    QQuickItem* m_item;
     QUrl m_cacheDir;
 
     QString m_path;

plugin/src/Caelestia/Internal/sparklineitem.cpp

@@ -27,9 +27,6 @@ void SparklineItem::paint(QPainter* painter) {
 }
 
 void SparklineItem::drawLine(QPainter* painter, CircularBuffer* buffer, const QColor& color, qreal fillAlpha) {
-    if (m_historyLength < 2)
-        return;
-
     const qreal w = width();
     const qreal h = height();
     const int len = buffer->count();

plugin/src/Caelestia/Models/filesystemmodel.cpp

@@ -219,7 +219,7 @@ void FileSystemModel::watchDirIfRecursive(const QString& path) {
     if (m_recursive && m_watchChanges) {
         const auto currentDir = m_dir;
         const bool showHidden = m_showHidden;
-        auto future = QtConcurrent::run([showHidden, path]() {
+        const auto future = QtConcurrent::run([showHidden, path]() {
             QDir::Filters filters = QDir::Dirs | QDir::NoDotAndDotDot;
             if (showHidden) {
                 filters |= QDir::Hidden;
@@ -232,12 +232,16 @@ void FileSystemModel::watchDirIfRecursive(const QString& path) {
             }
             return dirs;
         });
-        future.then(this, [currentDir, showHidden, this](const QStringList& paths) {
+        const auto watcher = new QFutureWatcher<QStringList>(this);
+        connect(watcher, &QFutureWatcher<QStringList>::finished, this, [currentDir, showHidden, watcher, this]() {
+            const auto paths = watcher->result();
             if (currentDir == m_dir && showHidden == m_showHidden && !paths.isEmpty()) {
                 // Ignore if dir or showHidden has changed
                 m_watcher.addPaths(paths);
             }
+            watcher->deleteLater();
         });
+        watcher->setFuture(future);
     }
 }
 
@@ -291,7 +295,7 @@ void FileSystemModel::updateEntriesForDir(const QString& dir) {
         oldPaths << entry->path();
     }
 
-    auto future = QtConcurrent::run([=](QPromise<QPair<QSet<QString>, QSet<QString>>>& promise) {
+    const auto future = QtConcurrent::run([=](QPromise<QPair<QSet<QString>, QSet<QString>>>& promise) {
         const auto flags = recursive ? QDirIterator::Subdirectories : QDirIterator::NoIteratorFlags;
 
         std::optional<QDirIterator> iter;
@@ -349,7 +353,7 @@ void FileSystemModel::updateEntriesForDir(const QString& dir) {
             newPaths.insert(path);
         }
 
-        if (promise.isCanceled()) {
+        if (promise.isCanceled() || newPaths == oldPaths) {
             return;
         }
 
@@ -361,17 +365,23 @@ void FileSystemModel::updateEntriesForDir(const QString& dir) {
     }
     m_futures.insert(dir, future);
 
-    future
-        .then(this,
-            [dir, this](QPair<QSet<QString>, QSet<QString>> result) {
-                m_futures.remove(dir);
-                if (!result.first.isEmpty() || !result.second.isEmpty()) {
-                    applyChanges(result.first, result.second);
-                }
-            })
-        .onCanceled(this, [dir, this]() {
-            m_futures.remove(dir);
-        });
+    const auto watcher = new QFutureWatcher<QPair<QSet<QString>, QSet<QString>>>(this);
+
+    connect(watcher, &QFutureWatcher<QPair<QSet<QString>, QSet<QString>>>::finished, this, [dir, watcher, this]() {
+        m_futures.remove(dir);
+
+        if (!watcher->future().isResultReadyAt(0)) {
+            watcher->deleteLater();
+            return;
+        }
+
+        const auto result = watcher->result();
+        applyChanges(result.first, result.second);
+
+        watcher->deleteLater();
+    });
+
+    watcher->setFuture(future);
 }
 
 void FileSystemModel::applyChanges(const QSet<QString>& removedPaths, const QSet<QString>& addedPaths) {

plugin/src/Caelestia/Models/filesystemmodel.hpp

@@ -132,7 +132,7 @@ class FileSystemModel : public QAbstractListModel {
     bool m_recursive;
     bool m_watchChanges;
     bool m_showHidden;
-    bool m_sortReverse = false;
+    bool m_sortReverse;
     Filter m_filter;
     QStringList m_nameFilters;
 

plugin/src/Caelestia/Services/audiocollector.cpp

@@ -221,7 +221,7 @@ AudioCollector::AudioCollector(QObject* parent)
     , m_writeBuffer(&m_buffer2) {}
 
 AudioCollector::~AudioCollector() {
-    AudioCollector::stop();
+    stop();
 }
 
 void AudioCollector::start() {

plugin/src/Caelestia/Services/audioprovider.hpp

@@ -23,7 +23,7 @@ public slots:
     virtual void process() = 0;
 
 private:
-    QTimer* m_timer = nullptr;
+    QTimer* m_timer;
 };
 
 class AudioProvider : public Service {

plugin/src/Caelestia/Services/beattracker.cpp

@@ -19,9 +19,7 @@ BeatProcessor::~BeatProcessor() {
     if (m_in) {
         del_fvec(m_in);
     }
-    if (m_out) {
-        del_fvec(m_out);
-    }
+    del_fvec(m_out);
 }
 
 void BeatProcessor::process() {

plugin/src/Caelestia/appdb.cpp

@@ -11,7 +11,7 @@ AppEntry::AppEntry(QObject* entry, unsigned int frequency, QObject* parent)
     , m_entry(entry)
     , m_frequency(frequency) {
     const auto mo = m_entry->metaObject();
-    const auto tmo = &AppEntry::staticMetaObject;
+    const auto tmo = metaObject();
 
     for (const auto& prop :
         { "name", "comment", "execString", "startupClass", "genericName", "categories", "keywords" }) {
@@ -303,13 +303,11 @@ void AppDb::updateApps() {
         newIds.insert(entry->property("id").toString());
     }
 
-    for (auto it = m_apps.begin(); it != m_apps.end();) {
-        if (!newIds.contains(it.key())) {
+    for (auto it = m_apps.keyBegin(); it != m_apps.keyEnd(); ++it) {
+        const auto& id = *it;
+        if (!newIds.contains(id)) {
             dirty = true;
-            it.value()->deleteLater();
-            it = m_apps.erase(it);
-        } else {
-            ++it;
+            m_apps.take(id)->deleteLater();
         }
     }