Add UserLoader back + misc regression fixes

core/src/apimodel.cpp

@@ -141,6 +141,15 @@ bool setRequestStartIndex(Loader::GetLatestMediaParams &params, int offset) {
     return false;
 }
 
+template<>
+QList<DTO::UserDto> extractRecords(const QList<DTO::UserDto> &result) {
+    return result;
+}
+
+template<>
+int extractTotalRecordCount(const QList<DTO::UserDto> &result) {
+    return result.size();
+}
 
 void registerModels(const char *URI) {
     Q_UNUSED(URI)

core/src/jellyfin.cpp

@@ -24,6 +24,7 @@ void registerTypes(const char *uri) {
     qmlRegisterType<ServerDiscoveryModel>(uri, 1, 0, "ServerDiscoveryModel");
     qmlRegisterType<ViewModel::PlaybackManager>(uri, 1, 0, "PlaybackManager");
     qmlRegisterUncreatableType<ViewModel::Item>(uri, 1, 0, "Item", "Acquire one via ItemLoader or exposed properties");
+    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::UserData>(uri, 1, 0, "UserData", "Obtain one via an Item");
@@ -32,16 +33,19 @@ void registerTypes(const char *uri) {
     qmlRegisterUncreatableType<BaseApiModel>(uri, 1, 0, "BaseApiModel", "Please use one of its subclasses");
     qmlRegisterUncreatableType<BaseModelLoader>(uri, 1, 0, "BaseModelLoader", "Please use one of its subclasses");
     qmlRegisterType<ViewModel::ItemModel>(uri, 1, 0, "ItemModel");
+    qmlRegisterType<ViewModel::UserModel>(uri, 1, 0, "UserModel");
 
     // Loaders
     qmlRegisterUncreatableType<ViewModel::LoaderBase>(uri, 1, 0, "LoaderBase", "Use one of its subclasses");
     qmlRegisterType<ViewModel::ItemLoader>(uri, 1, 0, "ItemLoader");
+    qmlRegisterType<ViewModel::UserLoader>(uri, 1, 0, "UserLoader");
     qmlRegisterType<ViewModel::LatestMediaLoader>(uri, 1, 0, "LatestMediaLoader");
     qmlRegisterType<ViewModel::UserItemsLoader>(uri, 1, 0, "UserItemsLoader");
     qmlRegisterType<ViewModel::UserViewsLoader>(uri, 1, 0, "UsersViewsLoader");
     qmlRegisterType<ViewModel::ResumeItemsLoader>(uri, 1, 0, "ResumeItemsLoader");
     qmlRegisterType<ViewModel::ShowSeasonsLoader>(uri, 1, 0, "ShowSeasonsLoader");
     qmlRegisterType<ViewModel::ShowEpisodesLoader>(uri, 1, 0, "ShowEpisodesLoader");
+    qmlRegisterType<ViewModel::PublicUsersLoader>(uri, 1, 0, "PublicUsersLoader");
 
     // Enumerations
     qmlRegisterUncreatableType<Jellyfin::DTO::GeneralCommandTypeClass>(uri, 1, 0, "GeneralCommandType", "Is an enum");

core/src/model/user.cpp

@@ -0,0 +1,38 @@
+/*
+ * Sailfin: a Jellyfin client written using Qt
+ * Copyright (C) 2021 Chris Josten and the Sailfin Contributors.
+ *
+ * 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/model/user.h"
+
+namespace Jellyfin {
+namespace Model {
+
+User::User() {}
+
+User::User(const DTO::UserDto &other, ApiClient *apiClient)
+    : DTO::UserDto(other) {
+    Q_UNUSED(apiClient)
+}
+
+bool User::sameAs(const DTO::UserDto &other) {
+    return this->jellyfinId() == other.jellyfinId();
+}
+
+
+} // NS Model
+} // NS Jellyfin

core/src/viewmodel/user.cpp

@@ -0,0 +1,55 @@
+/*
+ * Sailfin: a Jellyfin client written using Qt
+ * Copyright (C) 2021 Chris Josten and the Sailfin Contributors.
+ *
+ * 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/viewmodel/user.h"
+
+#include "JellyfinQt/loader/http/getuserbyid.h"
+
+namespace Jellyfin {
+namespace ViewModel {
+
+// User
+User::User(QObject *parent, QSharedPointer<Model::User> data)
+    : QObject(parent),
+      m_data(data) {
+
+}
+
+void User::setData(QSharedPointer<Model::User> newData) {
+    m_data = newData;
+}
+
+
+// UserLoader
+UserLoader::UserLoader(QObject *parent)
+    : UserLoaderBase(new Jellyfin::Loader::HTTP::GetUserByIdLoader(), parent) {}
+
+void UserLoader::setUserId(QString newUserId) {
+    m_parameters.setUserId(newUserId);
+    reloadIfNeeded();
+    emit userIdChanged(newUserId);
+}
+
+bool UserLoader::canReload() const {
+    return UserLoaderBase::canReload()
+            && !m_parameters.userId().isEmpty();
+}
+
+} // NS ViewModel
+} // NS Jellyfin

core/src/viewmodel/usermodel.cpp

@@ -0,0 +1,56 @@
+/*
+ * Sailfin: a Jellyfin client written using Qt
+ * Copyright (C) 2021 Chris Josten and the Sailfin Contributors.
+ *
+ * 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/viewmodel/usermodel.h"
+
+namespace Jellyfin {
+namespace ViewModel {
+
+UserModel::UserModel(QObject *parent)
+    : ApiModel<Model::User>(parent) {}
+
+QVariant UserModel::data(const QModelIndex &index, int role) const {
+    if (role <= Qt::UserRole || !index.isValid()) return QVariant();
+    int row = index.row();
+    if (row < 0 || row >= m_array.size()) return QVariant();
+    QSharedPointer<Model::User> item = m_array[row];
+
+    switch(role) {
+    case userId:
+        return QVariant(item->jellyfinId());
+    case name:
+        return QVariant(item->name());
+    case hasPassword:
+        return QVariant(item->hasPassword());
+    case primaryImageTag:
+        return QVariant(item->primaryImageTag());
+    default:
+        return QVariant();
+    }
+}
+
+PublicUsersLoader::PublicUsersLoader(QObject *parent)
+    : PublicUsersLoaderBase(new Loader::HTTP::GetPublicUsersLoader(), parent) {}
+
+bool PublicUsersLoader::canReload() const {
+    return m_apiClient != nullptr && !m_apiClient->baseUrl().isNull();
+}
+
+
+} // NS ViewModel
+} // NS Jellyfin