Make database query result deserialization more automatic

In preparation for making it a shared library in the future.

CMakeLists.txt

@@ -33,7 +33,7 @@ ecm_setup_version(${PROJECT_VERSION}
 
 kde_enable_exceptions()
 
-find_package(Qt5 ${QT5_MIN_VERSION} REQUIRED COMPONENTS Core Gui Qml QuickControls2 Svg)
+find_package(Qt5 ${QT5_MIN_VERSION} REQUIRED COMPONENTS Core Gui Qml QuickControls2 Svg Sql)
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 I18n CoreAddons Crash)
 find_package(pybind11 REQUIRED)
 find_package(Ytdlp REQUIRED RUNTIME)

flatpak/python3-yt-dlp.json

@@ -7,13 +7,18 @@
     "sources": [
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/b4/7b/0960d02701f783bb052ec69ea32789d878d2cce05a03950adbd75f164758/websockets-10.2.tar.gz",
-            "sha256": "8351c3c86b08156337b0e4ece0e3c5ec3e01fcd14e8950996832a23c99416098"
+            "url": "https://files.pythonhosted.org/packages/9a/bf/1bc7e3096ddc2c398b3d04176530a9c02efe08546d9730c9eef0b07a0a43/yt_dlp-2022.5.18-py2.py3-none-any.whl",
+            "sha256": "deec1009442312c1e2ee5298966842194d0e950b433f0d4fc844ef464b9c32a7"
         },
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/2a/18/70c32fe9357f3eea18598b23aa9ed29b1711c3001835f7cf99a9818985d0/Brotli-1.0.9.zip",
-            "sha256": "4d1b810aa0ed773f81dceda2cc7b403d01057458730e309856356d4ef4188438"
+            "url": "https://files.pythonhosted.org/packages/11/dd/e015f3780f42dd9af62cf0107b44ea1298926627ecd70c17b0e484e95bcd/certifi-2022.5.18.1-py3-none-any.whl",
+            "sha256": "f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"
+        },
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/f8/a3/622d9acbfb9a71144b5d7609906bc648c62e3ca5fdbb1c8cca222949d82c/websockets-10.3.tar.gz",
+            "sha256": "fc06cc8073c8e87072138ba1e431300e2d408f054b27047d047b549455066ff4"
         },
         {
             "type": "file",
@@ -22,8 +27,8 @@
         },
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/c0/61/3a08dc08c0c60498a0136a7eec1a098f08be79f75bf35fdd0a15a1bace70/yt_dlp-2022.3.8.2-py3-none-any.whl",
-            "sha256": "05179f0f2c34f06910003bb9f80af68ff798b072ca0f826c0e6704a3fbd5b306"
+            "url": "https://files.pythonhosted.org/packages/2a/18/70c32fe9357f3eea18598b23aa9ed29b1711c3001835f7cf99a9818985d0/Brotli-1.0.9.zip",
+            "sha256": "4d1b810aa0ed773f81dceda2cc7b403d01057458730e309856356d4ef4188438"
         },
         {
             "type": "file",

flatpak/python3-ytmusicapi.json

@@ -5,21 +5,16 @@
         "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"ytmusicapi\" --no-build-isolation"
     ],
     "sources": [
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/cb/58/834a6445479c72544d9285badce0a58650520c8ba5adfae7b98e61d133bb/ytmusicapi-0.21.0-py3-none-any.whl",
-            "sha256": "29d8d44e1911458041882a453b05c37021ff850757c648f93a45d1775dddbae2"
-        },
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/37/45/946c02767aabb873146011e665728b680884cd8fe70dde973c640e45b775/certifi-2021.10.8-py2.py3-none-any.whl",
-            "sha256": "d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"
-        },
         {
             "type": "file",
             "url": "https://files.pythonhosted.org/packages/ec/03/062e6444ce4baf1eac17a6a0ebfe36bb1ad05e1df0e20b110de59c278498/urllib3-1.26.9-py2.py3-none-any.whl",
             "sha256": "44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14"
         },
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/11/dd/e015f3780f42dd9af62cf0107b44ea1298926627ecd70c17b0e484e95bcd/certifi-2022.5.18.1-py3-none-any.whl",
+            "sha256": "f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"
+        },
         {
             "type": "file",
             "url": "https://files.pythonhosted.org/packages/06/b3/24afc8868eba069a7f03650ac750a778862dc34941a4bebeb58706715726/charset_normalizer-2.0.12-py3-none-any.whl",
@@ -30,6 +25,11 @@
             "url": "https://files.pythonhosted.org/packages/2d/61/08076519c80041bc0ffa1a8af0cbd3bf3e2b62af10435d269a9d0f40564d/requests-2.27.1-py2.py3-none-any.whl",
             "sha256": "f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"
         },
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/0e/5a/4a5316bddbb697d4b1787159291edfeffd10f73c08b59c7248b15291b601/ytmusicapi-0.22.0-py3-none-any.whl",
+            "sha256": "d042520f3f76eac2c1498130dbc4e8a4af21ca73496590a5ff054fc4da0af1d8"
+        },
         {
             "type": "file",
             "url": "https://files.pythonhosted.org/packages/04/a2/d918dcd22354d8958fe113e1a3630137e0fc8b44859ade3063982eacd2a4/idna-3.3-py3-none-any.whl",

requirements.txt

@@ -3,5 +3,5 @@
 #
 # SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
-ytmusicapi==0.21.0
+ytmusicapi==0.22.0
 yt-dlp

src/CMakeLists.txt

@@ -10,6 +10,14 @@ target_link_libraries(ytm PUBLIC pybind11::embed)
 target_include_directories(ytm PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_compile_definitions(ytm PRIVATE -DRANDALL_WAS_HERE)
 
+add_library(asyncdatabase STATIC
+    asyncdatabase.cpp
+    asyncdatabase_p.h
+)
+
+target_include_directories(asyncdatabase PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(asyncdatabase PUBLIC Qt5::Sql)
+
 add_subdirectory(example)
 
 add_executable(audiotube
@@ -26,6 +34,7 @@ add_executable(audiotube
     playerutils.cpp
     abstractytmusicmodel.cpp
     multiiterableview.h
+    library.cpp
     resources.qrc
 )
 
@@ -40,7 +49,9 @@ target_link_libraries(audiotube
     KF5::CoreAddons
     KF5::Crash
     ytm
+    asyncdatabase
 )
-target_compile_definitions(audiotube PRIVATE -DQT_NO_KEYWORDS -DQT_NO_URL_CAST_FROM_STRING)
+
+target_compile_definitions(audiotube PRIVATE -DQT_NO_KEYWORDS -DQT_NO_URL_CAST_FROM_STRING -DQT_QML_DEBUG)
 
 install(TARGETS audiotube ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

src/albummodel.cpp

@@ -11,21 +11,22 @@ AlbumModel::AlbumModel(QObject *parent)
 {
     connect(this, &AlbumModel::browseIdChanged, this, [this] {
         setLoading(true);
-        YTMusicThread::instance()->fetchAlbum(m_browseId);
-    });
-    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::fetchAlbumFinished, this, [this](const album::Album &album) {
-        setLoading(false);
+        auto future = YTMusicThread::instance()->fetchAlbum(m_browseId);
+        connectFuture(future, this, [=, this](const album::Album &album) {
+            setLoading(false);
 
-        beginResetModel();
-        m_album = album;
-        endResetModel();
-        std::sort(m_album.thumbnails.begin(), m_album.thumbnails.end());
+            beginResetModel();
+            m_album = album;
+            endResetModel();
+            std::sort(m_album.thumbnails.begin(), m_album.thumbnails.end());
 
-        Q_EMIT titleChanged();
-        Q_EMIT thumbnailUrlChanged();
-        Q_EMIT playlistIdChanged();
+            Q_EMIT titleChanged();
+            Q_EMIT thumbnailUrlChanged();
+            Q_EMIT playlistIdChanged();
+        });
     });
-    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::errorOccurred, this, [this] {
+
+    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::errorOccurred, this, [=, this] {
         setLoading(false);
     });
 }

src/artistmodel.cpp

@@ -17,26 +17,26 @@ ArtistModel::ArtistModel(QObject *parent)
 
         setLoading(true);
 
-        YTMusicThread::instance()->fetchArtist(m_channelId);
-    });
-    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::fetchArtistFinished, this, [this](const artist::Artist &artist) {
-        setLoading(false);
+        auto future = YTMusicThread::instance()->fetchArtist(m_channelId);
+        connectFuture(future, this, [=, this](const artist::Artist &artist) {
+            setLoading(false);
 
-        beginResetModel();
-        m_artist = artist;
-        std::sort(m_artist.thumbnails.begin(), m_artist.thumbnails.end());
+            beginResetModel();
+            m_artist = artist;
+            std::sort(m_artist.thumbnails.begin(), m_artist.thumbnails.end());
 
-        albums = m_artist.albums ? m_artist.albums->results : std::vector<artist::Artist::Album>();
-        singles = m_artist.singles ? m_artist.singles->results : std::vector<artist::Artist::Single>();
-        songs = m_artist.songs ? m_artist.songs->results : std::vector<artist::Artist::Song>();
-        videos = m_artist.videos ? m_artist.videos->results : std::vector<artist::Artist::Video>();
+            albums = m_artist.albums ? m_artist.albums->results : std::vector<artist::Artist::Album>();
+            singles = m_artist.singles ? m_artist.singles->results : std::vector<artist::Artist::Single>();
+            songs = m_artist.songs ? m_artist.songs->results : std::vector<artist::Artist::Song>();
+            videos = m_artist.videos ? m_artist.videos->results : std::vector<artist::Artist::Video>();
 
-        // std::span can't know if the data pointer underneath it was changed, so re-create
-        m_view = MultiIterableView(albums, singles, songs, videos);
-        endResetModel();
+            // std::span can't know if the data pointer underneath it was changed, so re-create
+            m_view = MultiIterableView(albums, singles, songs, videos);
+            endResetModel();
 
-        Q_EMIT titleChanged();
-        Q_EMIT thumbnailUrlChanged();
+            Q_EMIT titleChanged();
+            Q_EMIT thumbnailUrlChanged();
+        });
     });
     connect(&YTMusicThread::instance().get(), &AsyncYTMusic::errorOccurred, this, [this] {
         setLoading(false);

src/asyncdatabase.cpp

@@ -0,0 +1,309 @@
+// SPDX-FileCopyrightText: 2022 Jonah Brüchert <[email protected]>
+//
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#include "asyncdatabase.h"
+
+#include <QDir>
+#include <QSqlDatabase>
+#include <QSqlQuery>
+#include <QUrl>
+#include <QStringBuilder>
+#include <QVariant>
+#include <QSqlResult>
+#include <QSqlError>
+#include <QLoggingCategory>
+
+#define SCHAMA_MIGRATIONS_TABLE "__qt_schema_migrations"
+
+Q_DECLARE_LOGGING_CATEGORY(asyncdatabase)
+Q_LOGGING_CATEGORY(asyncdatabase, "asyncdatabase")
+
+namespace asyncdatabase_private {
+
+// migrations
+void createInternalTable(QSqlDatabase &database) {
+    QSqlQuery query(QStringLiteral("create table if not exists " SCHAMA_MIGRATIONS_TABLE " ("
+                                        "version Text primary key not null, "
+                                        "run_on timestamp not null default current_timestamp)"), database);
+    if (!query.exec()) {
+        printSqlError(query);
+    }
+}
+
+void markMigrationRun(QSqlDatabase &database, const QString &name) {
+    qCDebug(asyncdatabase) << "Marking migration" << name << "as done.";
+
+    QSqlQuery query(database);
+    if (!query.prepare(QStringLiteral("insert into " SCHAMA_MIGRATIONS_TABLE " (version) values (:name)"))) {
+        printSqlError(query);
+    }
+    query.bindValue(QStringLiteral(":name"), QVariant(name));
+    if (!query.exec()) {
+        printSqlError(query);
+    }
+}
+
+bool checkMigrationAlreadyRun(QSqlDatabase &database, const QString &name) {
+    qCDebug(asyncdatabase) << "Checking whether migration" << name << "is already applied";
+    QSqlQuery query(database);
+    query.prepare(QStringLiteral("select count(*) from " SCHAMA_MIGRATIONS_TABLE " where version = :name"));
+    query.bindValue(QStringLiteral(":name"), QVariant(name));
+    query.exec();
+
+    query.next();
+    int count = query.value(0).toInt();
+    bool isApplied = count > 0;
+    if (isApplied) {
+        qCDebug(asyncdatabase) << "… yes";
+    } else {
+        qDebug(asyncdatabase) << "… no";
+    }
+    return isApplied;
+}
+
+void runDatabaseMigrations(QSqlDatabase &database, const QString &migrationDirectory)
+{
+    createInternalTable(database);
+
+    QDir dir(migrationDirectory);
+    auto entries = dir.entryList(QDir::Filter::Dirs | QDir::Filter::NoDotAndDotDot, QDir::SortFlag::Name);
+
+    for (const auto &entry : entries) {
+        QDir subdir(entry);
+        if (!checkMigrationAlreadyRun(database, subdir.dirName())) {
+            QFile file(migrationDirectory % QDir::separator() % entry % QDir::separator() % "up.sql");
+            if (!file.open(QFile::ReadOnly)) {
+                qCDebug(asyncdatabase) << "Failed to open migration file" << file.fileName();
+            }
+            qCDebug(asyncdatabase) << "Running migration" << subdir.dirName();
+
+            database.transaction();
+
+            // Hackish
+            const auto statements = file.readAll().split(';');
+
+            bool migrationSuccessful = true;
+            for (const QByteArray &statement : statements) {
+                const auto trimmedStatement = statement.trimmed();
+                QSqlQuery query(database);
+
+                if (!trimmedStatement.isEmpty()) {
+                    qCDebug(asyncdatabase) << "Running" << trimmedStatement;
+                    if (!query.prepare(trimmedStatement)) {
+                        printSqlError(query);
+                    } else {
+                        bool success = query.exec();
+                        migrationSuccessful &= success;
+                        if (!success) {
+                            printSqlError(query);
+                        }
+                    }
+                }
+            }
+
+            if (migrationSuccessful) {
+                database.commit();
+                markMigrationRun(database, subdir.dirName());
+            } else {
+                database.rollback();
+            }
+        }
+    }
+    qCDebug(asyncdatabase) << "Migrations finished";
+}
+
+struct AsyncSqlDatabasePrivate {
+    QSqlDatabase database;
+};
+
+// Internal asynchronous database class
+QFuture<void> AsyncSqlDatabase::establishConnection(const DatabaseConfiguration &configuration)
+{
+    return runAsync<void>([=, this] {
+        d->database = QSqlDatabase::addDatabase(configuration.type());
+        if (configuration.databaseName()) {
+            d->database.setDatabaseName(*configuration.databaseName());
+        }
+        if (configuration.hostName()) {
+            d->database.setHostName(*configuration.hostName());
+        }
+        if (configuration.userName()) {
+            d->database.setUserName(*configuration.userName());
+        }
+        if (configuration.password()) {
+            d->database.setPassword(*configuration.password());
+        }
+
+        if (!d->database.open()) {
+            qCDebug(asyncdatabase) << "Failed to open database" << d->database.lastError().text();
+            if (configuration.databaseName()) {
+                qCDebug(asyncdatabase) << "Tried to use database" << *configuration.databaseName();
+            }
+        }
+    });
+}
+
+AsyncSqlDatabase::AsyncSqlDatabase()
+    : QObject()
+    , d(std::make_unique<AsyncSqlDatabasePrivate>())
+{
+}
+
+Row AsyncSqlDatabase::retrieveRow(const QSqlQuery &query) {
+    Row row;
+    int i = 0;
+
+    while (true) {
+        if (query.isValid()) {
+            QVariant value = query.value(i);
+            if (value.isValid()) {
+                row.push_back(std::move(value));
+                i++;
+            } else {
+                break;
+            }
+        } else {
+            break;
+        }
+    }
+    return row;
+}
+
+Rows AsyncSqlDatabase::retrieveRows(QSqlQuery &query)
+{
+    Rows rows;
+    while (query.next()) {
+        rows.push_back(retrieveRow(query));
+    }
+
+    return rows;
+}
+
+std::optional<Row> AsyncSqlDatabase::retrieveOptionalRow(QSqlQuery &query)
+{
+    query.next();
+
+    if (query.isValid()) {
+        return retrieveRow(query);
+    } else {
+        return std::nullopt;
+    }
+}
+
+QSqlDatabase &AsyncSqlDatabase::db()
+{
+    return d->database;
+}
+
+AsyncSqlDatabase::~AsyncSqlDatabase() = default;
+
+void printSqlError(const QSqlQuery &query)
+{
+    qCDebug(asyncdatabase) << "SQL error:" << query.lastError().text();
+}
+
+QSqlQuery prepareQuery(const QSqlDatabase &database, const QString &sqlQuery)
+{
+    qCDebug(asyncdatabase) << "Running" << sqlQuery;
+    QSqlQuery query(database);
+    if (!query.prepare(sqlQuery)) {
+        printSqlError(query);
+    }
+    return query;
+}
+
+QSqlQuery runQuery(QSqlQuery &query)
+{
+    if (!query.exec()) {
+        printSqlError(query);
+    }
+    return query;
+}
+
+}
+
+struct DatabaseConfigurationPrivate : public QSharedData {
+    QString type;
+    std::optional<QString> hostName;
+    std::optional<QString> databaseName;
+    std::optional<QString> userName;
+    std::optional<QString> password;
+};
+
+DatabaseConfiguration::DatabaseConfiguration() : d(new DatabaseConfigurationPrivate)
+{}
+
+DatabaseConfiguration::~DatabaseConfiguration() = default;
+DatabaseConfiguration::DatabaseConfiguration(const DatabaseConfiguration &) = default;
+
+void DatabaseConfiguration::setType(const QString &type) {
+    d->type = type;
+}
+
+const QString &DatabaseConfiguration::type() const {
+    return d->type;
+}
+
+void DatabaseConfiguration::setHostName(const QString &hostName) {
+    d->hostName = hostName;
+}
+
+const std::optional<QString> &DatabaseConfiguration::hostName() const {
+    return d->hostName;
+}
+
+void DatabaseConfiguration::setDatabaseName(const QString &databaseName) {
+    d->databaseName = databaseName;
+}
+
+const std::optional<QString> &DatabaseConfiguration::databaseName() const {
+    return d->databaseName;
+}
+
+void DatabaseConfiguration::setUserName(const QString &userName) {
+    d->userName = userName;
+}
+
+const std::optional<QString> &DatabaseConfiguration::userName() const {
+    return d->userName;
+}
+
+void DatabaseConfiguration::setPassword(const QString &password) {
+    d->password = password;
+}
+
+const std::optional<QString> &DatabaseConfiguration::password() const {
+    return d->password;
+}
+
+
+struct ThreadedDatabasePrivate {
+    asyncdatabase_private::AsyncSqlDatabase db;
+};
+
+std::unique_ptr<ThreadedDatabase> ThreadedDatabase::establishConnection(DatabaseConfiguration config) {
+    auto threadedDb = std::make_unique<ThreadedDatabase>();
+    threadedDb->setObjectName(QStringLiteral("database thread"));
+    threadedDb->d->db.moveToThread(&*threadedDb);
+    threadedDb->start();
+    threadedDb->d->db.establishConnection(config);
+    return threadedDb;
+}
+
+ThreadedDatabase::ThreadedDatabase()
+    : QThread()
+    , d(std::make_unique<ThreadedDatabasePrivate>())
+{
+}
+
+ThreadedDatabase::~ThreadedDatabase()
+{
+    quit();
+    wait();
+}
+
+asyncdatabase_private::AsyncSqlDatabase &ThreadedDatabase::db()
+{
+    return d->db;
+}

src/asyncdatabase.h

@@ -0,0 +1,161 @@
+// SPDX-FileCopyrightText: 2022 Jonah Brüchert <[email protected]>
+//
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#pragma once
+
+class QUrl;
+class QSqlDatabase;
+
+#include <QString>
+#include <QObject>
+#include <QFuture>
+#include <QFutureWatcher>
+#include <QSqlQuery>
+#include <QDebug>
+#include <QThread>
+#include <QSharedDataPointer>
+
+#include <memory>
+#include <optional>
+#include <tuple>
+#include <vector>
+
+#include "asyncdatabase_p.h"
+
+using Row  = std::vector<QVariant>;
+using Rows = std::vector<Row>;
+
+struct DatabaseConfigurationPrivate;
+
+///
+/// Options for connecting to a database
+///
+class DatabaseConfiguration {
+public:
+    DatabaseConfiguration();
+    DatabaseConfiguration(const DatabaseConfiguration &);
+    ~DatabaseConfiguration();
+
+    /// Set the name of the database driver, for example DATABASE_TYPE_SQLITE or a custom string.
+    void setType(const QString &type);
+    const QString &type() const;
+
+    /// Set the hostname
+    void setHostName(const QString &hostName);
+    const std::optional<QString> &hostName() const;
+
+    /// Set the name of the database (path of the file for SQLite)
+    void setDatabaseName(const QString &databaseName);
+    const std::optional<QString> &databaseName() const;
+
+    /// Set user name
+    void setUserName(const QString &userName);
+    const std::optional<QString> &userName() const;
+
+    /// Set password
+    void setPassword(const QString &password);
+    const std::optional<QString> &password() const;
+
+private:
+    QSharedDataPointer<DatabaseConfigurationPrivate> d;
+};
+
+///
+/// The SQLite database driver
+///
+const QString DATABASE_TYPE_SQLITE = QStringLiteral("QSQLITE");
+
+///
+/// Parse the row into a tuple of the given types.
+/// The types need to be deserializable from QVariant.
+///
+template <typename RowTypesTuple>
+auto parseRow(const Row &row) -> RowTypesTuple
+{
+    auto tuple = RowTypesTuple();
+    int i = 0;
+    asyncdatabase_private::iterate_tuple(tuple, [&](auto &elem) {
+        elem = row.at(i).value<std::decay_t<decltype(elem)>>();
+        i++;
+    });
+    return tuple;
+}
+
+///
+/// Parse the rows into a list of tuples of the given types.
+/// The types need to be deserializable from QVariant.
+///
+template <typename RowTypesTuple>
+auto parseRows(const Rows &rows) -> std::vector<RowTypesTuple> {
+    std::vector<RowTypesTuple> parsedRows;
+    parsedRows.reserve(rows.size());
+    for (const auto &row : rows) {
+        parsedRows.push_back(parseRow<RowTypesTuple>(row));
+    }
+
+    return parsedRows;
+}
+
+struct ThreadedDatabasePrivate;
+
+class ThreadedDatabase : public QThread {
+public:
+    ///
+    /// \brief Connect to a database
+    /// \param configuration of the database connection
+    /// \return
+    ///
+    static std::unique_ptr<ThreadedDatabase> establishConnection(DatabaseConfiguration config);
+
+    ///
+    /// \brief Execute an SQL query on the database, ignoring the result.
+    /// \param SQL query string to execute
+    /// \param Parameters to bind to the placeholders in the SQL Query
+    /// \return
+    ///
+    template <typename ...Args>
+    auto execute(const QString &sqlQuery, Args... args) -> QFuture<void> {
+        return db().execute(sqlQuery, args...);
+    }
+
+    ///
+    /// Run database migrations in the given directory.
+    /// The directory needs to contain a subdirectory for each migration.
+    /// The subdirectories need to be named so that when sorted alphabetically the migrations will be run in the correct order.
+    /// Each subdirectory needs to contain a file named up.sql.
+    ///
+    /// \param Directory which contains the migrations.
+    /// \return
+    ///
+    auto runMigrations(const QString &migrationDirectory) -> QFuture<void> {
+        return db().runMigrations(migrationDirectory);
+    }
+
+    ///
+    /// \brief Execute an SQL query on the database, retrieving the result.
+    /// \param SQL Query to execute
+    /// \param parameters to bind to the placeholders in the SQL query.
+    /// \return Future of a list of lists of variants.
+    ///
+    template <typename T, typename ...Args>
+    auto getResults(const QString &sqlQuery, Args... args) -> QFuture<std::vector<T>> {
+        return db().getResults<T, Args...>(sqlQuery, args...);
+    }
+
+    ///
+    /// \brief Like getResults, but for retrieving just one row.
+    ///
+    template <typename T, typename ...Args>
+    auto getResult(const QString &sqlQuery, Args... args) -> QFuture<std::optional<T>> {
+        return db().getResult<T, Args...>(sqlQuery, args...);
+    }
+
+    ThreadedDatabase();
+    ~ThreadedDatabase();
+
+private:
+    asyncdatabase_private::AsyncSqlDatabase &db();
+
+    std::unique_ptr<ThreadedDatabasePrivate> d;
+};

src/asyncdatabase_p.h

@@ -0,0 +1,161 @@
+// SPDX-FileCopyrightText: 2022 Jonah Brüchert <[email protected]>
+//
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#pragma once
+
+#include <memory>
+#include <tuple>
+#include <optional>
+
+#include <QFuture>
+#include <QFutureWatcher>
+#include <QSqlQuery>
+#include <QSqlDatabase>
+#include <QThread>
+
+class DatabaseConfiguration;
+
+namespace asyncdatabase_private {
+
+// Helpers
+template <typename Tuple, typename Func, std::size_t i>
+inline constexpr void iterate_impl(Tuple &tup, Func fun)
+{
+    if constexpr(i >= std::tuple_size_v<std::decay_t<decltype(tup)>>) {
+        return;
+    } else {
+        fun(std::get<i>(tup));
+        return asyncdatabase_private::iterate_impl<Tuple, Func, i + 1>(tup, fun);
+    }
+}
+
+template <typename Tuple, typename Func>
+inline constexpr void iterate_tuple(Tuple &tup, Func fun)
+{
+    asyncdatabase_private::iterate_impl<Tuple, Func, 0>(tup, fun);
+}
+
+template <typename T, typename QObjectDerivedType, typename Function>
+void connectFuture(const QFuture<T> &future, QObjectDerivedType *self, const Function &fun) {
+    auto watcher = std::make_shared<QFutureWatcher<T>>();
+    watcher->setFuture(future);
+    QObject::connect(watcher.get(), &QFutureWatcherBase::finished, self, [self, watcher, fun, future] {
+        if constexpr (std::is_same_v<void, T>) {
+            if constexpr (std::is_member_function_pointer_v<Function>) {
+                fun->*(self);
+            } else {
+                fun();
+            }
+        } else if (future.resultCount() > 0) {
+            if constexpr (std::is_member_function_pointer_v<Function>) {
+                (self->*fun)(watcher->result());
+            } else {
+                fun(watcher->result());
+            }
+        }
+    });
+}
+
+using Row  = std::vector<QVariant>;
+using Rows = std::vector<Row>;
+
+void runDatabaseMigrations(QSqlDatabase &database, const QString &migrationDirectory);
+
+void printSqlError(const QSqlQuery &query);
+
+// non-template helper functions to allow patching a much as possible in the shared library
+QSqlQuery prepareQuery(const QSqlDatabase &database, const QString &sqlQuery);
+QSqlQuery runQuery(QSqlQuery &query);
+
+struct AsyncSqlDatabasePrivate;
+
+class AsyncSqlDatabase : public QObject {
+    Q_OBJECT
+
+public:
+    QFuture<void> establishConnection(const DatabaseConfiguration &configuration);
+
+    template <typename T, typename ...Args>
+    auto getResults(const QString &sqlQuery, Args... args) -> QFuture<std::vector<T>> {
+        return runAsync<std::vector<T>>([=, this] {
+            auto query = executeQuery(sqlQuery, args...);
+            auto dbrows = retrieveRows(query);
+            const auto rows = parseRows<typename T::ColumnTypes>(dbrows);
+
+            std::vector<T> deserializedRows;
+            for (auto row : rows) {
+                deserializedRows.push_back(T::fromSql(std::move(row)));
+            }
+            return deserializedRows;
+        });
+    }
+
+    template <typename T, typename ...Args>
+    auto getResult(const QString &sqlQuery, Args... args) -> QFuture<std::optional<T>> {
+        return runAsync<std::optional<T>>([=, this]() -> std::optional<T> {
+            auto query = executeQuery(sqlQuery, args...);
+            if (const auto row = retrieveOptionalRow(query)) {
+                return T::fromSql(parseRow<typename T::ColumnTypes>(*row));
+            }
+
+            return std::nullopt;
+        });
+    }
+
+    template <typename ...Args>
+    auto execute(const QString &sqlQuery, Args... args) -> QFuture<void> {
+        return runAsync<void>([=, this] {
+            executeQuery(sqlQuery, args...);
+        });
+    }
+
+    auto runMigrations(const QString &migrationDirectory) -> QFuture<void> {
+        return runAsync<void>([=, this] {
+            runDatabaseMigrations(db(), migrationDirectory);
+        });
+    }
+
+    AsyncSqlDatabase();
+    ~AsyncSqlDatabase();
+
+private:
+    template <typename ...Args>
+    QSqlQuery executeQuery(const QString &sqlQuery, Args... args) {
+        auto query = prepareQuery(db(), sqlQuery);
+        auto argsTuple = std::make_tuple<Args...>(std::move(args)...);
+        int i = 0;
+        asyncdatabase_private::iterate_tuple(argsTuple, [&](auto &arg) {
+            query.bindValue(i, arg);
+            i++;
+        });
+        return runQuery(query);
+    }
+
+    template <typename T, typename Functor>
+    QFuture<T> runAsync(Functor func) {
+        auto interface = std::make_shared<QFutureInterface<T>>();
+        QMetaObject::invokeMethod(this, [interface, func] {
+            if constexpr (!std::is_same_v<T, void>) {
+                auto result = func();
+                interface->reportResult(result);
+            } else {
+                func();
+            }
+
+            interface->reportFinished();
+        });
+
+        return interface->future();
+    }
+
+    Row retrieveRow(const QSqlQuery &query);
+    Rows retrieveRows(QSqlQuery &query);
+    std::optional<Row> retrieveOptionalRow(QSqlQuery &query);
+
+    QSqlDatabase &db();
+
+    std::unique_ptr<AsyncSqlDatabasePrivate> d;
+};
+
+}

src/asyncytmusic.cpp

@@ -6,6 +6,9 @@
 
 #include <QThread>
 #include <QDebug>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QFutureInterface>
 
 #include <pybind11/embed.h>
 
@@ -13,6 +16,13 @@
 
 namespace py = pybind11;
 
+#include <iostream>
+#include <algorithm>
+#include <unordered_map>
+#include <ranges>
+#include <type_traits>
+#include <memory>
+
 template <typename R, typename T, typename OP>
 std::optional<R> map_optional(const std::optional<T> &optional, OP op) {
     if (optional.has_value()) {
@@ -49,95 +59,82 @@ AsyncYTMusic::AsyncYTMusic(QObject *parent)
 //
 // search
 //
-void AsyncYTMusic::search(const QString &query)
+QFuture<std::vector<search::SearchResultItem>> AsyncYTMusic::search(const QString &query)
 {
-    invokeAndCatchOnThread([=, this]() {
-        Q_EMIT searchFinished(m_ytm->search(query.toStdString()));
+    return invokeAndCatchOnThread<std::vector<search::SearchResultItem>>([=, this]() {
+        return m_ytm->search(query.toStdString());
     });
 }
 
 //
 // fetchArtist
 //
-void AsyncYTMusic::fetchArtist(const QString &channelId)
+QFuture<artist::Artist> AsyncYTMusic::fetchArtist(const QString &channelId)
 {
-    invokeAndCatchOnThread([=, this]() {
-        Q_EMIT fetchArtistFinished(m_ytm->get_artist(channelId.toStdString()));
+    return invokeAndCatchOnThread<artist::Artist>([=, this]() {
+        return m_ytm->get_artist(channelId.toStdString());
     });
 }
 
 //
 // fetchAlbum
 //
-void AsyncYTMusic::fetchAlbum(const QString &browseId)
+QFuture<album::Album> AsyncYTMusic::fetchAlbum(const QString &browseId)
 {
-    invokeAndCatchOnThread([=, this]() {
-        Q_EMIT fetchAlbumFinished(m_ytm->get_album(browseId.toStdString()));
+    return invokeAndCatchOnThread<album::Album>([=, this]() {
+        return m_ytm->get_album(browseId.toStdString());
     });
 }
 
 //
 // fetchSong
 //
-void AsyncYTMusic::fetchSong(const QString &videoId)
+QFuture<std::optional<song::Song>> AsyncYTMusic::fetchSong(const QString &videoId)
 {
-    invokeAndCatchOnThread([=, this]() {
-        auto maybeSong = m_ytm->get_song(videoId.toStdString());
-        if (maybeSong.has_value()) {
-            Q_EMIT fetchSongFinished(*maybeSong);
-        }
+    return invokeAndCatchOnThread<std::optional<song::Song>>([=, this]() {
+        return m_ytm->get_song(videoId.toStdString());
     });
 }
 
 //
 // fetchPlaylist
 //
-void AsyncYTMusic::fetchPlaylist(const QString &playlistId) {
-    invokeAndCatchOnThread([=, this]() {
-        Q_EMIT fetchPlaylistFinished(m_ytm->get_playlist(playlistId.toStdString()));
+QFuture<playlist::Playlist> AsyncYTMusic::fetchPlaylist(const QString &playlistId) {
+    return invokeAndCatchOnThread<playlist::Playlist>([=, this]() {
+        return m_ytm->get_playlist(playlistId.toStdString());
     });
 }
 
 //
 // fetchArtistAlbum
 //
-void AsyncYTMusic::fetchArtistAlbums(const QString &channelId, const QString &params)
+QFuture<std::vector<artist::Artist::Album>> AsyncYTMusic::fetchArtistAlbums(const QString &channelId, const QString &params)
 {
-    invokeAndCatchOnThread([=, this]() {
-        Q_EMIT fetchArtistAlbumsFinished(m_ytm->get_artist_albums(channelId.toStdString(), params.toStdString()));
+    return invokeAndCatchOnThread<std::vector<artist::Artist::Album>>([=, this]() {
+        return m_ytm->get_artist_albums(channelId.toStdString(), params.toStdString());
     });
 }
 
 //
 // extractVideoInfo
 //
-void AsyncYTMusic::extractVideoInfo(const QString &videoId)
+QFuture<video_info::VideoInfo> AsyncYTMusic::extractVideoInfo(const QString &videoId)
 {
-    invokeAndCatchOnThread([=, this]() {
-        Q_EMIT extractVideoInfoFinished(m_ytm->extract_video_info(videoId.toStdString()));
+    return invokeAndCatchOnThread<video_info::VideoInfo>([=, this]() {
+        return m_ytm->extract_video_info(videoId.toStdString());
     });
 }
 
 //
 // fetchWatchPlaylist
 //
-void AsyncYTMusic::fetchWatchPlaylist(const std::optional<QString> &videoId, const std::optional<QString> &playlistId)
+QFuture<watch::Playlist> AsyncYTMusic::fetchWatchPlaylist(const std::optional<QString> &videoId, const std::optional<QString> &playlistId)
 {
-    invokeAndCatchOnThread([=, this]() {
-        Q_EMIT fetchWatchPlaylistFinished(m_ytm->get_watch_playlist(
+    return invokeAndCatchOnThread<watch::Playlist>([=, this]() {
+        return m_ytm->get_watch_playlist(
             map_optional<std::string>(videoId, &QString::toStdString),
             map_optional<std::string>(playlistId,  &QString::toStdString)
-        ));
-    });
-}
-
-void AsyncYTMusic::invokeAndCatchOnThread(const std::function<void()> &fun) {
-    QMetaObject::invokeMethod(this, [=, this]() {
-        try {
-            fun();
-        } catch (const py::error_already_set &err) {
-            Q_EMIT errorOccurred(QString::fromLocal8Bit(err.what()));
-        }
+        );
     });
 }
 

src/asyncytmusic.h

@@ -6,6 +6,8 @@
 
 #include <QObject>
 #include <QThread>
+#include <QFuture>
+#include <QFutureWatcher>
 
 #include <vector>
 
@@ -45,6 +47,50 @@ private:
     std::unique_ptr<T> m_item = nullptr;
 };
 
+///
+/// Similar to QObject::connect, except that the first two arguments are replaced with a QFuture.
+///
+template <typename T, typename QObjectDerivedType, typename Function>
+void connectFuture(const QFuture<T> &future, QObjectDerivedType *self, const Function &fun) {
+    auto watcher = std::make_shared<QFutureWatcher<T>>();
+    watcher->setFuture(future);
+    QObject::connect(watcher.get(), &QFutureWatcherBase::finished, self, [self, watcher, fun, future] {
+        if constexpr (std::is_same_v<void, T>) {
+            if constexpr (std::is_member_function_pointer_v<Function>) {
+                (self->*fun)();
+            } else {
+                fun();
+            }
+        } else if (future.resultCount() > 0) {
+            if constexpr (std::is_member_function_pointer_v<Function>) {
+                (self->*fun)(watcher->result());
+            } else {
+                fun(watcher->result());
+            }
+        }
+    });
+}
+
+///
+/// Applies a function to a the contained value of a QFuture once it finishes.
+/// @returns a QFuture that finishes once the future given as first argument finished
+///
+template <typename T, typename U, typename Func>
+QFuture<U> mapFuture(const QFuture<T> &future, Func mapFunction) {
+    auto watcher = std::make_shared<QFutureWatcher<T>>();
+    watcher->setFuture(future);
+
+    auto interface = std::make_shared<QFutureInterface<U>>();
+    QObject::connect(watcher.get(), &QFutureWatcherBase::finished, watcher.get(), [interface, watcher, mapFunction] {
+        auto result = watcher->result();
+        auto mapped = mapFunction(std::move(result));
+        interface->reportResult(mapped);
+        interface->reportFinished();
+    });
+
+    return interface->future();
+}
+
 class AsyncYTMusic : public QObject
 {
     friend class YTMusicThread;
@@ -53,30 +99,22 @@ class AsyncYTMusic : public QObject
 
 public:
     // public functions need to be thread safe
-    void search(const QString &query);
-    Q_SIGNAL void searchFinished(std::vector<search::SearchResultItem>);
+    QFuture<std::vector<search::SearchResultItem>> search(const QString &query);
 
-    void fetchArtist(const QString &channelId);
-    Q_SIGNAL void fetchArtistFinished(artist::Artist);
+    QFuture<artist::Artist> fetchArtist(const QString &channelId);
 
-    void fetchAlbum(const QString &browseId);
-    Q_SIGNAL void fetchAlbumFinished(album::Album);
+    QFuture<album::Album> fetchAlbum(const QString &browseId);
 
-    void fetchSong(const QString &videoId);
-    Q_SIGNAL void fetchSongFinished(song::Song);
+    QFuture<std::optional<song::Song> > fetchSong(const QString &videoId);
 
-    void fetchPlaylist(const QString &playlistId);
-    Q_SIGNAL void fetchPlaylistFinished(playlist::Playlist);
+    QFuture<playlist::Playlist> fetchPlaylist(const QString &playlistId);
 
-    void fetchArtistAlbums(const QString &channelId, const QString &params);
-    Q_SIGNAL void fetchArtistAlbumsFinished(std::vector<artist::Artist::Album>);
+    QFuture<std::vector<artist::Artist::Album>> fetchArtistAlbums(const QString &channelId, const QString &params);
 
-    void extractVideoInfo(const QString &videoId);
-    Q_SIGNAL void extractVideoInfoFinished(video_info::VideoInfo);
+    QFuture<video_info::VideoInfo> extractVideoInfo(const QString &videoId);
 
-    void fetchWatchPlaylist(const std::optional<QString> &videoId = std::nullopt ,
+    QFuture<watch::Playlist> fetchWatchPlaylist(const std::optional<QString> &videoId = std::nullopt ,
                             const std::optional<QString> &playlistId = std::nullopt);
-    Q_SIGNAL void fetchWatchPlaylistFinished(watch::Playlist);
 
     Q_SIGNAL void errorOccurred(const QString &error);
 
@@ -85,7 +123,21 @@ protected:
 
 private:
     /// Invokes the given function on the thread of the YTMusic object, and handles exceptions that occur while invoking it.
-    void invokeAndCatchOnThread(const std::function<void()> &fun);
+    template <typename ReturnType>
+    QFuture<ReturnType> invokeAndCatchOnThread(const std::function<ReturnType()> &fun) {
+        auto interface = std::make_shared<QFutureInterface<ReturnType>>();
+        QMetaObject::invokeMethod(this, [=, this]() {
+            try {
+                ReturnType val = fun();
+                interface->reportResult(val);
+                interface->reportFinished();
+            } catch (const std::exception &err) {
+                interface->reportFinished();
+                Q_EMIT errorOccurred(QString::fromLocal8Bit(err.what()));
+            }
+        });
+        return interface->future();
+    }
 
     // Python interpreter will be initialized from the thread calling the methods
     Lazy<YTMusic> m_ytm;

src/contents/ui/LibraryPage.qml

@@ -0,0 +1,119 @@
+// SPDX-FileCopyrightText: 2022 Jonah Brüchert <[email protected]>
+//
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+import QtQuick 2.1
+import QtQuick.Controls 2.12 as Controls
+import QtQuick.Layouts 1.3
+import org.kde.kirigami 2.14 as Kirigami
+
+import org.kde.ytmusic 1.0
+
+Kirigami.ScrollablePage {
+    ColumnLayout {
+        Kirigami.Heading {
+            text: i18n("Favourites")
+        }
+        Controls.ScrollView {
+            Layout.fillWidth: true
+            RowLayout {
+                Repeater {
+                    Layout.fillWidth: true
+                    model: Library.favourites
+                    delegate: ColumnLayout {
+                        id: delegateItem
+                        required property string title
+                        required property string artist
+                        required property string videoId
+
+                        Layout.fillWidth: false
+                        Layout.maximumWidth: 200
+                        Kirigami.Card {
+                            id: card
+                            Layout.preferredHeight: 200
+
+                            onClicked: play(delegateItem.videoId)
+
+                            ThumbnailSource {
+                                id: thumbnailSource
+                                videoId: delegateItem.videoId
+                            }
+
+                            header: Image {
+                                sourceSize: "200x200"
+                                source: thumbnailSource.cachedPath
+                                fillMode: Image.PreserveAspectCrop
+                                asynchronous: true
+                            }
+
+                            actions: [
+                                Kirigami.Action {
+                                    icon.name: "delete"
+                                    onTriggered: Library.removeFavourite(delegateItem.videoId)
+                                }
+
+                            ]
+                        }
+                        Controls.Label {
+                            Layout.maximumWidth: 200
+                            text: delegateItem.title
+                            elide: Qt.ElideRight
+                        }
+                    }
+                }
+            }
+        }
+        Kirigami.Heading {
+            text: i18n("Most played")
+        }
+        Controls.ScrollView {
+            Layout.fillWidth: true
+            RowLayout {
+                Repeater {
+                    Layout.fillWidth: true
+                    model: Library.mostPlayed
+                    delegate: ColumnLayout {
+                        id: mpdelegateItem
+                        required property string title
+                        required property string artist
+                        required property string videoId
+
+                        Layout.fillWidth: false
+                        Layout.maximumWidth: 200
+                        Kirigami.Card {
+                            id: mpcard
+                            Layout.preferredHeight: 200
+
+                            onClicked: play(mpdelegateItem.videoId)
+
+                            ThumbnailSource {
+                                id: mpthumbnailSource
+                                videoId: mpdelegateItem.videoId
+                            }
+
+                            header: Image {
+                                sourceSize: "200x200"
+                                source: mpthumbnailSource.cachedPath
+                                fillMode: Image.PreserveAspectCrop
+                                asynchronous: true
+                            }
+
+                            actions: [
+                                Kirigami.Action {
+                                    icon.name: "delete"
+                                    onTriggered: Library.removeFavourite(mpdelegateItem.videoId)
+                                }
+
+                            ]
+                        }
+                        Controls.Label {
+                            Layout.maximumWidth: 200
+                            text: mpdelegateItem.title
+                            elide: Qt.ElideRight
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

src/contents/ui/MaximizedPlayerPage.qml

@@ -0,0 +1,427 @@
+// SPDX-FileCopyrightText: 2020-2022 Devin Lin <[email protected]>
+//
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+
+import QtGraphicalEffects 1.0
+import QtMultimedia 5.12
+
+import org.kde.kirigami 2.19 as Kirigami
+import org.kde.ytmusic 1.0
+
+Item {
+    id: root
+    
+    required property var info // VideoInfoExtractor object
+    required property var audio // Audio object
+    
+    signal requestClose()
+    
+    // background image
+    Item {
+        anchors.fill: parent
+        
+        Rectangle {
+            anchors.fill: parent
+            color: Qt.rgba(25, 25, 30, 1)
+        }
+        
+        Image {
+            anchors.fill: parent
+            asynchronous: true
+            
+            source: info.thumbnail
+            fillMode: Image.PreserveAspectCrop
+            
+            sourceSize.width: 512
+            sourceSize.height: 512
+        }
+        
+        layer.enabled: true
+        layer.effect: HueSaturation {
+            cached: true
+
+            lightness: -0.5
+            saturation: 1.9
+
+            layer.enabled: true
+            layer.effect: FastBlur {
+                cached: true
+                radius: 100
+            }
+        }
+    }
+    
+    // content
+    ColumnLayout {
+        anchors.fill: parent
+        spacing: 0
+
+        // hide arrow button
+        ToolButton {
+            id: closeButton
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
+            Layout.maximumHeight: parent.height
+            Layout.preferredHeight: Kirigami.Units.gridUnit * 3
+            Layout.maximumWidth: parent.height
+            Layout.preferredWidth: Kirigami.Units.gridUnit * 3
+            Layout.topMargin: Kirigami.Units.smallSpacing
+            icon.name: "arrow-down"
+            icon.color: "white"
+            Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+            Kirigami.Theme.inherit: false
+            onClicked: root.requestClose()
+        }
+        
+        // top tab bar
+        RowLayout {
+            id: tabBar
+            Layout.alignment: Qt.AlignHCenter
+            
+            ToolButton {
+                id: nowPlayingTab
+                text: i18n("Now Playing")
+                padding: Kirigami.Units.largeSpacing
+                onClicked: swipeView.setCurrentIndex(0)
+                Layout.preferredHeight: Kirigami.Units.gridUnit * 2
+                Layout.preferredWidth: Kirigami.Units.gridUnit * 9
+                
+                contentItem: Label {
+                    text: nowPlayingTab.text
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+                    elide: Text.ElideRight
+                    color: "white" // we need to ensure the label is white
+                }
+                
+                // selection indicator
+                Rectangle {
+                    anchors.top: parent.top
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    color: Kirigami.Theme.highlightColor
+                    height: 1
+                    visible: swipeView.currentIndex == 0
+                }
+            }
+            ToolButton {
+                id: queueTab
+                text: i18n("Queue")
+                padding: Kirigami.Units.largeSpacing
+                onClicked: swipeView.setCurrentIndex(1)
+                Layout.preferredHeight: Kirigami.Units.gridUnit * 2
+                Layout.preferredWidth: Kirigami.Units.gridUnit * 9
+                
+                contentItem: Label {
+                    text: queueTab.text
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+                    elide: Text.ElideRight
+                    color: "white"
+                }
+                
+                // selection indicator
+                Rectangle {
+                    anchors.top: parent.top
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    color: Kirigami.Theme.highlightColor
+                    height: 1
+                    visible: swipeView.currentIndex == 1
+                }
+            }
+        }
+        
+        // tabs
+        SwipeView {
+            id: swipeView
+            property double specWidth: {
+                let allowedWidth = root.width - Kirigami.Units.largeSpacing * 4;
+                let allowedHeight = root.height - Kirigami.Units.largeSpacing * 8 - (closeButton.height + tabBar.height + bottomPlayerControls.height);
+                if (allowedWidth > allowedHeight) {
+                    return allowedHeight;
+                } else {
+                    return allowedWidth;
+                }
+            }
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
+            Layout.fillWidth: true
+            Layout.preferredHeight: specWidth
+        
+            // music art
+            Item {
+                height: swipeView.width
+                width: swipeView.height
+                
+                Image {
+                    anchors.centerIn: parent
+                    width: swipeView.specWidth
+                    height: swipeView.specWidth
+
+                    asynchronous: true
+                    mipmap: true
+
+                    source: info.thumbnail
+
+                    sourceSize {
+                        width: 512
+                        height: 512
+                    }
+
+                    fillMode: Image.PreserveAspectFit
+                }
+            }
+            
+            // playlist
+            ListView {
+                id: playlistView
+                width: swipeView.width
+                height: swipeView.height
+                clip: true
+                
+                Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+                Kirigami.Theme.inherit: false
+
+                BusyIndicator {
+                    anchors.centerIn: parent
+                    visible: UserPlaylistModel.loading || UserPlaylistModel.loading
+                }
+
+                model: UserPlaylistModel
+
+                delegate: Kirigami.SwipeListItem {
+                    id: delegateItem
+                    required property string title
+                    required property string videoId
+                    required property string artists
+                    required property bool isCurrent
+
+                    backgroundColor: 'transparent'
+                    highlighted: isCurrent
+                    onClicked: UserPlaylistModel.skipTo(videoId)
+
+                    ColumnLayout {
+                        Layout.fillWidth: true
+                        Kirigami.Heading {
+                            elide: Text.ElideRight
+                            Layout.fillWidth: true
+                            level: 2
+                            text: title
+                        }
+
+                        Label {
+                            elide: Text.ElideRight
+                            Layout.fillWidth: true
+                            text: artists
+                        }
+                    }
+
+                    actions: [
+                        Kirigami.Action {
+                            text: i18n("Remove Track")
+                            icon.name: "list-remove"
+                            icon.color: "white"
+                            onTriggered: UserPlaylistModel.remove(delegateItem.videoId)
+                        }
+                    ]
+                }
+            }
+        }
+        
+        ColumnLayout {
+            id: bottomPlayerControls
+            Layout.topMargin: Kirigami.Units.largeSpacing
+            Layout.leftMargin: Kirigami.Units.gridUnit * 2
+            Layout.rightMargin: Kirigami.Units.gridUnit * 2
+            Layout.bottomMargin: Kirigami.Units.gridUnit * 2
+            
+            // song name
+            Label {
+                id: mainLabel
+                text: info.title ? info.title : i18n("No media playing")
+                
+                Layout.fillWidth: true
+                
+                horizontalAlignment: Text.AlignHCenter
+                elide: Text.ElideRight
+                maximumLineCount: 1
+                // Hardcoded because the footerbar blur always makes a dark-ish
+                // background, so we don't want to use a color scheme color that
+                // might also be dark
+                color: "white"
+                font.pointSize: Kirigami.Theme.defaultFont.pointSize * 1.5
+                font.weight: Font.Bold
+                font.bold: true
+            }
+            
+            // song artist
+            Kirigami.Heading {
+                id: authorLabel
+                text: info.artist ? info.artist : info.channel
+                
+                Layout.fillWidth: true
+                
+                horizontalAlignment: Text.AlignHCenter
+                elide: Text.ElideRight
+                maximumLineCount: 1
+                // Hardcoded because the footerbar blur always makes a dark-ish
+                // background, so we don't want to use a color scheme color that
+                // might also be dark
+                color: "white"
+                opacity: 0.9
+                font.pointSize: Kirigami.Theme.defaultFont.pointSize * 1.3
+                font.weight: Font.Bold
+                font.bold: true
+            }
+            
+            // slider row
+            RowLayout {
+                Layout.topMargin: Kirigami.Units.gridUnit * 2
+                spacing: Kirigami.Units.smallSpacing
+                
+                Label {
+                    Layout.alignment: Qt.AlignVCenter
+                    color: "white"
+                    visible: info.title
+                    text: PlayerUtils.formatTimestamp(audio.position)
+                }
+
+                Slider {
+                    Layout.alignment: Qt.AlignVCenter
+                    Layout.fillWidth: true
+                    from: 0
+                    to: audio.duration
+                    value: audio.position
+                    enabled: audio.seekable
+                    onMoved: {
+                        console.log("Value:", value);
+                        audio.seek(Math.floor(value));
+                    }
+
+                    Behavior on value {
+                        NumberAnimation {
+                            duration: 1000
+                        }
+                    }
+                }
+
+                Label {
+                    Layout.alignment: Qt.AlignVCenter
+                    color: "white"
+                    visible: info.title
+                    text: PlayerUtils.formatTimestamp(audio.duration)
+                }
+            }
+            
+            RowLayout {
+                Layout.topMargin: Kirigami.Units.largeSpacing
+                Layout.alignment: Qt.AlignCenter
+                Layout.fillWidth: true
+                spacing: Kirigami.Units.largeSpacing
+                
+                // ensure white icons
+                Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+                Kirigami.Theme.inherit: false
+
+                ToolButton {
+                    id: favouriteButton
+                    readonly property QtObject favouriteWatcher: Library.favouriteWatcher(info.videoId)
+                    Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+                    Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
+                    Layout.maximumWidth: height
+                    Layout.preferredWidth: height
+                    
+                    onClicked: if (favouriteWatcher)
+                                   favouriteWatcher.isFavourite
+                                    ? Library.removeFavourite(info.videoId)
+                                    : Library.addFavourite(info.videoId, info.title)
+                    
+                    icon.name: favouriteWatcher ? (favouriteWatcher.isFavourite ? "starred-symbolic" : "non-starred-symbolic") : ""
+                    icon.width: Kirigami.Units.gridUnit * 1.5
+                    icon.height: Kirigami.Units.gridUnit * 1.5
+                    icon.color: "white"
+                    
+                    Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+                    Kirigami.Theme.inherit: false
+                }
+                
+                ToolButton {
+                    id: skipBackwardButton
+                    Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+                    Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
+                    Layout.maximumWidth: height
+                    Layout.preferredWidth: height
+                    
+                    enabled: false
+                    
+                    icon.name: "media-skip-backward"
+                    icon.width: Kirigami.Units.gridUnit * 1.5
+                    icon.height: Kirigami.Units.gridUnit * 1.5
+                    icon.color: "white"
+                    
+                    Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+                    Kirigami.Theme.inherit: false
+                }
+                
+                ToolButton {
+                    id: playPauseButton
+                    Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+                    Layout.preferredHeight: Kirigami.Units.gridUnit * 4
+                    Layout.maximumWidth: height
+                    Layout.preferredWidth: height
+                    
+                    enabled: info.audioUrl != ""
+                    onClicked: audio.playbackState === Audio.PlayingState ? audio.pause() : audio.play()
+                    
+                    icon.name: audio.playbackState === Audio.PlayingState ? "media-playback-pause" : "media-playback-start"
+                    icon.width: Kirigami.Units.gridUnit * 3
+                    icon.height: Kirigami.Units.gridUnit * 3
+                    icon.color: "white"
+                    
+                    Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+                    Kirigami.Theme.inherit: false
+                }
+                
+                ToolButton {
+                    id: skipForwardButton
+                    Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+                    Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
+                    Layout.maximumWidth: height
+                    Layout.preferredWidth: height
+                    
+                    enabled: UserPlaylistModel.canSkip
+                    onClicked: UserPlaylistModel.next()
+                    
+                    icon.name: "media-skip-forward"
+                    icon.width: Kirigami.Units.gridUnit * 1.5
+                    icon.height: Kirigami.Units.gridUnit * 1.5
+                    icon.color: "white"
+                    
+                    Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+                    Kirigami.Theme.inherit: false
+                }
+                
+                ToolButton {
+                    id: shuffleButton
+                    Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+                    Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
+                    Layout.maximumWidth: height
+                    Layout.preferredWidth: height
+                    
+                    onClicked: UserPlaylistModel.shufflePlaylist()
+                    
+                    icon.name: "media-playlist-shuffle"
+                    icon.width: Kirigami.Units.gridUnit * 1.5
+                    icon.height: Kirigami.Units.gridUnit * 1.5
+                    icon.color: "white"
+                    
+                    Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+                    Kirigami.Theme.inherit: false
+                }
+            }
+        }
+    }
+}

src/contents/ui/MinimizedPlayerControls.qml

@@ -0,0 +1,207 @@
+// SPDX-FileCopyrightText: 2020-2022 Devin Lin <[email protected]>
+//
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+
+import QtGraphicalEffects 1.0
+import QtMultimedia 5.12
+
+import org.kde.kirigami 2.19 as Kirigami
+import org.kde.ytmusic 1.0
+
+Item {
+    id: root
+    
+    required property int progressBarHeight
+    required property int minimizedPlayerContentHeight
+    
+    required property var info // VideoInfoExtractor object
+    required property var audio // Audio object
+    
+    readonly property bool isWidescreen: width >= Kirigami.Units.gridUnit * 40
+    
+    signal requestOpen()
+    
+    Rectangle {
+        id: miniProgressBar
+        z: 1
+        visible: root.isWidescreen
+        anchors.top: parent.top
+        anchors.left: parent.left
+        height: root.progressBarHeight
+        color: Kirigami.Theme.highlightColor
+        width: parent.width * (audio.position / audio.duration)
+    }
+    
+    RowLayout {
+        anchors.fill: parent
+        spacing: 0
+        
+        Rectangle {
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+            Layout.maximumWidth: Kirigami.Units.gridUnit * 20
+            Layout.preferredWidth: Kirigami.Units.gridUnit * 20
+            color: Qt.rgba(0, 0, 0, trackClick.containsMouse ? 0.1 : trackClick.pressed ? 0.3 : 0)
+
+            RowLayout {
+                anchors.fill: parent
+                anchors.leftMargin: Kirigami.Units.largeSpacing
+                spacing: Kirigami.Units.largeSpacing
+                
+                // track image
+                Item {
+                    property double imageSize: root.height - Kirigami.Units.largeSpacing * 2
+                    
+                    Layout.alignment: Qt.AlignVCenter
+                    Layout.maximumWidth: imageSize
+                    Layout.preferredWidth: imageSize
+                    Layout.maximumHeight: imageSize
+                    Layout.minimumHeight: imageSize
+
+                    Image {
+                        id: mainIcon
+                        anchors.fill: parent
+                        asynchronous: true
+                        mipmap: true
+
+                        source: info.thumbnail
+
+                        sourceSize.width: 512
+                        sourceSize.height: 512
+                        fillMode: Image.PreserveAspectFit
+                    }
+                }
+                
+                // track information
+                ColumnLayout {
+                    Layout.fillWidth: true
+                    Layout.fillHeight: true
+                    
+                    Label {
+                        id: mainLabel
+                        text: info.title ? info.title : i18n("No media playing")
+                        textFormat: Text.PlainText
+                        wrapMode: Text.Wrap
+                        Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
+                        Layout.fillWidth: true
+                        horizontalAlignment: Text.AlignLeft
+                        elide: Text.ElideRight
+                        maximumLineCount: 1
+                        // Hardcoded because the footerbar blur always makes a dark-ish
+                        // background, so we don't want to use a color scheme color that
+                        // might also be dark
+                        color: "white"
+                        font.weight: Font.Bold
+                    }
+                    
+                    Label {
+                        id: authorLabel
+                        text: info.artist ? info.artist : info.channel
+                        textFormat: Text.PlainText
+                        wrapMode: Text.Wrap
+                        Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
+                        Layout.fillWidth: true
+                        horizontalAlignment: Text.AlignLeft
+                        elide: Text.ElideRight
+                        maximumLineCount: 1
+                        // Hardcoded because the footerbar blur always makes a dark-ish
+                        // background, so we don't want to use a color scheme color that
+                        // might also be dark
+                        color: "white"
+                    }
+                }
+            }
+            
+            MouseArea {
+                id: trackClick
+                anchors.fill: parent
+                hoverEnabled: true
+                onClicked: root.requestOpen()
+            }
+        }
+        
+        RowLayout {
+            visible: root.isWidescreen
+            Layout.preferredWidth: 0
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+            Layout.leftMargin: Kirigami.Units.largeSpacing
+            Layout.rightMargin: Kirigami.Units.largeSpacing
+            spacing: Kirigami.Units.smallSpacing
+            
+            Label {
+                Layout.alignment: Qt.AlignVCenter
+                color: "white"
+                visible: info.title
+                text: PlayerUtils.formatTimestamp(audio.position)
+            }
+
+            Slider {
+                Layout.alignment: Qt.AlignVCenter
+                Layout.fillWidth: true
+                from: 0
+                to: audio.duration
+                value: audio.position
+                enabled: audio.seekable
+                onMoved: {
+                    console.log("Value:", value);
+                    audio.seek(Math.floor(value));
+                }
+
+                Behavior on value {
+                    NumberAnimation {
+                        duration: 1000
+                    }
+                }
+            }
+
+            Label {
+                Layout.alignment: Qt.AlignVCenter
+                color: "white"
+                visible: info.title
+                text: PlayerUtils.formatTimestamp(audio.duration)
+            }
+        }
+        
+        ToolButton {
+            id: playPauseButton
+            Layout.preferredHeight: Kirigami.Units.gridUnit * 3
+            Layout.maximumWidth: height
+            Layout.preferredWidth: height
+            
+            enabled: info.audioUrl != ""
+            onClicked: audio.playbackState === Audio.PlayingState ? audio.pause() : audio.play()
+            
+            icon.name: audio.playbackState === Audio.PlayingState ? "media-playback-pause" : "media-playback-start"
+            icon.width: Kirigami.Units.gridUnit
+            icon.height: Kirigami.Units.gridUnit
+            icon.color: "white"
+            
+            Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+            Kirigami.Theme.inherit: false
+        }
+        
+        ToolButton {
+            id: skipForwardButton
+            Layout.rightMargin: Math.floor(Kirigami.Units.smallSpacing / 2)
+            Layout.preferredHeight: Kirigami.Units.gridUnit * 3
+            Layout.maximumWidth: height
+            Layout.preferredWidth: height
+            
+            enabled: UserPlaylistModel.canSkip
+            onClicked: UserPlaylistModel.next()
+            
+            icon.name: "media-skip-forward"
+            icon.width: Kirigami.Units.gridUnit
+            icon.height: Kirigami.Units.gridUnit
+            icon.color: "white"
+            
+            Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+            Kirigami.Theme.inherit: false
+        }
+    }
+}

src/contents/ui/PlayerFooter.qml

@@ -1,261 +1,422 @@
 // SPDX-FileCopyrightText: 2021 Jonah Brüchert <[email protected]>
+// SPDX-FileCopyrightText: 2021 Bart De Vries <[email protected]>
+// SPDX-FileCopyrightText: 2020-2022 Devin Lin <[email protected]>
 //
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
 import QtQuick 2.7
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.12 as Controls
+
+import QtMultimedia 5.12
+import QtGraphicalEffects 1.0
+
 import org.kde.kirigami 2.12 as Kirigami
 import org.kde.ytmusic 1.0
-import QtMultimedia 5.12
 
-Item {
+Flickable {
     id: footerItem
+    
     property bool maximized: false
+    
+    readonly property int progressBarHeight: Kirigami.Units.gridUnit / 6
+    readonly property int minimizedPlayerContentHeight: Math.round(Kirigami.Units.gridUnit * 3.5)
+    readonly property int minimizedPlayerHeight: minimizedPlayerContentHeight + progressBarHeight
 
-    anchors.left: parent.left
-    anchors.right: parent.right
-    height: maximized ? applicationWindow().height : 75
-
-    Rectangle {
-        color: Kirigami.Theme.backgroundColor
-        Kirigami.Theme.colorSet: Kirigami.Theme.Window
-        anchors.fill: footerLayout
+    boundsBehavior: Flickable.StopAtBounds
+    
+    function close() {
+        toClose.restart();
     }
 
+    function resetToBoundsOnFlick() {
+        if (!atYBeginning || !atYEnd) {
+            if (footerItem.verticalVelocity > 0) {
+                toOpen.restart();
+            } else if (footerItem.verticalVelocity < 0) {
+                toClose.restart();
+            } else { // i.e. when verticalVelocity === 0
+                if (contentY > contentHeight / 4) {
+                    toOpen.restart();
+                } else  {
+                    toClose.restart();
+                }
+            }
+        }
+    }
+
+    function resetToBoundsOnResize() {
+        if (contentY > contentHeight / 4) {
+            contentY = contentHeight / 2;
+        } else {
+            contentY = 0;
+        }
+    }
+    
+    NumberAnimation on contentY {
+        id: toOpen
+        from: contentY
+        to: contentHeight / 2
+        duration: Kirigami.Units.longDuration * 2
+        easing.type: Easing.OutCubic
+        running: false
+    }
+    
+    NumberAnimation on contentY {
+        id: toClose
+        from: contentY
+        to: 0
+        duration: Kirigami.Units.longDuration * 2
+        easing.type: Easing.OutCubic
+        running: false
+    }
+
+    // snap to end
+    MouseArea {
+        anchors.fill: footerLayout
+        propagateComposedEvents: true
+        onPressed: {
+            toOpen.stop();
+            toClose.stop();
+            propagateComposedEvents = true;
+        }
+        onReleased: footerItem.resetToBoundsOnFlick()
+    }
+
+    onMovementStarted: {
+        toOpen.stop();
+        toClose.stop();
+    }
+    onFlickStarted: resetToBoundsOnFlick()
+    onMovementEnded: resetToBoundsOnFlick()
+    onHeightChanged: resetToBoundsOnResize()
+
+    property var videoInfoExtractor: VideoInfoExtractor {
+        id: info
+
+        onSongChanged: audio.play()
+        videoId: UserPlaylistModel.currentVideoId
+        onTitleChanged: Library.addPlaybackHistoryItem(info.videoId, info.title)
+    }
+    
+    property var audioPlayer: Audio {
+        id: audio
+
+        source: info.audioUrl
+        onStatusChanged: {
+            if (status === Audio.EndOfMedia) {
+                console.log("Song ended");
+                UserPlaylistModel.next();
+            }
+        }
+    }
+    
+    contentHeight: height * 2
+    
     ColumnLayout {
         id: footerLayout
-        height: parent.height
-        anchors.fill: parent
+        
+        anchors.left: parent.left
+        anchors.right: parent.right
+        spacing: 0
 
-        GridLayout {
-            id: playerLayout
-
-            readonly property bool mobile: width > height
-
-            Layout.fillHeight: footerItem.maximized
+        // margin from top
+        Item {
+            Layout.minimumHeight: footerItem.height - footerItem.minimizedPlayerHeight
+        }
+        
+        Controls.Control {
             Layout.fillWidth: true
-            flow: width > height ? GridLayout.LeftToRight : GridLayout.TopToBottom
-            visible: footerItem.maximized
-
-            Item {
-                Layout.fillWidth: info.thumbnail
-                Layout.fillHeight: info.thumbnail
+            padding: 0
+            implicitHeight: footerItem.minimizedPlayerHeight
+            
+            // minimized player background
+            background: Item {
+                Rectangle {
+                    anchors.fill: parent
+                    color: Qt.rgba(25, 25, 30, 1)
+                }
+                
                 Image {
-                    anchors.fill: parent
-
+                    opacity: 0.2
                     source: info.thumbnail
-                    fillMode: Image.PreserveAspectFit
-                }
-            }
-
-            Item {
-                Layout.fillWidth: true
-                Layout.fillHeight: true
-
-                Controls.ScrollView {
+                    asynchronous: true
+                    
                     anchors.fill: parent
+                    fillMode: Image.PreserveAspectCrop
+                }
+                
+                layer.enabled: true
+                layer.effect: HueSaturation {
+                    cached: true
 
-                    ListView {
-                        anchors.fill: parent
-                        id: playlistView
+                    lightness: -0.5
+                    saturation: 1.9
 
-                        clip: true
-
-                        Controls.BusyIndicator {
-                            anchors.centerIn: parent
-                            visible: UserPlaylistModel.loading || UserPlaylistModel.loading
-                        }
-
-                        onCountChanged: {
-                            if (count < 1) {
-                                footerItem.maximized = false
-                            }
-                        }
-
-                        model: UserPlaylistModel
-
-                        delegate: Kirigami.SwipeListItem {
-                            id: delegateItem
-                            required property string title
-                            required property string videoId
-                            required property string artists
-                            required property bool isCurrent
-
-                            highlighted: isCurrent
-                            onClicked: UserPlaylistModel.skipTo(videoId)
-
-                            ColumnLayout {
-                                Layout.fillWidth: true
-                                Kirigami.Heading {
-                                    elide: Text.ElideRight
-                                    Layout.fillWidth: true
-                                    level: 2
-                                    text: title
-                                }
-
-                                Controls.Label {
-                                    elide: Text.ElideRight
-                                    Layout.fillWidth: true
-                                    text: artists
-                                }
-                            }
-
-                            actions: [
-                                Kirigami.Action {
-                                    text: i18n("Remove Track")
-                                    icon.name: "list-remove"
-                                    onTriggered: UserPlaylistModel.remove(delegateItem.videoId)
-                                }
-                            ]
-                        }
-
-                        header: Controls.ToolBar {
-                            anchors.left: parent.left
-                            anchors.right: parent.right
-                            RowLayout {
-                                anchors.fill: parent
-                                Item {
-                                    Layout.fillWidth: true
-                                }
-
-                                Controls.ToolButton {
-                                    text: i18n("Clear")
-                                    icon.name: "edit-clear-all"
-                                    onClicked: UserPlaylistModel.clear()
-                                }
-                                Controls.ToolButton {
-                                    text: i18n("Shuffle")
-                                    icon.name: "media-playlist-shuffle"
-                                    onClicked: UserPlaylistModel.shufflePlaylist()
-                                }
-                            }
-                        }
+                    layer.enabled: true
+                    layer.effect: FastBlur {
+                        cached: true
+                        radius: 64
+                        transparentBorder: false
                     }
                 }
             }
+            
+            MinimizedPlayerControls {
+                progressBarHeight: footerItem.progressBarHeight
+                minimizedPlayerContentHeight: footerItem.minimizedPlayerContentHeight
+                height: minimizedPlayerHeight
+                
+                focus: true
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.top: parent.top
+                
+                info: footerItem.videoInfoExtractor
+                audio: footerItem.audioPlayer
+                
+                onRequestOpen: toOpen.start();
+            }
         }
-
-        Kirigami.Separator {
+        
+        MaximizedPlayerPage {
+            id: maximizedPlayerPage
             Layout.fillWidth: true
+            Layout.fillHeight: true
+            implicitHeight: footerItem.height
+            
+            info: footerItem.videoInfoExtractor
+            audio: footerItem.audioPlayer
+                
+            onRequestClose: toClose.start();
         }
+        
+        //GridLayout {
+            //id: playerLayout
 
-        RowLayout {
-            id: player
+            //readonly property bool mobile: width > height
 
-            Layout.fillWidth: true
-            Layout.fillHeight: !footer.maximized
+            //Layout.fillHeight: footerItem.maximized
+            //Layout.fillWidth: true
+            //flow: width > height ? GridLayout.LeftToRight : GridLayout.TopToBottom
+            //visible: footerItem.maximized
 
-            VideoInfoExtractor {
-                id: info
+            //ColumnLayout {
+                //Layout.preferredWidth: footerLayout.width * (playerLayout.mobile ? 1 : 0.5)
+                //Layout.preferredHeight: footerLayout.height * (playerLayout.mobile ? 0.5 : 1)
 
-                onSongChanged: audio.play()
-                videoId: UserPlaylistModel.currentVideoId
-            }
+                //Item {
+                    //Layout.fillWidth: true
+                    //Layout.fillHeight: true
 
-            Audio {
-                id: audio
+                    //Image {
+                        //anchors.fill: parent
+                        //source: info.thumbnail
+                        //fillMode: Image.PreserveAspectFit
+                    //}
+                //}
+                //Controls.RoundButton {
+                    //readonly property QtObject favouriteWatcher: Library.favouriteWatcher(info.videoId)
 
-                source: info.audioUrl
-                onStatusChanged: {
-                    if (status === Audio.EndOfMedia) {
-                        console.log("Song ended");
-                        UserPlaylistModel.next();
-                    }
-                }
-            }
+                    //Layout.alignment: Qt.AlignHCenter
+                    //icon.name: favouriteWatcher ? (favouriteWatcher.isFavourite ? "starred-symbolic" : "non-starred-symbolic") : ""
+                    //onClicked: if (favouriteWatcher)
+                                   //favouriteWatcher.isFavourite
+                                    //? Library.removeFavourite(info.videoId)
+                                    //: Library.addFavourite(info.videoId, info.title)
+                //}
+            //}
 
-            Controls.ToolButton {
-                display: Controls.AbstractButton.IconOnly
-                Layout.preferredWidth: parent.height
-                Layout.fillHeight: true
-                enabled: info.audioUrl != ""
-                text: audio.playbackState === Audio.PlayingState ? i18n("Pause") : i18n("Play")
-                visible: !info.loading
-                icon.name: audio.playbackState === Audio.PlayingState ? "media-playback-pause" : "media-playback-start"
-                onClicked: audio.playbackState === Audio.PlayingState ? audio.pause() : audio.play()
-            }
+            //Item {
+                //Layout.fillWidth: true
+                //Layout.fillHeight: true
+                //Layout.preferredWidth: footerLayout.width * (playerLayout.mobile ? 1 : 0.5)
+                //Layout.preferredHeight: footerLayout.height * (playerLayout.mobile ? 0.5 : 1)
 
-            Controls.ToolButton {
-                display: Controls.AbstractButton.IconOnly
-                Layout.preferredWidth: parent.height
-                Layout.fillHeight: true
-                enabled: UserPlaylistModel.canSkip
-                visible: !info.loading
-                icon.name: "media-skip-forward"
-                onClicked: UserPlaylistModel.next()
-            }
+                //Controls.ScrollView {
+                    //anchors.fill: parent
 
-            Controls.BusyIndicator {
-                Layout.fillHeight: true
-                visible: info.loading
-            }
+                    //ListView {
+                        //anchors.fill: parent
+                        //id: playlistView
 
-            ColumnLayout {
-                Layout.fillHeight: true
-                Layout.topMargin: Kirigami.Units.smallSpacing
-                Layout.bottomMargin: Kirigami.Units.smallSpacing
+                        //clip: true
 
-                Kirigami.Heading {
-                    level: 3
-                    Layout.fillWidth: true
-                    elide: Qt.ElideRight
-                    text: info.title ? info.title : i18n("No media playing")
-                }
+                        //Controls.BusyIndicator {
+                            //anchors.centerIn: parent
+                            //visible: UserPlaylistModel.loading || UserPlaylistModel.loading
+                        //}
 
-                RowLayout{
+                        //onCountChanged: {
+                            //if (count < 1) {
+                                //footerItem.maximized = false
+                            //}
+                        //}
 
-                    Controls.Label{
-                        visible: info.title
-                        text: PlayerUtils.formatTimestamp(audio.position)
-                    }
+                        //model: UserPlaylistModel
 
-                    Controls.Slider {
-                        Layout.fillWidth: true
-                        from: 0
-                        to: audio.duration
-                        value: audio.position
-                        enabled: audio.seekable
-                        onMoved: {
-                            console.log("Value:", value);
-                            audio.seek(Math.floor(value));
-                        }
+                        //delegate: Kirigami.SwipeListItem {
+                            //id: delegateItem
+                            //required property string title
+                            //required property string videoId
+                            //required property string artists
+                            //required property bool isCurrent
 
-                        Behavior on value {
-                            NumberAnimation {
-                                duration: 1000
-                            }
+                            //highlighted: isCurrent
+                            //onClicked: UserPlaylistModel.skipTo(videoId)
 
-                        }
+                            //ColumnLayout {
+                                //Layout.fillWidth: true
+                                //Kirigami.Heading {
+                                    //elide: Text.ElideRight
+                                    //Layout.fillWidth: true
+                                    //level: 2
+                                    //text: title
+                                //}
 
-                    }
+                                //Controls.Label {
+                                    //elide: Text.ElideRight
+                                    //Layout.fillWidth: true
+                                    //text: artists
+                                //}
+                            //}
 
-                    Controls.Label{
-                        visible: info.title
-                        text: PlayerUtils.formatTimestamp(audio.duration)
-                    }
+                            //actions: [
+                                //Kirigami.Action {
+                                    //text: i18n("Remove Track")
+                                    //icon.name: "list-remove"
+                                    //onTriggered: UserPlaylistModel.remove(delegateItem.videoId)
+                                //}
+                            //]
+                        //}
 
-                }
+                        //header: Controls.ToolBar {
+                            //anchors.left: parent.left
+                            //anchors.right: parent.right
+                            //RowLayout {
+                                //anchors.fill: parent
+                                //Item {
+                                    //Layout.fillWidth: true
+                                //}
+
+                                //Controls.ToolButton {
+                                    //text: i18n("Clear")
+                                    //icon.name: "edit-clear-all"
+                                    //onClicked: UserPlaylistModel.clear()
+                                //}
+                                //Controls.ToolButton {
+                                    //text: i18n("Shuffle")
+                                    //icon.name: "media-playlist-shuffle"
+                                    //onClicked: UserPlaylistModel.shufflePlaylist()
+                                //}
+                            //}
+                        //}
+                    //}
+                //}
+            //}
+        //}
+
+        //Kirigami.Separator {
+            //Layout.fillWidth: true
+        //}
+
+        //RowLayout {
+            //id: player
+
+            //Layout.fillWidth: true
+            //Layout.fillHeight: !footer.maximized
+
+            //Controls.ToolButton {
+                //display: Controls.AbstractButton.IconOnly
+                //Layout.preferredWidth: parent.height
+                //Layout.fillHeight: true
+                //enabled: info.audioUrl != ""
+                //text: audio.playbackState === Audio.PlayingState ? i18n("Pause") : i18n("Play")
+                //visible: !info.loading
+                //icon.name: audio.playbackState === Audio.PlayingState ? "media-playback-pause" : "media-playback-start"
+                //onClicked: audio.playbackState === Audio.PlayingState ? audio.pause() : audio.play()
+            //}
+
+            //Controls.ToolButton {
+                //display: Controls.AbstractButton.IconOnly
+                //Layout.preferredWidth: parent.height
+                //Layout.fillHeight: true
+                //enabled: UserPlaylistModel.canSkip
+                //visible: !info.loading
+                //icon.name: "media-skip-forward"
+                //onClicked: UserPlaylistModel.next()
+            //}
+
+            //Controls.BusyIndicator {
+                //Layout.fillHeight: true
+                //visible: info.loading
+            //}
+
+            //ColumnLayout {
+                //Layout.fillHeight: true
+                //Layout.topMargin: Kirigami.Units.smallSpacing
+                //Layout.bottomMargin: Kirigami.Units.smallSpacing
+
+                //Kirigami.Heading {
+                    //level: 3
+                    //Layout.fillWidth: true
+                    //elide: Qt.ElideRight
+                    //text: info.title ? info.title : i18n("No media playing")
+                //}
+
+                //RowLayout{
+
+                    //Controls.Label{
+                        //visible: info.title
+                        //text: PlayerUtils.formatTimestamp(audio.position)
+                    //}
+
+                    //Controls.Slider {
+                        //Layout.fillWidth: true
+                        //from: 0
+                        //to: audio.duration
+                        //value: audio.position
+                        //enabled: audio.seekable
+                        //onMoved: {
+                            //console.log("Value:", value);
+                            //audio.seek(Math.floor(value));
+                        //}
+
+                        //Behavior on value {
+                            //NumberAnimation {
+                                //duration: 1000
+                            //}
+
+                        //}
+
+                    //}
+
+                    //Controls.Label{
+                        //visible: info.title
+                        //text: PlayerUtils.formatTimestamp(audio.duration)
+                    //}
+
+                //}
 
 
 
-            }
+            //}
 
-            Controls.ToolButton {
-                display: Controls.AbstractButton.IconOnly
-                Layout.preferredWidth: parent.height
-                text: i18n("Expand")
-                enabled: playlistView.count > 0
-                Layout.fillHeight: true
-                icon.name: footerItem.maximized ? "arrow-down" : "arrow-up"
-                onClicked: footerItem.maximized = !footerItem.maximized
-            }
+            //Controls.ToolButton {
+                //display: Controls.AbstractButton.IconOnly
+                //Layout.preferredWidth: parent.height
+                //text: i18n("Expand")
+                //enabled: playlistView.count > 0
+                //Layout.fillHeight: true
+                //icon.name: footerItem.maximized ? "arrow-down" : "arrow-up"
+                //onClicked: footerItem.maximized = !footerItem.maximized
+            //}
 
-        }
+        //}
     }
 
-    Behavior on height {
-        NumberAnimation {
-        }
-    }
+    //Behavior on height {
+        //NumberAnimation {
+        //}
+    //}
 }

src/contents/ui/main.qml

@@ -15,7 +15,6 @@ Kirigami.ApplicationWindow {
     property alias searchField: searchField
 
     header: Controls.Control {
-        visible: !footer.maximized
         padding: Kirigami.Units.largeSpacing
 
         background: Rectangle {
@@ -36,10 +35,53 @@ Kirigami.ApplicationWindow {
                 selectByMouse: true
                 Layout.fillWidth: true
                 Layout.maximumWidth: 400
+                onPressed: {
+                    popup.open()
+                }
+
+                Controls.Popup {
+                    id: popup
+                    x: searchField.y
+                    y: searchField.y + searchField.height
+                    visible: true
+                    width: searchField.width
+                    height: completionList
+                            ? Math.min(completionList.count * Kirigami.Units.gridUnit * 2 + Kirigami.Units.gridUnit * 2, Kirigami.Units.gridUnit * 20)
+                            : Kirigami.Units.gridUnit * 20
+
+                    contentItem: Controls.ScrollView {
+                        Controls.ScrollBar.horizontal.policy: Controls.ScrollBar.AlwaysOff
+                        ListView {
+                            id: completionList
+                            model: Library.searches
+                            delegate: Controls.ItemDelegate {
+                                Kirigami.Theme.colorSet: Kirigami.Theme.Window
+                                Kirigami.Theme.inherit: false
+                                id: completionDelegate
+                                width: parent.width
+                                height: Kirigami.Units.gridUnit * 2
+                                text: model.display
+                                onClicked: {
+                                    searchField.text = model.display
+                                    searchField.accepted()
+                                }
+                            }
+                        }
+                    }
+                }
+
                 onAccepted: {
                     pageStack.clear()
-                    pageStack.push("qrc:/SearchPage.qml", {
-                               "searchQuery": text})
+
+                    if (text) {
+                        Library.addSearch(text)
+                        pageStack.push("qrc:/SearchPage.qml", {
+                                   "searchQuery": text})
+                    } else {
+                        pageStack.replace("qrc:/LibraryPage.qml")
+                    }
+
+                    popup.close()
                 }
             }
             Item {
@@ -50,13 +92,11 @@ Kirigami.ApplicationWindow {
 
     title: i18n("AudioTube")
 
-    controlsVisible: !footer.maximized
-
     contextDrawer: Kirigami.ContextDrawer {
         id: contextDrawer
     }
 
-    pageStack.initialPage: "qrc:/SearchPage.qml"
+    pageStack.initialPage: "qrc:/LibraryPage.qml"
 
     function play(videoId) {
         UserPlaylistModel.initialVideoId = videoId
@@ -79,6 +119,16 @@ Kirigami.ApplicationWindow {
             showPassiveNotification(error)
         }
     }
+    
+    pageStack.anchors.bottomMargin: playerFooter.minimizedPlayerHeight + 1
 
-    footer: PlayerFooter {}
+    // media player
+    PlayerFooter {
+        id: playerFooter
+        anchors.topMargin: -root.header.height
+        anchors.fill: parent
+        
+        // only expand flicking area to full screen when it is open
+        z: (contentY === 0) ? -1 : 999
+    }
 }

src/library.cpp

@@ -0,0 +1,250 @@
+// SPDX-FileCopyrightText: 2022 Jonah Brüchert <[email protected]>
+//
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#include "library.h"
+
+#include <QStandardPaths>
+#include <QDir>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QStringBuilder>
+
+#include "asyncdatabase.h"
+
+namespace ranges = std::ranges;
+
+Library::Library(QObject *parent)
+    : QObject{parent}
+    , m_database(ThreadedDatabase::establishConnection([]() -> DatabaseConfiguration {
+        const auto databaseDirectory = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
+        // Make sure the database directory exists
+        QDir(databaseDirectory).mkpath(QStringLiteral("."));
+
+        DatabaseConfiguration config;
+        config.setDatabaseName(databaseDirectory % QDir::separator() % "library.sqlite");
+        config.setType(DATABASE_TYPE_SQLITE);
+        return config;
+    }()))
+{
+    m_database->runMigrations(":/migrations/");
+}
+
+Library::~Library() = default;
+
+Library &Library::instance()
+{
+    static Library inst;
+    return inst;
+}
+
+FavouritesModel *Library::favourites()
+{
+    auto future = m_database->getResults<Song>("select * from favourites natural join songs");
+    return new FavouritesModel(std::move(future), this);
+}
+
+void Library::addFavourite(const QString &videoId, const QString &title)
+{
+    connectFuture(addSong(videoId, title), this, [=, this] {
+        connectFuture(m_database->execute("insert or ignore into favourites (video_id) values (?)", videoId), this, &Library::favouritesChanged);
+    });
+}
+
+void Library::removeFavourite(const QString &videoId)
+{
+    connectFuture(m_database->execute("delete from favourites where video_id = ?", videoId), this, &Library::favouritesChanged);
+}
+
+FavouriteWatcher *Library::favouriteWatcher(const QString &videoId)
+{
+    if (videoId.isEmpty()) {
+        return nullptr;
+    }
+    return new FavouriteWatcher(this, videoId);
+}
+
+SearchHistoryModel *Library::searches()
+{
+    return new SearchHistoryModel(m_database->getResults<Search>("select (search_query) from searches order by search_id desc"), this);
+}
+
+void Library::addSearch(const QString &text)
+{
+    connectFuture(m_database->execute("insert into searches (search_query) values (?)", text), this, &Library::searchesChanged);
+}
+
+PlaybackHistoryModel *Library::playbackHistory()
+{
+    auto future = m_database->getResults<PlayedSong>("select * from played_songs natural join songs");
+    return new PlaybackHistoryModel(std::move(future), this);
+}
+
+void Library::addPlaybackHistoryItem(const QString &videoId, const QString &title)
+{
+    connectFuture(addSong(videoId, title), this, [=, this] {
+        connectFuture(m_database->execute("insert or ignore into played_songs (video_id, plays) values (?, ?)", videoId, 0), this, [=, this] {
+            connectFuture(m_database->execute("update played_songs set plays = plays + 1 where video_id = ? ", videoId), this, &Library::playbackHistoryChanged);
+        });
+    });
+}
+
+PlaybackHistoryModel *Library::mostPlayed()
+{
+    auto future = m_database->getResults<PlayedSong>("select * from played_songs natural join songs order by plays desc limit 10");
+    return new PlaybackHistoryModel(std::move(future), this);
+}
+
+QNetworkAccessManager &Library::nam()
+{
+    return m_networkImageCacher;
+}
+
+QFuture<void> Library::addSong(const QString &videoId, const QString &title)
+{
+    return m_database->execute("insert or ignore into songs (video_id, title, artist, album) values (?, ?, null, null)", videoId, title);
+}
+
+void ThumbnailSource::setVideoId(const QString &id) {
+    if (m_videoId == id) {
+        return;
+    }
+
+    m_videoId = id;
+    Q_EMIT videoIdChanged();
+
+    const QString cacheDir = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) % QDir::separator() % "thumbnails";
+    QDir(cacheDir).mkpath(QStringLiteral("."));
+    const QString cacheLocation = cacheDir % QDir::separator() % id % ".webp";
+
+    if (QFile::exists(cacheLocation)) {
+        setCachedPath(QUrl::fromLocalFile(cacheLocation));
+        return;
+    }
+
+    auto future = YTMusicThread::instance()->extractVideoInfo(id);
+    connectFuture(future, this, [this, id, cacheLocation](video_info::VideoInfo &&info) {
+        auto *reply = Library::instance().nam().get(QNetworkRequest(QUrl(QString::fromStdString(info.thumbnail))));
+        connect(reply, &QNetworkReply::finished, this, [id, reply, this, cacheLocation]() {
+            QFile file(cacheLocation);
+            file.open(QFile::WriteOnly);
+            file.write(reply->readAll());
+            setCachedPath(QUrl::fromLocalFile(cacheLocation));
+        });
+    });
+}
+
+PlaybackHistoryModel::PlaybackHistoryModel(QFuture<std::vector<PlayedSong> > &&songs, QObject *parent)
+    : QAbstractListModel(parent)
+{
+    connectFuture(songs, this, [this](const auto songs) {
+        beginResetModel();
+        m_playedSongs = songs;
+        endResetModel();
+    });
+}
+
+QHash<int, QByteArray> PlaybackHistoryModel::roleNames() const {
+    return {
+        {Roles::VideoId, "videoId"},
+        {Roles::Title, "title"},
+        {Roles::Artist, "artist"},
+        {Roles::Plays, "plays"}
+    };
+}
+
+int PlaybackHistoryModel::rowCount(const QModelIndex &parent) const {
+    return parent.isValid() ? 0 : m_playedSongs.size();
+}
+
+QVariant PlaybackHistoryModel::data(const QModelIndex &index, int role) const {
+    switch (role) {
+    case Roles::VideoId:
+        return m_playedSongs.at(index.row()).videoId;
+    case Roles::Title:
+        return m_playedSongs.at(index.row()).title;
+    case Roles::Artist:
+        return m_playedSongs.at(index.row()).artist;
+    case Roles::Plays:
+        return m_playedSongs.at(index.row()).plays;
+    }
+
+    Q_UNREACHABLE();
+}
+
+FavouritesModel::FavouritesModel(QFuture<std::vector<Song>> &&songs, QObject *parent)
+    : QAbstractListModel(parent)
+{
+    connectFuture(songs, this, [this](const auto songs) {
+        beginResetModel();
+        m_favouriteSongs = songs;
+        endResetModel();
+    });
+}
+
+QHash<int, QByteArray> FavouritesModel::roleNames() const {
+    return {
+        {Roles::VideoId, "videoId"},
+        {Roles::Title, "title"},
+        {Roles::Artist, "artist"}
+    };
+}
+
+int FavouritesModel::rowCount(const QModelIndex &parent) const {
+    return parent.isValid() ? 0 : m_favouriteSongs.size();
+}
+
+QVariant FavouritesModel::data(const QModelIndex &index, int role) const {
+    switch (role) {
+    case Roles::VideoId:
+        return m_favouriteSongs.at(index.row()).videoId;
+    case Roles::Title:
+        return m_favouriteSongs.at(index.row()).title;
+    case Roles::Artist:
+        return m_favouriteSongs.at(index.row()).artist;
+    }
+
+    Q_UNREACHABLE();
+}
+
+FavouriteWatcher::FavouriteWatcher(Library *library, const QString &videoId)
+    : QObject(library), m_videoId(videoId), m_library(library)
+{
+    auto update = [this] {
+        connectFuture(m_library->database().getResult<Count>("select count(*) from favourites where video_id = ?", m_videoId), this, [this](auto count) {
+            if (count) {
+                m_isFavourite = (*count).count > 0;
+                Q_EMIT isFavouriteChanged();
+            }
+        });
+    };
+    update();
+    connect(library, &Library::favouritesChanged, this, update);
+}
+
+bool FavouriteWatcher::isFavourite() const {
+    return m_isFavourite;
+}
+
+SearchHistoryModel::SearchHistoryModel(QFuture<std::vector<Search> > &&historyFuture, QObject *parent)
+    : QAbstractListModel(parent)
+{
+    connectFuture(historyFuture, this, [this](const auto history) {
+        beginResetModel();
+        m_history = history;
+        endResetModel();
+    });
+}
+
+int SearchHistoryModel::rowCount(const QModelIndex &parent) const {
+    return parent.isValid() ? 0 : m_history.size();
+}
+
+QVariant SearchHistoryModel::data(const QModelIndex &index, int role) const {
+    switch (role) {
+    case Qt::DisplayRole:
+        return m_history[index.row()].query;
+    }
+
+    Q_UNREACHABLE();
+}

src/library.h

@@ -0,0 +1,209 @@
+// SPDX-FileCopyrightText: 2022 Jonah Brüchert <[email protected]>
+//
+// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+#pragma once
+
+#include <QObject>
+#include <QQuickAsyncImageProvider>
+#include <QNetworkAccessManager>
+#include <QAbstractListModel>
+
+#include <memory>
+
+#include "asyncytmusic.h"
+#include "asyncdatabase.h"
+
+class FavouriteWatcher;
+
+struct Count {
+    using ColumnTypes = std::tuple<int>;
+
+    static Count fromSql(ColumnTypes tuple) {
+        auto [count] = tuple;
+        return Count { count };
+    }
+
+    int count;
+};
+
+struct Search {
+    using ColumnTypes = std::tuple<QString>;
+
+    static Search fromSql(ColumnTypes tuple) {
+        auto [query] = tuple;
+        return Search { query };
+    }
+
+    QString query;
+};
+
+struct Song {
+    using ColumnTypes = std::tuple<QString, QString, QString, QString>;
+
+    static Song fromSql(ColumnTypes tuple) {
+        auto [videoId, title, artist, album] = tuple;
+        return Song {videoId, title, artist, album};
+    }
+
+    QString videoId;
+    QString title;
+    QString artist;
+    QString album;
+};
+
+class FavouritesModel : public QAbstractListModel {
+    Q_OBJECT
+
+    enum Roles {
+        VideoId = Qt::UserRole + 1,
+        Title,
+        Artist,
+    };
+
+public:
+    FavouritesModel(QFuture<std::vector<Song>> &&songs, QObject *parent = nullptr);
+
+    QHash<int, QByteArray> roleNames() const override;
+    int rowCount(const QModelIndex &parent) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+
+private:
+    std::vector<Song> m_favouriteSongs;
+};
+
+struct PlayedSong {
+    using ColumnTypes = std::tuple<QString, int, QString, QString, QString>;
+
+    static PlayedSong fromSql(ColumnTypes tuple) {
+        auto [videoId, plays, title, artist, album] = tuple;
+        return PlayedSong {videoId, title, artist, album, plays};
+    }
+
+    QString videoId;
+    QString title;
+    QString artist;
+    QString album;
+    int plays;
+};
+
+class PlaybackHistoryModel : public QAbstractListModel {
+    Q_OBJECT
+
+    enum Roles {
+        VideoId = Qt::UserRole + 1,
+        Title,
+        Artist,
+        Plays
+    };
+
+public:
+    PlaybackHistoryModel(QFuture<std::vector<PlayedSong>> &&songs, QObject *parent = nullptr);
+
+    QHash<int, QByteArray> roleNames() const override;
+    int rowCount(const QModelIndex &parent) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+
+private:
+    std::vector<PlayedSong> m_playedSongs;
+};
+
+class SearchHistoryModel : public QAbstractListModel {
+    Q_OBJECT
+
+public:
+    SearchHistoryModel(QFuture<std::vector<Search> > &&historyFuture, QObject *parent = nullptr);
+    int rowCount(const QModelIndex &parent) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+
+private:
+    std::vector<Search> m_history;
+};
+
+class Library : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QAbstractListModel *favourites READ favourites NOTIFY favouritesChanged)
+    Q_PROPERTY(QAbstractListModel *searches READ searches NOTIFY searchesChanged)
+    Q_PROPERTY(QAbstractListModel *playbackHistory READ playbackHistory NOTIFY playbackHistoryChanged)
+    Q_PROPERTY(QAbstractListModel *mostPlayed READ mostPlayed NOTIFY playbackHistoryChanged)
+
+public:
+    explicit Library(QObject *parent = nullptr);
+    ~Library();
+
+    static Library &instance();
+
+    FavouritesModel *favourites();
+    Q_SIGNAL void favouritesChanged();
+    Q_INVOKABLE void addFavourite(const QString &videoId, const QString &title);
+    Q_INVOKABLE void removeFavourite(const QString &videoId);
+    Q_INVOKABLE FavouriteWatcher *favouriteWatcher(const QString &videoId);
+
+    SearchHistoryModel *searches();
+    Q_SIGNAL void searchesChanged();
+    Q_INVOKABLE void addSearch(const QString &text);
+
+    PlaybackHistoryModel *playbackHistory();
+    Q_SIGNAL void playbackHistoryChanged();
+    Q_INVOKABLE void addPlaybackHistoryItem(const QString &videoId, const QString &title);
+
+    PlaybackHistoryModel *mostPlayed();
+
+    QNetworkAccessManager &nam();
+    ThreadedDatabase &database() {
+        return *m_database;
+    }
+
+private:
+    QFuture<void> addSong(const QString &videoId, const QString &title);
+
+    QNetworkAccessManager m_networkImageCacher;
+    std::unique_ptr<ThreadedDatabase> m_database;
+};
+
+
+class ThumbnailSource : public QObject {
+    Q_OBJECT
+
+    Q_PROPERTY(QString videoId READ videoId WRITE setVideoId NOTIFY videoIdChanged)
+    Q_PROPERTY(QUrl cachedPath READ cachedPath NOTIFY cachedPathChanged)
+
+    QString videoId() const {
+        return m_videoId;
+    }
+    void setVideoId(const QString &id);
+    Q_SIGNAL void videoIdChanged();
+
+    QUrl cachedPath() const {
+        return m_cachedPath;
+    }
+    void setCachedPath(const QUrl &path) {
+        m_cachedPath = path;
+        cachedPathChanged();
+    }
+    Q_SIGNAL void cachedPathChanged();
+
+private:
+    QString m_videoId;
+    QUrl m_cachedPath;
+};
+
+class FavouriteWatcher : public QObject {
+    Q_OBJECT
+
+    Q_PROPERTY(bool isFavourite READ isFavourite NOTIFY isFavouriteChanged)
+
+public:
+    FavouriteWatcher(Library *library, const QString &videoId);
+
+    bool isFavourite() const;
+    Q_SIGNAL void isFavouriteChanged();
+
+    Q_SIGNAL void videoIdChanged();
+
+private:
+    QString m_videoId;
+    Library *m_library;
+    bool m_isFavourite = false;
+};

src/main.cpp

@@ -19,6 +19,9 @@
 #include "errorhandler.h"
 #include "playlistmodel.h"
 #include "playerutils.h"
+#include "library.h"
+
+#include "asyncdatabase.h"
 
 constexpr auto URI = "org.kde.ytmusic";
 
@@ -51,6 +54,9 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     qmlRegisterSingletonType<PlayerUtils>(URI, 1, 0, "PlayerUtils", [](QQmlEngine *, QJSEngine *) {
         return new PlayerUtils();
     });
+    qmlRegisterSingletonInstance<Library>(URI, 1, 0, "Library", &Library::instance());
+    qmlRegisterType<ThumbnailSource>(URI, 1, 0, "ThumbnailSource");
+    qmlRegisterAnonymousType<FavouriteWatcher>(URI, 1);
 
     engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
     engine.load(QUrl(QStringLiteral("qrc:///main.qml")));

src/migrations/2022-05-20-194850_init/down.sql

@@ -0,0 +1,8 @@
+-- SPDX-FileCopyrightText: 2022 Jonah Brüchert <[email protected]>
+--
+-- SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+drop table songs;
+drop table played_songs;
+drop table favourites;
+drop table searches;

src/migrations/2022-05-20-194850_init/up.sql

@@ -0,0 +1,26 @@
+-- SPDX-FileCopyrightText: 2022 Jonah Brüchert <[email protected]>
+--
+-- SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+
+create table songs (
+    video_id Text primary key not null,
+    title Text not null,
+    artist Text,
+    album Text
+);
+
+create table played_songs (
+    video_id Text primary key not null,
+    plays Int not null,
+    foreign key (video_id) references songs(video_id)
+);
+
+create table favourites (
+    video_id Text primary key not null,
+    foreign key (video_id) references songs(video_id)
+);
+
+create table searches (
+    search_id integer primary key autoincrement not null,
+    search_query Text not null
+);

src/playlistmodel.cpp

@@ -15,17 +15,17 @@ PlaylistModel::PlaylistModel(QObject *parent)
 {
     connect(this, &PlaylistModel::playlistIdChanged, this, [=, this] {
         setLoading(true);
-        YTMusicThread::instance()->fetchPlaylist(m_playlistId);
-    });
-    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::fetchPlaylistFinished, this, [this](const playlist::Playlist &playlist) {
-        setLoading(false);
-        beginResetModel();
-        m_playlist = playlist;
-        std::sort(m_playlist.thumbnails.begin(), m_playlist.thumbnails.end());
-        endResetModel();
+        auto future = YTMusicThread::instance()->fetchPlaylist(m_playlistId);
+        connectFuture(future, this, [=, this](const playlist::Playlist &playlist) {
+            setLoading(false);
+            beginResetModel();
+            m_playlist = playlist;
+            std::sort(m_playlist.thumbnails.begin(), m_playlist.thumbnails.end());
+            endResetModel();
 
-        Q_EMIT titleChanged();
-        Q_EMIT thumbnailUrlChanged();
+            Q_EMIT titleChanged();
+            Q_EMIT thumbnailUrlChanged();
+        });
     });
 }
 

src/resources.qrc

@@ -13,5 +13,10 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
         <file alias="SearchPage.qml">contents/ui/SearchPage.qml</file>
         <file alias="PlaylistPage.qml">contents/ui/PlaylistPage.qml</file>
         <file alias="ConfirmationMessage.qml">contents/ui/ConfirmationMessage.qml</file>
+        <file alias="LibraryPage.qml">contents/ui/LibraryPage.qml</file>
+        <file alias="MinimizedPlayerControls.qml">contents/ui/MinimizedPlayerControls.qml</file>
+        <file alias="MaximizedPlayerPage.qml">contents/ui/MaximizedPlayerPage.qml</file>
+        <file>migrations/2022-05-20-194850_init/down.sql</file>
+        <file>migrations/2022-05-20-194850_init/up.sql</file>
     </qresource>
 </RCC>

src/searchmodel.cpp

@@ -16,17 +16,13 @@ SearchModel::SearchModel(QObject *parent)
         }
 
         setLoading(true);
-        YTMusicThread::instance()->search(m_searchQuery);
-    });
-    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::searchFinished, this, [this](const std::vector<search::SearchResultItem> &results) {
-        beginResetModel();
-        setLoading(false);
-        m_searchResults = results;
-        std::sort(m_searchResults.begin(), m_searchResults.end(),
-                  [](search::SearchResultItem const & a, search::SearchResultItem const & b) {
-                      return SearchModel::itemType(a) < SearchModel::itemType(b);
-                  });
-        endResetModel();
+        auto future = YTMusicThread::instance()->search(m_searchQuery);
+        connectFuture(future, this, [=, this](const std::vector<search::SearchResultItem> &results) {
+            beginResetModel();
+            setLoading(false);
+            m_searchResults = results;
+            endResetModel();
+        });
     });
     connect(&YTMusicThread::instance().get(), &AsyncYTMusic::errorOccurred, this, [this] {
         setLoading(false);

src/userplaylistmodel.cpp

@@ -9,29 +9,14 @@
 #include <random>
 
 #include <QRandomGenerator>
+#include <QFutureWatcher>
 
 #include "playlistutils.h"
 
 UserPlaylistModel::UserPlaylistModel(QObject *parent)
     : AbstractYTMusicModel(parent)
 {
-    connect(this, &UserPlaylistModel::initialVideoIdChanged, this, [this] {
-        if (m_initialVideoId.isEmpty()) {
-            return;
-        }
-
-        setLoading(true);
-        YTMusicThread::instance()->fetchWatchPlaylist(m_initialVideoId);
-    });
-    connect(this, &UserPlaylistModel::playlistIdChanged, this, [this] {
-        if (m_playlistId.isEmpty()) {
-            return;
-        }
-
-        setLoading(true);
-        YTMusicThread::instance()->fetchWatchPlaylist(std::nullopt, m_playlistId);
-    });
-    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::fetchWatchPlaylistFinished, this, [this](const watch::Playlist &playlist) {
+    auto handleResult = [=, this](const watch::Playlist &playlist) {
         setLoading(false);
 
         beginResetModel();
@@ -48,6 +33,24 @@ UserPlaylistModel::UserPlaylistModel(QObject *parent)
         } else {
             setCurrentVideoId({});
         }
+    };
+    connect(this, &UserPlaylistModel::initialVideoIdChanged, this, [=, this] {
+        if (m_initialVideoId.isEmpty()) {
+            return;
+        }
+
+        setLoading(true);
+        auto future = YTMusicThread::instance()->fetchWatchPlaylist(m_initialVideoId);
+        connectFuture(future, this, handleResult);
+    });
+    connect(this, &UserPlaylistModel::playlistIdChanged, this, [=, this] {
+        if (m_playlistId.isEmpty()) {
+            return;
+        }
+
+        setLoading(true);
+        auto future = YTMusicThread::instance()->fetchWatchPlaylist(std::nullopt, m_playlistId);
+        connectFuture(future, this, handleResult);;
     });
     connect(&YTMusicThread::instance().get(), &AsyncYTMusic::errorOccurred, this, [this] {
         setLoading(false);

src/videoinfoextractor.cpp

@@ -4,7 +4,10 @@
 
 #include "videoinfoextractor.h"
 
-#include <asyncytmusic.h>
+#include <QFutureWatcher>
+
+#include "asyncytmusic.h"
+#include "library.h"
 
 VideoInfoExtractor::VideoInfoExtractor(QObject *parent)
     : QObject(parent)
@@ -14,22 +17,26 @@ VideoInfoExtractor::VideoInfoExtractor(QObject *parent)
             m_videoInfo = {};
             Q_EMIT audioUrlChanged();
             Q_EMIT titleChanged();
+            Q_EMIT artistChanged();
+            Q_EMIT channelChanged();
             Q_EMIT songChanged();
             Q_EMIT thumbnailChanged();
             return;
         }
 
         setLoading(true);
-        YTMusicThread::instance()->extractVideoInfo(QString::fromStdString(m_videoId.toStdString()));
-    });
 
-    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::extractVideoInfoFinished, this, [this](const video_info::VideoInfo &info) {
-        m_videoInfo = info;
-        setLoading(false);
-        Q_EMIT audioUrlChanged();
-        Q_EMIT titleChanged();
-        Q_EMIT songChanged();
-        Q_EMIT thumbnailChanged();
+        auto future = YTMusicThread::instance()->extractVideoInfo(QString::fromStdString(m_videoId.toStdString()));
+        connectFuture(future, this, [this](const video_info::VideoInfo &videoInfo) {
+            m_videoInfo = videoInfo;
+            setLoading(false);
+            Q_EMIT audioUrlChanged();
+            Q_EMIT titleChanged();
+            Q_EMIT artistChanged();
+            Q_EMIT channelChanged();
+            Q_EMIT songChanged();
+            Q_EMIT thumbnailChanged();
+        });
     });
 }
 
@@ -66,6 +73,9 @@ QString VideoInfoExtractor::videoId() const
 
 void VideoInfoExtractor::setVideoId(const QString &videoId)
 {
+    if (m_videoId == videoId || videoId.isEmpty()) {
+        return;
+    }
     m_videoId = videoId;
     Q_EMIT videoIdChanged();
 }
@@ -75,6 +85,16 @@ QString VideoInfoExtractor::title() const
     return QString::fromStdString(m_videoInfo.title);
 }
 
+QString VideoInfoExtractor::artist() const
+{
+    return QString::fromStdString(m_videoInfo.artist);
+}
+
+QString VideoInfoExtractor::channel() const
+{
+    return QString::fromStdString(m_videoInfo.channel);
+}
+
 QString VideoInfoExtractor::thumbnail() const
 {
     return QString::fromStdString(m_videoInfo.thumbnail);

src/videoinfoextractor.h

@@ -17,6 +17,8 @@ class VideoInfoExtractor : public QObject
 
     Q_PROPERTY(QUrl audioUrl READ audioUrl NOTIFY audioUrlChanged)
     Q_PROPERTY(QString title READ title NOTIFY titleChanged)
+    Q_PROPERTY(QString artist READ artist NOTIFY artistChanged) // may be empty if it is a video
+    Q_PROPERTY(QString channel READ channel NOTIFY channelChanged)
     Q_PROPERTY(QString thumbnail READ thumbnail NOTIFY thumbnailChanged)
     Q_PROPERTY(bool loading READ loading WRITE setLoading NOTIFY loadingChanged)
 
@@ -32,6 +34,12 @@ public:
 
     QString title() const;
     Q_SIGNAL void titleChanged();
+    
+    QString artist() const;
+    Q_SIGNAL void artistChanged();
+    
+    QString channel() const;
+    Q_SIGNAL void channelChanged();
 
     QString thumbnail() const;
     Q_SIGNAL void thumbnailChanged();

src/ytmusic.cpp

@@ -21,7 +21,7 @@ void pyPrintPretty(py::handle obj) {
 
 #define UNEXPORT __attribute__ ((visibility("hidden")))
 
-constexpr auto TESTED_YTMUSICAPI_VERSION = "0.21.0";
+constexpr auto TESTED_YTMUSICAPI_VERSION = "0.22.0";
 
 struct UNEXPORT YTMusicPrivate {
     py::scoped_interpreter guard {};
@@ -460,10 +460,12 @@ video_info::VideoInfo YTMusic::extract_video_info(const std::string &video_id) c
     using namespace pybind11::literals;
 
     const auto info = d->get_ytdl().attr("extract_info")(video_id, "download"_a=py::bool_(false));
-
+    
     return {
         info["id"].cast<std::string>(),
         info["title"].cast<std::string>(),
+        info.contains("artist") ? info["artist"].cast<std::string>() : "",
+        info.contains("channel") ? info["channel"].cast<std::string>() : "",
         extract_py_list<video_info::Format>(info["formats"]),
         info["thumbnail"].cast<std::string>()
     };

src/ytmusic.h

@@ -241,6 +241,8 @@ struct Format {
 struct VideoInfo {
     std::string id;
     std::string title;
+    std::string artist;
+    std::string channel;
     std::vector<Format> formats;
     std::string thumbnail;