Improve layout of the search popup

flatpak/python3-yt-dlp.json

@@ -7,29 +7,24 @@
     "sources": [
         {
             "type": "file",
-            "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/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",
-            "url": "https://files.pythonhosted.org/packages/16/b3/f7aa8edf2ff4495116f95fd442b2a346aa55d1d46313143c8814886dbcdb/mutagen-1.45.1-py3-none-any.whl",
-            "sha256": "9c9f243fcec7f410f138cb12c21c84c64fde4195481a30c9bfb05b5f003adfed"
+            "url": "https://files.pythonhosted.org/packages/b4/7b/0960d02701f783bb052ec69ea32789d878d2cce05a03950adbd75f164758/websockets-10.2.tar.gz",
+            "sha256": "8351c3c86b08156337b0e4ece0e3c5ec3e01fcd14e8950996832a23c99416098"
         },
         {
             "type": "file",
             "url": "https://files.pythonhosted.org/packages/2a/18/70c32fe9357f3eea18598b23aa9ed29b1711c3001835f7cf99a9818985d0/Brotli-1.0.9.zip",
             "sha256": "4d1b810aa0ed773f81dceda2cc7b403d01057458730e309856356d4ef4188438"
         },
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/16/b3/f7aa8edf2ff4495116f95fd442b2a346aa55d1d46313143c8814886dbcdb/mutagen-1.45.1-py3-none-any.whl",
+            "sha256": "9c9f243fcec7f410f138cb12c21c84c64fde4195481a30c9bfb05b5f003adfed"
+        },
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/c0/61/3a08dc08c0c60498a0136a7eec1a098f08be79f75bf35fdd0a15a1bace70/yt_dlp-2022.3.8.2-py3-none-any.whl",
+            "sha256": "05179f0f2c34f06910003bb9f80af68ff798b072ca0f826c0e6704a3fbd5b306"
+        },
         {
             "type": "file",
             "url": "https://files.pythonhosted.org/packages/24/40/e249ac3845a2333ce50f1bb02299ffb766babdfe80ca9d31e0158ad06afd/pycryptodomex-3.14.1.tar.gz",

flatpak/python3-ytmusicapi.json

@@ -7,13 +7,18 @@
     "sources": [
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/ec/03/062e6444ce4baf1eac17a6a0ebfe36bb1ad05e1df0e20b110de59c278498/urllib3-1.26.9-py2.py3-none-any.whl",
-            "sha256": "44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14"
+            "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/11/dd/e015f3780f42dd9af62cf0107b44ea1298926627ecd70c17b0e484e95bcd/certifi-2022.5.18.1-py3-none-any.whl",
-            "sha256": "f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"
+            "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",
@@ -25,11 +30,6 @@
             "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.22.0
+ytmusicapi==0.21.0
 yt-dlp

src/asyncdatabase.cpp

@@ -78,8 +78,6 @@ void runDatabaseMigrations(QSqlDatabase &database, const QString &migrationDirec
             }
             qCDebug(asyncdatabase) << "Running migration" << subdir.dirName();
 
-            database.transaction();
-
             // Hackish
             const auto statements = file.readAll().split(';');
 
@@ -101,52 +99,39 @@ void runDatabaseMigrations(QSqlDatabase &database, const QString &migrationDirec
                     }
                 }
             }
-
             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());
+        m_database = std::make_unique<QSqlDatabase>(QSqlDatabase::addDatabase(configuration.type()));
         if (configuration.databaseName()) {
-            d->database.setDatabaseName(*configuration.databaseName());
+            m_database->setDatabaseName(*configuration.databaseName());
         }
         if (configuration.hostName()) {
-            d->database.setHostName(*configuration.hostName());
+            m_database->setHostName(*configuration.hostName());
         }
         if (configuration.userName()) {
-            d->database.setUserName(*configuration.userName());
+            m_database->setUserName(*configuration.userName());
         }
         if (configuration.password()) {
-            d->database.setPassword(*configuration.password());
+            m_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();
-            }
-        }
+        m_database->open();
     });
 }
 
 AsyncSqlDatabase::AsyncSqlDatabase()
     : QObject()
-    , d(std::make_unique<AsyncSqlDatabasePrivate>())
+    , m_database(nullptr)
 {
 }
 
@@ -191,11 +176,6 @@ std::optional<Row> AsyncSqlDatabase::retrieveOptionalRow(QSqlQuery &query)
     }
 }
 
-QSqlDatabase &AsyncSqlDatabase::db()
-{
-    return d->database;
-}
-
 AsyncSqlDatabase::~AsyncSqlDatabase() = default;
 
 void printSqlError(const QSqlQuery &query)
@@ -213,14 +193,6 @@ QSqlQuery prepareQuery(const QSqlDatabase &database, const QString &sqlQuery)
     return query;
 }
 
-QSqlQuery runQuery(QSqlQuery &query)
-{
-    if (!query.exec()) {
-        printSqlError(query);
-    }
-    return query;
-}
-
 }
 
 struct DatabaseConfigurationPrivate : public QSharedData {
@@ -278,22 +250,18 @@ const std::optional<QString> &DatabaseConfiguration::password() const {
 }
 
 
-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->m_db->moveToThread(&*threadedDb);
     threadedDb->start();
-    threadedDb->d->db.establishConnection(config);
+    threadedDb->m_db->establishConnection(config);
     return threadedDb;
 }
 
 ThreadedDatabase::ThreadedDatabase()
     : QThread()
-    , d(std::make_unique<ThreadedDatabasePrivate>())
+    , m_db(std::make_unique<asyncdatabase_private::AsyncSqlDatabase>())
 {
 }
 
@@ -302,8 +270,3 @@ ThreadedDatabase::~ThreadedDatabase()
     quit();
     wait();
 }
-
-asyncdatabase_private::AsyncSqlDatabase &ThreadedDatabase::db()
-{
-    return d->db;
-}

src/asyncdatabase.h

@@ -70,10 +70,10 @@ 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
+template <typename ...RowTypes>
+auto parseRow(const Row &row) -> std::tuple<RowTypes...>
 {
-    auto tuple = RowTypesTuple();
+    auto tuple = std::tuple<RowTypes...>();
     int i = 0;
     asyncdatabase_private::iterate_tuple(tuple, [&](auto &elem) {
         elem = row.at(i).value<std::decay_t<decltype(elem)>>();
@@ -86,19 +86,17 @@ auto parseRow(const Row &row) -> RowTypesTuple
 /// 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;
+template <typename ...RowTypes>
+auto parseRows(const Rows &rows) -> std::vector<std::tuple<RowTypes...>> {
+    std::vector<std::tuple<RowTypes...>> parsedRows;
     parsedRows.reserve(rows.size());
     for (const auto &row : rows) {
-        parsedRows.push_back(parseRow<RowTypesTuple>(row));
+        parsedRows.push_back(parseRow<RowTypes...>(row));
     }
 
     return parsedRows;
 }
 
-struct ThreadedDatabasePrivate;
-
 class ThreadedDatabase : public QThread {
 public:
     ///
@@ -116,7 +114,7 @@ public:
     ///
     template <typename ...Args>
     auto execute(const QString &sqlQuery, Args... args) -> QFuture<void> {
-        return db().execute(sqlQuery, args...);
+        return m_db->execute(sqlQuery, args...);
     }
 
     ///
@@ -129,7 +127,7 @@ public:
     /// \return
     ///
     auto runMigrations(const QString &migrationDirectory) -> QFuture<void> {
-        return db().runMigrations(migrationDirectory);
+        return m_db->runMigrations(migrationDirectory);
     }
 
     ///
@@ -138,24 +136,22 @@ public:
     /// \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...);
+    template <typename ...Args>
+    auto getResults(const QString &sqlQuery, Args... args) -> QFuture<Rows> {
+        return m_db->getResults(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...);
+    template <typename ...Args>
+    auto getResult(const QString &sqlQuery, Args... args) -> QFuture<std::optional<Row>> {
+        return m_db->getResult(sqlQuery, args...);
     }
 
     ThreadedDatabase();
     ~ThreadedDatabase();
 
 private:
-    asyncdatabase_private::AsyncSqlDatabase &db();
-
-    std::unique_ptr<ThreadedDatabasePrivate> d;
+    std::unique_ptr<asyncdatabase_private::AsyncSqlDatabase> m_db;
 };

src/asyncdatabase_p.h

@@ -64,11 +64,7 @@ void runDatabaseMigrations(QSqlDatabase &database, const QString &migrationDirec
 
 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
@@ -76,30 +72,19 @@ class AsyncSqlDatabase : public QObject {
 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] {
+    template <typename ...Args>
+    auto getResults(const QString &sqlQuery, Args... args) -> QFuture<Rows> {
+        return runAsync<Rows>([=, 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;
+            return retrieveRows(query);
         });
     }
 
-    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> {
+    template <typename ...Args>
+    auto getResult(const QString &sqlQuery, Args... args) -> QFuture<std::optional<Row>> {
+        return runAsync<std::optional<Row>>([=, this] {
             auto query = executeQuery(sqlQuery, args...);
-            if (const auto row = retrieveOptionalRow(query)) {
-                return T::fromSql(parseRow<typename T::ColumnTypes>(*row));
-            }
-
-            return std::nullopt;
+            return retrieveOptionalRow(query);
         });
     }
 
@@ -112,7 +97,7 @@ public:
 
     auto runMigrations(const QString &migrationDirectory) -> QFuture<void> {
         return runAsync<void>([=, this] {
-            runDatabaseMigrations(db(), migrationDirectory);
+            runDatabaseMigrations(*m_database, migrationDirectory);
         });
     }
 
@@ -122,14 +107,19 @@ public:
 private:
     template <typename ...Args>
     QSqlQuery executeQuery(const QString &sqlQuery, Args... args) {
-        auto query = prepareQuery(db(), sqlQuery);
+        auto query = prepareQuery(*m_database, 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);
+
+        if (!query.exec()) {
+            printSqlError(query);
+        }
+
+        return query;
     }
 
     template <typename T, typename Functor>
@@ -153,9 +143,7 @@ private:
     Rows retrieveRows(QSqlQuery &query);
     std::optional<Row> retrieveOptionalRow(QSqlQuery &query);
 
-    QSqlDatabase &db();
-
-    std::unique_ptr<AsyncSqlDatabasePrivate> d;
+    std::unique_ptr<QSqlDatabase> m_database;
 };
 
 }

src/contents/ui/MaximizedPlayerPage.qml

@@ -1,427 +0,0 @@
-// 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

@@ -1,207 +0,0 @@
-// 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,422 +1,280 @@
 // 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
 
-Flickable {
+Item {
     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
 
-    boundsBehavior: Flickable.StopAtBounds
-    
-    function close() {
-        toClose.restart();
-    }
+    anchors.left: parent.left
+    anchors.right: parent.right
+    height: maximized ? applicationWindow().height : 75
 
-    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 {
+    Rectangle {
+        color: Kirigami.Theme.backgroundColor
+        Kirigami.Theme.colorSet: Kirigami.Theme.Window
         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
-        
-        anchors.left: parent.left
-        anchors.right: parent.right
-        spacing: 0
+        height: parent.height
+        anchors.fill: parent
 
-        // margin from top
-        Item {
-            Layout.minimumHeight: footerItem.height - footerItem.minimizedPlayerHeight
-        }
-        
-        Controls.Control {
+        GridLayout {
+            id: playerLayout
+
+            readonly property bool mobile: width > height
+
+            Layout.fillHeight: footerItem.maximized
             Layout.fillWidth: true
-            padding: 0
-            implicitHeight: footerItem.minimizedPlayerHeight
-            
-            // minimized player background
-            background: Item {
-                Rectangle {
-                    anchors.fill: parent
-                    color: Qt.rgba(25, 25, 30, 1)
-                }
-                
-                Image {
-                    opacity: 0.2
-                    source: info.thumbnail
-                    asynchronous: true
-                    
-                    anchors.fill: parent
-                    fillMode: Image.PreserveAspectCrop
-                }
-                
-                layer.enabled: true
-                layer.effect: HueSaturation {
-                    cached: true
+            flow: width > height ? GridLayout.LeftToRight : GridLayout.TopToBottom
+            visible: footerItem.maximized
 
-                    lightness: -0.5
-                    saturation: 1.9
+            ColumnLayout {
+                Layout.preferredWidth: footerLayout.width * (playerLayout.mobile ? 1 : 0.5)
+                Layout.preferredHeight: footerLayout.height * (playerLayout.mobile ? 0.5 : 1)
 
-                    layer.enabled: true
-                    layer.effect: FastBlur {
-                        cached: true
-                        radius: 64
-                        transparentBorder: false
+                Item {
+                    Layout.fillWidth: true
+                    Layout.fillHeight: true
+
+                    Image {
+                        anchors.fill: parent
+                        source: info.thumbnail
+                        fillMode: Image.PreserveAspectFit
+                    }
+                }
+                Controls.RoundButton {
+                    readonly property QtObject favouriteWatcher: Library.favouriteWatcher(info.videoId)
+
+                    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)
+                }
+            }
+
+            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.ScrollView {
+                    anchors.fill: parent
+
+                    ListView {
+                        anchors.fill: parent
+                        id: playlistView
+
+                        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()
+                                }
+                            }
+                        }
                     }
                 }
             }
-            
-            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();
-            }
         }
-        
-        MaximizedPlayerPage {
-            id: maximizedPlayerPage
+
+        Kirigami.Separator {
             Layout.fillWidth: true
-            Layout.fillHeight: true
-            implicitHeight: footerItem.height
-            
-            info: footerItem.videoInfoExtractor
-            audio: footerItem.audioPlayer
-                
-            onRequestClose: toClose.start();
         }
-        
-        //GridLayout {
-            //id: playerLayout
 
-            //readonly property bool mobile: width > height
+        RowLayout {
+            id: player
 
-            //Layout.fillHeight: footerItem.maximized
-            //Layout.fillWidth: true
-            //flow: width > height ? GridLayout.LeftToRight : GridLayout.TopToBottom
-            //visible: footerItem.maximized
+            Layout.fillWidth: true
+            Layout.fillHeight: !footer.maximized
 
-            //ColumnLayout {
-                //Layout.preferredWidth: footerLayout.width * (playerLayout.mobile ? 1 : 0.5)
-                //Layout.preferredHeight: footerLayout.height * (playerLayout.mobile ? 0.5 : 1)
+            VideoInfoExtractor {
+                id: info
 
-                //Item {
-                    //Layout.fillWidth: true
-                    //Layout.fillHeight: true
+                onSongChanged: audio.play()
+                videoId: UserPlaylistModel.currentVideoId
+                onTitleChanged: Library.addPlaybackHistoryItem(info.videoId, info.title)
+            }
 
-                    //Image {
-                        //anchors.fill: parent
-                        //source: info.thumbnail
-                        //fillMode: Image.PreserveAspectFit
-                    //}
-                //}
-                //Controls.RoundButton {
-                    //readonly property QtObject favouriteWatcher: Library.favouriteWatcher(info.videoId)
+            Audio {
+                id: audio
 
-                    //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)
-                //}
-            //}
+                source: info.audioUrl
+                onStatusChanged: {
+                    if (status === Audio.EndOfMedia) {
+                        console.log("Song ended");
+                        UserPlaylistModel.next();
+                    }
+                }
+            }
 
-            //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: 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.ScrollView {
-                    //anchors.fill: parent
+            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()
+            }
 
-                    //ListView {
-                        //anchors.fill: parent
-                        //id: playlistView
+            Controls.BusyIndicator {
+                Layout.fillHeight: true
+                visible: info.loading
+            }
 
-                        //clip: true
+            ColumnLayout {
+                Layout.fillHeight: true
+                Layout.topMargin: Kirigami.Units.smallSpacing
+                Layout.bottomMargin: Kirigami.Units.smallSpacing
 
-                        //Controls.BusyIndicator {
-                            //anchors.centerIn: parent
-                            //visible: UserPlaylistModel.loading || UserPlaylistModel.loading
-                        //}
+                Kirigami.Heading {
+                    level: 3
+                    Layout.fillWidth: true
+                    elide: Qt.ElideRight
+                    text: info.title ? info.title : i18n("No media playing")
+                }
 
-                        //onCountChanged: {
-                            //if (count < 1) {
-                                //footerItem.maximized = false
-                            //}
-                        //}
+                RowLayout{
 
-                        //model: UserPlaylistModel
+                    Controls.Label{
+                        visible: info.title
+                        text: PlayerUtils.formatTimestamp(audio.position)
+                    }
 
-                        //delegate: Kirigami.SwipeListItem {
-                            //id: delegateItem
-                            //required property string title
-                            //required property string videoId
-                            //required property string artists
-                            //required property bool isCurrent
+                    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));
+                        }
 
-                            //highlighted: isCurrent
-                            //onClicked: UserPlaylistModel.skipTo(videoId)
+                        Behavior on value {
+                            NumberAnimation {
+                                duration: 1000
+                            }
 
-                            //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)
-                                //}
-                            //]
-                        //}
+                    Controls.Label{
+                        visible: info.title
+                        text: PlayerUtils.formatTimestamp(audio.duration)
+                    }
 
-                        //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,6 +15,7 @@ Kirigami.ApplicationWindow {
     property alias searchField: searchField
 
     header: Controls.Control {
+        visible: !footer.maximized
         padding: Kirigami.Units.largeSpacing
 
         background: Rectangle {
@@ -55,8 +56,6 @@ Kirigami.ApplicationWindow {
                             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
@@ -92,6 +91,8 @@ Kirigami.ApplicationWindow {
 
     title: i18n("AudioTube")
 
+    controlsVisible: !footer.maximized
+
     contextDrawer: Kirigami.ContextDrawer {
         id: contextDrawer
     }
@@ -119,16 +120,6 @@ Kirigami.ApplicationWindow {
             showPassiveNotification(error)
         }
     }
-    
-    pageStack.anchors.bottomMargin: playerFooter.minimizedPlayerHeight + 1
 
-    // 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
-    }
+    footer: PlayerFooter {}
 }

src/library.cpp

@@ -17,12 +17,8 @@ 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.setDatabaseName(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) % QDir::separator() % "library.sqlite");
         config.setType(DATABASE_TYPE_SQLITE);
         return config;
     }()))
@@ -40,7 +36,16 @@ Library &Library::instance()
 
 FavouritesModel *Library::favourites()
 {
-    auto future = m_database->getResults<Song>("select * from favourites natural join songs");
+    auto future = mapFuture<Rows, std::vector<Song>>(
+        m_database->getResults("select * from favourites natural join songs"),
+        [](auto rows)
+    {
+        std::vector<Song> songs;
+        ranges::transform(parseRows<QString, QString, QString, QString>(rows),
+                          std::back_inserter(songs),
+                          Song::fromSql);
+        return songs;
+    });
     return new FavouritesModel(std::move(future), this);
 }
 
@@ -66,7 +71,16 @@ FavouriteWatcher *Library::favouriteWatcher(const QString &videoId)
 
 SearchHistoryModel *Library::searches()
 {
-    return new SearchHistoryModel(m_database->getResults<Search>("select (search_query) from searches order by search_id desc"), this);
+    return new SearchHistoryModel(mapFuture<Rows, std::vector<QString>>(
+        m_database->getResults("select (search_query) from searches order by search_id desc"),
+        [](const auto &rows)
+    {
+        std::vector<QString> out;
+        ranges::transform(rows, std::back_inserter(out), [](auto row) {
+            return row[0].toString();
+        });
+        return out;
+    }), this);
 }
 
 void Library::addSearch(const QString &text)
@@ -76,7 +90,16 @@ void Library::addSearch(const QString &text)
 
 PlaybackHistoryModel *Library::playbackHistory()
 {
-    auto future = m_database->getResults<PlayedSong>("select * from played_songs natural join songs");
+    auto future = mapFuture<Rows, std::vector<PlayedSong>>(
+        m_database->getResults("select * from played_songs natural join songs"),
+        [](auto rows)
+    {
+        std::vector<PlayedSong> playedSongs;
+        ranges::transform(parseRows<QString, int, QString, QString, QString>(rows),
+                          std::back_inserter(playedSongs),
+                          PlayedSong::fromSql);
+        return playedSongs;
+    });
     return new PlaybackHistoryModel(std::move(future), this);
 }
 
@@ -91,7 +114,16 @@ void Library::addPlaybackHistoryItem(const QString &videoId, const QString &titl
 
 PlaybackHistoryModel *Library::mostPlayed()
 {
-    auto future = m_database->getResults<PlayedSong>("select * from played_songs natural join songs order by plays desc limit 10");
+    auto future = mapFuture<Rows, std::vector<PlayedSong>>(
+        m_database->getResults("select * from played_songs natural join songs order by plays desc limit 10"),
+        [](auto rows)
+    {
+        std::vector<PlayedSong> playedSongs;
+        ranges::transform(parseRows<QString, int, QString, QString, QString>(rows),
+                          std::back_inserter(playedSongs),
+                          PlayedSong::fromSql);
+        return playedSongs;
+    });
     return new PlaybackHistoryModel(std::move(future), this);
 }
 
@@ -211,9 +243,10 @@ 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;
+        connectFuture(m_library->database().getResult("select count(*) from favourites where video_id = ?", m_videoId), this, [this](auto row) {
+            if (row) {
+                auto [favCount] = parseRow<int>(*row);
+                m_isFavourite = favCount > 0;
                 Q_EMIT isFavouriteChanged();
             }
         });
@@ -226,7 +259,7 @@ bool FavouriteWatcher::isFavourite() const {
     return m_isFavourite;
 }
 
-SearchHistoryModel::SearchHistoryModel(QFuture<std::vector<Search> > &&historyFuture, QObject *parent)
+SearchHistoryModel::SearchHistoryModel(QFuture<std::vector<QString>> &&historyFuture, QObject *parent)
     : QAbstractListModel(parent)
 {
     connectFuture(historyFuture, this, [this](const auto history) {
@@ -243,7 +276,7 @@ int SearchHistoryModel::rowCount(const QModelIndex &parent) const {
 QVariant SearchHistoryModel::data(const QModelIndex &index, int role) const {
     switch (role) {
     case Qt::DisplayRole:
-        return m_history[index.row()].query;
+        return m_history[index.row()];
     }
 
     Q_UNREACHABLE();

src/library.h

@@ -16,32 +16,8 @@
 
 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) {
+    static Song fromSql(std::tuple<QString, QString, QString, QString> tuple) {
         auto [videoId, title, artist, album] = tuple;
         return Song {videoId, title, artist, album};
     }
@@ -73,9 +49,7 @@ private:
 };
 
 struct PlayedSong {
-    using ColumnTypes = std::tuple<QString, int, QString, QString, QString>;
-
-    static PlayedSong fromSql(ColumnTypes tuple) {
+    static PlayedSong fromSql(std::tuple<QString, int, QString, QString, QString> tuple) {
         auto [videoId, plays, title, artist, album] = tuple;
         return PlayedSong {videoId, title, artist, album, plays};
     }
@@ -112,12 +86,12 @@ class SearchHistoryModel : public QAbstractListModel {
     Q_OBJECT
 
 public:
-    SearchHistoryModel(QFuture<std::vector<Search> > &&historyFuture, QObject *parent = nullptr);
+    SearchHistoryModel(QFuture<std::vector<QString> > &&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;
+    std::vector<QString> m_history;
 };
 
 class Library : public QObject

src/resources.qrc

@@ -14,8 +14,6 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
         <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>

src/videoinfoextractor.cpp

@@ -17,8 +17,6 @@ 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;
@@ -32,8 +30,6 @@ VideoInfoExtractor::VideoInfoExtractor(QObject *parent)
             setLoading(false);
             Q_EMIT audioUrlChanged();
             Q_EMIT titleChanged();
-            Q_EMIT artistChanged();
-            Q_EMIT channelChanged();
             Q_EMIT songChanged();
             Q_EMIT thumbnailChanged();
         });
@@ -85,16 +81,6 @@ 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,8 +17,6 @@ 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)
 
@@ -34,12 +32,6 @@ 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.22.0";
+constexpr auto TESTED_YTMUSICAPI_VERSION = "0.21.0";
 
 struct UNEXPORT YTMusicPrivate {
     py::scoped_interpreter guard {};
@@ -460,12 +460,10 @@ 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,8 +241,6 @@ struct Format {
 struct VideoInfo {
     std::string id;
     std::string title;
-    std::string artist;
-    std::string channel;
     std::vector<Format> formats;
     std::string thumbnail;