Big C++ refractor

- Removed "jellyfin" prefix from files, as they are already in a
  directory named Jellyfin
- Split the former "jellyfinitem.{h,cpp}" into multiple files in the DTO
  directory, one for each class. The jellyfinitem files started to
  become enormous.
- Use forward declarations in headers instead of including files
  wherever possible.
- Updated copyright headers

CMakeLists.txt

@@ -6,8 +6,8 @@ set(CMAKE_AUTOMOC ON)
 cmake_policy(SET CMP0048 NEW)
 
 # Options
-option(PLATFORM_SAILFISHOS "Build SailfishOS version of application")
+option(PLATFORM_SAILFISHOS "Build SailfishOS version of application" OFF)
-option(PLATFORM_QTQUICK "Build QtQuick version of application")
+option(PLATFORM_QTQUICK "Build QtQuick version of application" ON)
 
 if(PLATFORM_SAILFISHOS)
 	# Hardcode this less?

core/CMakeLists.txt

@@ -3,28 +3,40 @@ find_package(Qt5 5.6 COMPONENTS Multimedia Network Qml WebSockets REQUIRED)
 include(GNUInstallDirs)
 
 set(jellyfin-qt_SOURCES
+        src/DTO/dto.cpp
+        src/DTO/item.cpp
+        src/DTO/namedguidpair.cpp
+        src/DTO/mediastream.cpp
+        src/DTO/types.cpp
+        src/DTO/user.cpp
+        src/DTO/userdata.cpp
+        src/apiclient.cpp
+        src/apimodel.cpp
         src/credentialmanager.cpp
+        src/deviceprofile.cpp
         src/jellyfin.cpp
-	src/jellyfinapiclient.cpp
-	src/jellyfinapimodel.cpp
-	src/jellyfindeviceprofile.cpp
-	src/jellyfinitem.cpp
-	src/jellyfinplaybackmanager.cpp
-	src/jellyfinwebsocket.cpp
         src/jsonhelper.cpp
-	src/serverdiscoverymodel.cpp)
+        src/playbackmanager.cpp
+        src/serverdiscoverymodel.cpp
+        src/websocket.cpp)
 
 set(jellyfin-qt_HEADERS
+        include/JellyfinQt/DTO/dto.h
+        include/JellyfinQt/DTO/item.h
+        include/JellyfinQt/DTO/mediastream.h
+        include/JellyfinQt/DTO/namedguidpair.h
+        include/JellyfinQt/DTO/types.h
+        include/JellyfinQt/DTO/userdata.h
+        include/JellyfinQt/DTO/user.h
+        include/JellyfinQt/apiclient.h
+        include/JellyfinQt/apimodel.h
         include/JellyfinQt/credentialmanager.h
+        include/JellyfinQt/deviceprofile.h
         include/JellyfinQt/jellyfin.h
-	include/JellyfinQt/jellyfinapiclient.h 
-	include/JellyfinQt/jellyfinapimodel.h 
-	include/JellyfinQt/jellyfindeviceprofile.h 
-	include/JellyfinQt/jellyfinitem.h 
-	include/JellyfinQt/jellyfinplaybackmanager.h 
-	include/JellyfinQt/jellyfinwebsocket.h 
         include/JellyfinQt/jsonhelper.h
-	include/JellyfinQt/serverdiscoverymodel.h)
+        include/JellyfinQt/playbackmanager.h
+        include/JellyfinQt/serverdiscoverymodel.h
+        include/JellyfinQt/websocket.h)
 
 add_definitions(-DSAILFIN_VERSION=\"${SAILFIN_VERSION}\")
 if (PLATFORM_SAILFISHOS)

core/include/JellyfinQt/DTO/dto.h

@@ -0,0 +1,167 @@
+/*
+Sailfin: a Jellyfin client written using Qt
+Copyright (C) 2021 Chris Josten
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef JELLYFIN_DTO_DTO
+#define JELLYFIN_DTO_DTO
+
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QMetaObject>
+#include <QMetaProperty>
+#include <QNetworkReply>
+#include <QObject>
+#include <QRegularExpression>
+#include <QString>
+#include <QVariant>
+
+#include "../apiclient.h"
+#include "../jsonhelper.h"
+
+namespace Jellyfin {
+namespace DTO {
+/**
+ * @brief Base class for a serializable object.
+ *
+ * This class will be (de)serialized based on its properties.
+ * Note: it must have a constructor without arguments marked with Q_INVOKABLE
+ */
+class JsonSerializable : public QObject {
+    Q_OBJECT
+public:
+    Q_INVOKABLE JsonSerializable(QObject *parent);
+
+    /**
+     * @brief Sets this objects properties based on obj.
+     * @param obj The data to load into this object.
+     */
+    void deserialize(const QJsonObject &obj);
+    QJsonObject serialize(bool capitalize = true) const;
+private:
+    QVariant jsonToVariant(QMetaProperty prop, const QJsonValue &val, const QJsonObject &root);
+    QJsonValue variantToJson(const QVariant var) const;
+    QVariant deserializeQobject(const QJsonObject &obj, const QMetaProperty &prop);
+
+    /**
+     * @brief Sets the first letter of the string to lower case (to make it camelCase).
+     * @param str The string to modify
+     * @return THe modified string
+     */
+    static QString fromPascalCase(QString str);
+    /**
+     * @brief Sets the first letter of the string to uper case (to make it PascalCase).
+     * @param str The string to modify
+     * @return THe modified string
+     */
+    static QString toPascalCase(QString st);
+
+    static const QRegularExpression m_listExpression;
+    /**
+     * @brief Qt is doing weird. I'll keep track of the metatypes myself.
+     */
+    QHash<QString, const QMetaType *> m_nameMetatypeMap;
+};
+
+
+/**
+ * @brief An "interface" for a remote data source
+ *
+ * This class is basically a base class for JSON data that can be fetched from over the network.
+ * Subclasses should reimplement reload and call setStatus to update the QML part of the code
+ * appropiatly.
+ */
+class RemoteData : public JsonSerializable {
+    Q_OBJECT
+public:
+    enum Status {
+        /// The data is unitialized and not loading either.
+        Uninitialised,
+        /// The data is being loaded over the network
+        Loading,
+        /// The data is ready, the properties in this object are up to date.
+        Ready,
+        /// An error has occurred while loading the data. See error() for more details.
+        Error
+    };
+    Q_ENUM(Status)
+
+    explicit RemoteData(QObject *parent = nullptr);
+
+    Q_PROPERTY(ApiClient *apiClient MEMBER m_apiClient WRITE setApiClient NOTIFY apiClientChanged STORED false)
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged STORED false)
+    Q_PROPERTY(QNetworkReply::NetworkError error READ error NOTIFY errorChanged STORED false)
+    Q_PROPERTY(QString errorString READ errorString NOTIFY errorStringChanged STORED false)
+
+    Status status() const { return m_status; }
+    QNetworkReply::NetworkError error() const { return m_error; }
+    QString errorString() const { return m_errorString; }
+
+    void setApiClient(ApiClient *newApiClient);
+signals:
+    void statusChanged(Status newStatus);
+    void apiClientChanged(ApiClient *newApiClient);
+    void errorChanged(QNetworkReply::NetworkError newError);
+    void errorStringChanged(QString newErrorString);
+    /**
+     * @brief Convenience signal for status == RemoteData.Ready.
+     */
+    void ready();
+public slots:
+
+    /**
+     * @brief Overload this method to reimplement the fetching mechanism to
+     * populate the RemoteData with data from the server.
+     *
+     * The default implementation makes a GET request to getDataUrl() and parses the resulting JSON,
+     * which should be enough for most cases. Consider overriding getDataUrl() and
+     * canRelaod() if possible. Manual overrides need to make sure that
+     * they're calling setStatus(Status), setError(QNetworkReply::NetworkError) and
+     * setErrorString() to let the QML side know what this thing is up to.
+     */
+    virtual void reload();
+protected:
+    /**
+     * @brief Subclasses should implement this to determine if they can
+     * load data from the server.
+     *
+     * Usage cases include checking if the
+     * required properties, such as the item id are set.
+     */
+    virtual bool canReload() const = 0;
+
+    /**
+     * @brief Construct the URL to fetch the data from.
+     * @return The URL to load data from.
+     */
+    virtual QString getDataUrl() const = 0;
+
+    void setStatus(Status newStatus);
+    void setError(QNetworkReply::NetworkError error);
+    void setErrorString(const QString &newErrorString);
+    ApiClient *m_apiClient = nullptr;
+private:
+    Status m_status = Uninitialised;
+    QNetworkReply::NetworkError m_error = QNetworkReply::NoError;
+    QString m_errorString;
+};
+
+} // NS DTO
+} // NS Jellyfin
+
+#endif // JELLYFIN_DTO_DTO_H

core/include/JellyfinQt/DTO/item.h

@@ -1,6 +1,6 @@
 /*
 Sailfin: a Jellyfin client written using Qt
-Copyright (C) 2020 Chris Josten
+Copyright (C) 2021 Chris Josten
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -25,278 +25,23 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <QJsonObject>
 #include <QJsonValue>
 
-#include <QDebug>
-#include <QMetaObject>
-#include <QMetaProperty>
 #include <QDateTime>
+#include <QDebug>
+#include <QList>
 #include <QObject>
-#include <QRegularExpression>
-#include <QtQml>
-
-#include <QNetworkReply>
 
 #include <optional>
 
 #include <cmath>
 
-#include "jellyfinapiclient.h"
+#include "dto.h"
-#include "jsonhelper.h"
+#include "mediastream.h"
+#include "namedguidpair.h"
+#include "userdata.h"
 
 namespace Jellyfin {
 class ApiClient;
-/**
+namespace DTO {
- * @brief Base class for a serializable object.
- *
- * This class will be (de)serialized based on its properties.
- * Note: it must have a constructor without arguments marked with Q_INVOKABLE
- */
-class JsonSerializable : public QObject {
-    Q_OBJECT
-public:
-    Q_INVOKABLE JsonSerializable(QObject *parent);
-
-    /**
-     * @brief Sets this objects properties based on obj.
-     * @param obj The data to load into this object.
-     */
-    void deserialize(const QJsonObject &obj);
-    QJsonObject serialize(bool capitalize = true) const;
-private:
-    QVariant jsonToVariant(QMetaProperty prop, const QJsonValue &val, const QJsonObject &root);
-    QJsonValue variantToJson(const QVariant var) const;
-    QVariant deserializeQobject(const QJsonObject &obj, const QMetaProperty &prop);
-
-    /**
-     * @brief Sets the first letter of the string to lower case (to make it camelCase).
-     * @param str The string to modify
-     * @return THe modified string
-     */
-    static QString fromPascalCase(QString str);
-    /**
-     * @brief Sets the first letter of the string to uper case (to make it PascalCase).
-     * @param str The string to modify
-     * @return THe modified string
-     */
-    static QString toPascalCase(QString st);
-
-    static const QRegularExpression m_listExpression;
-    /**
-     * @brief Qt is doing weird. I'll keep track of the metatypes myself.
-     */
-    QHash<QString, const QMetaType *> m_nameMetatypeMap;
-};
-
-
-/**
- * @brief An "interface" for a remote data source
- *
- * This class is basically a base class for JSON data that can be fetched from over the network.
- * Subclasses should reimplement reload and call setStatus to update the QML part of the code
- * appropiatly.
- */
-class RemoteData : public JsonSerializable {
-    Q_OBJECT
-public:
-    enum Status {
-        /// The data is unitialized and not loading either.
-        Uninitialised,
-        /// The data is being loaded over the network
-        Loading,
-        /// The data is ready, the properties in this object are up to date.
-        Ready,
-        /// An error has occurred while loading the data. See error() for more details.
-        Error
-    };
-    Q_ENUM(Status)
-
-    explicit RemoteData(QObject *parent = nullptr);
-
-    Q_PROPERTY(ApiClient *apiClient MEMBER m_apiClient WRITE setApiClient NOTIFY apiClientChanged STORED false)
-    Q_PROPERTY(Status status READ status NOTIFY statusChanged STORED false)
-    Q_PROPERTY(QNetworkReply::NetworkError error READ error NOTIFY errorChanged STORED false)
-    Q_PROPERTY(QString errorString READ errorString NOTIFY errorStringChanged STORED false)
-
-    Status status() const { return m_status; }
-    QNetworkReply::NetworkError error() const { return m_error; }
-    QString errorString() const { return m_errorString; }
-
-    void setApiClient(ApiClient *newApiClient);
-signals:
-    void statusChanged(Status newStatus);
-    void apiClientChanged(ApiClient *newApiClient);
-    void errorChanged(QNetworkReply::NetworkError newError);
-    void errorStringChanged(QString newErrorString);
-    /**
-     * @brief Convenience signal for status == RemoteData.Ready.
-     */
-    void ready();
-public slots:
-
-    /**
-     * @brief Overload this method to reimplement the fetching mechanism to
-     * populate the RemoteData with data from the server.
-     *
-     * The default implementation makes a GET request to getDataUrl() and parses the resulting JSON,
-     * which should be enough for most cases. Consider overriding getDataUrl() and
-     * canRelaod() if possible. Manual overrides need to make sure that
-     * they're calling setStatus(Status), setError(QNetworkReply::NetworkError) and
-     * setErrorString() to let the QML side know what this thing is up to.
-     */
-    virtual void reload();
-protected:
-    /**
-     * @brief Subclasses should implement this to determine if they can
-     * load data from the server.
-     *
-     * Usage cases include checking if the
-     * required properties, such as the item id are set.
-     */
-    virtual bool canReload() const = 0;
-
-    /**
-     * @brief Construct the URL to fetch the data from.
-     * @return The URL to load data from.
-     */
-    virtual QString getDataUrl() const = 0;
-
-    void setStatus(Status newStatus);
-    void setError(QNetworkReply::NetworkError error);
-    void setErrorString(const QString &newErrorString);
-    ApiClient *m_apiClient = nullptr;
-private:
-    Status m_status = Uninitialised;
-    QNetworkReply::NetworkError m_error = QNetworkReply::NoError;
-    QString m_errorString;
-};
-
-class NameGuidPair : public JsonSerializable {
-    Q_OBJECT
-public:
-    Q_INVOKABLE NameGuidPair(QObject *parent = nullptr);
-    Q_PROPERTY(QString name MEMBER m_name NOTIFY nameChanged)
-    // Once again the Jellyfin id workaround
-    Q_PROPERTY(QString jellyfinId MEMBER m_id NOTIFY jellyfinIdChanged)
-signals:
-    void nameChanged(const QString &newName);
-    void jellyfinIdChanged(const QString &newJellyfinId);
-private:
-    QString m_name;
-    QString m_id;
-};
-
-class User : public RemoteData {
-    Q_OBJECT
-public:
-    Q_INVOKABLE User(QObject *parent = nullptr);
-
-    Q_PROPERTY(QString userId MEMBER m_userId WRITE setUserId NOTIFY userIdChanged)
-    Q_PROPERTY(QString name MEMBER m_name NOTIFY nameChanged)
-    Q_PROPERTY(QString primaryImageTag MEMBER m_primaryImageTag NOTIFY primaryImageTagChanged)
-
-    void setUserId(const QString &newUserId) {
-        this->m_userId = newUserId;
-        emit userIdChanged(newUserId);
-        reload();
-    }
-signals:
-    void userIdChanged(const QString &newUserId);
-    void nameChanged(const QString &newName);
-    void primaryImageTagChanged(const QString &newPrimaryImageTag);
-protected:
-    QString getDataUrl() const override;
-    bool canReload() const override;
-private:
-    QString m_userId;
-    QString m_name;
-    QString m_primaryImageTag;
-};
-
-class MediaStream : public JsonSerializable {
-    Q_OBJECT
-public:
-    Q_INVOKABLE explicit MediaStream(QObject *parent = nullptr);
-    MediaStream(const MediaStream &other);
-    bool operator==(const MediaStream &other);
-    virtual ~MediaStream() { qDebug() << "MediaStream destroyed"; }
-
-    enum MediaStreamType {
-        Undefined,
-        Audio,
-        Video,
-        Subtitle,
-        EmbeddedImage
-    };
-    Q_ENUM(MediaStreamType)
-
-    Q_PROPERTY(QString codec MEMBER m_codec NOTIFY codecChanged)
-    Q_PROPERTY(QString codecTag MEMBER m_codecTag NOTIFY codecTagChanged)
-    Q_PROPERTY(QString language MEMBER m_language NOTIFY languageChanged)
-    Q_PROPERTY(QString displayTitle MEMBER m_displayTitle NOTIFY displayTitleChanged)
-    Q_PROPERTY(MediaStreamType type MEMBER m_type NOTIFY typeChanged)
-    Q_PROPERTY(int index MEMBER m_index NOTIFY indexChanged)
-signals:
-    void codecChanged(const QString &newCodec);
-    void codecTagChanged(const QString &newCodecTag);
-    void languageChanged(const QString &newLanguage);
-    void displayTitleChanged(const QString &newDisplayTitle);
-    void typeChanged(MediaStreamType newType);
-    void indexChanged(int newIndex);
-private:
-    QString m_codec;
-    QString m_codecTag;
-    QString m_language;
-    QString m_displayTitle;
-    MediaStreamType m_type = Undefined;
-    int m_index = -1;
-};
-
-class UserData : public JsonSerializable {
-    Q_OBJECT
-public:
-    Q_INVOKABLE explicit UserData(QObject *parent = nullptr);
-
-    Q_PROPERTY(double playedPercentage READ playedPercentage WRITE setPlayedPercentage RESET resetPlayedPercentage NOTIFY playedPercentageChanged)
-    Q_PROPERTY(qint64 playbackPositionTicks READ playbackPositionTicks WRITE setPlaybackPositionTicks NOTIFY playbackPositionTicksChanged)
-    Q_PROPERTY(bool isFavorite READ isFavorite WRITE setIsFavorite NOTIFY isFavoriteChanged)
-    Q_PROPERTY(bool likes READ likes WRITE setLikes RESET resetLikes NOTIFY likesChanged)
-    Q_PROPERTY(bool played READ played WRITE setPlayed NOTIFY playedChanged)
-    Q_PROPERTY(QString itemId READ itemId MEMBER m_itemId);
-
-    double playedPercentage() const { return m_playedPercentage.value_or(0.0); }
-    void setPlayedPercentage(double newPlayedPercentage) { m_playedPercentage = newPlayedPercentage; emit playedPercentageChanged(newPlayedPercentage); }
-    void resetPlayedPercentage() { m_playedPercentage = std::nullopt; emit playedPercentageChanged(0.0); updateOnServer(); }
-
-    qint64 playbackPositionTicks() const { return m_playbackPositionTicks; }
-    void setPlaybackPositionTicks(qint64 newPlaybackPositionTicks) { m_playbackPositionTicks = newPlaybackPositionTicks; emit playbackPositionTicksChanged(newPlaybackPositionTicks); }
-
-    bool played() const { return m_played; }
-    void setPlayed(bool newPlayed) { m_played = newPlayed; emit playedChanged(newPlayed); updateOnServer(); }
-
-    bool likes() const { return m_likes.value_or(false); }
-    void setLikes(bool newLikes) { m_likes = newLikes; emit likesChanged(newLikes); }
-    void resetLikes() { m_likes = std::nullopt; emit likesChanged(false); updateOnServer(); }
-
-    bool isFavorite() const { return m_isFavorite; }
-    void setIsFavorite(bool newIsFavorite) { m_isFavorite = newIsFavorite; emit isFavoriteChanged(newIsFavorite); updateOnServer(); }
-
-    const QString &itemId() const { return m_itemId; }
-signals:
-    void playedPercentageChanged(double newPlayedPercentage);
-    void playbackPositionTicksChanged(qint64 playbackPositionTicks);
-    void isFavoriteChanged(bool newIsFavorite);
-    void likesChanged(bool newLikes);
-    void playedChanged(bool newPlayed);
-public slots:
-    void updateOnServer();
-    void onUpdated(QSharedPointer<UserData> other);
-private:
-    std::optional<double> m_playedPercentage =  std::nullopt;
-    qint64 m_playbackPositionTicks = 0;
-    bool m_isFavorite = false;
-    std::optional<bool> m_likes = std::nullopt;
-    bool m_played;
-    QString m_itemId;
-};
 
 class Item : public RemoteData {
     Q_OBJECT
@@ -527,24 +272,9 @@ protected:
     QString m_mediaType;
     int m_width;
     int m_height;
-
-    template<typename T>
-    QQmlListProperty<T> toReadOnlyQmlListProperty(QList<T *> &list) {
-        return QQmlListProperty<T>(this, std::addressof(list), &qlist_count, &qlist_at);
-    }
-
-    template<typename T>
-    static int qlist_count(QQmlListProperty<T> *p) {
-        return reinterpret_cast<QList<T *> *>(p->data)->count();
-    }
-
-    template<typename T>
-    static T *qlist_at(QQmlListProperty<T> *p, int idx) {
-        return reinterpret_cast<QList<T *> *>(p->data)->at(idx);
-    }
 };
 
-void registerSerializableJsonTypes(const char* URI);
+} // NS DTO
-}
+} // NS Jellyfin
 
 #endif // JELLYFIN_ITEM_H

core/include/JellyfinQt/DTO/mediastream.h

@@ -0,0 +1,74 @@
+/*
+Sailfin: a Jellyfin client written using Qt
+Copyright (C) 2021 Chris Josten
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef JELLYFIN_DTO_MEDIASTREAM_H
+#define JELLYFIN_DTO_MEDIASTREAM_H
+
+#include <QDebug>
+#include <QObject>
+#include <QString>
+
+#include "dto.h"
+
+namespace Jellyfin {
+namespace DTO {
+
+class MediaStream : public JsonSerializable {
+    Q_OBJECT
+public:
+    Q_INVOKABLE explicit MediaStream(QObject *parent = nullptr);
+    MediaStream(const MediaStream &other);
+    bool operator==(const MediaStream &other);
+    virtual ~MediaStream() { qDebug() << "MediaStream destroyed"; }
+
+    enum MediaStreamType {
+        Undefined,
+        Audio,
+        Video,
+        Subtitle,
+        EmbeddedImage
+    };
+    Q_ENUM(MediaStreamType)
+
+    Q_PROPERTY(QString codec MEMBER m_codec NOTIFY codecChanged)
+    Q_PROPERTY(QString codecTag MEMBER m_codecTag NOTIFY codecTagChanged)
+    Q_PROPERTY(QString language MEMBER m_language NOTIFY languageChanged)
+    Q_PROPERTY(QString displayTitle MEMBER m_displayTitle NOTIFY displayTitleChanged)
+    Q_PROPERTY(MediaStreamType type MEMBER m_type NOTIFY typeChanged)
+    Q_PROPERTY(int index MEMBER m_index NOTIFY indexChanged)
+signals:
+    void codecChanged(const QString &newCodec);
+    void codecTagChanged(const QString &newCodecTag);
+    void languageChanged(const QString &newLanguage);
+    void displayTitleChanged(const QString &newDisplayTitle);
+    void typeChanged(MediaStreamType newType);
+    void indexChanged(int newIndex);
+private:
+    QString m_codec;
+    QString m_codecTag;
+    QString m_language;
+    QString m_displayTitle;
+    MediaStreamType m_type = Undefined;
+    int m_index = -1;
+};
+
+}
+}
+
+#endif // JELLYFIN_DTO_MEDIASTREAM_H

core/include/JellyfinQt/DTO/namedguidpair.h

@@ -0,0 +1,50 @@
+ 
+/*
+Sailfin: a Jellyfin client written using Qt
+Copyright (C) 2021 Chris Josten
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef JELLYFIN_DTO_NAMEDGUIDPAIR_H
+#define JELLYFIN_DTO_NAMEDGUIDPAIR_H
+
+#include <QObject>
+#include <QString>
+
+#include "dto.h"
+
+namespace Jellyfin {
+namespace DTO {
+
+class NameGuidPair : public JsonSerializable {
+    Q_OBJECT
+public:
+    Q_INVOKABLE NameGuidPair(QObject *parent = nullptr);
+    Q_PROPERTY(QString name MEMBER m_name NOTIFY nameChanged)
+    // Once again the Jellyfin id workaround
+    Q_PROPERTY(QString jellyfinId MEMBER m_id NOTIFY jellyfinIdChanged)
+signals:
+    void nameChanged(const QString &newName);
+    void jellyfinIdChanged(const QString &newJellyfinId);
+private:
+    QString m_name;
+    QString m_id;
+};
+
+} // NS DTO
+} // NS JELLYFIN
+
+#endif // JELLYFIN_DTO_NAMEDGUIDPAIR_H

core/include/JellyfinQt/DTO/types.h

@@ -0,0 +1,41 @@
+/*
+Sailfin: a Jellyfin client written using Qt
+Copyright (C) 2021 Chris Josten
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#ifndef JELLYFIN_DTO_TYPES_H
+#define JELLYFIN_DTO_TYPES_H
+
+#include "dto.h"
+#include "item.h"
+#include "mediastream.h"
+#include "namedguidpair.h"
+#include "user.h"
+#include "userdata.h"
+
+namespace Jellyfin {
+namespace DTO {
+
+/**
+ * @brief registerTypes Registers all DTO types to the QML type system
+ * @param uri The uri to register the items under.
+ */
+void registerTypes(const char *uri);
+
+} // NS DTO
+} // NS Jellyfin
+
+#endif // JELLYFIN_DTO_TYPES_H

core/include/JellyfinQt/DTO/user.h

@@ -0,0 +1,61 @@
+/*
+Sailfin: a Jellyfin client written using Qt
+Copyright (C) 2021 Chris Josten
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef JELLYFIN_DTO_USER_H
+#define JELLYFIN_DTO_USER_H
+
+#include <QObject>
+#include <QString>
+
+#include "dto.h"
+
+namespace Jellyfin {
+namespace DTO {
+
+class User : public RemoteData {
+    Q_OBJECT
+public:
+    Q_INVOKABLE User(QObject *parent = nullptr);
+
+    Q_PROPERTY(QString userId MEMBER m_userId WRITE setUserId NOTIFY userIdChanged)
+    Q_PROPERTY(QString name MEMBER m_name NOTIFY nameChanged)
+    Q_PROPERTY(QString primaryImageTag MEMBER m_primaryImageTag NOTIFY primaryImageTagChanged)
+
+    void setUserId(const QString &newUserId) {
+        this->m_userId = newUserId;
+        emit userIdChanged(newUserId);
+        reload();
+    }
+signals:
+    void userIdChanged(const QString &newUserId);
+    void nameChanged(const QString &newName);
+    void primaryImageTagChanged(const QString &newPrimaryImageTag);
+protected:
+    QString getDataUrl() const override;
+    bool canReload() const override;
+private:
+    QString m_userId;
+    QString m_name;
+    QString m_primaryImageTag;
+};
+
+} // NS DTO
+} // NS Jellyfin
+
+#endif // JELLYFIN_DTO_USER

core/include/JellyfinQt/DTO/userdata.h

@@ -0,0 +1,83 @@
+/*
+Sailfin: a Jellyfin client written using Qt
+Copyright (C) 2021 Chris Josten
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef JELLYFIN_DTO_USERDATA
+#define JELLYFIN_DTO_USERDATA
+
+#include <QObject>
+#include <QSharedPointer>
+#include <QString>
+
+#include "dto.h"
+
+namespace Jellyfin {
+namespace DTO {
+
+class UserData : public JsonSerializable {
+    Q_OBJECT
+public:
+    Q_INVOKABLE explicit UserData(QObject *parent = nullptr);
+
+    Q_PROPERTY(double playedPercentage READ playedPercentage WRITE setPlayedPercentage RESET resetPlayedPercentage NOTIFY playedPercentageChanged)
+    Q_PROPERTY(qint64 playbackPositionTicks READ playbackPositionTicks WRITE setPlaybackPositionTicks NOTIFY playbackPositionTicksChanged)
+    Q_PROPERTY(bool isFavorite READ isFavorite WRITE setIsFavorite NOTIFY isFavoriteChanged)
+    Q_PROPERTY(bool likes READ likes WRITE setLikes RESET resetLikes NOTIFY likesChanged)
+    Q_PROPERTY(bool played READ played WRITE setPlayed NOTIFY playedChanged)
+    Q_PROPERTY(QString itemId READ itemId MEMBER m_itemId)
+
+    double playedPercentage() const { return m_playedPercentage.value_or(0.0); }
+    void setPlayedPercentage(double newPlayedPercentage) { m_playedPercentage = newPlayedPercentage; emit playedPercentageChanged(newPlayedPercentage); }
+    void resetPlayedPercentage() { m_playedPercentage = std::nullopt; emit playedPercentageChanged(0.0); updateOnServer(); }
+
+    qint64 playbackPositionTicks() const { return m_playbackPositionTicks; }
+    void setPlaybackPositionTicks(qint64 newPlaybackPositionTicks) { m_playbackPositionTicks = newPlaybackPositionTicks; emit playbackPositionTicksChanged(newPlaybackPositionTicks); }
+
+    bool played() const { return m_played; }
+    void setPlayed(bool newPlayed) { m_played = newPlayed; emit playedChanged(newPlayed); updateOnServer(); }
+
+    bool likes() const { return m_likes.value_or(false); }
+    void setLikes(bool newLikes) { m_likes = newLikes; emit likesChanged(newLikes); }
+    void resetLikes() { m_likes = std::nullopt; emit likesChanged(false); updateOnServer(); }
+
+    bool isFavorite() const { return m_isFavorite; }
+    void setIsFavorite(bool newIsFavorite) { m_isFavorite = newIsFavorite; emit isFavoriteChanged(newIsFavorite); updateOnServer(); }
+
+    const QString &itemId() const { return m_itemId; }
+signals:
+    void playedPercentageChanged(double newPlayedPercentage);
+    void playbackPositionTicksChanged(qint64 playbackPositionTicks);
+    void isFavoriteChanged(bool newIsFavorite);
+    void likesChanged(bool newLikes);
+    void playedChanged(bool newPlayed);
+public slots:
+    void updateOnServer();
+    void onUpdated(QSharedPointer<UserData> other);
+private:
+    std::optional<double> m_playedPercentage =  std::nullopt;
+    qint64 m_playbackPositionTicks = 0;
+    bool m_isFavorite = false;
+    std::optional<bool> m_likes = std::nullopt;
+    bool m_played;
+    QString m_itemId;
+};
+
+}
+}
+
+#endif // JELLYFIN_DTO_USERDATA

core/include/JellyfinQt/apiclient.h

@@ -1,6 +1,6 @@
 /*
 Sailfin: a Jellyfin client written using Qt
-Copyright (C) 2020 Chris Josten
+Copyright (C) 2021 Chris Josten
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -37,15 +37,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <QUrlQuery>
 
 #include "credentialmanager.h"
-#include "jellyfindeviceprofile.h"
+#include "deviceprofile.h"
-#include "jellyfinitem.h"
+#include "websocket.h"
-#include "jellyfinplaybackmanager.h"
-#include "jellyfinwebsocket.h"
 
 namespace Jellyfin {
 class MediaSource;
 class WebSocket;
 class PlaybackManager;
+
+namespace DTO {
+    class UserData; // Keep it as an opaque pointer
+}
+
+using namespace DTO;
+
 /**
  * @brief An Api client for Jellyfin. Handles requests and authentication.
  *

core/include/JellyfinQt/apimodel.h

@@ -1,6 +1,6 @@
 /*
 Sailfin: a Jellyfin client written using Qt
-Copyright (C) 2020 Chris Josten
+Copyright (C) 2021 Chris Josten
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -29,10 +29,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <QtQml>
 #include <QVariant>
 
-#include "jellyfinapiclient.h"
+#include "apiclient.h"
 #include "jsonhelper.h"
 
 namespace Jellyfin {
+
+namespace DTO {
+    class JsonSerializable;
+}
 class SortOptions : public QObject{
     Q_OBJECT
 public:
@@ -267,7 +271,7 @@ class ItemModel : public ApiModel {
 public:
     explicit ItemModel (QString path, bool responseHasRecords, bool replaceUser, QObject *parent = nullptr);
 public slots:
-    void onUserDataChanged(const QString &itemId, QSharedPointer<UserData> userData);
+    void onUserDataChanged(const QString &itemId, QSharedPointer<DTO::UserData> userData);
 };
 
 class UserViewModel : public ApiModel {

core/include/JellyfinQt/credentialmanager.h

@@ -1,6 +1,6 @@
 /*
 Sailfin: a Jellyfin client written using Qt
-Copyright (C) 2020 Chris Josten
+Copyright (C) 2021 Chris Josten
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

core/include/JellyfinQt/deviceprofile.h

@@ -1,6 +1,6 @@
 /*
 Sailfin: a Jellyfin client written using Qt
-Copyright (C) 2020 Chris Josten
+Copyright (C) 2021 Chris Josten
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

core/include/JellyfinQt/jellyfin.h

@@ -1,13 +1,38 @@
+/*
+Sailfin: a Jellyfin client written using Qt
+Copyright (C) 2021 Chris Josten
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 #ifndef JELLYFIN_H
 #define JELLYFIN_H
 
 #include <QtQml>
 
-#include "JellyfinQt/jellyfinapiclient.h"
+#include "DTO/dto.h"
-#include "JellyfinQt/jellyfinapimodel.h"
+#include "DTO/item.h"
-#include "JellyfinQt/jellyfinitem.h"
+#include "DTO/mediastream.h"
-#include "JellyfinQt/serverdiscoverymodel.h"
+#include "DTO/namedguidpair.h"
-#include "JellyfinQt/jellyfinplaybackmanager.h"
+#include "DTO/types.h"
+#include "DTO/user.h"
+#include "DTO/userdata.h"
+
+#include "apiclient.h"
+#include "apimodel.h"
+#include "serverdiscoverymodel.h"
+#include "playbackmanager.h"
 
 namespace Jellyfin {
 void registerTypes(const char *uri = "nl.netsoj.chris.Jellyfin");

core/include/JellyfinQt/jsonhelper.h

@@ -1,3 +1,21 @@
+/*
+Sailfin: a Jellyfin client written using Qt
+Copyright (C) 2021 Chris Josten
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 #ifndef JSON_SERIALIZER_H
 #define JSON_SERIALIZER_H
 

core/include/JellyfinQt/playbackmanager.h

@@ -1,6 +1,6 @@
 /*
 Sailfin: a Jellyfin client written using Qt
-Copyright (C) 2020 Chris Josten
+Copyright (C) 2021 Chris Josten
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -30,16 +30,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <QtMultimedia/QMediaPlayer>
 
+#include "JellyfinQt/DTO/item.h"
 
-#include "jellyfinapiclient.h"
+#include "apiclient.h"
-#include "jellyfinitem.h"
 
 namespace Jellyfin {
 
-// Forward declaration of Jellyfin::Item found in jellyfinitem.h
-class Item;
 // Forward declaration of Jellyfin::ApiClient found in jellyfinapiclient.h
 class ApiClient;
+using namespace DTO;
 
 /**
  * @brief The PlaybackManager class manages the playback of Jellyfin items. It fetches streams based on Jellyfin items, posts
@@ -95,6 +94,16 @@ public slots:
      * @param itemId The id of the item to play.
      */
     void playItem(const QString &itemId);
+
+    /**
+     * @brief previous Play the previous track in the current playlist.
+     */
+    void previous();
+
+    /**
+     * @brief next Play the next track in the current playlist.
+     */
+    void next();
 private slots:
     void mediaPlayerStateChanged(QMediaPlayer::State newState);
     void mediaPlayerPositionChanged(qint64 position);

core/include/JellyfinQt/serverdiscoverymodel.h

@@ -1,6 +1,6 @@
 /*
 Sailfin: a Jellyfin client written using Qt
-Copyright (C) 2020 Chris Josten
+Copyright (C) 2021 Chris Josten
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

core/include/JellyfinQt/websocket.h

@@ -1,6 +1,6 @@
 /*
 Sailfin: a Jellyfin client written using Qt
-Copyright (C) 2020 Chris Josten
+Copyright (C) 2021 Chris Josten
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -31,12 +31,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <QtWebSockets/QWebSocket>
 
-#include "jellyfinapiclient.h"
+#include "apiclient.h"
-#include "jellyfinitem.h"
 
 namespace Jellyfin {
 class ApiClient;
+
+namespace DTO {
 class UserData;
+}
 /**
  * @brief Keeps a connection with the Jellyfin server to receive real time updates.
  *

core/src/DTO/dto.cpp

@@ -1,6 +1,6 @@
 /*
 Sailfin: a Jellyfin client written using Qt
-Copyright (C) 2020 Chris Josten
+Copyright (C) 2021 Chris Josten
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -17,12 +17,15 @@ License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "JellyfinQt/jellyfinitem.h"
+#include "JellyfinQt/DTO/dto.h"
+
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
+namespace DTO {
+
 const QRegularExpression JsonSerializable::m_listExpression = QRegularExpression("^QList<\\s*([a-zA-Z0-9]*)\\s*\\*?\\s*>$");
-JsonSerializable::JsonSerializable(QObject *parent) : QObject(parent) {
+JsonSerializable::JsonSerializable(QObject *parent) : QObject(parent) { }
-}
 
 void JsonSerializable::deserialize(const QJsonObject &jObj) {
     const QMetaObject *obj = this->metaObject();
@@ -107,7 +110,7 @@ QVariant JsonSerializable::deserializeQobject(const QJsonObject &innerObj, const
             if (match.hasMatch()) {
                 // It is a qList! Now extract the inner type
                 // There should be an easier way, shouldn't there?
-                QString listType = match.captured(1).prepend("Jellyfin::").append("*");
+                QString listType = match.captured(1).prepend("Jellyfin::DTO::").append("*");
                 // UGLY CODE HERE WE COME
                 typeNo = QMetaType::type(listType.toUtf8());
                 if (typeNo == QMetaType::UnknownType) {
@@ -254,116 +257,5 @@ void RemoteData::reload() {
     });
 }
 
-NameGuidPair::NameGuidPair(QObject *parent) : JsonSerializable (parent) {}
+} // NS DTO
-
+} // NS Jellyfin
-// User
-User::User(QObject *parent) : RemoteData (parent) {}
-
-QString User::getDataUrl() const {
-    return QString("/Users/") + m_apiClient->userId();
-}
-
-bool User::canReload() const {
-    return true;
-}
-
-// MediaStream
-MediaStream::MediaStream(QObject *parent) : JsonSerializable (parent) {}
-MediaStream::MediaStream(const MediaStream &other)
-    : JsonSerializable (other.parent()),
-      m_codec(other.m_codec),
-      m_codecTag(other.m_codecTag),
-      m_language(other.m_language),
-      m_displayTitle(other.m_displayTitle),
-      m_type(other.m_type),
-      m_index(other.m_index){
-}
-bool MediaStream::operator==(const MediaStream &other) {
-    // displayTitle is explicitly left out, since it's generated based on other properties
-    // in the Jellyfin source code.
-    return m_codec == other.m_codec && m_codecTag == other.m_codecTag
-            && m_language == other.m_language && m_type == other.m_type
-            && m_index == other.m_index;
-}
-
-// UserData
-UserData::UserData(QObject *parent) : JsonSerializable (parent) {}
-
-void UserData::updateOnServer() {
-    //TODO: implement
-}
-
-void UserData::onUpdated(QSharedPointer<UserData> other) {
-    // The reason I'm not using setLikes and similar is that they don't work with std::nullopt,
-    // since QML does not like it.
-    // THe other reason is that the setLikes method will send a post request to the server, to update the contents
-    // we don't want that to happen, obviously, since the application could end in an infinite loop.
-    if (this->m_playedPercentage != other->m_playedPercentage) {
-        this->m_playedPercentage = other->m_playedPercentage;
-        emit playedPercentageChanged(playedPercentage());
-    }
-    if (m_playbackPositionTicks!= other->m_playbackPositionTicks) {
-        this->m_playbackPositionTicks = other->m_playbackPositionTicks;
-        emit playbackPositionTicksChanged(this->m_playbackPositionTicks);
-    }
-    if (m_isFavorite != other->m_isFavorite) {
-        this->m_isFavorite = other->m_isFavorite;
-        emit isFavoriteChanged(this->m_isFavorite);
-    }
-    if (this->m_likes != other->m_likes) {
-        this->m_likes = other->m_likes;
-        emit likesChanged(likes());
-    }
-    if (this->m_played != other->m_played) {
-        this->m_played = other->m_played;
-        emit playedChanged(this->m_played);
-    }
-}
-
-// Item
-
-Item::Item(QObject *parent) : RemoteData(parent) {
-    connect(this, &RemoteData::apiClientChanged, this, [this](ApiClient *newApiClient) {
-        connect(newApiClient, &ApiClient::userDataChanged, this, &Item::onUserDataChanged);
-    });
-}
-
-Item::Item(QString id, ApiClient *apiClient, QObject *parent)
-    : RemoteData(parent), m_id(id) {
-    connect(this, &RemoteData::apiClientChanged, this, [this](ApiClient *newApiClient) {
-        connect(newApiClient, &ApiClient::userDataChanged, this, &Item::onUserDataChanged);
-    });
-    setApiClient(apiClient);
-}
-
-QString Item::getDataUrl() const {
-    return QString("/Users/") + m_apiClient->userId() + "/Items/" + m_id;
-}
-
-bool Item::canReload() const {
-    return !m_id.isNull();
-}
-
-void Item::setJellyfinId(QString newId) {
-    m_id = newId.trimmed();
-    if (m_id != newId) {
-        emit jellyfinIdChanged(m_id);
-        reload();
-    }
-}
-
-
-
-void Item::onUserDataChanged(const QString &itemId, QSharedPointer<UserData> userData) {
-    if (itemId != m_id || m_userData == nullptr) return;
-    m_userData->onUpdated(userData);
-}
-
-void registerSerializableJsonTypes(const char* URI) {
-    qmlRegisterType<MediaStream>(URI, 1, 0, "MediaStream");
-    qmlRegisterType<NameGuidPair>(URI, 1, 0, "NameGuidPair");
-    qmlRegisterType<User>(URI, 1, 0, "User");
-    qmlRegisterType<UserData>(URI, 1, 0, "UserData");
-    qmlRegisterType<Item>(URI, 1, 0, "JellyfinItem");
-}
-}

core/src/DTO/item.cpp

@@ -0,0 +1,63 @@
+/*
+Sailfin: a Jellyfin client written using Qt
+Copyright (C) 2021 Chris Josten
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "JellyfinQt/DTO/item.h"
+
+#include "JellyfinQt/apiclient.h"
+
+namespace Jellyfin {
+namespace DTO {
+
+Item::Item(QObject *parent) : RemoteData(parent) {
+    connect(this, &RemoteData::apiClientChanged, this, [this](ApiClient *newApiClient) {
+        connect(newApiClient, &ApiClient::userDataChanged, this, &Item::onUserDataChanged);
+    });
+}
+
+Item::Item(QString id, ApiClient *apiClient, QObject *parent)
+    : RemoteData(parent), m_id(id) {
+    connect(this, &RemoteData::apiClientChanged, this, [this](ApiClient *newApiClient) {
+        connect(newApiClient, &ApiClient::userDataChanged, this, &Item::onUserDataChanged);
+    });
+    setApiClient(apiClient);
+}
+
+QString Item::getDataUrl() const {
+    return QString("/Users/") + m_apiClient->userId() + "/Items/" + m_id;
+}
+
+bool Item::canReload() const {
+    return !m_id.isNull();
+}
+
+void Item::setJellyfinId(QString newId) {
+    m_id = newId.trimmed();
+    if (m_id != newId) {
+        emit jellyfinIdChanged(m_id);
+        reload();
+    }
+}
+
+void Item::onUserDataChanged(const QString &itemId, QSharedPointer<UserData> userData) {
+    if (itemId != m_id || m_userData == nullptr) return;
+    m_userData->onUpdated(userData);
+}
+
+} // NS DTO
+} // NS Jellyfin

core/src/DTO/mediastream.cpp

@@ -0,0 +1,43 @@
+/*
+Sailfin: a Jellyfin client written using Qt
+Copyright (C) 2021 Chris Josten
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#include "JellyfinQt/DTO/mediastream.h"
+
+namespace Jellyfin {
+namespace DTO {
+
+MediaStream::MediaStream(QObject *parent) : JsonSerializable (parent) {}
+MediaStream::MediaStream(const MediaStream &other)
+    : JsonSerializable (other.parent()),
+      m_codec(other.m_codec),
+      m_codecTag(other.m_codecTag),
+      m_language(other.m_language),
+      m_displayTitle(other.m_displayTitle),
+      m_type(other.m_type),
+      m_index(other.m_index){
+}
+bool MediaStream::operator==(const MediaStream &other) {
+    // displayTitle is explicitly left out, since it's generated based on other properties
+    // in the Jellyfin source code.
+    return m_codec == other.m_codec && m_codecTag == other.m_codecTag
+            && m_language == other.m_language && m_type == other.m_type
+            && m_index == other.m_index;
+}
+
+} // NS DTO
+} // NS Jellyfin

core/src/DTO/namedguidpair.cpp

@@ -0,0 +1,27 @@
+/*
+Sailfin: a Jellyfin client written using Qt
+Copyright (C) 2021 Chris Josten
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#include "JellyfinQt/DTO/namedguidpair.h"
+
+namespace Jellyfin {
+namespace DTO {
+
+NameGuidPair::NameGuidPair(QObject *parent) : JsonSerializable (parent) {}
+
+} // NS DTO
+} // NS Jellyfin

core/src/DTO/types.cpp

@@ -0,0 +1,36 @@
+/*
+Sailfin: a Jellyfin client written using Qt
+Copyright (C) 2021 Chris Josten
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "JellyfinQt/DTO/types.h"
+
+#include <QtQml>
+
+namespace Jellyfin {
+namespace DTO {
+
+void registerTypes(const char *uri) {
+    qmlRegisterType<MediaStream>(uri, 1, 0, "MediaStream");
+    qmlRegisterType<NameGuidPair>(uri, 1, 0, "NameGuidPair");
+    qmlRegisterType<User>(uri, 1, 0, "User");
+    qmlRegisterType<UserData>(uri, 1, 0, "UserData");
+    qmlRegisterType<Item>(uri, 1, 0, "JellyfinItem");
+}
+
+} // NS DTO
+} // NS Jellyfin

core/src/DTO/user.cpp

@@ -0,0 +1,36 @@
+/*
+Sailfin: a Jellyfin client written using Qt
+Copyright (C) 2021 Chris Josten
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#include "JellyfinQt/DTO/user.h"
+
+#include "JellyfinQt/apiclient.h"
+
+namespace Jellyfin {
+namespace DTO {
+User::User(QObject *parent) : RemoteData (parent) {}
+
+QString User::getDataUrl() const {
+    return QString("/Users/") + m_apiClient->userId();
+}
+
+bool User::canReload() const {
+    return true;
+}
+
+} // NS DTO
+} // NS Jellyfin

core/src/DTO/userdata.cpp

@@ -0,0 +1,58 @@
+/*
+Sailfin: a Jellyfin client written using Qt
+Copyright (C) 2021 Chris Josten
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#include "JellyfinQt/DTO/userdata.h"
+
+namespace Jellyfin {
+namespace DTO {
+
+UserData::UserData(QObject *parent) : JsonSerializable (parent) {}
+
+void UserData::updateOnServer() {
+    //TODO: implement
+}
+
+void UserData::onUpdated(QSharedPointer<UserData> other) {
+    // The reason I'm not using setLikes and similar is that they don't work with std::nullopt,
+    // since QML does not like it.
+    // THe other reason is that the setLikes method will send a post request to the server, to update the contents
+    // we don't want that to happen, obviously, since the application could end in an infinite loop.
+    if (this->m_playedPercentage != other->m_playedPercentage) {
+        this->m_playedPercentage = other->m_playedPercentage;
+        emit playedPercentageChanged(playedPercentage());
+    }
+    if (m_playbackPositionTicks!= other->m_playbackPositionTicks) {
+        this->m_playbackPositionTicks = other->m_playbackPositionTicks;
+        emit playbackPositionTicksChanged(this->m_playbackPositionTicks);
+    }
+    if (m_isFavorite != other->m_isFavorite) {
+        this->m_isFavorite = other->m_isFavorite;
+        emit isFavoriteChanged(this->m_isFavorite);
+    }
+    if (this->m_likes != other->m_likes) {
+        this->m_likes = other->m_likes;
+        emit likesChanged(likes());
+    }
+    if (this->m_played != other->m_played) {
+        this->m_played = other->m_played;
+        emit playedChanged(this->m_played);
+    }
+}
+
+} // NS DTO
+} // NS Jellyfin

core/src/apiclient.cpp

@@ -1,6 +1,6 @@
 /*
 Sailfin: a Jellyfin client written using Qt
-Copyright (C) 2020 Chris Josten
+Copyright (C) 2021 Chris Josten
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,7 @@ License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "JellyfinQt/jellyfinapiclient.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 
@@ -264,7 +264,7 @@ void ApiClient::defaultNetworkErrorHandler(QNetworkReply::NetworkError error) {
 }
 
 void ApiClient::onUserDataChanged(const QString &itemId, QSharedPointer<UserData> userData) {
-    userDataChanged(itemId, userData);
+    emit userDataChanged(itemId, userData);
 }
 
 void ApiClient::setAuthenticated(bool authenticated) {

core/src/apimodel.cpp

@@ -1,6 +1,6 @@
 /*
 Sailfin: a Jellyfin client written using Qt
-Copyright (C) 2020 Chris Josten
+Copyright (C) 2021 Chris Josten
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,9 @@ License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "JellyfinQt/jellyfinapimodel.h"
+#include "JellyfinQt/apimodel.h"
+
+#include "JellyfinQt/DTO/userdata.h"
 
 namespace Jellyfin {
 ApiModel::ApiModel(QString path, bool hasRecordResponse, bool addUserId, QObject *parent)
@@ -229,7 +231,7 @@ ItemModel::ItemModel(QString path, bool hasRecordFields, bool replaceUser, QObje
     });
 }
 
-void ItemModel::onUserDataChanged(const QString &itemId, QSharedPointer<UserData> userData) {
+void ItemModel::onUserDataChanged(const QString &itemId, QSharedPointer<DTO::UserData> userData) {
     int i = 0;
     for (QJsonValueRef val: m_array) {
         QJsonObject item = val.toObject();

core/src/credentialmanager.cpp

@@ -1,6 +1,6 @@
 /*
 Sailfin: a Jellyfin client written using Qt
-Copyright (C) 2020 Chris Josten
+Copyright (C) 2021 Chris Josten
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

core/src/deviceprofile.cpp

@@ -1,6 +1,6 @@
 /*
 Sailfin: a Jellyfin client written using Qt
-Copyright (C) 2020 Chris Josten
+Copyright (C) 2021 Chris Josten
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,7 @@ License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "JellyfinQt/jellyfindeviceprofile.h"
+#include "JellyfinQt/deviceprofile.h"
 
 namespace Jellyfin {
 

core/src/jellyfin.cpp

@@ -1,6 +1,6 @@
 /*
 Sailfin: a Jellyfin client written using Qt
-Copyright (C) 2020 Chris Josten
+Copyright (C) 2021 Chris Josten
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -31,6 +31,6 @@ void registerTypes(const char *uri) {
 
     // API models
     Jellyfin::registerModels(uri);
-    Jellyfin::registerSerializableJsonTypes(uri);
+    Jellyfin::DTO::registerTypes(uri);
 }
 }

core/src/jsonhelper.cpp

@@ -1,6 +1,6 @@
 /*
 Sailfin: a Jellyfin client written using Qt
-Copyright (C) 2020 Chris Josten
+Copyright (C) 2021 Chris Josten
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -19,7 +19,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include "JellyfinQt/jsonhelper.h"
 
 namespace Jellyfin {
-
 namespace JsonHelper {
 
 void convertToCamelCase(QJsonValueRef val) {

core/src/playbackmanager.cpp

@@ -1,6 +1,6 @@
 /*
 Sailfin: a Jellyfin client written using Qt
-Copyright (C) 2020 Chris Josten
+Copyright (C) 2021 Chris Josten
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,10 @@ License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "JellyfinQt/jellyfinplaybackmanager.h"
+#include "JellyfinQt/playbackmanager.h"
+
+#include "JellyfinQt/DTO/dto.h"
+#include "JellyfinQt/DTO/userdata.h"
 
 namespace Jellyfin {
 
@@ -213,6 +216,14 @@ void PlaybackManager::playItem(const QString &itemId) {
     setItem(newItem);
 }
 
+void PlaybackManager::next() {
+    Q_UNIMPLEMENTED();
+}
+
+void PlaybackManager::previous() {
+    Q_UNIMPLEMENTED();
+}
+
 void PlaybackManager::postPlaybackInfo(PlaybackInfoType type) {
     QJsonObject root;
 

core/src/serverdiscoverymodel.cpp

@@ -1,6 +1,6 @@
 /*
 Sailfin: a Jellyfin client written using Qt
-Copyright (C) 2020 Chris Josten
+Copyright (C) 2021 Chris Josten
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

core/src/websocket.cpp

@@ -1,6 +1,6 @@
 /*
 Sailfin: a Jellyfin client written using Qt
-Copyright (C) 2020 Chris Josten
+Copyright (C) 2021 Chris Josten
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -16,7 +16,10 @@ You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#include "JellyfinQt/jellyfinwebsocket.h"
+
+#include "JellyfinQt/websocket.h"
+
+#include "JellyfinQt/DTO/userdata.h"
 
 namespace Jellyfin {
 WebSocket::WebSocket(ApiClient *client)
@@ -102,7 +105,7 @@ void WebSocket::textMessageReceived(const QString &message) {
         }
         QJsonArray userDataList = data2["UserDataList"].toArray();
         for (QJsonValue val: userDataList) {
-            QSharedPointer<UserData> userData(new UserData, &QObject::deleteLater);
+            QSharedPointer<DTO::UserData> userData(new DTO::UserData, &QObject::deleteLater);
             userData->deserialize(val.toObject());
             m_apiClient->onUserDataChanged(userData->itemId(), userData);
         }