mirror of
https://github.com/HenkKalkwater/harbour-sailfin.git
synced 2025-09-04 01:42:44 +00:00
Fix a few bugs and unimplemented features
* Show the now playing cover when playing an item, otherwise show the collection cover. * ItemModelLoaders now correctly expose list properties of non-built-in Qt objects * toString is now implemented for lists, fixing some query construction code. * PlaybackManager now clears the playlist when playing a single item to prevent weird behaviour. * The covers are slightly updated.
This commit is contained in:
Henk Kalkwater
parent
60bc90c5fa
commit
caf72af999
19 changed files with 179 additions and 81 deletions
|
|
@ -22,6 +22,7 @@
|
|||
#include <QAbstractListModel>
|
||||
#include <QObject>
|
||||
#include <QScopedPointer>
|
||||
#include <QVariantList>
|
||||
|
||||
#include "../dto/baseitemdto.h"
|
||||
#include "../dto/baseitemdtoqueryresult.h"
|
||||
|
|
@ -45,6 +46,31 @@
|
|||
Q_SIGNALS: \
|
||||
void propName##Changed();
|
||||
|
||||
#define FWDLISTPROP(type, propName, propSetName) \
|
||||
public: \
|
||||
Q_PROPERTY(QVariantList propName READ propName WRITE set##propSetName NOTIFY propName##Changed) \
|
||||
QVariantList propName() const { \
|
||||
QVariantList result; \
|
||||
QList<type> list; \
|
||||
result.reserve(list.size()); \
|
||||
for (auto it = list.cbegin(); it != list.cend(); it++) { \
|
||||
result.append(QVariant::fromValue<type>(*it)); \
|
||||
} \
|
||||
return result; \
|
||||
} \
|
||||
void set##propSetName(const QVariantList &newValue) { \
|
||||
QList<type> list;\
|
||||
list.reserve(newValue.size()); \
|
||||
for(auto it = newValue.cbegin(); it != newValue.cend(); it++) { \
|
||||
list.append(it->value<type>()); \
|
||||
} \
|
||||
this->m_parameters.set##propSetName(list); \
|
||||
emit propName##Changed(); \
|
||||
autoReloadIfNeeded(); \
|
||||
} \
|
||||
Q_SIGNALS: \
|
||||
void propName##Changed();
|
||||
|
||||
namespace Jellyfin {
|
||||
|
||||
namespace ViewModel {
|
||||
|
|
@ -112,7 +138,7 @@ public:
|
|||
FWDPROP(QList<Jellyfin::DTO::ImageTypeClass::Value>, enableImageTypes, EnableImageTypes)
|
||||
FWDPROP(bool, enableImages, EnableImages)
|
||||
FWDPROP(bool, enableUserData, EnableUserData)
|
||||
FWDPROP(QList<Jellyfin::DTO::ItemFieldsClass::Value>, fields, Fields)
|
||||
FWDLISTPROP(Jellyfin::DTO::ItemFieldsClass::Value, fields, Fields)
|
||||
FWDPROP(bool, groupItems, GroupItems)
|
||||
FWDPROP(qint32, imageTypeLimit, ImageTypeLimit)
|
||||
FWDPROP(QStringList, includeItemTypes, IncludeItemTypes)
|
||||
|
|
@ -134,7 +160,7 @@ public:
|
|||
FWDPROP(QStringList, artists, Artists)
|
||||
FWDPROP(bool, collapseBoxSetItems, CollapseBoxSetItems)
|
||||
FWDPROP(QStringList, contributingArtistIds, ContributingArtistIds)
|
||||
FWDPROP(QList<Jellyfin::DTO::ImageTypeClass::Value>, enableImageTypes, EnableImageTypes);
|
||||
FWDLISTPROP(Jellyfin::DTO::ImageTypeClass::Value, enableImageTypes, EnableImageTypes);
|
||||
FWDPROP(bool, enableImages, EnableImages)
|
||||
FWDPROP(bool, enableTotalRecordCount, EnableTotalRecordCount)
|
||||
FWDPROP(bool, enableUserData, EnableUserData)
|
||||
|
|
@ -142,8 +168,8 @@ public:
|
|||
FWDPROP(QStringList, excludeItemIds, ExcludeItemIds)
|
||||
FWDPROP(QStringList, excludeItemTypes, ExcludeItemTypes)
|
||||
FWDPROP(QList<Jellyfin::DTO::LocationTypeClass::Value>, excludeLocationTypes, ExcludeLocationTypes)
|
||||
FWDPROP(QList<Jellyfin::DTO::ItemFieldsClass::Value>, fields, Fields)
|
||||
FWDPROP(QList<Jellyfin::DTO::ItemFilterClass::Value>, filters, Filters)
|
||||
FWDLISTPROP(Jellyfin::DTO::ItemFieldsClass::Value, fields, Fields)
|
||||
FWDLISTPROP(Jellyfin::DTO::ItemFilterClass::Value, filters, Filters)
|
||||
FWDPROP(QStringList, genreIds, GenreIds)
|
||||
FWDPROP(QStringList, genres, Genres)
|
||||
FWDPROP(bool, hasImdbId, HasImdbId)
|
||||
|
|
@ -159,7 +185,7 @@ public:
|
|||
FWDPROP(bool, hasTvdbId, HasTvdbId)
|
||||
FWDPROP(QStringList, ids, Ids)
|
||||
FWDPROP(qint32, imageTypeLimit, ImageTypeLimit)
|
||||
FWDPROP(QList<Jellyfin::DTO::ImageTypeClass::Value>, imageTypes, ImageTypes)
|
||||
FWDLISTPROP(Jellyfin::DTO::ImageTypeClass::Value, imageTypes, ImageTypes)
|
||||
FWDPROP(QStringList, includeItemTypes, IncludeItemTypes)
|
||||
FWDPROP(bool, is3D, Is3D)
|
||||
FWDPROP(bool, is4K, Is4K)
|
||||
|
|
@ -170,8 +196,7 @@ public:
|
|||
FWDPROP(bool, isPlaceHolder, IsPlaceHolder)
|
||||
FWDPROP(bool, isPlayed, IsPlayed)
|
||||
FWDPROP(bool, isUnaired, IsUnaired)
|
||||
FWDPROP(int, limit, Limit)
|
||||
FWDPROP(QList<Jellyfin::DTO::LocationTypeClass::Value>, locationTypes, LocationTypes)
|
||||
FWDLISTPROP(Jellyfin::DTO::LocationTypeClass::Value, locationTypes, LocationTypes)
|
||||
FWDPROP(qint32, maxHeight, MaxHeight)
|
||||
FWDPROP(QString, maxOfficialRating, MaxOfficialRating)
|
||||
FWDPROP(QDateTime, maxPremiereDate, MaxPremiereDate)
|
||||
|
|
@ -198,12 +223,12 @@ class ResumeItemsLoader : public ResumeItemsLoaderBase {
|
|||
public:
|
||||
explicit ResumeItemsLoader(QObject *parent = nullptr);
|
||||
|
||||
FWDPROP(QList<Jellyfin::DTO::ImageTypeClass::Value>, enableImageTypes, EnableImageTypes);
|
||||
FWDLISTPROP(Jellyfin::DTO::ImageTypeClass::Value, enableImageTypes, EnableImageTypes);
|
||||
FWDPROP(bool, enableImages, EnableImages)
|
||||
FWDPROP(bool, enableTotalRecordCount, EnableTotalRecordCount)
|
||||
FWDPROP(bool, enableUserData, EnableUserData)
|
||||
FWDPROP(QStringList, excludeItemTypes, ExcludeItemTypes)
|
||||
FWDPROP(QList<Jellyfin::DTO::ItemFieldsClass::Value>, fields, Fields)
|
||||
FWDLISTPROP(Jellyfin::DTO::ItemFieldsClass::Value, fields, Fields)
|
||||
FWDPROP(qint32, imageTypeLimit, ImageTypeLimit)
|
||||
FWDPROP(QStringList, includeItemTypes, IncludeItemTypes)
|
||||
FWDPROP(QStringList, mediaTypes, MediaTypes)
|
||||
|
|
@ -219,10 +244,10 @@ public:
|
|||
|
||||
FWDPROP(QString, seriesId, SeriesId)
|
||||
FWDPROP(QString, adjacentTo, AdjacentTo)
|
||||
FWDPROP(QList<Jellyfin::DTO::ImageTypeClass::Value>, enableImageTypes, EnableImageTypes)
|
||||
FWDLISTPROP(Jellyfin::DTO::ImageTypeClass::Value, enableImageTypes, EnableImageTypes)
|
||||
FWDPROP(bool, enableImages, EnableImages)
|
||||
FWDPROP(bool, enableUserData, EnableUserData)
|
||||
FWDPROP(QList<Jellyfin::DTO::ItemFieldsClass::Value>, fields, Fields)
|
||||
FWDLISTPROP(Jellyfin::DTO::ItemFieldsClass::Value, fields, Fields)
|
||||
FWDPROP(qint32, imageTypeLimit, ImageTypeLimit)
|
||||
FWDPROP(bool, isMissing, IsMissing)
|
||||
FWDPROP(bool, isSpecialSeason, IsSpecialSeason)
|
||||
|
|
@ -239,7 +264,7 @@ public:
|
|||
FWDPROP(QString, adjacentTo, AdjacentTo)
|
||||
FWDPROP(bool, enableImages, EnableImages)
|
||||
FWDPROP(bool, enableUserData, EnableUserData)
|
||||
FWDPROP(QList<Jellyfin::DTO::ItemFieldsClass::Value>, fields, Fields)
|
||||
FWDLISTPROP(Jellyfin::DTO::ItemFieldsClass::Value, fields, Fields)
|
||||
FWDPROP(qint32, imageTypeLimit, ImageTypeLimit)
|
||||
FWDPROP(bool, isMissing, IsMissing)
|
||||
FWDPROP(qint32, season, Season)
|
||||
|
|
@ -248,6 +273,23 @@ public:
|
|||
FWDPROP(QString, startItemId, StartItemId)
|
||||
};
|
||||
|
||||
using NextUpLoaderBase = AbstractUserParameterLoader<Model::Item, DTO::BaseItemDto, DTO::BaseItemDtoQueryResult, Jellyfin::Loader::GetNextUpParams>;
|
||||
class NextUpLoader : public NextUpLoaderBase {
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit NextUpLoader(QObject *parent = nullptr);
|
||||
|
||||
FWDPROP(bool, disableFirstEpisode, DisableFirstEpisode)
|
||||
FWDLISTPROP(Jellyfin::DTO::ImageTypeClass::Value, enableImageTypes, EnableImageTypes);
|
||||
FWDPROP(bool, enableImges, EnableImges)
|
||||
FWDPROP(bool, enableTotalRecordCount, EnableTotalRecordCount)
|
||||
FWDPROP(bool, enableUserData, EnableUserData)
|
||||
FWDLISTPROP(Jellyfin::DTO::ItemFieldsClass::Value, fields, Fields)
|
||||
FWDPROP(qint32, imageTypeLimit, ImageTypeLimit)
|
||||
FWDPROP(QString, parentId, ParentId)
|
||||
FWDPROP(QString, seriesId, SeriesId)
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* @brief Base class for each model that works with items.
|
||||
|
|
@ -278,6 +320,7 @@ public:
|
|||
runTimeTicks,
|
||||
artists,
|
||||
isFolder,
|
||||
overview,
|
||||
parentIndexNumber,
|
||||
userDataRating,
|
||||
userDataPlayedPercentage,
|
||||
|
|
@ -317,6 +360,7 @@ public:
|
|||
JFRN(runTimeTicks),
|
||||
JFRN(artists),
|
||||
JFRN(isFolder),
|
||||
JFRN(overview),
|
||||
JFRN(parentIndexNumber),
|
||||
JFRN(userDataRating),
|
||||
JFRN(userDataPlayedPercentage),
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ public:
|
|||
: QObject(parent), m_apiClient(apiClient) {}
|
||||
|
||||
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(Jellyfin::ViewModel::LoaderBase::Status status READ status NOTIFY statusChanged STORED false)
|
||||
Q_PROPERTY(QString errorString READ errorString NOTIFY errorStringChanged STORED false)
|
||||
Q_PROPERTY(bool autoReload MEMBER m_autoReload NOTIFY autoReloadChanged)
|
||||
Q_PROPERTY(QObject *data READ data NOTIFY dataChanged STORED false)
|
||||
|
|
@ -73,7 +73,7 @@ public:
|
|||
void setApiClient(ApiClient *newApiClient);
|
||||
void setExtraFields(const QStringList &extraFields);
|
||||
signals:
|
||||
void statusChanged(Status newStatus);
|
||||
void statusChanged(Jellyfin::ViewModel::LoaderBase::Status newStatus);
|
||||
void apiClientChanged(ApiClient *newApiClient);
|
||||
void errorStringChanged(QString newErrorString);
|
||||
void autoReloadChanged(bool newAutoReload);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue