Add navigation to artists from tracks

I'm not to happy about the C++ sides. If anyone from the future finds
this commit with "git blame" while debugging this code: I apologise

core/include/JellyfinQt/viewmodel/item.h

@@ -28,6 +28,7 @@
 #include <QDebug>
 #include <QList>
 #include <QObject>
+#include <QQmlListProperty>
 #include <QSharedPointer>
 #include <QUuid>
 
@@ -55,6 +56,51 @@ namespace ViewModel {
 
 class UserData;
 
+namespace {
+    template<typename T>
+    void qqmlistproperty_qlist_append(QQmlListProperty<T> *prop, T *data) {
+        static_cast<QList<T> *>(prop->data())->append(data);
+    }
+
+    template<typename T>
+    void qqmlistproperty_qlist_clear(QQmlListProperty<T> *prop) {
+        static_cast<QList<T> *>(prop->data())->clear();
+    }
+
+    template<typename T>
+    T *qqmlistproperty_qlist_at(QQmlListProperty<T> *prop, qint32 idx) {
+        return &static_cast<QList<T> *>(prop->data())->at(idx);
+    }
+
+    template<typename T>
+    void qqmlistproperty_qlist_count(QQmlListProperty<T> *prop) {
+        static_cast<QList<T> *>(prop->data())->count();
+    }
+}
+
+template <typename T>
+QQmlListProperty<T> qQmlListPropertyFromQList(QObject *object, QList<T> *list) {
+    return QQmlListProperty<T>(object, list, &qqmlistproperty_qlist_append<T>, &qqmlistproperty_qlist_count<T>, &qqmlistproperty_qlist_at<T>, &qqmlistproperty_qlist_clear<T>);
+}
+
+
+class NameGuidPair : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
+    Q_PROPERTY(QString jellyfinId READ jellyfinId NOTIFY jellyfinIdChanged)
+public:
+    explicit NameGuidPair(QSharedPointer<DTO::NameGuidPair> data = QSharedPointer<DTO::NameGuidPair>::create(QStringLiteral("00000000000000000000000000000000")), QObject *parent = nullptr);
+
+    QString name() const { return m_data->name(); }
+    QString jellyfinId() const { return m_data->jellyfinId(); }
+signals:
+    void nameChanged(const QString &newName);
+    void jellyfinIdChanged(const QString &newJellyfinId);
+
+private:
+    QSharedPointer<DTO::NameGuidPair> m_data;
+};
+
 class Item : public QObject {
     Q_OBJECT
 public:
@@ -116,6 +162,7 @@ public:
     Q_PROPERTY(QList<QObject *> subtitleStreams READ subtitleStreams NOTIFY subtitleStreamsChanged)
     Q_PROPERTY(double primaryImageAspectRatio READ primaryImageAspectRatio NOTIFY primaryImageAspectRatioChanged)
     Q_PROPERTY(QStringList artists READ artists NOTIFY artistsChanged)
+    Q_PROPERTY(QList<QObject *> artistItems READ artistItems NOTIFY artistItemsChanged);
     // Why is this a QJsonObject? Well, because I couldn't be bothered to implement the deserialisations of
     // a QHash at the moment.
     Q_PROPERTY(QJsonObject imageTags READ imageTags NOTIFY imageTagsChanged)
@@ -171,6 +218,7 @@ public:
     QObjectList subtitleStreams() const { return m_subtitleStreams; }
     double primaryImageAspectRatio() const { return m_data->primaryImageAspectRatio().value_or(1.0); }
     QStringList artists() const { return m_data->artists(); }
+    QList<QObject *> artistItems() const{ return this->m_artistItems; }
     QJsonObject imageTags() const { return m_data->imageTags(); }
     QStringList backdropImageTags() const { return m_data->backdropImageTags(); }
     QJsonObject imageBlurHashes() const { return m_data->imageBlurHashes(); }
@@ -243,6 +291,7 @@ signals:
     void subtitleStreamsChanged(QVariantList &newSubtitleStreams);
     void primaryImageAspectRatioChanged(double newPrimaryImageAspectRatio);
     void artistsChanged(const QStringList &newArtists);
+    void artistItemsChanged();
     void imageTagsChanged();
     void backdropImageTagsChanged();
     void imageBlurHashesChanged();
@@ -269,6 +318,7 @@ protected:
     QObjectList m_audioStreams;
     QObjectList m_videoStreams;
     QObjectList m_subtitleStreams;
+    QObjectList m_artistItems;
 private slots:
     void onUserDataChanged(const DTO::UserItemDataDto &userData);
 };

core/include/JellyfinQt/viewmodel/itemmodel.h

@@ -355,6 +355,7 @@ public:
         indexNumber,
         runTimeTicks,
         artists,
+        artistItems,
         isFolder,
         overview,
         parentIndexNumber,
@@ -395,6 +396,7 @@ public:
             JFRN(indexNumber),
             JFRN(runTimeTicks),
             JFRN(artists),
+            JFRN(artistItems),
             JFRN(isFolder),
             JFRN(overview),
             JFRN(parentIndexNumber),

core/include/JellyfinQt/viewmodel/playlist.h

@@ -59,6 +59,7 @@ public:
         // Item properties
         name = Qt::UserRole + 1,
         artists,
+        artistItems,
         runTimeTicks,
 
         // Non-item properties

core/src/jellyfin.cpp

@@ -54,6 +54,7 @@ void JellyfinPlugin::registerTypes(const char *uri) {
     qmlRegisterUncreatableType<ViewModel::User>(uri, 1, 0, "User", "Acquire one via UserLoader or exposed properties");
     qmlRegisterUncreatableType<EventBus>(uri, 1, 0, "EventBus", "Obtain one via your ApiClient");
     qmlRegisterUncreatableType<WebSocket>(uri, 1, 0, "WebSocket", "Obtain one via your ApiClient");
+    qmlRegisterUncreatableType<ViewModel::NameGuidPair>(uri, 1, 0, "NameGuidPair", "Obbtain one via an Item");
     qmlRegisterUncreatableType<ViewModel::MediaStream>(uri, 1, 0, "MediaStream", "Obtain one via an Item");
     qmlRegisterUncreatableType<ViewModel::Settings>(uri, 1, 0, "Settings", "Obtain one via your ApiClient");
     qmlRegisterUncreatableType<ViewModel::UserData>(uri, 1, 0, "UserData", "Obtain one via an Item");

core/src/viewmodel/item.cpp

@@ -26,6 +26,9 @@
 namespace Jellyfin {
 namespace ViewModel {
 
+NameGuidPair::NameGuidPair(QSharedPointer<DTO::NameGuidPair> data, QObject *parent)
+    : QObject(parent), m_data(data) {}
+
 Item::Item(QObject *parent, QSharedPointer<Model::Item> data)
     : QObject(parent),
       m_data(data),
@@ -44,6 +47,7 @@ void Item::setData(QSharedPointer<Model::Item> newData) {
 
     if (!m_data.isNull()) {
         connect(m_data.data(), &Model::Item::userDataChanged, this, &Item::onUserDataChanged);
+        updateMediaStreams();
         setUserData(m_data->userData());
     }
 
@@ -77,6 +81,11 @@ void Item::updateMediaStreams() {
     qDebug() << m_audioStreams.size() << " audio streams, " << m_videoStreams.size() << " video streams, "
              << m_subtitleStreams.size() << " subtitle streams, " << m_allMediaStreams.size() << " streams total";
 
+    m_artistItems.clear();
+    const QList<DTO::NameGuidPair> artists = m_data->artistItems();
+    for (auto it = artists.cbegin(); it != artists.cend(); it++) {
+        m_artistItems.append(new NameGuidPair(QSharedPointer<DTO::NameGuidPair>::create(*it), this));
+    }
 }
 
 void Item::setUserData(DTO::UserItemDataDto &newData) {

core/src/viewmodel/itemmodel.cpp

@@ -18,6 +18,8 @@
  */
 #include "JellyfinQt/viewmodel/itemmodel.h"
 
+#include "JellyfinQt/viewmodel/item.h"
+
 #include "JellyfinQt/loader/http/artists.h"
 #include "JellyfinQt/loader/http/items.h"
 #include "JellyfinQt/loader/http/userlibrary.h"
@@ -93,6 +95,14 @@ QVariant ItemModel::data(const QModelIndex &index, int role) const {
     case RoleNames::runTimeTicks:
         return QVariant(item->runTimeTicks().value_or(0));
     JF_CASE(artists)
+    case RoleNames::artistItems: {
+        QVariantList data;
+        auto artists = item->artistItems();
+        for (auto it = artists.cbegin(); it != artists.cend(); it++) {
+            data.append(QVariant::fromValue(new NameGuidPair(QSharedPointer<DTO::NameGuidPair>::create(*it), const_cast<ItemModel *>(this))));
+        }
+        return data;
+    }
     case RoleNames::isFolder:
         return QVariant(item->isFolder().value_or(false));
     JF_CASE(overview)

core/src/viewmodel/playlist.cpp

@@ -18,6 +18,8 @@
  */
 #include "JellyfinQt/viewmodel/playlist.h"
 
+#include "JellyfinQt/viewmodel/item.h"
+
 namespace Jellyfin {
 namespace ViewModel {
 
@@ -47,6 +49,7 @@ QHash<int, QByteArray> Playlist::roleNames() const {
     return {
         {RoleNames::name, "name"},
         {RoleNames::artists, "artists"},
+        {RoleNames::artistItems, "artistItems"},
         {RoleNames::runTimeTicks, "runTimeTicks"},
         {RoleNames::section, "section"},
         {RoleNames::playing, "playing"},
@@ -83,6 +86,16 @@ QVariant Playlist::data(const QModelIndex &index, int role) const {
         return QVariant(rowData->name());
     case RoleNames::artists:
         return QVariant(rowData->artists());
+    case RoleNames::artistItems: {
+        QVariantList result;
+
+        auto items = rowData->artistItems();
+        for (auto it = items.cbegin(); it != items.cend(); it++) {
+            result.append(QVariant::fromValue(new NameGuidPair(QSharedPointer<DTO::NameGuidPair>::create(*it), const_cast<Playlist *>(this))));
+        }
+
+        return result;
+    }
     case RoleNames::runTimeTicks:
         return QVariant(rowData->runTimeTicks().value_or(-1));
     default: