initiate mpris work from elisa

.gitignore

@@ -1,9 +1,3 @@
-# SPDX-FileCopyrightText: 2021 Jonah Brüchert <[email protected]>
-# SPDX-FileCopyrightText: 2021 Bhushan Shah <[email protected]>
-#
-# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-*.kdev4
 CMakeLists.txt.user
 flatpak/flatpak-builder-tools/
 build/

.gitlab-ci.yml

@@ -1,6 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Jonah Brüchert <[email protected]>
-#
-# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-include:
- - 'https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-reuse.yml'

.reuse/dep5

@@ -1,25 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: AudioTube
-Upstream-Contact: Jonah Brüchert <[email protected]>
-Source: https://invent.kde.org/plasma-mobile/audiotube
-
-# Sample paragraph, commented out:
-#
-# Files: ...
-# Copyright: $YEAR $NAME <$CONTACT>
-# License: ...
-# Comment: ...
-
-Files: README.md
-Copyright: 2021 Jonah Brüchert <[email protected]>
-License: CC0-1.0
-
-Files: org.kde.audiotube.desktop
-       org.kde.audiotube.json
-Copyright: 2021 Jonah Brüchert <[email protected]>
-License: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-Files: logo.png
-       org.kde.audiotube.svg
-Copyright: 2021 Mathis Brüchert <[email protected]>
-License: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL

CMakeLists.txt

@@ -1,23 +1,18 @@
-# SPDX-FileCopyrightText: 2021 Jonah Brüchert <[email protected]>
-#
-# SPDX-License-Identifier: BSD-2-Clause
-
-cmake_minimum_required(VERSION 3.16.0)
+cmake_minimum_required(VERSION 3.14)
 
 project(audiotube)
 
 include(FeatureSummary)
 
-set(PROJECT_VERSION "22.02")
 set(QT5_MIN_VERSION 5.15)
 set(KF5_MIN_VERSION 5.81)
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
@@ -26,18 +21,11 @@ include(ECMSetupVersion)
 include(ECMGenerateHeaders)
 include(ECMPoQmTools)
 
-ecm_setup_version(${PROJECT_VERSION}
-    VARIABLE_PREFIX AUDIOTUBE
-    VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/version.h
-)
-
 kde_enable_exceptions()
 
 find_package(Qt5 ${QT5_MIN_VERSION} REQUIRED COMPONENTS Core Gui Qml QuickControls2 Svg)
-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 I18n CoreAddons Crash)
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 I18n)
 find_package(pybind11 REQUIRED)
-find_package(Ytdlp REQUIRED RUNTIME)
-find_package(YTMusicAPI REQUIRED RUNTIME)
 
 add_subdirectory(src)
 

LICENSES/BSD-2-Clause.txt

@@ -1,22 +0,0 @@
-Copyright (c) <year> <owner>. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSES/CC0-1.0.txt

@@ -1,119 +0,0 @@
-Creative Commons Legal Code
-
-CC0 1.0 Universal CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES
-NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE
-AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION
-ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE
-OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS
-LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION
-OR WORKS PROVIDED HEREUNDER.
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer exclusive
-Copyright and Related Rights (defined below) upon the creator and subsequent
-owner(s) (each and all, an "owner") of an original work of authorship and/or
-a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for the
-purpose of contributing to a commons of creative, cultural and scientific
-works ("Commons") that the public can reliably and without fear of later claims
-of infringement build upon, modify, incorporate in other works, reuse and
-redistribute as freely as possible in any form whatsoever and for any purposes,
-including without limitation commercial purposes. These owners may contribute
-to the Commons to promote the ideal of a free culture and the further production
-of creative, cultural and scientific works, or to gain reputation or greater
-distribution for their Work in part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any expectation
-of additional consideration or compensation, the person associating CC0 with
-a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
-and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
-and publicly distribute the Work under its terms, with knowledge of his or
-her Copyright and Related Rights in the Work and the meaning and intended
-legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be protected
-by copyright and related or neighboring rights ("Copyright and Related Rights").
-Copyright and Related Rights include, but are not limited to, the following:
-
-i. the right to reproduce, adapt, distribute, perform, display, communicate,
-and translate a Work;
-
-      ii. moral rights retained by the original author(s) and/or performer(s);
-
-iii. publicity and privacy rights pertaining to a person's image or likeness
-depicted in a Work;
-
-iv. rights protecting against unfair competition in regards to a Work, subject
-to the limitations in paragraph 4(a), below;
-
-v. rights protecting the extraction, dissemination, use and reuse of data
-in a Work;
-
-vi. database rights (such as those arising under Directive 96/9/EC of the
-European Parliament and of the Council of 11 March 1996 on the legal protection
-of databases, and under any national implementation thereof, including any
-amended or successor version of such directive); and
-
-vii. other similar, equivalent or corresponding rights throughout the world
-based on applicable law or treaty, and any national implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention of,
-applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
-unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
-and Related Rights and associated claims and causes of action, whether now
-known or unknown (including existing as well as future claims and causes of
-action), in the Work (i) in all territories worldwide, (ii) for the maximum
-duration provided by applicable law or treaty (including future time extensions),
-(iii) in any current or future medium and for any number of copies, and (iv)
-for any purpose whatsoever, including without limitation commercial, advertising
-or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the
-benefit of each member of the public at large and to the detriment of Affirmer's
-heirs and successors, fully intending that such Waiver shall not be subject
-to revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason be
-judged legally invalid or ineffective under applicable law, then the Waiver
-shall be preserved to the maximum extent permitted taking into account Affirmer's
-express Statement of Purpose. In addition, to the extent the Waiver is so
-judged Affirmer hereby grants to each affected person a royalty-free, non
-transferable, non sublicensable, non exclusive, irrevocable and unconditional
-license to exercise Affirmer's Copyright and Related Rights in the Work (i)
-in all territories worldwide, (ii) for the maximum duration provided by applicable
-law or treaty (including future time extensions), (iii) in any current or
-future medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional purposes
-(the "License"). The License shall be deemed effective as of the date CC0
-was applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder of
-the License, and in such case Affirmer hereby affirms that he or she will
-not (i) exercise any of his or her remaining Copyright and Related Rights
-in the Work or (ii) assert any associated claims and causes of action with
-respect to the Work, in either case contrary to Affirmer's express Statement
-of Purpose.
-
-   4. Limitations and Disclaimers.
-
-a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered,
-licensed or otherwise affected by this document.
-
-b. Affirmer offers the Work as-is and makes no representations or warranties
-of any kind concerning the Work, express, implied, statutory or otherwise,
-including without limitation warranties of title, merchantability, fitness
-for a particular purpose, non infringement, or the absence of latent or other
-defects, accuracy, or the present or absence of errors, whether or not discoverable,
-all to the greatest extent permissible under applicable law.
-
-c. Affirmer disclaims responsibility for clearing rights of other persons
-that may apply to the Work or any use thereof, including without limitation
-any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims
-responsibility for obtaining any necessary consents, permissions or other
-rights required for any use of the Work.
-
-d. Affirmer understands and acknowledges that Creative Commons is not a party
-to this document and has no duty or obligation with respect to this CC0 or
-use of the Work.

README.md

@@ -4,9 +4,9 @@ AudioTube is a client for YouTube Music.
 
 # Dependencies
 
-It depends on Qt, Kirigami, KI18n, KCoreAddons and KCrash in addition to a few python packages:
+It depends on Qt and Kirigami in addition to a few python packages:
  * ytmusicapi
- * yt_dlp
+ * youtube_dl
 
 YouTube uses webp images for the cover art, so you will need to install qtimageformats.
 

cmake/FindYTMusicAPI.cmake

@@ -1,11 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Jonah Brüchert <[email protected]>
-#
-# SPDX-License-Identifier: BSD-2-Clause
-
-find_package(Python3 REQUIRED COMPONENTS Interpreter)
-
-execute_process(COMMAND ${Python3_EXECUTABLE} -c "import ytmusicapi" RESULT_VARIABLE YTMUSICAPI_CHECK_RESULT)
-
-if (${YTMUSICAPI_CHECK_RESULT} EQUAL 0)
-	set(YTMusicAPI_FOUND TRUE)
-endif()

cmake/FindYtdlp.cmake

@@ -1,11 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Jonah Brüchert <[email protected]>
-#
-# SPDX-License-Identifier: BSD-2-Clause
-
-find_package(Python3 REQUIRED COMPONENTS Interpreter)
-
-execute_process(COMMAND ${Python3_EXECUTABLE} -c "import yt_dlp" RESULT_VARIABLE YTDLP_CHECK_RESULT)
-
-if (${YTDLP_CHECK_RESULT} EQUAL 0)
-	set(Ytdlp_FOUND TRUE)
-endif()

flatpak/python3-youtube_dl.json

@@ -0,0 +1,14 @@
+{
+    "name": "python3-youtube_dl",
+    "buildsystem": "simple",
+    "build-commands": [
+        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"youtube_dl\" --no-build-isolation"
+    ],
+    "sources": [
+        {
+            "type": "file",
+            "url": "https://files.pythonhosted.org/packages/94/a0/b8325b524700daae1c04a6156473ab7091d44071353f1d7c9e66b9c7f019/youtube_dl-2021.4.26.tar.gz",
+            "sha256": "6f311ffaf8b88cdcf27a2301a2272455e213bdb780aa447246933a3da4532879"
+        }
+    ]
+}

flatpak/python3-yt-dlp.json

@@ -1,29 +0,0 @@
-{
-    "name": "python3-yt-dlp",
-    "buildsystem": "simple",
-    "build-commands": [
-        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"yt-dlp\" --no-build-isolation"
-    ],
-    "sources": [
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/8e/10/7b43c0a779d4c6331088d64af7e4a2da27b47817f558e97ebbadfc41869f/yt_dlp-2022.1.21-py2.py3-none-any.whl",
-            "sha256": "182903b78a4645edd504dcd9f2603f76f9fdaf8bd279fd45d01992f7637b6d8a"
-        },
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/f6/06/e2ad9e93210790be86d36c6e2d5524ba54928c3ed27dd0be9b2ced7c57f1/pycryptodomex-3.12.0.zip",
-            "sha256": "922e9dac0166e4617e5c7980d2cff6912a6eb5cb5c13e7ece222438650bd7f66"
-        },
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/69/77/591bbc51a5ed6a906a7813e60a9627f988f9546513fcf9d250eb31ec8689/websockets-10.1.tar.gz",
-            "sha256": "181d2b25de5a437b36aefedaf006ecb6fa3aa1328ec0236cdde15f32f9d3ff6d"
-        },
-        {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/16/b3/f7aa8edf2ff4495116f95fd442b2a346aa55d1d46313143c8814886dbcdb/mutagen-1.45.1-py3-none-any.whl",
-            "sha256": "9c9f243fcec7f410f138cb12c21c84c64fde4195481a30c9bfb05b5f003adfed"
-        }
-    ]
-}

flatpak/python3-yt-dlp.json.license

@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2021 Jonah Brüchert <[email protected]>
-
-SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL

flatpak/python3-ytmusicapi.json

@@ -7,33 +7,33 @@
     "sources": [
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/33/d9/d18f3827dfd54acc48f29337059197514ad656ffc88e02a51e0457c5117a/ytmusicapi-0.20.0-py3-none-any.whl",
-            "sha256": "abdb90426baa14a7929ec810d65c1df228661b61d580678fc48c087909a9aea2"
+            "url": "https://files.pythonhosted.org/packages/cb/cf/871177f1fc795c6c10787bc0e1f27bb6cf7b81dbde399fd35860472cecbc/urllib3-1.26.4.tar.gz",
+            "sha256": "e7b021f7241115872f92f43c6508082facffbd1c048e3c6e2bb9c2a157e28937"
         },
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/37/45/946c02767aabb873146011e665728b680884cd8fe70dde973c640e45b775/certifi-2021.10.8-py2.py3-none-any.whl",
-            "sha256": "d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"
+            "url": "https://files.pythonhosted.org/packages/ea/b7/e0e3c1c467636186c39925827be42f16fee389dc404ac29e930e9136be70/idna-2.10.tar.gz",
+            "sha256": "b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"
         },
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/84/3e/1037abe6498e65d645ce7a22d3402605d49a3b2c7f20c3abb027760da4f0/charset_normalizer-2.0.10-py3-none-any.whl",
-            "sha256": "cb957888737fc0bbcd78e3df769addb41fd1ff8cf950dc9e7ad7793f1bf44455"
+            "url": "https://files.pythonhosted.org/packages/ee/2d/9cdc2b527e127b4c9db64b86647d567985940ac3698eeabc7ffaccb4ea61/chardet-4.0.0.tar.gz",
+            "sha256": "0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"
         },
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/2d/61/08076519c80041bc0ffa1a8af0cbd3bf3e2b62af10435d269a9d0f40564d/requests-2.27.1-py2.py3-none-any.whl",
-            "sha256": "f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"
+            "url": "https://files.pythonhosted.org/packages/06/a9/cd1fd8ee13f73a4d4f491ee219deeeae20afefa914dfb4c130cfc9dc397a/certifi-2020.12.5.tar.gz",
+            "sha256": "1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c"
         },
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/04/a2/d918dcd22354d8958fe113e1a3630137e0fc8b44859ade3063982eacd2a4/idna-3.3-py3-none-any.whl",
-            "sha256": "84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"
+            "url": "https://files.pythonhosted.org/packages/6b/47/c14abc08432ab22dc18b9892252efaf005ab44066de871e72a38d6af464b/requests-2.25.1.tar.gz",
+            "sha256": "27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"
         },
         {
             "type": "file",
-            "url": "https://files.pythonhosted.org/packages/4e/b8/f5a25b22e803f0578e668daa33ba3701bb37858ec80e08a150bd7d2cf1b1/urllib3-1.26.8-py2.py3-none-any.whl",
-            "sha256": "000ca7f471a233c2251c6c7023ee85305721bfdf18621ebff4fd17a8653427ed"
+            "url": "https://files.pythonhosted.org/packages/61/b5/da439d5f75db7ff17790b19136c835f9a315530436ee7bc9d75aeea2f6e5/ytmusicapi-0.16.0.tar.gz",
+            "sha256": "ffde3fb5a78123ac59dee37fc1f32793f34f9a4fa3d3e69a1fc08064112c2b5d"
         }
     ]
 }

flatpak/python3-ytmusicapi.json.license

@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2021 Jonah Brüchert <[email protected]>
-
-SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL

flatpak/regenerate-sources.sh

@@ -1,9 +1,5 @@
 #!/usr/bin/env bash
 
-# SPDX-FileCopyrightText: 2021 Jonah Brüchert <[email protected]>
-#
-# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
 set -e
 
 export GIT_CLONE_ARGS="--depth 1 --single-branch"
@@ -16,5 +12,5 @@ else
 	git -C flatpak-builder-tools pull
 fi
 
-./flatpak-builder-tools/pip/flatpak-pip-generator yt-dlp
+./flatpak-builder-tools/pip/flatpak-pip-generator youtube_dl
 ./flatpak-builder-tools/pip/flatpak-pip-generator ytmusicapi

org.kde.audiotube.appdata.xml

@@ -1,138 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-SPDX-FileCopyrightText: 2021 Jonah Brüchert <[email protected]>
-
-SPDX-License-Identifier: CC0-1.0
--->
 <component type="desktop-application">
   <id>org.kde.audiotube</id>
   <name>AudioTube</name>
-  <name xml:lang="ar">تيوب الصوتي</name>
-  <name xml:lang="ca">AudioTube</name>
-  <name xml:lang="ca-valencia">AudioTube</name>
-  <name xml:lang="cs">AudioTube</name>
-  <name xml:lang="de">AudioTube</name>
-  <name xml:lang="en-GB">AudioTube</name>
-  <name xml:lang="es">AudioTube</name>
-  <name xml:lang="eu">AudioTube</name>
-  <name xml:lang="fi">AudioTube</name>
-  <name xml:lang="fr">AudioTube</name>
-  <name xml:lang="hi">ओडियो-ट्यूब</name>
-  <name xml:lang="it">AudioTube</name>
-  <name xml:lang="ko">AudioTube</name>
-  <name xml:lang="nl">AudioTube</name>
-  <name xml:lang="pa">ਆਡੀਓ-ਟਿਊਬ</name>
-  <name xml:lang="pl">AudioTube</name>
-  <name xml:lang="pt">AudioTube</name>
-  <name xml:lang="pt-BR">AudioTube</name>
-  <name xml:lang="ro">AudioTube</name>
-  <name xml:lang="sk">AudioTube</name>
-  <name xml:lang="sl">AudioTube</name>
-  <name xml:lang="sv">AudioTube</name>
-  <name xml:lang="uk">AudioTube</name>
-  <name xml:lang="x-test">xxAudioTubexx</name>
   <summary>Convergent YouTube Music client</summary>
-  <summary xml:lang="ar">عميل موسيقى يوتيوب متعدد المنصات</summary>
-  <summary xml:lang="ca">Client convergent de música de YouTube</summary>
-  <summary xml:lang="ca-valencia">Client convergent de música de YouTube</summary>
-  <summary xml:lang="de">Konvergentes YouTube-Musikprogramm</summary>
-  <summary xml:lang="en-GB">Convergent YouTube Music client</summary>
-  <summary xml:lang="es">Cliente de música de YouTube convergente</summary>
-  <summary xml:lang="eu">YouTube Music bezero konbergentea</summary>
-  <summary xml:lang="fi">Mukautuva YouTube Music -asiakas</summary>
-  <summary xml:lang="fr">Client convergent pour musique sur YouTube</summary>
-  <summary xml:lang="hi">अभिसृत यूट्यूब संगीत क्लाएंट</summary>
-  <summary xml:lang="it">Client YouTube Music convergente</summary>
-  <summary xml:lang="ko">올인원 YouTube Music 클라이언트</summary>
-  <summary xml:lang="nl">Convergente muziekclient van YouTube</summary>
-  <summary xml:lang="pl">Adaptacyjny program do YouTube Music</summary>
-  <summary xml:lang="pt">Cliente de música do YouTube convergente</summary>
-  <summary xml:lang="pt-BR">Um cliente convergente para o YouTube Music</summary>
-  <summary xml:lang="ro">Client convergent de muzică pentru YouTube</summary>
-  <summary xml:lang="sl">Konvergentni odjemalec glasbe YouTube</summary>
-  <summary xml:lang="sv">Konvergent YouTube-musikprogram</summary>
-  <summary xml:lang="uk">Зручний музичний клієнт YouTube</summary>
-  <summary xml:lang="x-test">xxConvergent YouTube Music clientxx</summary>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
   <developer_name>KDE Community</developer_name>
-  <developer_name xml:lang="ar">مجتمع كدي</developer_name>
-  <developer_name xml:lang="ca">La comunitat KDE</developer_name>
-  <developer_name xml:lang="ca-valencia">La comunitat KDE</developer_name>
-  <developer_name xml:lang="cs">Komunita KDE</developer_name>
-  <developer_name xml:lang="de">KDE-Gemeinschaft</developer_name>
-  <developer_name xml:lang="en-GB">KDE Community</developer_name>
-  <developer_name xml:lang="es">Comunidad KDE</developer_name>
-  <developer_name xml:lang="eu">KDE komunitatea</developer_name>
-  <developer_name xml:lang="fi">KDE-yhteisö</developer_name>
-  <developer_name xml:lang="fr">Communauté de KDE</developer_name>
-  <developer_name xml:lang="hi">केडीई समुदाय</developer_name>
-  <developer_name xml:lang="it">Comunità KDE</developer_name>
-  <developer_name xml:lang="ko">KDE 커뮤니티</developer_name>
-  <developer_name xml:lang="nl">KDE-gemeenschap</developer_name>
-  <developer_name xml:lang="pa">ਕੇਡੀਈ ਕਮਿਊਨਟੀ</developer_name>
-  <developer_name xml:lang="pl">Społeczność KDE</developer_name>
-  <developer_name xml:lang="pt">Comunidade do KDE</developer_name>
-  <developer_name xml:lang="pt-BR">A Comunidade KDE</developer_name>
-  <developer_name xml:lang="ro">Comunitatea KDE</developer_name>
-  <developer_name xml:lang="sk">KDE komunita</developer_name>
-  <developer_name xml:lang="sl">Skupnost KDE</developer_name>
-  <developer_name xml:lang="sv">KDE-gemenskapen</developer_name>
-  <developer_name xml:lang="uk">Спільнота KDE</developer_name>
-  <developer_name xml:lang="x-test">xxKDE Communityxx</developer_name>
-  <content_rating type="oars-1.0"/>
-  <url type="homepage">https://apps.kde.org/en/audiotube</url>
-  <releases>
-    <release version="22.02" date="2022-02-09">
-      <url>https://www.plasma-mobile.org/2022/02/09/plasma-mobile-gear-22-02/</url>
-      <description>
-        <ul>
-          <li>Update the version of ytmusicapi</li>
-        </ul>
-      </description>
-    </release>
-    <release version="21.12" date="2021-12-07">
-      <url>https://www.plasma-mobile.org/2021/12/07/plasma-mobile-gear-21-12/</url>
-    </release>
-    <release version="21.08" date="2021-08-31">
-      <url>https://www.plasma-mobile.org/2021/08/31/plasma-mobile-gear-21-08/</url>
-    </release>
-  </releases>
-  <launchable type="desktop-id">org.kde.audiotube.desktop</launchable>
-  <screenshots>
-    <screenshot>
-      <image>https://cdn.kde.org/screenshots/audiotube/desktop.png</image>
-    </screenshot>
-    <screenshot>
-      <image>https://cdn.kde.org/screenshots/audiotube/mobile_playlist.png</image>
-    </screenshot>
-  </screenshots>
-  <recommends>
-    <control>pointing</control>
-    <control>keyboard</control>
-    <control>touch</control>
-  </recommends>
   <description>
     <p>AudioTube can search YouTube Music, list albums and artists, play automatically generated playlists, albums and allows to put your own playlist together.</p>
-    <p xml:lang="ar">يمكن لتيوب الصوتي البحث في موسيقى يوتيوب، وعرض الألبومات والفنانين، وتشغيل القوائم والألبومات المولدة تلقائيًا، ويسمح لك بوضع قائمة التشغيل الخاصة بك معًا.</p>
-    <p xml:lang="ca">L'AudioTube pot cercar música a YouTube, llistar àlbums i artistes, reproduir llistes de reproducció generades automàticament, àlbums i permet crear la vostra pròpia llista de reproducció.</p>
-    <p xml:lang="ca-valencia">L'AudioTube pot cercar música a YouTube, llistar àlbums i artistes, reproduir llistes de reproducció generades automàticament, àlbums i permet crear la vostra pròpia llista de reproducció.</p>
-    <p xml:lang="de">AudioTube kann Musik auf YouTube durchsuchen, Alben und Interpreten auflisten, automatisch generierte Wiedergabelisten und Alben abspielen und erlaubt es, eine eigene Wiedergabeliste zusammenzustellen.</p>
-    <p xml:lang="en-GB">AudioTube can search YouTube Music, list albums and artists, play automatically generated playlists, albums and allows to put your own playlist together.</p>
-    <p xml:lang="es">AudioTube puede buscar música de YouTube, listar álbumes y artistas, reproducir las listas de reproducción generadas, álbumes y le permite crear su propia lista de reproducción.</p>
-    <p xml:lang="eu">AudioTube-k YouTube Music-en bilatu dezake, albumak eta artistak zerrendatu, automatikoki sortutako jotze-zerrendak eta albumak jo, eta zure jotze-zerrenda osatzeko aukera eskaintzen dizu.</p>
-    <p xml:lang="fi">AudioTube osaa etsiä YouTube Music -haun, albumien ja artistien luettelun, luotujen soittolistojen automaattisen toiston ja omien soittolistojen kokoamisen.</p>
-    <p xml:lang="fr">AudioTube peut effectuer des recherches de musiques sur YouTube Music, établir une liste d'albums et d'artistes, lire des listes de lecture générées automatiquement, des albums et permet de composer sa propre liste de lecture.</p>
-    <p xml:lang="hi">ऑडियोट्यूब यूट्यूब संगीत खोज सकता है, एल्बम और कलाकारों की सूची बना सकता है, स्वचालित रूप से उत्पन्न की गई गीतसूची, एल्बम बजा सकता है और आपकी अपनी खुद की प्लेलिस्ट को एक साथ रखने में मदद करता है।</p>
-    <p xml:lang="it">AudioTube può eseguire ricerche su YouTube Music, elencare album e artisti, riprodurre scalette e album generati automaticamente e ti consente di creare la tua scaletta.</p>
-    <p xml:lang="ko">AudioTube는 YouTube Music을 검색하고, 앨범과 아티스트를 표시하고, 자동 생성된 재생 목록, 앨범을 재생하고, 사용자 정의 재생 목록을 만들 수 있습니다.</p>
-    <p xml:lang="nl">AudioTube kan in YouTube Music zoeken, een lijst maken van albums en artiesten, automatically gegenereerde afspeellijsten, albums afspelen en biedt u het samenstellen van uw eigen afspeellijst.</p>
-    <p xml:lang="pl">AudioTube może przeszukiwać serwis YouTube Music, wypisać albumy i wykonawców, odtwarzać samoczynnie utworzone listy odtwarzania, albumy oraz umożliwia tworzenie własnych list odtwarzania.</p>
-    <p xml:lang="pt">O AudioTube consegue pesquisar no YouTube Music, enumerar os álbuns e artistas, reproduzir listas geradas automaticamente, álbuns e permite-lhe reproduzir as suas próprias listas de reprodução.</p>
-    <p xml:lang="pt-BR">O AudioTube pode pesquisar no YouTube Music, listar álbuns e artistas, rodar listas de reprodução geradas automaticamente, álbuns inteiros, e criar a sua própria lista de reprodução.</p>
-    <p xml:lang="sl">AudioTube lahko išče po YouTube Music, izdela sezname albumov in avtorjev, samodejno predvaja generirane sezname, albume in sestavlja vaše sezname predvajanja.</p>
-    <p xml:lang="sv">AudioTube kan söka på YouTube Music, lista album och artister, spela upp automatiskt genererade spellistor, albums och låter dig sammanställa egna spellistor.</p>
-    <p xml:lang="uk">AudioTube може виконувати пошук на YouTube Music, показувати списки альбомів та виконавців, відтворювати створені автоматично списки відтворення, альбоми та надає вам змогу створювати власні списки відворення.</p>
-    <p xml:lang="x-test">xxAudioTube can search YouTube Music, list albums and artists, play automatically generated playlists, albums and allows to put your own playlist together.xx</p>
   </description>
 </component>

org.kde.audiotube.desktop

@@ -1,54 +1,6 @@
 [Desktop Entry]
 Name=AudioTube
-Name[ar]=تيوب الصوتي
-Name[ca]=AudioTube
-Name[ca@valencia]=AudioTube
-Name[cs]=AudioTube
-Name[de]=AudioTube
-Name[en_GB]=AudioTube
-Name[es]=AudioTube
-Name[eu]=AudioTube
-Name[fi]=AudioTube
-Name[fr]=AudioTube
-Name[hi]=ओडियो-ट्यूब
-Name[it]=AudioTube
-Name[ko]=AudioTube
-Name[nl]=AudioTube
-Name[pa]=ਆਡੀਓ-ਟਿਊਬ
-Name[pl]=AudioTube
-Name[pt]=AudioTube
-Name[pt_BR]=AudioTube
-Name[ro]=AudioTube
-Name[sk]=AudioTube
-Name[sl]=AudioTube
-Name[sv]=AudioTube
-Name[uk]=AudioTube
-Name[x-test]=xxAudioTubexx
 Comment=YouTube Music client
-Comment[ar]=عميل يوتيوب ميوزيك
-Comment[ca]=Client de música de YouTube
-Comment[ca@valencia]=Client de música de YouTube
-Comment[cs]=Hudební klient YouTube
-Comment[de]=YouTube-Musikprogramm
-Comment[en_GB]=YouTube Music client
-Comment[es]=Cliente de música de YouTube
-Comment[eu]=YouTube Music bezeroa
-Comment[fi]=YouTube Music -asiakas
-Comment[fr]=Client de musique sur Youtube
-Comment[hi]=यूट्यूब संगीत क्लाएंट
-Comment[it]=Client YouTube Music
-Comment[ko]=YouTube Music 클라이언트
-Comment[nl]=Muziekclient van YouTube
-Comment[pa]=ਯੂਟਿਊਬ ਸੰਗੀਤ ਕਲਾਈਂਟ
-Comment[pl]=Program do YouTube Music
-Comment[pt]=Cliente do YouTube Music
-Comment[pt_BR]=Cliente YouTube Music
-Comment[ro]=Client de muzică pentru YouTube
-Comment[sk]=Hudobný klient YouTube
-Comment[sl]=Glasbeni odjemalec Youtube
-Comment[sv]=YouTube-musikprogram
-Comment[uk]=Музичний клієнт YouTube
-Comment[x-test]=xxYouTube Music clientxx
 Version=1.0
 Exec=audiotube
 Icon=org.kde.audiotube

org.kde.audiotube.json

@@ -1,7 +1,7 @@
 {
     "id": "org.kde.audiotube",
     "runtime": "org.kde.Platform",
-    "runtime-version": "5.15-21.08",
+    "runtime-version": "5.15",
     "sdk": "org.kde.Sdk",
     "command": "audiotube",
     "tags": ["nightly"],
@@ -21,14 +21,14 @@
     ],
 
     "modules": [
-        "flatpak/python3-yt-dlp.json",
+        "flatpak/python3-youtube_dl.json",
         "flatpak/python3-ytmusicapi.json",
         {
             "name": "pybind11",
             "config-opts": ["-DPYBIND11_FINDPYTHON=ON", "-DPYBIND11_TEST=OFF"],
             "buildsystem": "cmake-ninja",
             "builddir": true,
-            "sources": [ { "type": "git", "url": "https://github.com/pybind/pybind11", "tag": "v2.9.1" } ]
+            "sources": [ { "type": "git", "url": "https://github.com/pybind/pybind11", "tag": "v2.6.2" } ]
         },
         {
             "name": "org.kde.audiotube",

requirements.txt

@@ -1,7 +1,2 @@
-# SPDX-FileCopyrightText: 2021 Jonah Brüchert <[email protected]>
-# SPDX-FileCopyrightText: 2021 Kuba Prussak <[email protected]>
-#
-# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-ytmusicapi==0.20.0
-yt-dlp
+ytmusicapi==0.16.0
+youtube_dl

src/CMakeLists.txt

@@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021 Jonah Brüchert <[email protected]>
-#
-# SPDX-License-Identifier: BSD-2-Clause
-
 add_library(ytm STATIC
     ytmusic.cpp
 )
@@ -23,8 +19,6 @@ add_executable(audiotube
     playlistmodel.cpp
     playlistutils.cpp
     errorhandler.cpp
-    playerutils.cpp
-    abstractytmusicmodel.cpp
     multiiterableview.h
     resources.qrc
 )
@@ -37,8 +31,6 @@ target_link_libraries(audiotube
     Qt5::QuickControls2
     Qt5::Svg
     KF5::I18n
-    KF5::CoreAddons
-    KF5::Crash
     ytm
 )
 target_compile_definitions(audiotube PRIVATE -DQT_NO_KEYWORDS -DQT_NO_URL_CAST_FROM_STRING)

src/Messages.sh

@@ -1,4 +0,0 @@
-#! /usr/bin/env bash
-# SPDX-FileCopyrightText: 2020 Tobias Fella <[email protected]>
-# SPDX-License-Identifier: CC0-1.0
-$XGETTEXT `find -name \*.cpp -o -name \*.qml -o -name \*.js` -o $podir/audiotube.pot

src/abstractytmusicmodel.cpp

@@ -1,27 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Jonah Brüchert <[email protected]>
-//
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#include "abstractytmusicmodel.h"
-
-#include "asyncytmusic.h"
-
-
-AbstractYTMusicModel::AbstractYTMusicModel(QObject *parent)
-    : QAbstractListModel(parent)
-{
-}
-
-bool AbstractYTMusicModel::loading() const
-{
-    return m_loading;
-}
-
-void AbstractYTMusicModel::setLoading(bool loading)
-{
-    if (m_loading == loading)
-        return;
-
-    m_loading = loading;
-    Q_EMIT loadingChanged();
-}

src/abstractytmusicmodel.h

@@ -1,28 +0,0 @@
-// SPDX-FileCopyrightText: 2021 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 <QAbstractListModel>
-
-///
-/// Base class for all models that work with data from the AsyncYTMusic class.
-/// It provides a loading property, that is automatically set to false if a query fails.
-///
-class AbstractYTMusicModel : public QAbstractListModel
-{
-    Q_OBJECT
-    Q_PROPERTY(bool loading READ loading WRITE setLoading NOTIFY loadingChanged)
-
-public:
-    explicit AbstractYTMusicModel(QObject *parent = nullptr);
-
-    bool loading() const;
-    void setLoading(bool loading);
-    Q_SIGNAL void loadingChanged();
-
-private:
-    bool m_loading = false;
-};
-

src/albummodel.cpp

@@ -7,13 +7,13 @@
 #include <QDebug>
 
 AlbumModel::AlbumModel(QObject *parent)
-    : AbstractYTMusicModel(parent)
+    : QAbstractListModel(parent)
 {
-    connect(this, &AlbumModel::browseIdChanged, this, [this] {
+    connect(this, &AlbumModel::browseIdChanged, this, [=] {
         setLoading(true);
         YTMusicThread::instance()->fetchAlbum(m_browseId);
     });
-    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::fetchAlbumFinished, this, [this](const album::Album &album) {
+    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::fetchAlbumFinished, this, [=](const album::Album &album) {
         setLoading(false);
 
         beginResetModel();
@@ -25,7 +25,7 @@ AlbumModel::AlbumModel(QObject *parent)
         Q_EMIT thumbnailUrlChanged();
         Q_EMIT playlistIdChanged();
     });
-    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::errorOccurred, this, [this] {
+    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::errorOccurred, this, [=] {
         setLoading(false);
     });
 }
@@ -43,7 +43,12 @@ QVariant AlbumModel::data(const QModelIndex &index, int role) const
     case VideoId:
         return QString::fromStdString(m_album.tracks[index.row()].video_id.value_or(std::string()));
     case Artists:
-        return QVariant::fromValue(m_album.tracks[index.row()].artists);
+        return QVariant::fromValue(std::vector<meta::Artist> {
+            {
+                m_album.tracks[index.row()].artists,
+                std::nullopt
+            }
+        });
     }
 
     Q_UNREACHABLE();
@@ -76,6 +81,18 @@ QString AlbumModel::title() const
     return QString::fromStdString(m_album.title);
 }
 
+bool AlbumModel::loading() const
+{
+    return m_loading;
+}
+
+void AlbumModel::setLoading(bool loading)
+{
+    m_loading = loading;
+    Q_EMIT loadingChanged();
+}
+
+
 QUrl AlbumModel::thumbnailUrl() const
 {
     if (m_album.thumbnails.empty()) {
@@ -87,5 +104,5 @@ QUrl AlbumModel::thumbnailUrl() const
 
 QString AlbumModel::playlistId() const
 {
-    return QString::fromStdString(m_album.audio_playlist_id);
+    return QString::fromStdString(m_album.playlist_id);
 }

src/albummodel.h

@@ -8,15 +8,15 @@
 #include <QUrl>
 
 #include "asyncytmusic.h"
-#include "abstractytmusicmodel.h"
 
-class AlbumModel : public AbstractYTMusicModel
+class AlbumModel : public QAbstractListModel
 {
     Q_OBJECT
     Q_PROPERTY(QString browseId READ browseId WRITE setBrowseId NOTIFY browseIdChanged REQUIRED)
 
     Q_PROPERTY(QString title READ title NOTIFY titleChanged)
     Q_PROPERTY(QUrl thumbnailUrl READ thumbnailUrl NOTIFY thumbnailUrlChanged)
+    Q_PROPERTY(bool loading READ loading WRITE setLoading NOTIFY loadingChanged)
     Q_PROPERTY(QString playlistId READ playlistId NOTIFY playlistIdChanged)
 
 public:
@@ -39,6 +39,10 @@ public:
     QString title() const;
     Q_SIGNAL void titleChanged();
 
+    bool loading() const;
+    void setLoading(bool loading);
+    Q_SIGNAL void loadingChanged();
+
     QUrl thumbnailUrl() const;
     Q_SIGNAL void thumbnailUrlChanged();
 
@@ -47,6 +51,7 @@ public:
 
 private:
     QString m_browseId;
+    bool m_loading = false;
 
     album::Album m_album;
 };

src/artistmodel.cpp

@@ -7,10 +7,9 @@
 #include <asyncytmusic.h>
 
 ArtistModel::ArtistModel(QObject *parent)
-    : AbstractYTMusicModel(parent)
-    , m_view(albums, singles, songs, videos)
+    : QAbstractListModel(parent)
 {
-    connect(this, &ArtistModel::channelIdChanged, this, [this] {
+    connect(this, &ArtistModel::channelIdChanged, this, [=] {
         if (m_channelId.isEmpty()) {
             return;
         }
@@ -19,37 +18,38 @@ ArtistModel::ArtistModel(QObject *parent)
 
         YTMusicThread::instance()->fetchArtist(m_channelId);
     });
-    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::fetchArtistFinished, this, [this](const artist::Artist &artist) {
+    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::fetchArtistFinished, this, [=](const artist::Artist &artist) {
         setLoading(false);
 
         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>();
-
-        // std::span can't know if the data pointer underneath it was changed, so re-create
-        m_view = MultiIterableView(albums, singles, songs, videos);
+        m_view = std::optional(MultiIterableView(m_artist.albums->results,
+                                                 m_artist.singles->results,
+                                                 m_artist.songs->results,
+                                                 m_artist.videos->results));
         endResetModel();
 
+
         Q_EMIT titleChanged();
         Q_EMIT thumbnailUrlChanged();
     });
-    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::errorOccurred, this, [this] {
+    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::errorOccurred, this, [=] {
         setLoading(false);
     });
 }
 
 int ArtistModel::rowCount(const QModelIndex &parent) const
 {
-    return parent.isValid() ? 0 : m_view.size();
+    return parent.isValid() ? 0 : m_view ? int(m_view->size()) : 0;
 }
 
 QVariant ArtistModel::data(const QModelIndex &index, int role) const
 {
+    if (!m_view) {
+        return {};
+    }
+
     switch (role) {
     case Title:
         return QString::fromStdString(std::visit([&](auto&& item) {
@@ -65,7 +65,7 @@ QVariant ArtistModel::data(const QModelIndex &index, int role) const
             }
 
             Q_UNREACHABLE();
-        }, m_view[index.row()]));
+        }, m_view.value()[index.row()]));
     case Type:
         return std::visit([&](auto&& item) {
             using T = std::decay_t<decltype(item)>;
@@ -80,7 +80,7 @@ QVariant ArtistModel::data(const QModelIndex &index, int role) const
             }
 
             Q_UNREACHABLE();
-        }, m_view[index.row()]);
+        }, m_view.value()[index.row()]);
     case Artists:
         return QVariant::fromValue(std::vector<meta::Artist> {
             {
@@ -102,7 +102,7 @@ QVariant ArtistModel::data(const QModelIndex &index, int role) const
             }
 
             Q_UNREACHABLE();
-        }, m_view[index.row()]);
+        }, m_view.value()[index.row()]);
     }
 
     Q_UNREACHABLE();
@@ -145,20 +145,33 @@ QUrl ArtistModel::thumbnailUrl() const
     return QUrl(QString::fromStdString(m_artist.thumbnails.back().url));
 }
 
+bool ArtistModel::loading() const
+{
+    return m_loading;
+}
+
+void ArtistModel::setLoading(bool loading)
+{
+    m_loading = loading;
+    Q_EMIT loadingChanged();
+}
+
 void ArtistModel::triggerItem(int row)
 {
-    std::visit([&](auto&& item) {
-        using T = std::decay_t<decltype(item)>;
-        if constexpr(std::is_same_v<T, artist::Artist::Album>) {
-            Q_EMIT openAlbum(QString::fromStdString(item.browse_id));
-        } else if constexpr(std::is_same_v<T, artist::Artist::Single>) {
-            Q_EMIT openAlbum(QString::fromStdString(item.browse_id));
-        } else if constexpr(std::is_same_v<T, artist::Artist::Song>) {
-            Q_EMIT openSong(QString::fromStdString(item.video_id));
-        } else if constexpr(std::is_same_v<T, artist::Artist::Video>) {
-            Q_EMIT openVideo(QString::fromStdString(item.video_id), QString::fromStdString(item.title));
-        } else {
-            Q_UNREACHABLE();
-        }
-    }, m_view[row]);
+    if (m_view) {
+        std::visit([&](auto&& item) {
+            using T = std::decay_t<decltype(item)>;
+            if constexpr(std::is_same_v<T, artist::Artist::Album>) {
+                Q_EMIT openAlbum(QString::fromStdString(item.browse_id));
+            } else if constexpr(std::is_same_v<T, artist::Artist::Single>) {
+                Q_EMIT openAlbum(QString::fromStdString(item.browse_id));
+            } else if constexpr(std::is_same_v<T, artist::Artist::Song>) {
+                Q_EMIT openSong(QString::fromStdString(item.video_id));
+            } else if constexpr(std::is_same_v<T, artist::Artist::Video>) {
+                Q_EMIT openVideo(QString::fromStdString(item.video_id));
+            } else {
+                Q_UNREACHABLE();
+            }
+        }, m_view.value()[row]);
+    }
 }

src/artistmodel.h

@@ -10,12 +10,9 @@
 #include <optional>
 
 #include <ytmusic.h>
-
 #include "multiiterableview.h"
-#include "abstractytmusicmodel.h"
 
-
-class ArtistModel : public AbstractYTMusicModel
+class ArtistModel : public QAbstractListModel
 {
     Q_OBJECT
 
@@ -23,6 +20,7 @@ class ArtistModel : public AbstractYTMusicModel
 
     Q_PROPERTY(QString title READ title NOTIFY titleChanged)
     Q_PROPERTY(QUrl thumbnailUrl READ thumbnailUrl NOTIFY thumbnailUrlChanged)
+    Q_PROPERTY(bool loading READ loading WRITE setLoading NOTIFY loadingChanged)
 
 public:
     enum Type {
@@ -56,23 +54,22 @@ public:
     QUrl thumbnailUrl() const;
     Q_SIGNAL void thumbnailUrlChanged();
 
+    bool loading() const;
+    void setLoading(bool loading);
+    Q_SIGNAL void loadingChanged();
+
     Q_INVOKABLE void triggerItem(int row);
 
     Q_SIGNAL void openAlbum(const QString &browseId);
     Q_SIGNAL void openSong(const QString &videoId);
-    Q_SIGNAL void openVideo(const QString &videoId, const QString &title);
+    Q_SIGNAL void openVideo(const QString &videoId);
 
 private:
     QString m_channelId;
+    bool m_loading = false;
 
     artist::Artist m_artist;
-
-    std::vector<artist::Artist::Album> albums;
-    std::vector<artist::Artist::Single> singles;
-    std::vector<artist::Artist::Song> songs;
-    std::vector<artist::Artist::Video> videos;
-
-    MultiIterableView<
+    std::optional<MultiIterableView<
         artist::Artist::Album, artist::Artist::Single, artist::Artist::Song, artist::Artist::Video
-    > m_view;
+    >> m_view;
 };

src/asyncytmusic.cpp

@@ -16,11 +16,7 @@ namespace py = pybind11;
 template <typename R, typename T, typename OP>
 std::optional<R> map_optional(const std::optional<T> &optional, OP op) {
     if (optional.has_value()) {
-        if constexpr (std::is_member_function_pointer<OP>::value) {
-            return (&optional.value()->*op)();
-        } else {
-            return op(optional.value());
-        }
+        return op(optional.value());
     }
 
     return std::nullopt;
@@ -41,6 +37,15 @@ AsyncYTMusic::AsyncYTMusic(QObject *parent)
     qRegisterMetaType<std::vector<meta::Artist>>();
     qRegisterMetaType<meta::Artist>();
 
+    connect(this, &AsyncYTMusic::startSearch, this, &AsyncYTMusic::internalSearch);
+    connect(this, &AsyncYTMusic::startFetchArtist, this, &AsyncYTMusic::internalFetchArtist);
+    connect(this, &AsyncYTMusic::startFetchAlbum, this, &AsyncYTMusic::internalFetchAlbum);
+    connect(this, &AsyncYTMusic::startFetchSong, this, &AsyncYTMusic::internalFetchSong);
+    connect(this, &AsyncYTMusic::startFetchPlaylist, this, &AsyncYTMusic::internalFetchPlaylist);
+    connect(this, &AsyncYTMusic::startFetchArtistAlbums, this, &AsyncYTMusic::internalFetchArtistAlbums);
+    connect(this, &AsyncYTMusic::startExtractVideoInfo, this, &AsyncYTMusic::internalExtractVideoInfo);
+    connect(this, &AsyncYTMusic::startFetchWatchPlaylist, this, &AsyncYTMusic::internalFetchWatchPlaylist);
+
     connect(this, &AsyncYTMusic::errorOccurred, this, [](const QString &err) {
         std::cerr << qPrintable(err);
     });
@@ -51,9 +56,16 @@ AsyncYTMusic::AsyncYTMusic(QObject *parent)
 //
 void AsyncYTMusic::search(const QString &query)
 {
-    invokeAndCatchOnThread([=, this]() {
+    Q_EMIT startSearch(query);
+}
+
+void AsyncYTMusic::internalSearch(const QString &query)
+{
+    try {
         Q_EMIT searchFinished(m_ytm->search(query.toStdString()));
-    });
+    } catch (const py::error_already_set &err) {
+        Q_EMIT errorOccurred(QString::fromLocal8Bit(err.what()));
+    }
 }
 
 //
@@ -61,9 +73,16 @@ void AsyncYTMusic::search(const QString &query)
 //
 void AsyncYTMusic::fetchArtist(const QString &channelId)
 {
-    invokeAndCatchOnThread([=, this]() {
+    Q_EMIT startFetchArtist(channelId);
+}
+
+void AsyncYTMusic::internalFetchArtist(const QString &channelId)
+{
+    try {
         Q_EMIT fetchArtistFinished(m_ytm->get_artist(channelId.toStdString()));
-    });
+    } catch (const py::error_already_set &err) {
+        Q_EMIT errorOccurred(QString::fromLocal8Bit(err.what()));
+    }
 }
 
 //
@@ -71,9 +90,16 @@ void AsyncYTMusic::fetchArtist(const QString &channelId)
 //
 void AsyncYTMusic::fetchAlbum(const QString &browseId)
 {
-    invokeAndCatchOnThread([=, this]() {
+    Q_EMIT startFetchAlbum(browseId);
+}
+
+void AsyncYTMusic::internalFetchAlbum(const QString &browseId)
+{
+    try {
         Q_EMIT fetchAlbumFinished(m_ytm->get_album(browseId.toStdString()));
-    });
+    } catch (const py::error_already_set &err) {
+        Q_EMIT errorOccurred(QString::fromLocal8Bit(err.what()));
+    }
 }
 
 //
@@ -81,21 +107,32 @@ void AsyncYTMusic::fetchAlbum(const QString &browseId)
 //
 void AsyncYTMusic::fetchSong(const QString &videoId)
 {
-    invokeAndCatchOnThread([=, this]() {
-        auto maybeSong = m_ytm->get_song(videoId.toStdString());
-        if (maybeSong.has_value()) {
-            Q_EMIT fetchSongFinished(*maybeSong);
-        }
-    });
+    Q_EMIT startFetchSong(videoId);
+}
+
+void AsyncYTMusic::internalFetchSong(const QString &videoId)
+{
+    try {
+        Q_EMIT fetchSongFinished(m_ytm->get_song(videoId.toStdString()));
+    } catch (const py::error_already_set &err) {
+        Q_EMIT errorOccurred(QString::fromLocal8Bit(err.what()));
+    }
 }
 
 //
 // fetchPlaylist
 //
 void AsyncYTMusic::fetchPlaylist(const QString &playlistId) {
-    invokeAndCatchOnThread([=, this]() {
+    Q_EMIT startFetchPlaylist(playlistId);
+}
+
+void AsyncYTMusic::internalFetchPlaylist(const QString &playlistId)
+{
+    try {
         Q_EMIT fetchPlaylistFinished(m_ytm->get_playlist(playlistId.toStdString()));
-    });
+    } catch (const py::error_already_set &err) {
+        Q_EMIT errorOccurred(QString::fromLocal8Bit(err.what()));
+    }
 }
 
 //
@@ -103,9 +140,16 @@ void AsyncYTMusic::fetchPlaylist(const QString &playlistId) {
 //
 void AsyncYTMusic::fetchArtistAlbums(const QString &channelId, const QString &params)
 {
-    invokeAndCatchOnThread([=, this]() {
-        Q_EMIT fetchArtistAlbumsFinished(m_ytm->get_artist_albums(channelId.toStdString(), params.toStdString()));
-    });
+    Q_EMIT startFetchArtistAlbums(channelId, params);
+}
+
+void AsyncYTMusic::internalFetchArtistAlbums(const QString &channelid, const QString &params)
+{
+    try {
+        Q_EMIT fetchArtistAlbumsFinished(m_ytm->get_artist_albums(channelid.toStdString(), params.toStdString()));
+    } catch (const py::error_already_set &err) {
+        Q_EMIT errorOccurred(QString::fromLocal8Bit(err.what()));
+    }
 }
 
 //
@@ -113,9 +157,16 @@ void AsyncYTMusic::fetchArtistAlbums(const QString &channelId, const QString &pa
 //
 void AsyncYTMusic::extractVideoInfo(const QString &videoId)
 {
-    invokeAndCatchOnThread([=, this]() {
+    Q_EMIT startExtractVideoInfo(videoId);
+}
+
+void AsyncYTMusic::internalExtractVideoInfo(const QString &videoId)
+{
+    try {
         Q_EMIT extractVideoInfoFinished(m_ytm->extract_video_info(videoId.toStdString()));
-    });
+    } catch (const py::error_already_set &err) {
+        Q_EMIT errorOccurred(QString::fromLocal8Bit(err.what()));
+    }
 }
 
 //
@@ -123,22 +174,19 @@ void AsyncYTMusic::extractVideoInfo(const QString &videoId)
 //
 void AsyncYTMusic::fetchWatchPlaylist(const std::optional<QString> &videoId, const std::optional<QString> &playlistId)
 {
-    invokeAndCatchOnThread([=, this]() {
-        Q_EMIT fetchWatchPlaylistFinished(m_ytm->get_watch_playlist(
-            map_optional<std::string>(videoId, &QString::toStdString),
-            map_optional<std::string>(playlistId,  &QString::toStdString)
-        ));
-    });
+    Q_EMIT startFetchWatchPlaylist(videoId, playlistId);
 }
 
-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()));
-        }
-    });
+void AsyncYTMusic::internalFetchWatchPlaylist(const std::optional<QString> &videoId, const std::optional<QString> &playlistId)
+{
+    try {
+        Q_EMIT fetchWatchPlaylistFinished(m_ytm->get_watch_playlist(
+            map_optional<std::string>(videoId, [](const QString &value) { return value.toStdString(); }),
+            map_optional<std::string>(playlistId, [](const QString &value) { return value.toStdString(); })
+        ));
+    } catch (const py::error_already_set &err) {
+        Q_EMIT errorOccurred(QString::fromLocal8Bit(err.what()));
+    }
 }
 
 YTMusicThread &YTMusicThread::instance()

src/asyncytmusic.h

@@ -37,7 +37,6 @@ public:
         if (!m_item) {
             m_item = std::make_unique<T>();
         }
-        Q_ASSERT(m_item);
         return m_item;
     }
 
@@ -84,17 +83,38 @@ protected:
     explicit AsyncYTMusic(QObject *parent = nullptr);
 
 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);
+    Q_SIGNAL void startSearch(const QString &query);
+    Q_SLOT void internalSearch(const QString &query);
 
-    // Python interpreter will be initialized from the thread calling the methods
+    Q_SIGNAL void startFetchArtist(const QString &channelId);
+    Q_SLOT void internalFetchArtist(const QString &channelId);
+
+    Q_SIGNAL void startFetchAlbum(const QString &browseId);
+    Q_SLOT void internalFetchAlbum(const QString &browseId);
+
+    Q_SIGNAL void startFetchSong(const QString &videoId);
+    Q_SLOT void internalFetchSong(const QString &videoId);
+
+    Q_SIGNAL void startFetchPlaylist(const QString &playlistId);
+    Q_SLOT void internalFetchPlaylist(const QString &playlistId);
+
+    Q_SIGNAL void startFetchArtistAlbums(const QString &channelid, const QString &params);
+    Q_SLOT void internalFetchArtistAlbums(const QString &channelid, const QString &params);
+
+    Q_SIGNAL void startExtractVideoInfo(const QString &videoId);
+    Q_SLOT void internalExtractVideoInfo(const QString &videoId);
+
+    Q_SIGNAL void startFetchWatchPlaylist(const std::optional<QString> &videoId, const std::optional<QString> &playlistId);
+    Q_SLOT void internalFetchWatchPlaylist(const std::optional<QString> &videoId, const std::optional<QString> &playlistId);
+
+    // Python interpreter will be ininitalized from the thread calling the methods
     Lazy<YTMusic> m_ytm;
 };
 
 class YTMusicThread : private QThread {
 public:
     static YTMusicThread &instance();
-    ~YTMusicThread() override;
+    ~YTMusicThread();
 
     AsyncYTMusic *operator->();
     AsyncYTMusic &get();

src/contents/ui/AlbumPage.qml

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
-import QtQuick 2.15
+import QtQuick 2.1
 import org.kde.kirigami 2.14 as Kirigami
 import QtQuick.Controls 2.14 as Controls
 import QtQuick.Layouts 1.3
@@ -29,8 +29,6 @@ Kirigami.ScrollablePage {
             title: albumModel.title
         }
 
-        reuseItems: true
-
         model: AlbumModel {
             id: albumModel
         }
@@ -58,12 +56,12 @@ Kirigami.ScrollablePage {
             actions: [
                 Kirigami.Action {
                     icon.name: "go-next"
-                    text: i18n("Play Next")
+                    text: i18n("Play next")
                     onTriggered: UserPlaylistModel.playNext(delegateItem.videoId, delegateItem.title, delegateItem.artists)
                 },
                 Kirigami.Action {
                     icon.name: "media-playlist-append"
-                    text: i18n("Add to Playlist")
+                    text: i18n("Add to playlist")
                     onTriggered: UserPlaylistModel.append(delegateItem.videoId, delegateItem.title, delegateItem.artists)
                 }
             ]

src/contents/ui/ArtistPage.qml

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
-import QtQuick 2.15
+import QtQuick 2.1
 import org.kde.kirigami 2.14 as Kirigami
 import QtQuick.Controls 2.14 as Controls
 import QtQuick.Layouts 1.3
@@ -19,9 +19,6 @@ Kirigami.ScrollablePage {
             backgroundImage.source: artistModel.thumbnailUrl
             title: artistModel.title
         }
-
-        reuseItems: true
-
         model: ArtistModel {
             id: artistModel
 
@@ -35,16 +32,8 @@ Kirigami.ScrollablePage {
                 play(videoId)
             }
 
-            onOpenVideo: (videoId, title) => {
-                videoPlayMessage.text = i18n("Video playback is not supported yet. Do you want to play only the audio of \"%1\"?", title)
-                videoPlayMessage.visible = true
-                videoPlayMessage.okAction = function() {
-                    play(videoId)
-                    videoPlayMessage.visible = false
-                }
-                videoPlayMessage.cancelAction = function() {
-                    videoPlayMessage.visible = false
-                }
+            onOpenVideo: (videoId) => {
+                askPlayVideoAudio(videoId)
             }
         }
         section.property: "type"
@@ -98,13 +87,13 @@ Kirigami.ScrollablePage {
             actions: [
                 Kirigami.Action {
                     icon.name: "go-next"
-                    text: i18n("Play Next")
+                    text: i18n("Play next")
                     visible: type === ArtistModel.Song
                     onTriggered: UserPlaylistModel.playNext(delegateItem.videoId, delegateItem.title, delegateItem.artists)
                 },
                 Kirigami.Action {
                     icon.name: "media-playlist-append"
-                    text: i18n("Add to Playlist")
+                    text: i18n("Add to playlist")
                     visible: type === ArtistModel.Song
                     onTriggered: UserPlaylistModel.append(delegateItem.videoId, delegateItem.title, delegateItem.artists)
                 }
@@ -118,8 +107,4 @@ Kirigami.ScrollablePage {
             visible: artistModel.loading
         }
     }
-
-    footer: ConfirmationMessage {
-        id: videoPlayMessage
-    }
 }

src/contents/ui/ConfirmationMessage.qml

@@ -1,26 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Dimitris Kardarakos <[email protected]>
-//
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-import QtQuick 2.15
-import org.kde.kirigami 2.14 as Kirigami
-
-Kirigami.InlineMessage {
-
-    property var okAction
-    property var cancelAction
-
-    visible: false
-    actions: [
-        Kirigami.Action {
-            text: i18n("OK")
-
-            onTriggered: okAction()
-        },
-        Kirigami.Action {
-            text: i18n("Cancel")
-
-            onTriggered: cancelAction()
-        }
-    ]
-}

src/contents/ui/PlayerFooter.qml

@@ -9,253 +9,225 @@ import org.kde.kirigami 2.12 as Kirigami
 import org.kde.ytmusic 1.0
 import QtMultimedia 5.12
 
-Item {
-    id: footerItem
+ColumnLayout {
+    id: footerLayout
+
     property bool maximized: false
 
     anchors.left: parent.left
     anchors.right: parent.right
-    height: maximized ? applicationWindow().height : 75
+    height: maximized ? applicationWindow().height : player.preferredHeight
 
-    Rectangle {
-        color: Kirigami.Theme.backgroundColor
-        Kirigami.Theme.colorSet: Kirigami.Theme.Window
-        anchors.fill: footerLayout
+    GridLayout {
+        id: playerLayout
+
+        readonly property bool mobile: width > height
+
+        Layout.fillHeight: footerLayout.maximized
+        Layout.fillWidth: true
+        flow: width > height ? GridLayout.LeftToRight : GridLayout.TopToBottom
+        visible: footerLayout.maximized
+
+        Item {
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            Image {
+                anchors.fill: parent
+
+                source: info.thumbnail
+                fillMode: Image.PreserveAspectFit
+            }
+        }
+
+        Item {
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+
+            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) {
+                            footerLayout.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 {
+                                icon.name: "edit-clear-all"
+                                onClicked: UserPlaylistModel.clear()
+                            }
+                            Controls.ToolButton {
+                                icon.name: "media-playlist-shuffle"
+                                onClicked: UserPlaylistModel.shufflePlaylist()
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
 
-    ColumnLayout {
-        id: footerLayout
-        height: parent.height
-        anchors.fill: parent
+    Kirigami.Separator {
+        Layout.fillWidth: true
+    }
 
-        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
 
-            Item {
-                Layout.fillWidth: info.thumbnail
-                Layout.fillHeight: info.thumbnail
-                Image {
-                    anchors.fill: parent
+            onSongChanged: audio.play()
+            videoId: UserPlaylistModel.currentVideoId
+        }
 
-                    source: info.thumbnail
-                    fillMode: Image.PreserveAspectFit
+        Audio {
+            id: audio
+
+            source: info.audioUrl
+            onStatusChanged: {
+                if (status === Audio.EndOfMedia) {
+                    console.log("Song ended");
+                    UserPlaylistModel.next();
                 }
             }
+        }
 
-            Item {
+        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
-                Layout.fillHeight: true
-
-                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()
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        Kirigami.Separator {
-            Layout.fillWidth: true
-        }
-
-        RowLayout {
-            id: player
-
-            Layout.fillWidth: true
-            Layout.fillHeight: !footer.maximized
-
-            VideoInfoExtractor {
-                id: info
-
-                onSongChanged: audio.play()
-                videoId: UserPlaylistModel.currentVideoId
+                elide: Qt.ElideRight
+                text: info.title ? info.title : i18n("No media playing")
             }
 
-            Audio {
-                id: audio
-
-                source: info.audioUrl
-                onStatusChanged: {
-                    if (status === Audio.EndOfMedia) {
-                        console.log("Song ended");
-                        UserPlaylistModel.next();
-                    }
-                }
-            }
-
-            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")
+            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));
                 }
 
-                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)
+                Behavior on value {
+                    NumberAnimation {
                     }
 
                 }
 
-
-
-            }
-
-            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: footerLayout.maximized ? "arrow-down" : "arrow-up"
+            onClicked: footerLayout.maximized = !footerLayout.maximized
+        }
+
     }
 
     Behavior on height {
         NumberAnimation {
         }
+
     }
+
 }

src/contents/ui/PlaylistPage.qml

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
-import QtQuick 2.15
+import QtQuick 2.0
 import QtQuick.Layouts 1.12
 import QtQuick.Controls 2.12 as Controls
 import org.kde.kirigami 2.12 as Kirigami
@@ -38,14 +38,11 @@ Kirigami.ScrollablePage {
         model: PlaylistModel {
             id: playlistModel
         }
-
-        reuseItems: true
-
         delegate: Kirigami.SwipeListItem {
             id: delegateItem
             required property string title
             required property string videoId
-            required property var artists
+            required property string artists
 
             RowLayout {
                 Layout.fillHeight: true
@@ -64,17 +61,15 @@ Kirigami.ScrollablePage {
             actions: [
                 Kirigami.Action {
                     icon.name: "go-next"
-                    text: i18n("Play Next")
+                    text: i18n("Play next")
                     onTriggered: UserPlaylistModel.playNext(delegateItem.videoId, delegateItem.title, delegateItem.artists)
                 },
                 Kirigami.Action {
                     icon.name: "media-playlist-append"
-                    text: i18n("Add to Playlist")
+                    text: i18n("Add to playlist")
                     onTriggered: UserPlaylistModel.append(delegateItem.videoId, delegateItem.title, delegateItem.artists)
                 }
             ]
-
-            onClicked: play(videoId)
         }
 
         Controls.BusyIndicator {

src/contents/ui/SearchPage.qml

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 
-import QtQuick 2.15
+import QtQuick 2.0
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.14 as Controls
 import org.kde.kirigami 2.14 as Kirigami
@@ -10,34 +10,20 @@ import org.kde.kirigami 2.14 as Kirigami
 import org.kde.ytmusic 1.0
 
 Kirigami.ScrollablePage {
-    property alias searchQuery: searchModel.searchQuery
+    title: i18n("Youtube Music")
 
-    title: searchQuery
-
-    ListView {
-        reuseItems: true
-
-        section.delegate: Kirigami.ListSectionHeader {
-            required property string section
-            text: {
-                switch (parseInt(section)) {
-                case SearchModel.Album:
-                    return i18n("Albums")
-                case SearchModel.Artist:
-                    return i18n("Artists")
-                case SearchModel.Playlist:
-                    return i18n("Playlists")
-                case SearchModel.Song:
-                    return i18n("Songs")
-                case SearchModel.Video:
-                    return i18n("Videos")
-                }
-
-                return i18n("Unknown")
+    header: Controls.Control {
+        padding: Kirigami.Units.largeSpacing
+        contentItem: Kirigami.SearchField {
+            delaySearch: true
+            selectByMouse: true
+            onAccepted: {
+                searchModel.searchQuery = text
             }
         }
-        section.property: "type"
+    }
 
+    ListView {
         model: SearchModel {
             id: searchModel
 
@@ -63,16 +49,8 @@ Kirigami.ScrollablePage {
                 play(videoId)
             }
 
-            onOpenVideo: (videoId, title) => {
-                videoPlayMessage.text = i18n("Video playback is not supported yet. Do you want to play only the audio of \"%1\"?", title)
-                videoPlayMessage.visible = true
-                videoPlayMessage.okAction = function() {
-                    play(videoId)
-                    videoPlayMessage.visible = false
-                }
-                videoPlayMessage.cancelAction = function() {
-                    videoPlayMessage.visible = false
-                }
+            onOpenVideo: (videoId) => {
+                askPlayVideoAudio(videoId)
             }
         }
         delegate: Kirigami.SwipeListItem {
@@ -82,7 +60,6 @@ Kirigami.ScrollablePage {
             required property int type
             required property string videoId
             required property var artists
-            required property string radioPlaylistId
 
             RowLayout {
                 Layout.fillHeight: true
@@ -115,20 +92,14 @@ Kirigami.ScrollablePage {
                 Kirigami.Action {
                     icon.name: "go-next"
                     text: i18n("Play next")
-                    visible: delegateItem.type === SearchModel.Song || delegateItem.type == SearchModel.Video
+                    visible: delegateItem.type === SearchModel.Song
                     onTriggered: UserPlaylistModel.playNext(delegateItem.videoId, delegateItem.title, delegateItem.artists)
                 },
                 Kirigami.Action {
                     icon.name: "media-playlist-append"
-                    text: i18n("Add to Playlist")
-                    visible: delegateItem.type === SearchModel.Song || delegateItem.type == SearchModel.Video
+                    text: i18n("Add to playlist")
+                    visible: delegateItem.type === SearchModel.Song
                     onTriggered: UserPlaylistModel.append(delegateItem.videoId, delegateItem.title, delegateItem.artists)
-                },
-                Kirigami.Action {
-                    icon.name: "radio"
-                    text: i18n("Radio")
-                    visible: delegateItem.type === SearchModel.Artist && delegateItem.radioPlaylistId
-                    onTriggered: playPlaylist(delegateItem.radioPlaylistId)
                 }
             ]
 
@@ -138,22 +109,5 @@ Kirigami.ScrollablePage {
             anchors.centerIn: parent
             visible: searchModel.loading
         }
-        Kirigami.PlaceholderMessage {
-            anchors.centerIn: parent
-            width: parent.width - (Kirigami.Units.largeSpacing * 4)
-
-            visible: parent.count === 0 && !searchModel.loading
-
-            text: i18n("Find music on YouTube Music")
-            helpfulAction: Kirigami.Action {
-                onTriggered: searchField.forceActiveFocus()
-                text: i18n("Search")
-                icon.name: "search"
-            }
-        }
-    }
-
-    footer: ConfirmationMessage {
-        id: videoPlayMessage
     }
 }

src/contents/ui/main.qml

@@ -3,8 +3,6 @@
 // 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
@@ -12,42 +10,6 @@ import org.kde.ytmusic 1.0
 Kirigami.ApplicationWindow {
     id: root
 
-    property alias searchField: searchField
-
-    header: Controls.Control {
-        visible: !footer.maximized
-        padding: Kirigami.Units.largeSpacing
-
-        background: Rectangle {
-             width: parent.width
-             height: parent.height
-             anchors.fill: parent
-             Kirigami.Theme.inherit: false
-             Kirigami.Theme.colorSet: Kirigami.Theme.Header
-             color:  Kirigami.Theme.backgroundColor
-         }
-        contentItem: RowLayout{
-            Item {
-                Layout.fillWidth: true
-            }
-            Kirigami.SearchField {
-                id: searchField
-                delaySearch: true
-                selectByMouse: true
-                Layout.fillWidth: true
-                Layout.maximumWidth: 400
-                onAccepted: {
-                    pageStack.clear()
-                    pageStack.push("qrc:/SearchPage.qml", {
-                               "searchQuery": text})
-                }
-            }
-            Item {
-                Layout.fillWidth: true
-            }
-        }
-    }
-
     title: i18n("AudioTube")
 
     controlsVisible: !footer.maximized
@@ -71,6 +33,14 @@ Kirigami.ApplicationWindow {
         UserPlaylistModel.playlistId = playlistId
     }
 
+    function askPlayVideoAudio(videoId) {
+        showPassiveNotification(i18n("Video playback is not supported yet."),
+                            "long",
+                            i18n("Play only audio"),
+                            function() {
+                                play(videoId)
+                            })
+    }
 
     Connections {
         target: ErrorHandler

src/example/CMakeLists.txt

@@ -1,6 +1,2 @@
-# SPDX-FileCopyrightText: 2021 Jonah Brüchert <[email protected]>
-#
-# SPDX-License-Identifier: BSD-2-Clause
-
 add_executable(ytm_example main.cpp)
 target_link_libraries(ytm_example PRIVATE ytm)

src/example/main.cpp

@@ -8,7 +8,7 @@
 
 int main() {
     const auto ytm = YTMusic();
-    const auto results = ytm.search("Another one bites the dust");
+    const auto results = ytm.search("arte concert");
 
     std::cout << "Found " << results.size() << " results." << std::endl;
 
@@ -42,7 +42,7 @@ int main() {
             } else if constexpr (std::is_same_v<T, search::Video>) {
                 std::cout << arg.title << std::endl;
             } else {
-                std::cout << "non exaustive visitor";
+                std::cout << "non excaustive visitor";
             }
         }, result);
     }

src/main.cpp

@@ -7,9 +7,6 @@
 #include <QtQml>
 #include <QUrl>
 #include <KLocalizedContext>
-#include <KLocalizedString>
-#include <KCrash>
-#include <KAboutData>
 
 #include "searchmodel.h"
 #include "albummodel.h"
@@ -18,7 +15,6 @@
 #include "userplaylistmodel.h"
 #include "errorhandler.h"
 #include "playlistmodel.h"
-#include "playerutils.h"
 
 constexpr auto URI = "org.kde.ytmusic";
 
@@ -30,11 +26,6 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     QCoreApplication::setOrganizationDomain(QStringLiteral("kde.org"));
     QCoreApplication::setApplicationName(QStringLiteral("audiotube"));
 
-    KLocalizedString::setApplicationDomain("audiotube");
-
-    KAboutData::setApplicationData(KAboutData(QStringLiteral("audiotube"), QStringLiteral("AudioTube")));
-    KCrash::initialize();
-
     QQmlApplicationEngine engine;
 
     qmlRegisterType<SearchModel>(URI, 1, 0, "SearchModel");
@@ -48,9 +39,6 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     qmlRegisterSingletonType<ErrorHandler>(URI, 1, 0, "ErrorHandler", [](QQmlEngine *, QJSEngine *) {
         return new ErrorHandler();
     });
-    qmlRegisterSingletonType<PlayerUtils>(URI, 1, 0, "PlayerUtils", [](QQmlEngine *, QJSEngine *) {
-        return new PlayerUtils();
-    });
 
     engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
     engine.load(QUrl(QStringLiteral("qrc:///main.qml")));

src/mpris2/mediaplayer2.cpp

@@ -0,0 +1,71 @@
+/***************************************************************************
+   SPDX-FileCopyrightText: 2014 (c) Sujith Haridasan <[email protected]>
+   SPDX-FileCopyrightText: 2014 (c) Ashish Madeti <[email protected]>
+   SPDX-FileCopyrightText: 2016 (c) Matthieu Gallien <[email protected]>
+
+   SPDX-License-Identifier: GPL-3.0-or-later
+ ***************************************************************************/
+
+#include "mediaplayer2.h"
+
+#include <QCoreApplication>
+
+#include <KCoreAddons/KAboutData>
+
+MediaPlayer2::MediaPlayer2(QObject* parent)
+    : QDBusAbstractAdaptor(parent)
+{
+}
+
+MediaPlayer2::~MediaPlayer2()
+= default;
+
+bool MediaPlayer2::CanQuit() const
+{
+    return true;
+}
+
+bool MediaPlayer2::CanRaise() const
+{
+    return true;
+}
+bool MediaPlayer2::HasTrackList() const
+{
+    return false;
+}
+
+void MediaPlayer2::Quit()
+{
+    QCoreApplication::quit();
+}
+
+void MediaPlayer2::Raise()
+{
+    emit raisePlayer();
+}
+
+QString MediaPlayer2::Identity() const
+{
+    return KAboutData::applicationData().displayName();
+}
+
+QString MediaPlayer2::DesktopEntry() const
+{
+    return KAboutData::applicationData().desktopFileName();
+}
+
+QStringList MediaPlayer2::SupportedUriSchemes() const
+{
+    return QStringList() << QStringLiteral("file");
+}
+
+QStringList MediaPlayer2::SupportedMimeTypes() const
+{
+//    KService::Ptr app = KService::serviceByDesktopName(KCmdLineArgs::aboutData()->appName());
+
+//    if (app) {
+//        return app->mimeTypes();
+//    }
+
+    return QStringList();
+}

src/mpris2/mediaplayer2.h

@@ -0,0 +1,53 @@
+/***************************************************************************
+   SPDX-FileCopyrightText: 2014 (c) Sujith Haridasan <[email protected]>
+   SPDX-FileCopyrightText: 2014 (c) Ashish Madeti <[email protected]>
+   SPDX-FileCopyrightText: 2016 (c) Matthieu Gallien <[email protected]>
+
+   SPDX-License-Identifier: GPL-3.0-or-later
+ ***************************************************************************/
+
+//#pragma once
+
+#include "elisaLib_export.h"
+
+#include <QDBusAbstractAdaptor>
+#include <QStringList>
+
+
+class MediaPlayer2 : public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.mpris.MediaPlayer2") // Docs: https://specifications.freedesktop.org/mpris-spec/latest/Media_Player.html
+
+    Q_PROPERTY(bool CanQuit READ CanQuit CONSTANT)
+    Q_PROPERTY(bool CanRaise READ CanRaise CONSTANT)
+    Q_PROPERTY(bool HasTrackList READ HasTrackList CONSTANT)
+
+    Q_PROPERTY(QString Identity READ Identity CONSTANT)
+    Q_PROPERTY(QString DesktopEntry READ DesktopEntry CONSTANT)
+
+    Q_PROPERTY(QStringList SupportedUriSchemes READ SupportedUriSchemes CONSTANT)
+    Q_PROPERTY(QStringList SupportedMimeTypes READ SupportedMimeTypes CONSTANT)
+
+public:
+    explicit MediaPlayer2(QObject* parent = nullptr);
+    ~MediaPlayer2() override;
+
+    [[nodiscard]] bool CanQuit() const;
+    [[nodiscard]] bool CanRaise() const;
+    [[nodiscard]] bool HasTrackList() const;
+
+    [[nodiscard]] QString Identity() const;
+    [[nodiscard]] QString DesktopEntry() const;
+
+    [[nodiscard]] QStringList SupportedUriSchemes() const;
+    [[nodiscard]] QStringList SupportedMimeTypes() const;
+
+public Q_SLOTS:
+    void Quit();
+    void Raise();
+
+Q_SIGNALS:
+    void raisePlayer();
+
+};

src/mpris2/mediaplayer2player.cpp

@@ -0,0 +1,493 @@
+/***************************************************************************
+   SPDX-FileCopyrightText: 2014 (c) Sujith Haridasan <[email protected]>
+   SPDX-FileCopyrightText: 2014 (c) Ashish Madeti <[email protected]>
+   SPDX-FileCopyrightText: 2016 (c) Matthieu Gallien <[email protected]>
+
+   SPDX-License-Identifier: GPL-3.0-or-later
+ ***************************************************************************/
+
+#include "mediaplayer2player.h"
+#include "mpris2.h"
+
+#include "asyncytmusic.h"
+#include "ytmusic.h"
+#include "playlistmodel.h"
+
+#if defined KF5FileMetaData_FOUND && KF5FileMetaData_FOUND
+#include <KFileMetaData/EmbeddedImageData>
+#endif
+
+#include <QCryptographicHash>
+#include <QStringList>
+#include <QDBusMessage>
+#include <QDBusConnection>
+
+
+static const double MAX_RATE = 1.0;
+static const double MIN_RATE = 1.0;
+
+MediaPlayer2Player::MediaPlayer2Player(MediaPlayListProxyModel *playListControler, ManageAudioPlayer *manageAudioPlayer,
+                                       ManageMediaPlayerControl *manageMediaPlayerControl, ManageHeaderBar *manageHeaderBar,
+                                       AudioWrapper *audioPlayer, bool showProgressOnTaskBar, QObject* parent)
+    : QDBusAbstractAdaptor(parent), m_playListControler(playListControler), m_manageAudioPlayer(manageAudioPlayer),
+      m_manageMediaPlayerControl(manageMediaPlayerControl), m_manageHeaderBar(manageHeaderBar), m_audioPlayer(audioPlayer),
+      mProgressIndicatorSignal(QDBusMessage::createSignal(QStringLiteral("/org/kde/elisa"),
+                                                          QStringLiteral("com.canonical.Unity.LauncherEntry"),
+                                                          QStringLiteral("Update"))),
+      mShowProgressOnTaskBar(showProgressOnTaskBar)
+{
+    if (!m_playListControler) {
+        return;
+    }
+
+    connect(m_manageAudioPlayer, &ManageAudioPlayer::playerSourceChanged,
+            this, &MediaPlayer2Player::playerSourceChanged, Qt::QueuedConnection);
+    connect(m_manageMediaPlayerControl, &ManageMediaPlayerControl::playControlEnabledChanged,
+            this, &MediaPlayer2Player::playControlEnabledChanged);
+    connect(m_manageMediaPlayerControl, &ManageMediaPlayerControl::skipBackwardControlEnabledChanged,
+            this, &MediaPlayer2Player::skipBackwardControlEnabledChanged);
+    connect(m_manageMediaPlayerControl, &ManageMediaPlayerControl::skipForwardControlEnabledChanged,
+            this, &MediaPlayer2Player::skipForwardControlEnabledChanged);
+    connect(m_manageAudioPlayer, &ManageAudioPlayer::playerPlaybackStateChanged,
+            this, &MediaPlayer2Player::playerPlaybackStateChanged);
+    connect(m_manageAudioPlayer, &ManageAudioPlayer::playerIsSeekableChanged,
+            this, &MediaPlayer2Player::playerIsSeekableChanged);
+    connect(m_manageAudioPlayer, &ManageAudioPlayer::playerPositionChanged,
+            this, &MediaPlayer2Player::audioPositionChanged);
+    connect(m_manageAudioPlayer, &ManageAudioPlayer::seek,
+            this, &MediaPlayer2Player::playerSeeked);
+    connect(m_manageAudioPlayer, &ManageAudioPlayer::audioDurationChanged,
+            this, &MediaPlayer2Player::audioDurationChanged);
+    connect(m_audioPlayer, &AudioWrapper::volumeChanged,
+            this, &MediaPlayer2Player::playerVolumeChanged);
+
+    m_volume = m_audioPlayer->volume() / 100;
+    m_canPlay = m_manageMediaPlayerControl->playControlEnabled();
+    signalPropertiesChange(QStringLiteral("Volume"), Volume());
+
+    m_mediaPlayerPresent = 1;
+}
+
+MediaPlayer2Player::~MediaPlayer2Player()
+= default;
+
+QString MediaPlayer2Player::PlaybackStatus() const
+{
+    QString result;
+
+    if (!m_playListControler) {
+        result = QStringLiteral("Stopped");
+        return result;
+    }
+
+    if (m_manageAudioPlayer->playerPlaybackState() == QMediaPlayer::StoppedState) {
+        result = QStringLiteral("Stopped");
+    } else if (m_manageAudioPlayer->playerPlaybackState() == QMediaPlayer::PlayingState) {
+        result = QStringLiteral("Playing");
+    } else {
+        result = QStringLiteral("Paused");
+    }
+
+    if (mShowProgressOnTaskBar) {
+        QVariantMap parameters;
+
+        if (m_manageAudioPlayer->playerPlaybackState() == QMediaPlayer::StoppedState || m_audioPlayer->duration() == 0) {
+            parameters.insert(QStringLiteral("progress-visible"), false);
+            parameters.insert(QStringLiteral("progress"), 0);
+        } else {
+            parameters.insert(QStringLiteral("progress-visible"), true);
+            parameters.insert(QStringLiteral("progress"), qRound(static_cast<double>(m_position / m_audioPlayer->duration())) / 1000.0);
+        }
+
+        mProgressIndicatorSignal.setArguments({QStringLiteral("application://org.kde.elisa.desktop"), parameters});
+
+        QDBusConnection::sessionBus().send(mProgressIndicatorSignal);
+    }
+
+    return result;
+}
+
+bool MediaPlayer2Player::CanGoNext() const
+{
+    return m_canGoNext;
+}
+
+void MediaPlayer2Player::Next()
+{
+    emit next();
+
+    if (m_playListControler) {
+        m_playListControler->skipNextTrack();
+    }
+}
+
+bool MediaPlayer2Player::CanGoPrevious() const
+{
+    return m_canGoPrevious;
+}
+
+void MediaPlayer2Player::Previous()
+{
+    emit previous();
+
+    if (m_playListControler) {
+        m_playListControler->skipPreviousTrack(m_audioPlayer->position());
+    }
+}
+
+bool MediaPlayer2Player::CanPause() const
+{
+    return m_canPlay;
+}
+
+void MediaPlayer2Player::Pause()
+{
+    if (m_playListControler) {
+        m_manageAudioPlayer->ensurePause();
+    }
+}
+
+void MediaPlayer2Player::PlayPause()
+{
+    emit playPause();
+
+    if (m_playListControler) {
+        m_manageAudioPlayer->playPause();
+    }
+}
+
+void MediaPlayer2Player::Stop()
+{
+    emit stop();
+
+    if (m_playListControler) {
+        m_manageAudioPlayer->stop();
+    }
+}
+
+bool MediaPlayer2Player::CanPlay() const
+{
+    return m_canPlay;
+}
+
+void MediaPlayer2Player::Play()
+{
+    if (m_playListControler) {
+        m_manageAudioPlayer->ensurePlay();
+    }
+}
+
+double MediaPlayer2Player::Volume() const
+{
+    return m_volume;
+}
+
+void MediaPlayer2Player::setVolume(double volume)
+{
+    m_volume= qBound(0.0, volume, 1.0);
+    emit volumeChanged(m_volume);
+
+    m_audioPlayer->setVolume(100 * m_volume);
+
+    signalPropertiesChange(QStringLiteral("Volume"), Volume());
+}
+
+QVariantMap MediaPlayer2Player::Metadata() const
+{
+    return m_metadata;
+}
+
+qlonglong MediaPlayer2Player::Position() const
+{
+    return m_position;
+}
+
+void MediaPlayer2Player::setPropertyPosition(int newPositionInMs)
+{
+    m_position = qlonglong(newPositionInMs) * 1000;
+
+    /* only sent new progress when it has advanced more than 1 %
+     * to limit DBus traffic
+     */
+    const auto incrementalProgress = static_cast<double>(newPositionInMs - mPreviousProgressPosition) / m_audioPlayer->duration();
+    if (mShowProgressOnTaskBar && (incrementalProgress > 0.01 || incrementalProgress < 0))
+    {
+        mPreviousProgressPosition = newPositionInMs;
+        QVariantMap parameters;
+        parameters.insert(QStringLiteral("progress-visible"), true);
+        parameters.insert(QStringLiteral("progress"), static_cast<double>(newPositionInMs) / m_audioPlayer->duration());
+
+        mProgressIndicatorSignal.setArguments({QStringLiteral("application://org.kde.elisa.desktop"), parameters});
+
+        QDBusConnection::sessionBus().send(mProgressIndicatorSignal);
+    }
+}
+
+double MediaPlayer2Player::Rate() const
+{
+    return m_rate;
+}
+
+void MediaPlayer2Player::setRate(double newRate)
+{
+    if (newRate <= 0.0001 && newRate >= -0.0001) {
+        Pause();
+    } else {
+        m_rate = qBound(MinimumRate(), newRate, MaximumRate());
+        emit rateChanged(m_rate);
+
+        signalPropertiesChange(QStringLiteral("Rate"), Rate());
+    }
+}
+
+double MediaPlayer2Player::MinimumRate() const
+{
+    return MIN_RATE;
+}
+
+double MediaPlayer2Player::MaximumRate() const
+{
+    return MAX_RATE;
+}
+
+bool MediaPlayer2Player::CanSeek() const
+{
+    return m_playerIsSeekableChanged;
+}
+
+bool MediaPlayer2Player::CanControl() const
+{
+    return true;
+}
+
+void MediaPlayer2Player::Seek(qlonglong Offset)
+{
+    if (mediaPlayerPresent()) {
+        auto offset = (m_position + Offset) / 1000;
+        m_manageAudioPlayer->playerSeek(int(offset));
+    }
+}
+
+void MediaPlayer2Player::SetPosition(const QDBusObjectPath &trackId, qlonglong pos)
+{
+    if (trackId.path() == m_currentTrackId) {
+        m_manageAudioPlayer->playerSeek(int(pos / 1000));
+    }
+}
+
+void MediaPlayer2Player::OpenUri(const QString &uri)
+{
+    Q_UNUSED(uri);
+}
+
+void MediaPlayer2Player::playerSourceChanged()
+{
+    if (!m_playListControler) {
+        return;
+    }
+
+    setCurrentTrack(m_manageAudioPlayer->playListPosition());
+}
+
+void MediaPlayer2Player::playControlEnabledChanged()
+{
+    if (!m_playListControler) {
+        return;
+    }
+
+    m_canPlay = m_manageMediaPlayerControl->playControlEnabled();
+
+    signalPropertiesChange(QStringLiteral("CanPause"), CanPause());
+    signalPropertiesChange(QStringLiteral("CanPlay"), CanPlay());
+
+    emit canPauseChanged();
+    emit canPlayChanged();
+}
+
+void MediaPlayer2Player::skipBackwardControlEnabledChanged()
+{
+    if (!m_playListControler) {
+        return;
+    }
+
+    m_canGoPrevious = m_manageMediaPlayerControl->skipBackwardControlEnabled();
+
+    signalPropertiesChange(QStringLiteral("CanGoPrevious"), CanGoPrevious());
+    emit canGoPreviousChanged();
+}
+
+void MediaPlayer2Player::skipForwardControlEnabledChanged()
+{
+    if (!m_playListControler) {
+        return;
+    }
+
+    m_canGoNext = m_manageMediaPlayerControl->skipForwardControlEnabled();
+
+    signalPropertiesChange(QStringLiteral("CanGoNext"), CanGoNext());
+    emit canGoNextChanged();
+}
+
+void MediaPlayer2Player::playerPlaybackStateChanged()
+{
+    signalPropertiesChange(QStringLiteral("PlaybackStatus"), PlaybackStatus());
+    emit playbackStatusChanged();
+
+    playerIsSeekableChanged();
+}
+
+void MediaPlayer2Player::playerIsSeekableChanged()
+{
+    m_playerIsSeekableChanged = m_manageAudioPlayer->playerIsSeekable();
+
+    signalPropertiesChange(QStringLiteral("CanSeek"), CanSeek());
+    emit canSeekChanged();
+}
+
+void MediaPlayer2Player::audioPositionChanged()
+{
+    setPropertyPosition(static_cast<int>(m_manageAudioPlayer->playerPosition()));
+}
+
+void MediaPlayer2Player::playerSeeked(qint64 position)
+{
+    Q_EMIT Seeked(position * 1000);
+}
+
+void MediaPlayer2Player::audioDurationChanged()
+{
+    m_metadata = getMetadataOfCurrentTrack();
+    signalPropertiesChange(QStringLiteral("Metadata"), Metadata());
+
+    skipBackwardControlEnabledChanged();
+    skipForwardControlEnabledChanged();
+    playerPlaybackStateChanged();
+    playerIsSeekableChanged();
+    setPropertyPosition(static_cast<int>(m_manageAudioPlayer->playerPosition()));
+}
+
+void MediaPlayer2Player::playerVolumeChanged()
+{
+    setVolume(m_audioPlayer->volume() / 100.0);
+}
+
+int MediaPlayer2Player::currentTrack() const
+{
+    return m_manageAudioPlayer->playListPosition();
+}
+
+void MediaPlayer2Player::setCurrentTrack(int newTrackPosition)
+{
+    m_currentTrack = m_manageAudioPlayer->playerSource().toString();
+    m_currentTrackId = QDBusObjectPath(QLatin1String("/org/kde/elisa/playlist/") + QString::number(newTrackPosition)).path();
+
+    emit currentTrackChanged();
+
+    m_metadata = getMetadataOfCurrentTrack();
+    signalPropertiesChange(QStringLiteral("Metadata"), Metadata());
+}
+
+QVariantMap MediaPlayer2Player::getMetadataOfCurrentTrack()
+{
+    auto result = QVariantMap();
+
+    if (m_currentTrackId.isEmpty()) {
+        return {};
+    }
+
+    result[QStringLiteral("mpris:trackid")] = QVariant::fromValue<QDBusObjectPath>(QDBusObjectPath(m_currentTrackId));
+    result[QStringLiteral("mpris:length")] = qlonglong(m_manageAudioPlayer->audioDuration()) * 1000;
+    //convert milli-seconds into micro-seconds
+    if (!m_manageHeaderBar->title().isNull() && !m_manageHeaderBar->title().toString().isEmpty()) {
+        result[QStringLiteral("xesam:title")] = m_manageHeaderBar->title();
+    }
+    result[QStringLiteral("xesam:url")] = m_manageAudioPlayer->playerSource().toString();
+    if (!m_manageHeaderBar->album().isNull() && !m_manageHeaderBar->album().toString().isEmpty()) {
+        result[QStringLiteral("xesam:album")] = m_manageHeaderBar->album();
+    }
+    if (!m_manageHeaderBar->artist().isNull() && !m_manageHeaderBar->artist().toString().isEmpty()) {
+        result[QStringLiteral("xesam:artist")] = QStringList{m_manageHeaderBar->artist().toString()};
+    }
+    if (!m_manageHeaderBar->image().isEmpty() && !m_manageHeaderBar->image().toString().isEmpty()) {
+        if (m_manageHeaderBar->image().scheme() == QStringLiteral("image")) {
+            // adding a special case for image:// URLs that are only valid because Elisa installs a special handler for them
+            // converting those URL to data URLs with embedded image data
+#if defined KF5FileMetaData_FOUND && KF5FileMetaData_FOUND
+            KFileMetaData::EmbeddedImageData embeddedImage;
+
+            auto imageData = embeddedImage.imageData(m_manageHeaderBar->image().toString().mid(14));
+
+            if (imageData.contains(KFileMetaData::EmbeddedImageData::FrontCover)) {
+                result[QStringLiteral("mpris:artUrl")] = QString{QStringLiteral("data:image/png;base64,") + QLatin1String{imageData[KFileMetaData::EmbeddedImageData::FrontCover].toBase64()}};
+            }
+#endif
+        } else {
+            result[QStringLiteral("mpris:artUrl")] = m_manageHeaderBar->image().toString();
+        }
+    }
+
+    return result;
+}
+
+int MediaPlayer2Player::mediaPlayerPresent() const
+{
+    return m_mediaPlayerPresent;
+}
+
+bool MediaPlayer2Player::showProgressOnTaskBar() const
+{
+    return mShowProgressOnTaskBar;
+}
+
+void MediaPlayer2Player::setShowProgressOnTaskBar(bool value)
+{
+    mShowProgressOnTaskBar = value;
+
+    QVariantMap parameters;
+
+    if (!mShowProgressOnTaskBar || m_manageAudioPlayer->playerPlaybackState() == QMediaPlayer::StoppedState || m_audioPlayer->duration() == 0) {
+        parameters.insert(QStringLiteral("progress-visible"), false);
+        parameters.insert(QStringLiteral("progress"), 0);
+    } else {
+        parameters.insert(QStringLiteral("progress-visible"), true);
+        parameters.insert(QStringLiteral("progress"), qRound(static_cast<double>(m_position / m_audioPlayer->duration())) / 1000.0);
+    }
+
+    mProgressIndicatorSignal.setArguments({QStringLiteral("application://org.kde.elisa.desktop"), parameters});
+
+    QDBusConnection::sessionBus().send(mProgressIndicatorSignal);
+}
+
+void MediaPlayer2Player::setMediaPlayerPresent(int status)
+{
+    if (m_mediaPlayerPresent != status) {
+        m_mediaPlayerPresent = status;
+        emit mediaPlayerPresentChanged();
+
+        signalPropertiesChange(QStringLiteral("CanGoNext"), CanGoNext());
+        signalPropertiesChange(QStringLiteral("CanGoPrevious"), CanGoPrevious());
+        signalPropertiesChange(QStringLiteral("CanPause"), CanPause());
+        signalPropertiesChange(QStringLiteral("CanPlay"), CanPlay());
+        emit canGoNextChanged();
+        emit canGoPreviousChanged();
+        emit canPauseChanged();
+        emit canPlayChanged();
+    }
+}
+
+void MediaPlayer2Player::signalPropertiesChange(const QString &property, const QVariant &value)
+{
+    QVariantMap properties;
+    properties[property] = value;
+    const int ifaceIndex = metaObject()->indexOfClassInfo("D-Bus Interface");
+    QDBusMessage msg = QDBusMessage::createSignal(QStringLiteral("/org/mpris/MediaPlayer2"),
+                                                  QStringLiteral("org.freedesktop.DBus.Properties"), QStringLiteral("PropertiesChanged"));
+
+    msg << QLatin1String(metaObject()->classInfo(ifaceIndex).value());
+    msg << properties;
+    msg << QStringList();
+
+    QDBusConnection::sessionBus().send(msg);
+}
+
+#include "moc_mediaplayer2player.cpp"

src/mpris2/mediaplayer2player.h

@@ -0,0 +1,159 @@
+/***************************************************************************
+   SPDX-FileCopyrightText: 2014 (c) Sujith Haridasan <[email protected]>
+   SPDX-FileCopyrightText: 2014 (c) Ashish Madeti <[email protected]>
+   SPDX-FileCopyrightText: 2016 (c) Matthieu Gallien <[email protected]>
+
+   SPDX-License-Identifier: GPL-3.0-or-later
+ ***************************************************************************/
+
+#ifndef MEDIAPLAYER2PLAYER_H
+#define MEDIAPLAYER2PLAYER_H
+
+#include "elisaLib_export.h"
+
+#include <QDBusAbstractAdaptor>
+#include <QDBusObjectPath>
+#include <QDBusMessage>
+
+class MediaPlayListProxyModel;
+class ManageAudioPlayer;
+class ManageMediaPlayerControl;
+class ManageHeaderBar;
+class AudioWrapper;
+
+class ELISALIB_EXPORT MediaPlayer2Player : public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.mpris.MediaPlayer2.Player") // Docs: https://specifications.freedesktop.org/mpris-spec/latest/Player_Interface.html
+
+    Q_PROPERTY(QString PlaybackStatus READ PlaybackStatus NOTIFY playbackStatusChanged)
+    Q_PROPERTY(double Rate READ Rate WRITE setRate NOTIFY rateChanged)
+    Q_PROPERTY(QVariantMap Metadata READ Metadata NOTIFY playbackStatusChanged)
+    Q_PROPERTY(double Volume READ Volume WRITE setVolume NOTIFY volumeChanged)
+    Q_PROPERTY(qlonglong Position READ Position WRITE setPropertyPosition NOTIFY playbackStatusChanged)
+    Q_PROPERTY(double MinimumRate READ MinimumRate CONSTANT)
+    Q_PROPERTY(double MaximumRate READ MaximumRate CONSTANT)
+    Q_PROPERTY(bool CanGoNext READ CanGoNext NOTIFY canGoNextChanged)
+    Q_PROPERTY(bool CanGoPrevious READ CanGoPrevious NOTIFY canGoPreviousChanged)
+    Q_PROPERTY(bool CanPlay READ CanPlay NOTIFY canPlayChanged)
+    Q_PROPERTY(bool CanPause READ CanPause NOTIFY canPauseChanged)
+    Q_PROPERTY(bool CanControl READ CanControl NOTIFY canControlChanged)
+    Q_PROPERTY(bool CanSeek READ CanSeek NOTIFY canSeekChanged)
+    Q_PROPERTY(int currentTrack READ currentTrack WRITE setCurrentTrack NOTIFY currentTrackChanged)
+    Q_PROPERTY(int mediaPlayerPresent READ mediaPlayerPresent WRITE setMediaPlayerPresent NOTIFY mediaPlayerPresentChanged)
+
+public:
+    explicit MediaPlayer2Player(MediaPlayListProxyModel *playListControler,
+                                ManageAudioPlayer *manageAudioPlayer,
+                                ManageMediaPlayerControl* manageMediaPlayerControl,
+                                ManageHeaderBar * manageHeaderBar,
+                                AudioWrapper *audioPlayer,
+                                bool showProgressOnTaskBar,
+                                QObject* parent = nullptr);
+    ~MediaPlayer2Player() override;
+
+    QString PlaybackStatus() const;
+    double Rate() const;
+    QVariantMap Metadata() const;
+    double Volume() const;
+    qlonglong Position() const;
+    double MinimumRate() const;
+    double MaximumRate() const;
+    bool CanGoNext() const;
+    bool CanGoPrevious() const;
+    bool CanPlay() const;
+    bool CanPause() const;
+    bool CanSeek() const;
+    bool CanControl() const;
+    int currentTrack() const;
+    int mediaPlayerPresent() const;
+
+    bool showProgressOnTaskBar() const;
+    void setShowProgressOnTaskBar(bool value);
+
+Q_SIGNALS:
+    void Seeked(qlonglong Position);
+
+    void rateChanged(double newRate);
+    void volumeChanged(double newVol);
+    void playbackStatusChanged();
+    void canGoNextChanged();
+    void canGoPreviousChanged();
+    void canPlayChanged();
+    void canPauseChanged();
+    void canControlChanged();
+    void canSeekChanged();
+    void currentTrackChanged();
+    void mediaPlayerPresentChanged();
+    void next();
+    void previous();
+    void playPause();
+    void stop();
+
+public Q_SLOTS:
+
+    void Next();
+    void Previous();
+    void Pause();
+    void PlayPause();
+    void Stop();
+    void Play();
+    void Seek(qlonglong Offset);
+    void SetPosition(const QDBusObjectPath &trackId, qlonglong pos);
+    void OpenUri(const QString &uri);
+
+private Q_SLOTS:
+
+    void playerSourceChanged();
+
+    void playControlEnabledChanged();
+
+    void skipBackwardControlEnabledChanged();
+
+    void skipForwardControlEnabledChanged();
+
+    void playerPlaybackStateChanged();
+
+    void playerIsSeekableChanged();
+
+    void audioPositionChanged();
+
+    void playerSeeked(qint64 position);
+
+    void audioDurationChanged();
+
+    void playerVolumeChanged();
+
+private:
+    void signalPropertiesChange(const QString &property, const QVariant &value);
+
+    void setMediaPlayerPresent(int status);
+    void setRate(double newRate);
+    void setVolume(double volume);
+    void setPropertyPosition(int newPositionInMs);
+    void setCurrentTrack(int newTrackPosition);
+
+    QVariantMap getMetadataOfCurrentTrack();
+
+    QVariantMap m_metadata;
+    QString m_currentTrack;
+    QString m_currentTrackId;
+    double m_rate = 1.0;
+    double m_volume = 0.0;
+    int m_mediaPlayerPresent = 0;
+    bool m_canPlay = false;
+    bool m_canGoNext = false;
+    bool m_canGoPrevious = false;
+    qlonglong m_position = 0;
+    MediaPlayListProxyModel *m_playListControler = nullptr;
+    bool m_playerIsSeekableChanged = false;
+    ManageAudioPlayer* m_manageAudioPlayer = nullptr;
+    ManageMediaPlayerControl* m_manageMediaPlayerControl = nullptr;
+    ManageHeaderBar * m_manageHeaderBar = nullptr;
+    AudioWrapper *m_audioPlayer = nullptr;
+    mutable QDBusMessage mProgressIndicatorSignal;
+    int mPreviousProgressPosition = 0;
+    bool mShowProgressOnTaskBar = true;
+};
+
+#endif // MEDIAPLAYER2PLAYER_H

src/mpris2/mpris2.cpp

@@ -0,0 +1,200 @@
+/***************************************************************************
+   SPDX-FileCopyrightText: 2014 (c) Sujith Haridasan <[email protected]>
+   SPDX-FileCopyrightText: 2014 (c) Ashish Madeti <[email protected]>
+   SPDX-FileCopyrightText: 2016 (c) Matthieu Gallien <[email protected]>
+
+   SPDX-License-Identifier: GPL-3.0-or-later
+ ***************************************************************************/
+
+#include "mpris2.h"
+#include "mediaplayer2.h"
+#include "mediaplayer2player.h"
+#include "mediaplaylistproxymodel.h"
+
+#include <QDBusConnection>
+
+
+#if defined Q_OS_WIN
+#include <Windows.h>
+#else
+#include <unistd.h>
+#endif
+
+Mpris2::Mpris2(QObject* parent)
+    : QObject(parent)
+{
+}
+
+void Mpris2::initDBusService()
+{
+    QString mspris2Name(QStringLiteral("org.mpris.MediaPlayer2.") + m_playerName);
+
+    bool success = QDBusConnection::sessionBus().registerService(mspris2Name);
+
+    // If the above failed, it's likely because we're not the first instance
+    // or the name is already taken. In that event the MPRIS2 spec wants the
+    // following:
+    if (!success) {
+#if defined Q_OS_WIN
+        success = QDBusConnection::sessionBus().registerService(mspris2Name + QLatin1String(".instance") + QString::number(GetCurrentProcessId()));
+#else
+        success = QDBusConnection::sessionBus().registerService(mspris2Name + QLatin1String(".instance") + QString::number(getpid()));
+#endif
+    }
+
+    if (success) {
+        m_mp2 = std::make_unique<MediaPlayer2>(this);
+        m_mp2p = std::make_unique<MediaPlayer2Player>(m_playListModel, m_manageAudioPlayer, m_manageMediaPlayerControl, m_manageHeaderBar, m_audioPlayer, mShowProgressOnTaskBar, this);
+
+        QDBusConnection::sessionBus().registerObject(QStringLiteral("/org/mpris/MediaPlayer2"), this, QDBusConnection::ExportAdaptors);
+
+        connect(m_mp2.get(), &MediaPlayer2::raisePlayer, this, &Mpris2::raisePlayer);
+    }
+}
+
+Mpris2::~Mpris2()
+= default;
+
+QString Mpris2::playerName() const
+{
+    return m_playerName;
+}
+
+MediaPlayListProxyModel *Mpris2::playListModel() const
+{
+    return m_playListModel;
+}
+
+ManageAudioPlayer *Mpris2::audioPlayerManager() const
+{
+    return m_manageAudioPlayer;
+}
+
+ManageMediaPlayerControl *Mpris2::manageMediaPlayerControl() const
+{
+    return m_manageMediaPlayerControl;
+}
+
+ManageHeaderBar *Mpris2::headerBarManager() const
+{
+    return m_manageHeaderBar;
+}
+
+AudioWrapper *Mpris2::audioPlayer() const
+{
+    return m_audioPlayer;
+}
+
+bool Mpris2::showProgressOnTaskBar() const
+{
+    return mShowProgressOnTaskBar;
+}
+
+void Mpris2::setPlayerName(const QString &playerName)
+{
+    if (m_playerName == playerName) {
+        return;
+    }
+
+    m_playerName = playerName;
+
+    if (m_playListModel && m_manageAudioPlayer && m_manageMediaPlayerControl && m_manageHeaderBar && m_audioPlayer && !m_playerName.isEmpty()) {
+        if (!m_mp2) {
+            initDBusService();
+        }
+    }
+
+    emit playerNameChanged();
+}
+
+void Mpris2::setPlayListModel(MediaPlayListProxyModel *playListModel)
+{
+    if (m_playListModel == playListModel) {
+        return;
+    }
+
+    m_playListModel = playListModel;
+
+    if (m_playListModel && m_manageAudioPlayer && m_manageMediaPlayerControl && m_manageHeaderBar && m_audioPlayer && !m_playerName.isEmpty()) {
+        if (!m_mp2) {
+            initDBusService();
+        }
+    }
+
+    emit playListModelChanged();
+}
+
+void Mpris2::setAudioPlayerManager(ManageAudioPlayer *manageAudioPlayer)
+{
+    if (m_manageAudioPlayer == manageAudioPlayer) {
+        return;
+    }
+
+    m_manageAudioPlayer = manageAudioPlayer;
+
+    if (m_playListModel && m_manageAudioPlayer && m_manageMediaPlayerControl && m_manageHeaderBar && m_audioPlayer && !m_playerName.isEmpty()) {
+        if (!m_mp2) {
+            initDBusService();
+        }
+    }
+
+    emit audioPlayerManagerChanged();
+}
+
+void Mpris2::setManageMediaPlayerControl(ManageMediaPlayerControl *manageMediaPlayerControl)
+{
+    if (m_manageMediaPlayerControl == manageMediaPlayerControl) {
+        return;
+    }
+
+    m_manageMediaPlayerControl = manageMediaPlayerControl;
+
+    if (m_playListModel && m_manageAudioPlayer && m_manageMediaPlayerControl && m_manageHeaderBar && m_audioPlayer && !m_playerName.isEmpty()) {
+        if (!m_mp2) {
+            initDBusService();
+        }
+    }
+
+    emit manageMediaPlayerControlChanged();
+}
+
+void Mpris2::setHeaderBarManager(ManageHeaderBar *manageHeaderBar)
+{
+    if (m_manageHeaderBar == manageHeaderBar)
+        return;
+
+    m_manageHeaderBar = manageHeaderBar;
+
+    if (m_playListModel && m_manageAudioPlayer && m_manageMediaPlayerControl && m_manageHeaderBar && m_audioPlayer && !m_playerName.isEmpty()) {
+        if (!m_mp2) {
+            initDBusService();
+        }
+    }
+
+    emit headerBarManagerChanged();
+}
+
+void Mpris2::setAudioPlayer(AudioWrapper *audioPlayer)
+{
+    if (m_audioPlayer == audioPlayer)
+        return;
+
+    m_audioPlayer = audioPlayer;
+
+    if (m_playListModel && m_manageAudioPlayer && m_manageMediaPlayerControl && m_manageHeaderBar && m_audioPlayer && !m_playerName.isEmpty()) {
+        if (!m_mp2) {
+            initDBusService();
+        }
+    }
+
+    emit audioPlayerChanged();
+}
+
+void Mpris2::setShowProgressOnTaskBar(bool value)
+{
+    m_mp2p->setShowProgressOnTaskBar(value);
+    mShowProgressOnTaskBar = value;
+    Q_EMIT showProgressOnTaskBarChanged();
+}
+
+#include "moc_mpris2.cpp"

src/mpris2/mpris2.h

@@ -0,0 +1,131 @@
+/***************************************************************************
+   SPDX-FileCopyrightText: 2014 (c) Sujith Haridasan <[email protected]>
+   SPDX-FileCopyrightText: 2014 (c) Ashish Madeti <[email protected]>
+   SPDX-FileCopyrightText: 2016 (c) Matthieu Gallien <[email protected]>
+
+   SPDX-License-Identifier: GPL-3.0-or-later
+ ***************************************************************************/
+
+#ifndef MEDIACENTER_MPRIS2_H
+#define MEDIACENTER_MPRIS2_H
+
+#include "elisaLib_export.h"
+
+#include <QObject>
+#include <QSharedPointer>
+#include <memory>
+
+class MediaPlayer2Player;
+class MediaPlayer2;
+class MediaPlayListProxyModel;
+class ManageAudioPlayer;
+class ManageMediaPlayerControl;
+class ManageHeaderBar;
+class AudioWrapper;
+
+class ELISALIB_EXPORT Mpris2 : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString playerName
+               READ playerName
+               WRITE setPlayerName
+               NOTIFY playerNameChanged)
+
+    Q_PROPERTY(MediaPlayListProxyModel* playListModel
+               READ playListModel
+               WRITE setPlayListModel
+               NOTIFY playListModelChanged)
+
+    Q_PROPERTY(ManageAudioPlayer* audioPlayerManager
+               READ audioPlayerManager
+               WRITE setAudioPlayerManager
+               NOTIFY audioPlayerManagerChanged)
+
+    Q_PROPERTY(ManageMediaPlayerControl* manageMediaPlayerControl
+               READ manageMediaPlayerControl
+               WRITE setManageMediaPlayerControl
+               NOTIFY manageMediaPlayerControlChanged)
+
+    Q_PROPERTY(ManageHeaderBar* headerBarManager
+               READ headerBarManager
+               WRITE setHeaderBarManager
+               NOTIFY headerBarManagerChanged)
+
+    Q_PROPERTY(AudioWrapper* audioPlayer
+               READ audioPlayer
+               WRITE setAudioPlayer
+               NOTIFY audioPlayerChanged)
+
+    Q_PROPERTY(bool showProgressOnTaskBar
+               READ showProgressOnTaskBar
+               WRITE setShowProgressOnTaskBar
+               NOTIFY showProgressOnTaskBarChanged)
+
+public:
+    explicit Mpris2(QObject* parent = nullptr);
+    ~Mpris2() override;
+
+    [[nodiscard]] QString playerName() const;
+
+    [[nodiscard]] MediaPlayListProxyModel* playListModel() const;
+
+    [[nodiscard]] ManageAudioPlayer* audioPlayerManager() const;
+
+    [[nodiscard]] ManageMediaPlayerControl* manageMediaPlayerControl() const;
+
+    [[nodiscard]] ManageHeaderBar* headerBarManager() const;
+
+    [[nodiscard]] AudioWrapper* audioPlayer() const;
+
+    [[nodiscard]] bool showProgressOnTaskBar() const;
+
+public Q_SLOTS:
+
+    void setPlayerName(const QString &playerName);
+
+    void setPlayListModel(MediaPlayListProxyModel* playListModel);
+
+    void setAudioPlayerManager(ManageAudioPlayer* audioPlayerManager);
+
+    void setManageMediaPlayerControl(ManageMediaPlayerControl* manageMediaPlayerControl);
+
+    void setHeaderBarManager(ManageHeaderBar* headerBarManager);
+
+    void setAudioPlayer(AudioWrapper* audioPlayer);
+
+    void setShowProgressOnTaskBar(bool value);
+
+Q_SIGNALS:
+    void raisePlayer();
+
+    void playerNameChanged();
+
+    void playListModelChanged();
+
+    void audioPlayerManagerChanged();
+
+    void manageMediaPlayerControlChanged();
+
+    void headerBarManagerChanged();
+
+    void audioPlayerChanged();
+
+    void showProgressOnTaskBarChanged();
+
+private:
+
+    void initDBusService();
+
+    std::unique_ptr<MediaPlayer2> m_mp2;
+    std::unique_ptr<MediaPlayer2Player> m_mp2p;
+    QString m_playerName;
+    MediaPlayListProxyModel* m_playListModel = nullptr;
+    ManageAudioPlayer* m_manageAudioPlayer = nullptr;
+    ManageMediaPlayerControl* m_manageMediaPlayerControl = nullptr;
+    ManageHeaderBar* m_manageHeaderBar = nullptr;
+    AudioWrapper* m_audioPlayer = nullptr;
+    bool mShowProgressOnTaskBar = true;
+};
+
+#endif //MEDIACENTER_MPRIS2_H

src/multiiterableview.h

@@ -6,68 +6,71 @@
 
 #include <variant>
 #include <tuple>
-#include <span>
+#include <vector>
 #include <QtGlobal>
 
-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 iterate_impl<Tuple, Func, i + 1>(tup, fun);
-    }
-}
+// MultiIterableView is usually used on a small number of vectors.
+// The number is already known, so we can convert this into an if else if else etc tree
+// instead of recursively calling the function
+#ifdef __GNUC__
+#define REMOVE_RECURSION __attribute__((always_inline))
+#else
+#define REMOVE_RECURSION
+#endif
 
-template <typename Tuple, typename Func>
-inline constexpr void iterate_tuple(Tuple &tup, Func fun)
-{
-    iterate_impl<Tuple, Func, 0>(tup, fun);
-}
-
-/// MultiIterableView is a view over multiple contigous memory arrays, like std::vector or std::array.
-/// The elements of the arrays do not need to be of the same type.
 template <typename... Arguments>
 class MultiIterableView {
-public:
-    explicit MultiIterableView(std::span<Arguments>... lists)
-        : m_vectors(std::forward_as_tuple(lists...))
-    {
+private:
+    template<typename T, size_t i, size_t len>
+    REMOVE_RECURSION inline size_t count(const T &tuple, int initial_size = 0) const {
+        if constexpr(i < len) {
+            return count<T, i + 1, len>(tuple, initial_size + std::get<i>(tuple).size());
+        } else {
+            return initial_size;
+        }
     }
 
-    explicit MultiIterableView(std::vector<Arguments> &...lists)
-        : MultiIterableView(std::span{lists}...)
-    {
-    }
-
-    [[nodiscard]] constexpr size_t size() const {
-        size_t s = 0;
-        iterate_tuple(m_vectors, [&](auto &vec) {
-            s += vec.size();
-        });
-        return s;
-    }
-
-    [[nodiscard]] constexpr std::variant<Arguments...> operator[](size_t i) const {
-        size_t s = 0;
-        std::variant<Arguments...> out;
-        iterate_tuple(m_vectors, [&](auto &vec) {
-            if (i >= s && i < s + vec.size()) {
-                out = vec[i - s];
+    template<typename T, size_t tuple_i, size_t tuple_len>
+    REMOVE_RECURSION inline std::variant<Arguments...> get_item(const T &tuple, size_t i) const {
+        if constexpr(tuple_i < tuple_len) {
+            if (i < std::get<tuple_i>(tuple).size()) {
+                return std::get<tuple_i>(tuple)[i];
+            } else {
+                return get_item<T, tuple_i + 1, tuple_len>(tuple, i - std::get<tuple_i>(tuple).size());
             }
-            s += vec.size();
-        });
-        return out;
+        } else {
+            Q_UNREACHABLE();
+        }
     }
 
-    [[nodiscard]] constexpr bool empty() const {
-        bool empty = true;
-        iterate_tuple(m_vectors, [&](auto &elem) {
-            empty &= elem.empty();
-        });
-        return empty;
+    template<typename T, size_t i, size_t len>
+    REMOVE_RECURSION inline bool everything_empty(const T &tuple, bool initial_state = true) const {
+        if constexpr(i < len) {
+            return everything_empty<T, i + 1, len>(tuple, initial_state && std::get<i>(tuple).empty());
+        } else {
+            return initial_state;
+        }
+    }
+public:
+    explicit MultiIterableView(const std::vector<Arguments> &...lists)
+        : m_vectors(std::make_tuple(lists...))
+    {
+    }
+
+    size_t size() const {
+        constexpr size_t nvecs = std::tuple_size_v<decltype(m_vectors)>;
+        return count<decltype(m_vectors), 0, nvecs>(m_vectors);
+    }
+
+    std::variant<Arguments...> operator[](size_t i) const {
+        constexpr size_t nvecs = std::tuple_size_v<decltype(m_vectors)>;
+        return get_item<decltype(m_vectors), 0, nvecs>(m_vectors, i);
+    }
+
+    bool empty() const {
+        constexpr size_t nvecs = std::tuple_size_v<decltype(m_vectors)>;
+        return everything_empty<decltype(m_vectors), 0, nvecs>(m_vectors);
     }
 private:
-    std::tuple<std::span<Arguments>...> m_vectors;
+    std::tuple<std::vector<Arguments>...> m_vectors;
 };

src/playerutils.cpp

@@ -1,15 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Jonah Brüchert <[email protected]>
-//
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#include "playerutils.h"
-
-PlayerUtils::PlayerUtils(QObject *parent) : QObject(parent)
-{
-
-}
-
-QString PlayerUtils::formatTimestamp(quint64 stamp)
-{
-    return m_format.formatDuration(stamp, KFormat::FoldHours);
-}

src/playerutils.h

@@ -1,22 +0,0 @@
-// SPDX-FileCopyrightText: 2021 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 <KFormat>
-
-class PlayerUtils : public QObject
-{
-    Q_OBJECT
-public:
-    explicit PlayerUtils(QObject *parent = nullptr);
-
-    Q_INVOKABLE QString formatTimestamp(quint64 stamp);
-
-private:
-    KFormat m_format;
-};
-

src/playlistmodel.cpp

@@ -11,13 +11,13 @@
 #include "playlistutils.h"
 
 PlaylistModel::PlaylistModel(QObject *parent)
-    : AbstractYTMusicModel(parent)
+    : QAbstractListModel(parent)
 {
-    connect(this, &PlaylistModel::playlistIdChanged, this, [=, this] {
+    connect(this, &PlaylistModel::playlistIdChanged, this, [=] {
         setLoading(true);
         YTMusicThread::instance()->fetchPlaylist(m_playlistId);
     });
-    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::fetchPlaylistFinished, this, [this](const playlist::Playlist &playlist) {
+    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::fetchPlaylistFinished, this, [=](const playlist::Playlist &playlist) {
         setLoading(false);
         beginResetModel();
         m_playlist = playlist;
@@ -49,7 +49,7 @@ QVariant PlaylistModel::data(const QModelIndex &index, int role) const
     case Title:
         return QString::fromStdString(m_playlist.tracks[index.row()].title);
     case Artists:
-        return QVariant::fromValue(m_playlist.tracks[index.row()].artists);
+        return PlaylistUtils::artistsToString(m_playlist.tracks[index.row()].artists);
     case VideoId:
         if (m_playlist.tracks[index.row()].video_id) {
             return QString::fromStdString(*m_playlist.tracks[index.row()].video_id);
@@ -76,6 +76,17 @@ void PlaylistModel::setPlaylistId(const QString &playlistId)
     Q_EMIT playlistIdChanged();
 }
 
+bool PlaylistModel::loading() const
+{
+    return m_loading;
+}
+
+void PlaylistModel::setLoading(bool loading)
+{
+    m_loading = loading;
+    Q_EMIT loadingChanged();
+}
+
 QUrl PlaylistModel::thumbnailUrl() const
 {
     if (m_playlist.thumbnails.empty()) {

src/playlistmodel.h

@@ -7,9 +7,7 @@
 #include <QAbstractListModel>
 #include <ytmusic.h>
 
-#include "abstractytmusicmodel.h"
-
-class PlaylistModel : public AbstractYTMusicModel
+class PlaylistModel : public QAbstractListModel
 {
     Q_OBJECT
 
@@ -17,6 +15,7 @@ class PlaylistModel : public AbstractYTMusicModel
     Q_PROPERTY(QString playlistId READ playlistId WRITE setPlaylistId NOTIFY playlistIdChanged REQUIRED)
 
     // output
+    Q_PROPERTY(bool loading READ loading WRITE setLoading NOTIFY loadingChanged)
     Q_PROPERTY(QUrl thumbnailUrl READ thumbnailUrl NOTIFY thumbnailUrlChanged)
     Q_PROPERTY(QString title READ title NOTIFY titleChanged)
 
@@ -37,6 +36,10 @@ public:
     void setPlaylistId(const QString &playlistId);
     Q_SIGNAL void playlistIdChanged();
 
+    bool loading() const;
+    void setLoading(bool loading);
+    Q_SIGNAL void loadingChanged();
+
     QUrl thumbnailUrl() const;
     Q_SIGNAL void thumbnailUrlChanged();
 
@@ -45,6 +48,7 @@ public:
 
 private:
     QString m_playlistId;
+    bool m_loading = false;
 
     playlist::Playlist m_playlist {};
 };

src/playlistutils.cpp

@@ -10,20 +10,15 @@
 
 #include <ytmusic.h>
 
-namespace PlaylistUtils {
-
-QString artistsToString(const std::vector<meta::Artist> &artists)
+QString PlaylistUtils::artistsToString(const std::vector<meta::Artist> &artists)
 {
     if (!artists.empty()) {
-        QString string = QString::fromStdString(artists.front().name);
-        std::for_each(artists.begin() + 1, artists.end(),
-                               [&string](const meta::Artist &artist) {
-            string.append(QStringLiteral(", %1").arg(QString::fromStdString(artist.name)));
+        return std::accumulate(artists.begin() + 1, artists.end(),
+                               QString::fromStdString(artists.front().name),
+                               [](QString &string, const meta::Artist &artist) {
+            return string.append(QStringLiteral(", %1").arg(QString::fromStdString(artist.name)));
         });
-        return string;
     }
 
     return {};
 }
-
-}

src/playlistutils.h

@@ -11,6 +11,10 @@ namespace meta {
 struct Artist;
 }
 
-namespace PlaylistUtils {
-    QString artistsToString(const std::vector<meta::Artist> &artists);
+class PlaylistUtils
+{
+public:
+    PlaylistUtils() = delete;
+
+    static QString artistsToString(const std::vector<meta::Artist> &artists);
 };

src/resources.qrc

@@ -1,9 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2021 Jonah Brüchert <[email protected]>
-
-SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
--->
-
 <RCC>
     <qresource prefix="/">
         <file alias="main.qml">contents/ui/main.qml</file>
@@ -12,6 +6,5 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
         <file alias="PlayerFooter.qml">contents/ui/PlayerFooter.qml</file>
         <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>
     </qresource>
 </RCC>

src/searchmodel.cpp

@@ -5,9 +5,9 @@
 #include "searchmodel.h"
 
 SearchModel::SearchModel(QObject *parent)
-    : AbstractYTMusicModel(parent)
+    : QAbstractListModel(parent)
 {
-    connect(this, &SearchModel::searchQueryChanged, this, [this] {
+    connect(this, &SearchModel::searchQueryChanged, this, [=] {
         if (m_searchQuery.isEmpty()) {
             beginResetModel();
             m_searchResults.clear();
@@ -18,17 +18,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) {
+    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::searchFinished, 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();
     });
-    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::errorOccurred, this, [this] {
+    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::errorOccurred, this, [=] {
         setLoading(false);
     });
 }
@@ -109,18 +105,6 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const
                 Q_UNREACHABLE();
             }
         }, m_searchResults.at(index.row())));
-    case RadioPlaylistId:
-        return std::visit([&](auto &&arg) {
-            using T = std::decay_t<decltype(arg)>;
-
-            if constexpr (std::is_same_v<T, search::Artist>) {
-                if (arg.radio_id) {
-                    return QString::fromStdString(*arg.radio_id);
-                }
-            }
-
-            return QString();
-        }, m_searchResults.at(index.row()));
     }
 
     Q_UNREACHABLE();
@@ -134,8 +118,7 @@ QHash<int, QByteArray> SearchModel::roleNames() const
         {Title, "title"},
         {Type, "type"},
         {VideoId, "videoId"},
-        {Artists, "artists"},
-        {RadioPlaylistId, "radioPlaylistId"},
+        {Artists, "artists"}
     };
 }
 
@@ -150,6 +133,17 @@ void SearchModel::setSearchQuery(const QString &searchQuery)
     Q_EMIT searchQueryChanged();
 }
 
+bool SearchModel::loading() const
+{
+    return m_loading;
+}
+
+void SearchModel::setLoading(bool loading)
+{
+    m_loading = loading;
+    Q_EMIT loadingChanged();
+}
+
 void SearchModel::triggerItem(int row)
 {
     std::visit([&](auto&& arg) {
@@ -163,30 +157,9 @@ void SearchModel::triggerItem(int row)
         } else if constexpr (std::is_same_v<T, search::Song>) {
             Q_EMIT openSong(QString::fromStdString(arg.video_id));
         } else if constexpr (std::is_same_v<T, search::Video>) {
-            Q_EMIT openVideo(QString::fromStdString(arg.video_id), QString::fromStdString(arg.title));
+            Q_EMIT openVideo(QString::fromStdString(arg.video_id));
         } else {
             Q_UNREACHABLE();
         }
     }, m_searchResults.at(row));
 }
-
-
-int SearchModel::itemType(search::SearchResultItem const &item)
-{
-    return std::visit([&](auto &&arg) {
-        using T = std::decay_t<decltype(arg)>;
-        if constexpr(std::is_same_v<T, search::Album>) {
-            return SearchModel::Type::Album;
-        } else if constexpr(std::is_same_v<T, search::Artist>) {
-            return SearchModel::Type::Artist;
-        } else if constexpr(std::is_same_v<T, search::Playlist>) {
-            return SearchModel::Type::Playlist;
-        } else if constexpr(std::is_same_v<T, search::Song>) {
-            return SearchModel::Type::Song;
-        } else if constexpr(std::is_same_v<T, search::Video>) {
-            return SearchModel::Type::Video;
-        } else {
-            Q_UNREACHABLE();
-        }
-    }, item);
-}

src/searchmodel.h

@@ -8,13 +8,13 @@
 #include <QThread>
 
 #include "asyncytmusic.h"
-#include "abstractytmusicmodel.h"
 
-class SearchModel : public AbstractYTMusicModel
+class SearchModel : public QAbstractListModel
 {
     Q_OBJECT
 
     Q_PROPERTY(QString searchQuery READ searchQuery WRITE setSearchQuery NOTIFY searchQueryChanged)
+    Q_PROPERTY(bool loading READ loading WRITE setLoading NOTIFY loadingChanged)
 
 public:
     enum Type {
@@ -30,8 +30,7 @@ public:
         Title = Qt::UserRole + 1,
         Type,
         VideoId,
-        Artists,
-        RadioPlaylistId
+        Artists
     };
 
     explicit SearchModel(QObject *parent = nullptr);
@@ -44,16 +43,20 @@ public:
     void setSearchQuery(const QString &searchQuery);
     Q_SIGNAL void searchQueryChanged();
 
+    bool loading() const;
+    void setLoading(bool loading);
+    Q_SIGNAL void loadingChanged();
+
     Q_INVOKABLE void triggerItem(int row);
 
     Q_SIGNAL void openAlbum(const QString &browseId);
     Q_SIGNAL void openArtist(const QString &browseId);
     Q_SIGNAL void openPlaylist(const QString &browseId);
     Q_SIGNAL void openSong(const QString &videoId);
-    Q_SIGNAL void openVideo(const QString &videoId, const QString &title);
+    Q_SIGNAL void openVideo(const QString &videoId);
 
 private:
     QString m_searchQuery;
     std::vector<search::SearchResultItem> m_searchResults;
-    static int itemType(search::SearchResultItem const &item);
+    bool m_loading = false;
 };

src/userplaylistmodel.cpp

@@ -13,9 +13,9 @@
 #include "playlistutils.h"
 
 UserPlaylistModel::UserPlaylistModel(QObject *parent)
-    : AbstractYTMusicModel(parent)
+    : QAbstractListModel(parent)
 {
-    connect(this, &UserPlaylistModel::initialVideoIdChanged, this, [this] {
+    connect(this, &UserPlaylistModel::initialVideoIdChanged, this, [=] {
         if (m_initialVideoId.isEmpty()) {
             return;
         }
@@ -23,7 +23,7 @@ UserPlaylistModel::UserPlaylistModel(QObject *parent)
         setLoading(true);
         YTMusicThread::instance()->fetchWatchPlaylist(m_initialVideoId);
     });
-    connect(this, &UserPlaylistModel::playlistIdChanged, this, [this] {
+    connect(this, &UserPlaylistModel::playlistIdChanged, this, [=] {
         if (m_playlistId.isEmpty()) {
             return;
         }
@@ -31,7 +31,7 @@ UserPlaylistModel::UserPlaylistModel(QObject *parent)
         setLoading(true);
         YTMusicThread::instance()->fetchWatchPlaylist(std::nullopt, m_playlistId);
     });
-    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::fetchWatchPlaylistFinished, this, [this](const watch::Playlist &playlist) {
+    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::fetchWatchPlaylistFinished, this, [=](const watch::Playlist &playlist) {
         setLoading(false);
 
         beginResetModel();
@@ -49,7 +49,7 @@ UserPlaylistModel::UserPlaylistModel(QObject *parent)
             setCurrentVideoId({});
         }
     });
-    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::errorOccurred, this, [this] {
+    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::errorOccurred, this, [=] {
         setLoading(false);
     });
 }
@@ -98,10 +98,21 @@ void UserPlaylistModel::setInitialVideoId(const QString &videoId)
     Q_EMIT initialVideoIdChanged();
 }
 
+bool UserPlaylistModel::loading() const
+{
+    return m_loading;
+}
+
+void UserPlaylistModel::setLoading(bool loading)
+{
+    m_loading = loading;
+    Q_EMIT loadingChanged();
+}
+
 QString UserPlaylistModel::nextVideoId() const
 {
     auto currentTrack = std::find_if(m_playlist.tracks.begin(), m_playlist.tracks.end(),
-                                     [this](const watch::Playlist::Track &track) {
+                                     [=](const watch::Playlist::Track &track) {
         return track.video_id == m_currentVideoId.toStdString();
     });
 
@@ -129,7 +140,7 @@ void UserPlaylistModel::setCurrentVideoId(const QString &videoId)
 bool UserPlaylistModel::canSkip() const
 {
     const auto currentTrackIt = std::find_if(m_playlist.tracks.begin(), m_playlist.tracks.end(),
-                                        [this](const watch::Playlist::Track &track) {
+                                        [=](const watch::Playlist::Track &track) {
         return track.video_id == m_currentVideoId.toStdString();
     });
 
@@ -157,7 +168,7 @@ void UserPlaylistModel::skipTo(const QString &videoId)
 void UserPlaylistModel::playNext(const QString &videoId, const QString &title, const std::vector<meta::Artist> &artists)
 {
     const auto currentIt = std::find_if(m_playlist.tracks.begin(), m_playlist.tracks.end(),
-                                        [this](const watch::Playlist::Track &track) {
+                                        [=](const watch::Playlist::Track &track) {
         return track.video_id == m_currentVideoId.toStdString();
     });
 
@@ -239,7 +250,7 @@ void UserPlaylistModel::shufflePlaylist()
     // Only shuffle playlist after current track
     if (!m_currentVideoId.isEmpty()) {
         const auto currentIt = std::find_if(m_playlist.tracks.begin(), m_playlist.tracks.end(),
-                                                           [this](const watch::Playlist::Track &track) {
+                                                           [=](const watch::Playlist::Track &track) {
             return track.video_id == m_currentVideoId.toStdString();
         });
 
@@ -257,7 +268,7 @@ void UserPlaylistModel::emitCurrentVideoChanged(const QString &oldVideoId)
         return track.video_id == oldVideoId.toStdString();
     });
     const auto currentVideoIt = std::find_if(m_playlist.tracks.begin(), m_playlist.tracks.end(),
-                                             [this](const watch::Playlist::Track &track) {
+                                             [=](const watch::Playlist::Track &track) {
         return track.video_id == m_currentVideoId.toStdString();
     });
 

src/userplaylistmodel.h

@@ -7,9 +7,7 @@
 
 #include <ytmusic.h>
 
-#include "abstractytmusicmodel.h"
-
-class UserPlaylistModel : public AbstractYTMusicModel
+class UserPlaylistModel : public QAbstractListModel
 {
     Q_OBJECT
 
@@ -19,6 +17,7 @@ class UserPlaylistModel : public AbstractYTMusicModel
     Q_PROPERTY(bool shuffle READ shuffle WRITE setShuffle NOTIFY shuffleChanged)
 
     // output
+    Q_PROPERTY(bool loading READ loading WRITE setLoading NOTIFY loadingChanged)
     Q_PROPERTY(QString currentVideoId READ currentVideoId NOTIFY currentVideoIdChanged)
     Q_PROPERTY(bool canSkip READ canSkip NOTIFY canSkipChanged)
 
@@ -40,6 +39,10 @@ public:
     void setInitialVideoId(const QString &videoId);
     Q_SIGNAL void initialVideoIdChanged();
 
+    bool loading() const;
+    void setLoading(bool loading);
+    Q_SIGNAL void loadingChanged();
+
     QString nextVideoId() const;
 
     QString currentVideoId() const;
@@ -71,6 +74,7 @@ private:
     QString m_initialVideoId;
     QString m_playlistId;
     QString m_currentVideoId;
+    bool m_loading = false;
     bool m_shuffle = false;
 
     watch::Playlist m_playlist;

src/videoinfoextractor.cpp

@@ -9,7 +9,7 @@
 VideoInfoExtractor::VideoInfoExtractor(QObject *parent)
     : QObject(parent)
 {
-    connect(this, &VideoInfoExtractor::videoIdChanged, this, [this] {
+    connect(this, &VideoInfoExtractor::videoIdChanged, this, [=] {
         if (m_videoId.isEmpty()) {
             m_videoInfo = {};
             Q_EMIT audioUrlChanged();
@@ -23,7 +23,7 @@ VideoInfoExtractor::VideoInfoExtractor(QObject *parent)
         YTMusicThread::instance()->extractVideoInfo(QString::fromStdString(m_videoId.toStdString()));
     });
 
-    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::extractVideoInfoFinished, this, [this](const video_info::VideoInfo &info) {
+    connect(&YTMusicThread::instance().get(), &AsyncYTMusic::extractVideoInfoFinished, this, [=](const video_info::VideoInfo &info) {
         m_videoInfo = info;
         setLoading(false);
         Q_EMIT audioUrlChanged();
@@ -33,10 +33,11 @@ VideoInfoExtractor::VideoInfoExtractor(QObject *parent)
     });
 }
 
+
 QUrl VideoInfoExtractor::audioUrl() const
 {
     if (m_videoInfo.formats.empty()) {
-        return {};
+        return QUrl();
     }
 
     std::vector<video_info::Format> audioFormats;
@@ -48,13 +49,17 @@ QUrl VideoInfoExtractor::audioUrl() const
     });
 
     if (audioFormats.empty()) {
-        return {};
+        return QUrl();
     }
 
-    std::sort(audioFormats.begin(), audioFormats.end(),
-              [](const video_info::Format &a, const video_info::Format &b) {
-        return a.quality > b.quality;
-    });
+
+    struct {
+        bool operator()(const video_info::Format &a, const video_info::Format &b) {
+            return a.quality > b.quality;
+        }
+    } qualitySort;
+
+    std::sort(audioFormats.begin(), audioFormats.end(), qualitySort);
 
     return QUrl(QString::fromStdString(audioFormats.front().url));
 }
@@ -77,7 +82,7 @@ QString VideoInfoExtractor::title() const
 
 QString VideoInfoExtractor::thumbnail() const
 {
-    return QString::fromStdString(m_videoInfo.thumbnail);
+    return QString::fromStdString(m_videoInfo.thumnnail);
 }
 
 bool VideoInfoExtractor::loading() const

src/videoinfoextractor.h

@@ -21,7 +21,7 @@ class VideoInfoExtractor : public QObject
     Q_PROPERTY(bool loading READ loading WRITE setLoading NOTIFY loadingChanged)
 
 public:
-    explicit VideoInfoExtractor(QObject *parent = nullptr);
+    VideoInfoExtractor(QObject *parent = nullptr);
 
     QUrl audioUrl() const;
     Q_SIGNAL void audioUrlChanged();

src/ytmusic.cpp

@@ -13,54 +13,13 @@ namespace py = pybind11;
 
 using namespace py::literals;
 
-/// Useful for debugging
-void pyPrintPretty(py::handle obj) {
-    auto json = py::module::import("json");
-    py::print(json.attr("dumps")(obj, "indent"_a=py::int_(4)));
-}
-
 #define UNEXPORT __attribute__ ((visibility("hidden")))
 
-constexpr auto TESTED_YTMUSICAPI_VERSION = "0.20.0";
+constexpr auto TESTED_YTMUSICAPI_VERSION = "0.16.0";
 
 struct UNEXPORT YTMusicPrivate {
     py::scoped_interpreter guard {};
-
-    std::optional<std::string> auth;
-    std::optional<std::string> user;
-    std::optional<bool> requests_session;
-    std::optional<std::map<std::string, std::string> > proxies;
-    std::string language;
-
-    py::object get_ytmusic() {
-        if (ytmusic.is_none()) {
-            const auto module = py::module::import("ytmusicapi");
-            ytmusic = module.attr("YTMusic")(auth, user, requests_session, proxies, language);
-
-            // Some of the called python code randomly fails if the encoding is not utf8
-            setenv("LC_ALL", "en_US.utf8", true);
-
-            const auto version = module.attr("_version").attr("__version__").cast<std::string>();
-            if (version != TESTED_YTMUSICAPI_VERSION) {
-                std::cerr << "Running with untested version of ytmusicapi." << std::endl;
-                std::cerr << "The currently tested and supported version is " << TESTED_YTMUSICAPI_VERSION << std::endl;
-            }
-        }
-
-        return ytmusic;
-    }
-
-    py::object get_ytdl() {
-        // lazy initialization
-        if (ytdl.is_none()) {
-             ytdl = py::module::import("yt_dlp").attr("YoutubeDL")(py::dict());
-        }
-
-        return ytdl;
-    }
-
-private:
-    py::object ytmusic = py::none();
+    py::object ytmusic;
     py::object ytdl = py::none();
 };
 
@@ -70,7 +29,7 @@ std::optional<T> optional_key(py::handle obj, const char *name) {
         return std::nullopt;
     }
 
-    return obj[name].cast<std::optional<T>>();
+    return obj[name].cast<T>();
 }
 
 meta::Thumbnail extract_thumbnail(py::handle thumbnail) {
@@ -88,17 +47,31 @@ meta::Artist extract_meta_artist(py::handle artist) {
     };
 };
 
+album::Track extract_album_track(py::handle track) {
+    return {
+        track["index"].cast<std::string>(),
+        track["title"].cast<std::string>(),
+        track["artists"].cast<std::string>(),
+        track["videoId"].cast<std::optional<std::string>>(),  // E rated songs don't have a videoId
+        track["lengthMs"].cast<std::optional<std::string>>(), //
+        track["likeStatus"].cast<std::optional<std::string>>()
+    };
+}
+
+video_info::Format extract_format(py::handle format) {
+    return {
+        optional_key<int>(format, "quality"),
+        format["url"].cast<std::string>(),
+        format["vcodec"].cast<std::string>(),
+        format["acodec"].cast<std::string>()
+    };
+}
+
 playlist::Track extract_playlist_track(py::handle track);
 watch::Playlist::Track extract_watch_track(py::handle track);
-album::Track extract_album_track(py::handle track);
-video_info::Format extract_format(py::handle format);
 
 template <typename T>
 inline auto extract_py_list(py::handle obj) {
-    if (obj.is_none()) {
-        return std::vector<T>();
-    }
-
     const auto list = obj.cast<py::list>();
     std::vector<T> output;
 
@@ -123,27 +96,6 @@ inline auto extract_py_list(py::handle obj) {
     return output;
 }
 
-album::Track extract_album_track(py::handle track) {
-    return {
-        track["isExplicit"].cast<bool>(),
-        track["title"].cast<std::string>(),
-        extract_py_list<meta::Artist>(track["artists"]),
-        track["album"].cast<std::optional<std::string>>(),
-        track["videoId"].cast<std::optional<std::string>>(),  // E rated songs don't have a videoId
-        track["duration"].cast<std::optional<std::string>>(), //
-        track["likeStatus"].cast<std::optional<std::string>>()
-    };
-}
-
-video_info::Format extract_format(py::handle format) {
-    return {
-        optional_key<int>(format, "quality"),
-        format["url"].cast<std::string>(),
-        format["vcodec"].cast<std::string>(),
-        format["acodec"].cast<std::string>()
-    };
-}
-
 meta::Album extract_meta_album(py::handle album) {
     return meta::Album {
         album["name"].cast<std::string>(),
@@ -289,7 +241,7 @@ std::optional<search::SearchResultItem> extract_search_result(py::handle result)
             result["title"].cast<std::string>(),
             result["type"].cast<std::string>(),
             extract_py_list<meta::Artist>(result["artists"]),
-            result["year"].cast<std::optional<std::string>>(),
+            result["year"].cast<std::string>(),
             result["isExplicit"].cast<bool>()
         };
     } else if (resultType == "playlist") {
@@ -308,8 +260,7 @@ std::optional<search::SearchResultItem> extract_search_result(py::handle result)
         };
     } else {
         std::cerr << "Warning: Unsupported search result type found" << std::endl;
-        std::cerr << "It's called: " << resultType << std::endl;
-        pyPrintPretty(result);
+        std::cerr << "It's called: " << resultType;
         return std::nullopt;
     }
 }
@@ -322,11 +273,16 @@ YTMusic::YTMusic(
         const std::string &language)
     : d(std::make_unique<YTMusicPrivate>())
 {
-    d->auth = auth;
-    d->user = user;
-    d->requests_session = requests_session;
-    d->proxies = proxies;
-    d->language = language;
+    const auto module = py::module::import("ytmusicapi");
+    d->ytmusic = module.attr("YTMusic")(auth, user, requests_session, proxies, language);
+
+    setenv("LC_ALL", "en_US.utf8", true);
+
+    const auto version = module.attr("_version").attr("__version__").cast<std::string>();
+    if (version != TESTED_YTMUSICAPI_VERSION) {
+        std::cerr << "Running with untested version of ytmusicapi." << std::endl;
+        std::cerr << "The currently tested and supported version is " << TESTED_YTMUSICAPI_VERSION << std::endl;
+    }
 }
 
 YTMusic::~YTMusic() = default;
@@ -334,11 +290,10 @@ YTMusic::~YTMusic() = default;
 std::vector<search::SearchResultItem> YTMusic::search(
         const std::string &query,
         const std::optional<std::string> &filter,
-        const std::optional<std::string> &scope,
         const int limit,
         const bool ignore_spelling) const
 {
-    const auto results = d->get_ytmusic().attr("search")("query"_a=query, "filter"_a=filter, "scope"_a=scope, "limit"_a = limit, "ignore_spelling"_a = ignore_spelling).cast<py::list>();
+    const auto results = d->ytmusic.attr("search")(query, filter, limit, ignore_spelling).cast<py::list>();
 
     std::vector<search::SearchResultItem> output;
     for (const auto &result : results) {
@@ -352,9 +307,9 @@ std::vector<search::SearchResultItem> YTMusic::search(
 
 artist::Artist YTMusic::get_artist(const std::string &channel_id) const
 {
-    const auto artist = d->get_ytmusic().attr("get_artist")(channel_id);
+    const auto artist = d->ytmusic.attr("get_artist")(channel_id);
     return artist::Artist {
-        optional_key<std::string>(artist, "description"),
+        artist["description"].cast<std::optional<std::string>>(),
         artist["views"].cast<std::optional<std::string>>(),
         artist["name"].cast<std::string>(),
         artist["channelId"].cast<std::string>(),
@@ -370,29 +325,32 @@ artist::Artist YTMusic::get_artist(const std::string &channel_id) const
 
 album::Album YTMusic::get_album(const std::string &browseId) const
 {
-    const auto album = d->get_ytmusic().attr("get_album")(browseId);
+    const auto album = d->ytmusic.attr("get_album")(browseId);
+
     return {
         album["title"].cast<std::string>(),
-        album["trackCount"].cast<int>(),
-        album["duration"].cast<std::string>(),
-        album["audioPlaylistId"].cast<std::string>(),
-        album["year"].cast<std::string>(),
-        optional_key<std::string>(album, "description"),
+        album["trackCount"].cast<std::string>(),
+        album["durationMs"].cast<std::string>(),
+        album["playlistId"].cast<std::string>(),
+        [&]() -> album::Album::ReleaseDate {
+            const auto date = album["releaseDate"];
+            return {
+                date["year"].cast<int>(),
+                date["month"].cast<int>(),
+                date["day"].cast<int>()
+            };
+        }(),
+        album["description"].cast<std::string>(),
         extract_py_list<meta::Thumbnail>(album["thumbnails"]),
-        extract_py_list<album::Track>(album["tracks"]),
-        extract_py_list<meta::Artist>(album["artists"])
+        extract_py_list<album::Track>(album["tracks"])
     };
 }
 
-std::optional<song::Song> YTMusic::get_song(const std::string &video_id) const
+song::Song YTMusic::get_song(const std::string &video_id) const
 {
-    const auto song = d->get_ytmusic().attr("get_song")(video_id);
+    const auto song = d->ytmusic.attr("get_song")(video_id);
 
-    if (!song.cast<py::dict>().contains("videoId")) {
-        return std::nullopt;
-    }
-
-    return song::Song {
+    return {
         song["videoId"].cast<std::string>(),
         song["title"].cast<std::string>(),
         song["lengthSeconds"].cast<std::string>(),
@@ -422,7 +380,7 @@ std::optional<song::Song> YTMusic::get_song(const std::string &video_id) const
 
 playlist::Playlist YTMusic::get_playlist(const std::string &playlist_id, int limit) const
 {
-    const auto playlist = d->get_ytmusic().attr("get_playlist")(playlist_id, limit);
+    const auto playlist = d->ytmusic.attr("get_playlist")(playlist_id, limit);
 
     return {
         playlist["id"].cast<std::string>(),
@@ -439,7 +397,7 @@ playlist::Playlist YTMusic::get_playlist(const std::string &playlist_id, int lim
 
 std::vector<artist::Artist::Album> YTMusic::get_artist_albums(const std::string &channel_id, const std::string &params) const
 {
-    const auto py_albums = d->get_ytmusic().attr("get_artist_albums")(channel_id, params);
+    const auto py_albums = d->ytmusic.attr("get_artist_albums")(channel_id, params);
     std::vector<artist::Artist::Album> albums;
 
     std::transform(py_albums.begin(), py_albums.end(), std::back_inserter(albums), [](py::handle album) {
@@ -459,7 +417,15 @@ 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));
+    // lazy initialization
+    if (d->ytdl.is_none()) {
+        const auto module = py::module::import("youtube_dl");
+        py::dict options;
+        d->ytdl = module.attr("YoutubeDL")(options);
+    }
+
+    const auto info = d->ytdl.attr("extract_info")(video_id, "download"_a=py::bool_(false));
+    //py::print(py::module::import("json").attr("dumps")(info, "indent"_a=4));
 
     return {
         info["id"].cast<std::string>(),
@@ -474,7 +440,7 @@ watch::Playlist YTMusic::get_watch_playlist(const std::optional<std::string> &vi
                                             int limit,
                                             const std::optional<std::string> &params) const
 {
-    const auto playlist = d->get_ytmusic().attr("get_watch_playlist")("videoId"_a = videoId,
+    const auto playlist = d->ytmusic.attr("get_watch_playlist")("videoId"_a = videoId,
                                                                 "playlistId"_a = playlistId,
                                                                 "limit"_a = py::int_(limit),
                                                                 "params"_a = params);

src/ytmusic.h

@@ -67,7 +67,7 @@ struct Album {
     std::string title;
     std::string type;
     std::vector<meta::Artist> artists;
-    std::optional<std::string> year;
+    std::string year;
     bool is_explicit;
 };
 
@@ -122,7 +122,7 @@ struct Artist {
 
     struct Single {
         std::string title;
-        std::vector<meta::Thumbnail> thumbnails;
+        std::vector<meta::Thumbnail> thumnnails;
         std::string year;
         std::string browse_id;
     };
@@ -143,12 +143,11 @@ struct Artist {
 
 namespace album {
     struct Track {
-        bool is_explicit;
+        std::string index;
         std::string title;
-        std::vector<meta::Artist> artists;
-        std::optional<std::string> album;
+        std::string artists;
         std::optional<std::string> video_id;
-        std::optional<std::string> duration;
+        std::optional<std::string> length_ms;
         std::optional<std::string> like_status;
     };
 
@@ -160,14 +159,13 @@ namespace album {
         };
 
         std::string title;
-        int track_count;
-        std::string duration;
-        std::string audio_playlist_id;
-        std::string year;
-        std::optional<std::string> description;
+        std::string track_count;
+        std::string duration_ms;
+        std::string playlist_id;
+        ReleaseDate release_date;
+        std::string description;
         std::vector<meta::Thumbnail> thumbnails;
         std::vector<Track> tracks;
-        std::vector<meta::Artist> artists;
     };
 }
 
@@ -242,7 +240,7 @@ struct VideoInfo {
     std::string id;
     std::string title;
     std::vector<Format> formats;
-    std::string thumbnail;
+    std::string thumnnail;
 
     // More, but not interesting for us right now
 };
@@ -279,7 +277,6 @@ public:
 
     std::vector<search::SearchResultItem> search(const std::string &query,
                                                  const std::optional<std::string> &filter = std::nullopt,
-                                                 const std::optional<std::string> &scope = std::nullopt,
                                                  const int limit = 20,
                                                  const bool ignore_spelling = false) const;
 
@@ -290,7 +287,7 @@ public:
     album::Album get_album(const std::string &browse_id) const;
 
     /// https://ytmusicapi.readthedocs.io/en/latest/reference.html#ytmusicapi.YTMusic.get_song
-    std::optional<song::Song> get_song(const std::string &video_id) const;
+    song::Song get_song(const std::string &video_id) const;
 
     /// https://ytmusicapi.readthedocs.io/en/latest/reference.html#ytmusicapi.YTMusic.get_playlist
     playlist::Playlist get_playlist(const std::string &playlist_id, int limit = 100) const;