WIP: Refractor C++-side. Loader should be working again

core/codegen/loader_header.hbs

@@ -8,10 +8,10 @@
 
 class {{className}} : public {{supportNamespace}}::HttpLoader<{{dtoNamespace}}::{{endpoint.resultType}}, {{endpoint.parameterType}}> {
 public:
-	explicit {{className}}(ApiClient *apiClient);
+	explicit {{className}}(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const {{endpoint.parameterType}}& parameters) const override;
+	QString path(const {{endpoint.parameterType}}& parameters) const override;
 	QUrlQuery query(const {{endpoint.parameterType}}& parameters) const override;
 };
 {{/if}}

core/codegen/loader_implementation.hbs

@@ -1,2 +1,34 @@
+{{#if endpoint.hasSuccessResponse}}
+
 {{className}}::{{className}}(ApiClient *apiClient)
-	: Loader<>(apiClient) {}
+	: {{supportNamespace}}::HttpLoader<{{dtoNamespace}}::{{endpoint.resultType}}, {{endpoint.parameterType}}>(apiClient) {}
+
+QString {{className}}::path(const {{endpoint.parameterType}} &params) const {
+	Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings
+	
+	return {{pathStringInterpolation "params"}};
+}
+
+QUrlQuery {{className}}::query(const {{endpoint.parameterType}} &params) const {
+	Q_UNUSED(params) // Might be overzealous, but I don't like theses kind of warnings
+
+	QUrlQuery result;
+
+	{{#each endpoint.requiredQueryParameters as |p|}}
+	result.addQueryItem("{{p.name}}", params.{{p.type.name}}());
+
+	{{/each}}
+
+	// Optional parameters
+
+	{{#each endpoint.optionalQueryParameters as |p|}}
+	if (!params.{{p.type.name}}Null()) {
+		result.addQueryItem("{{p.name}}", Support::toString(params.{{p.type.name}}()));
+	}
+
+	{{/each}}
+	
+	return result;
+}
+
+{{/if}}

core/codegen/loader_types_header.hbs

@@ -5,14 +5,23 @@ class {{e.name}} {
 public:
 
 	{{#each e.parameters as |param|}}
+
 	/**
 	 * @brief {{param.description}}
 	
 	 */
-	
-	{{param.type.typeNameWithQualifiers}} {{param.type.name}}() const;
-	void set{{param.type.writeName}}({{param.type.typeNameWithQualifiers}} new{{param.type.writeName}}) const;
 
+	{{#if param.required}}
+	const {{param.type.typeNameWithQualifiers}} &{{param.type.name}}() const;
+	void set{{param.type.writeName}}({{param.type.typeNameWithQualifiers}} new{{param.type.writeName}});
+
+	{{else}}
+	const {{param.type.typeName}} &{{param.type.name}}() const;
+	void set{{param.type.writeName}}({{param.type.typeName}} new{{param.type.writeName}});
+	bool {{param.type.name}}Null() const;
+	void set{{param.type.writeName}}Null();
+	
+	{{/if}}
 
 	{{/each}}
 
@@ -29,13 +38,6 @@ private:
 	{{#each e.requiredQueryParameters as |param|}}
 	{{param.type.typeNameWithQualifiers}} {{param.type.memberName}};
 
-	{{/each}}
-	
-	// Optional path parameters
-
-	{{#each e.optionalPathParameters as |param|}}
-	{{param.type.typeNameWithQualifiers}} {{param.type.memberName}};
-
 	{{/each}}
 
 	// Optional query parameters

core/codegen/loader_types_implementation.hbs

@@ -0,0 +1,57 @@
+using namespace {{dtoNamespace}};
+
+{{#each endpoints as |e|}}
+
+// {{e.name}}
+
+{{#each e.parameters as |param|}}
+
+{{#if param.required}}
+const {{param.type.typeNameWithQualifiers}} &{{e.name}}::{{param.type.name}}() const {
+	return {{param.type.memberName}};
+}
+
+void {{e.name}}::set{{param.type.writeName}}({{param.type.typeNameWithQualifiers}} new{{param.type.writeName}}) {
+	
+	{{param.type.memberName}} = new{{param.type.writeName}};
+}
+
+{{else}}
+const {{param.type.typeName}} &{{e.name}}::{{param.type.name}}() const {
+
+	{{#if param.type.needsOptional}}
+	return {{param.type.memberName}}.value();
+
+	{{else}}
+	return {{param.type.memberName}};
+
+	{{/if}}
+}
+
+void {{e.name}}::set{{param.type.writeName}}({{param.type.typeName}} new{{param.type.writeName}})  {
+	
+	{{param.type.memberName}} = new{{param.type.writeName}};
+}
+
+bool {{e.name}}::{{param.type.name}}Null() const {
+	// Nullable: {{param.type.isNullable}}
+
+	// Type Nullable: {{param.type.isTypeNullable}}
+
+	
+
+	return {{param.type.nullableCheck}};
+}
+
+void {{e.name}}::set{{param.type.writeName}}Null() {
+	
+	{{param.type.memberName}}{{param.type.nullableSetter}};
+}
+
+{{/if}}
+
+{{/each}}
+
+
+
+{{/each}}

core/include/JellyfinQt/apiclient.h

@@ -95,6 +95,13 @@ public:
     Q_PROPERTY(EventBus *eventbus READ eventbus FINAL)
     Q_PROPERTY(WebSocket *websocket READ websocket FINAL)
     Q_PROPERTY(QList<DTO::GeneralCommandType> supportedCommands READ supportedCommands WRITE setSupportedCommands NOTIFY supportedCommandsChanged)
+    /**
+     * Wether this ApiClient operates in "online mode".
+     *
+     * When operating in offline mode, this client will not make network requests and only use a local cache, making
+     * certain features unavailable.
+     */
+    Q_PROPERTY(bool online READ online NOTIFY onlineChanged)
 
     /*QNetworkReply *handleRequest(QString path, QStringList sort, Pagination *pagination,
                                  QVariantMap filters, QStringList fields, QStringList expand, QString id);*/
@@ -143,6 +150,7 @@ public:
     QString version() const;
     EventBus *eventbus() const { return m_eventbus; }
     WebSocket *websocket() const { return m_webSocket; }
+    bool online() const { return m_online; }
 
     /**
      * @brief Sets the error handler of a reply to this classes default error handler
@@ -185,6 +193,7 @@ signals:
     void deviceProfileChanged();
 
     void supportedCommandsChanged();
+    void onlineChanged();
 
     /**
      * @brief onUserDataChanged Emitted when the user data of an item is changed on the server.
@@ -268,6 +277,7 @@ private:
     QString m_userId = "";
     QJsonObject m_deviceProfile;
     QJsonObject m_playbackDeviceProfile;
+    bool m_online = true;
     QList<GeneralCommandType> m_supportedCommands;
 
     bool m_authenticated = false;

core/include/JellyfinQt/apimodel.h

@@ -134,7 +134,6 @@ protected:
     QString m_path;
     bool m_hasRecordResponse;
     bool m_addUserId;
-    bool padding; bool padding2;
 
     // Query/record controlling properties
     int m_limit = -1;

core/include/JellyfinQt/dto/basepluginconfiguration.h

@@ -0,0 +1,44 @@
+/*
+ * 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
+ */
+/*
+ * WARNING: THIS IS AN AUTOMATICALLY GENERATED FILE! PLEASE DO NOT EDIT THIS, AS YOUR EDITS WILL GET
+ * OVERWRITTEN AT SOME POINT! 
+ *
+ * If there is a bug in this file, please fix the code generator used to generate this file found in
+ * core/openapigenerator.d. 
+ *
+ * This file is generated based on Jellyfin's OpenAPI description, "openapi.json". Please update that
+ * file with a newer file if needed instead of manually updating the files.
+ */
+
+#ifndef JELLYFIN_DTO_BASEPLUGINCONFIGURATION_H
+#define JELLYFIN_DTO_BASEPLUGINCONFIGURATION_H
+
+#include <QJsonObject>
+
+namespace Jellyfin {
+namespace DTO {
+
+using BasePluginConfiguration = QJsonObject;
+
+} // NS DTO
+} // NS Jellyfin
+
+#endif // JELLYFIN_DTO_BASEPLUGINCONFIGURATION_H
+// No implementation needed

core/include/JellyfinQt/dto/objectgroupupdate.h

@@ -80,8 +80,6 @@ public:
 	* @brief Gets the update data.
 	*/
 	void setData(QVariant newData);
-	bool dataNull() const;
-	void setDataNull();
 
 
 protected:

core/include/JellyfinQt/loader/http/activate.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/addlistingprovider.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/listingsproviderinfo.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class AddListingProvider : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::ListingsProviderInfo, AddListingProviderParams> {
 public:
-	explicit AddListingProvider(ApiClient *apiClient);
+	explicit AddListingProvider(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const AddListingProviderParams& parameters) const override;
+	QString path(const AddListingProviderParams& parameters) const override;
 	QUrlQuery query(const AddListingProviderParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/addmediapath.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/addtocollection.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/addtoplaylist.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/addtunerhost.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/tunerhostinfo.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class AddTunerHost : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::TunerHostInfo, AddTunerHostParams> {
 public:
-	explicit AddTunerHost(ApiClient *apiClient);
+	explicit AddTunerHost(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const AddTunerHostParams& parameters) const override;
+	QString path(const AddTunerHostParams& parameters) const override;
 	QUrlQuery query(const AddTunerHostParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/addusertosession.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/addvirtualfolder.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/applysearchcriteria.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/authenticateuser.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/authenticationresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class AuthenticateUser : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::AuthenticationResult, AuthenticateUserParams> {
 public:
-	explicit AuthenticateUser(ApiClient *apiClient);
+	explicit AuthenticateUser(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const AuthenticateUserParams& parameters) const override;
+	QString path(const AuthenticateUserParams& parameters) const override;
 	QUrlQuery query(const AuthenticateUserParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/authenticateuserbyname.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/authenticationresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class AuthenticateUserByName : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::AuthenticationResult, AuthenticateUserByNameParams> {
 public:
-	explicit AuthenticateUserByName(ApiClient *apiClient);
+	explicit AuthenticateUserByName(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const AuthenticateUserByNameParams& parameters) const override;
+	QString path(const AuthenticateUserByNameParams& parameters) const override;
 	QUrlQuery query(const AuthenticateUserByNameParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/authenticatewithquickconnect.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/authenticationresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class AuthenticateWithQuickConnect : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::AuthenticationResult, AuthenticateWithQuickConnectParams> {
 public:
-	explicit AuthenticateWithQuickConnect(ApiClient *apiClient);
+	explicit AuthenticateWithQuickConnect(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const AuthenticateWithQuickConnectParams& parameters) const override;
+	QString path(const AuthenticateWithQuickConnectParams& parameters) const override;
 	QUrlQuery query(const AuthenticateWithQuickConnectParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/authorize.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/available.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/cancelpackageinstallation.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/cancelseriestimer.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/canceltimer.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/closelivestream.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/completewizard.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/connect.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/quickconnectresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class Connect : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::QuickConnectResult, ConnectParams> {
 public:
-	explicit Connect(ApiClient *apiClient);
+	explicit Connect(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const ConnectParams& parameters) const override;
+	QString path(const ConnectParams& parameters) const override;
 	QUrlQuery query(const ConnectParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/createadminnotification.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/createcollection.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/collectioncreationresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class CreateCollection : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::CollectionCreationResult, CreateCollectionParams> {
 public:
-	explicit CreateCollection(ApiClient *apiClient);
+	explicit CreateCollection(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const CreateCollectionParams& parameters) const override;
+	QString path(const CreateCollectionParams& parameters) const override;
 	QUrlQuery query(const CreateCollectionParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/createkey.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/createplaylist.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/playlistcreationresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class CreatePlaylist : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::PlaylistCreationResult, CreatePlaylistParams> {
 public:
-	explicit CreatePlaylist(ApiClient *apiClient);
+	explicit CreatePlaylist(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const CreatePlaylistParams& parameters) const override;
+	QString path(const CreatePlaylistParams& parameters) const override;
 	QUrlQuery query(const CreatePlaylistParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/createprofile.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/createseriestimer.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/createtimer.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/createuserbyname.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/userdto.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class CreateUserByName : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::UserDto, CreateUserByNameParams> {
 public:
-	explicit CreateUserByName(ApiClient *apiClient);
+	explicit CreateUserByName(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const CreateUserByNameParams& parameters) const override;
+	QString path(const CreateUserByNameParams& parameters) const override;
 	QUrlQuery query(const CreateUserByNameParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/deauthorize.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deletealternatesources.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deletedevice.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deleteitem.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deleteitemimage.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deleteitemimagebyindex.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deleteitems.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deletelistingprovider.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deleteprofile.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deleterecording.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deletesubtitle.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deletetunerhost.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deleteuser.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deleteuserimage.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deleteuserimagebyindex.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/deleteuseritemrating.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/useritemdatadto.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class DeleteUserItemRating : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::UserItemDataDto, DeleteUserItemRatingParams> {
 public:
-	explicit DeleteUserItemRating(ApiClient *apiClient);
+	explicit DeleteUserItemRating(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const DeleteUserItemRatingParams& parameters) const override;
+	QString path(const DeleteUserItemRatingParams& parameters) const override;
 	QUrlQuery query(const DeleteUserItemRatingParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/disableplugin.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/discovertuners.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/discvovertuners.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/displaycontent.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/downloadremoteimage.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/downloadremotesubtitles.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/enableplugin.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/forgotpassword.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/forgotpasswordresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class ForgotPassword : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::ForgotPasswordResult, ForgotPasswordParams> {
 public:
-	explicit ForgotPassword(ApiClient *apiClient);
+	explicit ForgotPassword(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const ForgotPasswordParams& parameters) const override;
+	QString path(const ForgotPasswordParams& parameters) const override;
 	QUrlQuery query(const ForgotPasswordParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/forgotpasswordpin.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/pinredeemresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class ForgotPasswordPin : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::PinRedeemResult, ForgotPasswordPinParams> {
 public:
-	explicit ForgotPasswordPin(ApiClient *apiClient);
+	explicit ForgotPasswordPin(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const ForgotPasswordPinParams& parameters) const override;
+	QString path(const ForgotPasswordPinParams& parameters) const override;
 	QUrlQuery query(const ForgotPasswordPinParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/get.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/searchhintresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class Get : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::SearchHintResult, GetParams> {
 public:
-	explicit Get(ApiClient *apiClient);
+	explicit Get(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetParams& parameters) const override;
+	QString path(const GetParams& parameters) const override;
 	QUrlQuery query(const GetParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getadditionalpart.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/baseitemdtoqueryresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetAdditionalPart : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::BaseItemDtoQueryResult, GetAdditionalPartParams> {
 public:
-	explicit GetAdditionalPart(ApiClient *apiClient);
+	explicit GetAdditionalPart(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetAdditionalPartParams& parameters) const override;
+	QString path(const GetAdditionalPartParams& parameters) const override;
 	QUrlQuery query(const GetAdditionalPartParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getalbumartists.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/baseitemdtoqueryresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetAlbumArtists : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::BaseItemDtoQueryResult, GetAlbumArtistsParams> {
 public:
-	explicit GetAlbumArtists(ApiClient *apiClient);
+	explicit GetAlbumArtists(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetAlbumArtistsParams& parameters) const override;
+	QString path(const GetAlbumArtistsParams& parameters) const override;
 	QUrlQuery query(const GetAlbumArtistsParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getallchannelfeatures.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getancestors.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getartistbyname.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/baseitemdto.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetArtistByName : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::BaseItemDto, GetArtistByNameParams> {
 public:
-	explicit GetArtistByName(ApiClient *apiClient);
+	explicit GetArtistByName(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetArtistByNameParams& parameters) const override;
+	QString path(const GetArtistByNameParams& parameters) const override;
 	QUrlQuery query(const GetArtistByNameParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getartistimage.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getartists.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/baseitemdtoqueryresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetArtists : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::BaseItemDtoQueryResult, GetArtistsParams> {
 public:
-	explicit GetArtists(ApiClient *apiClient);
+	explicit GetArtists(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetArtistsParams& parameters) const override;
+	QString path(const GetArtistsParams& parameters) const override;
 	QUrlQuery query(const GetArtistsParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getattachment.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getaudiostream.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getaudiostreambycontainer.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getauthproviders.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getbitratetestbytes.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getbookremotesearchresults.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getboxsetremotesearchresults.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getbrandingcss.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getbrandingcss_2.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getbrandingoptions.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/brandingoptions.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetBrandingOptions : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::BrandingOptions, GetBrandingOptionsParams> {
 public:
-	explicit GetBrandingOptions(ApiClient *apiClient);
+	explicit GetBrandingOptions(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetBrandingOptionsParams& parameters) const override;
+	QString path(const GetBrandingOptionsParams& parameters) const override;
 	QUrlQuery query(const GetBrandingOptionsParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getchannel.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/baseitemdto.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetChannel : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::BaseItemDto, GetChannelParams> {
 public:
-	explicit GetChannel(ApiClient *apiClient);
+	explicit GetChannel(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetChannelParams& parameters) const override;
+	QString path(const GetChannelParams& parameters) const override;
 	QUrlQuery query(const GetChannelParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getchannelfeatures.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/channelfeatures.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetChannelFeatures : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::ChannelFeatures, GetChannelFeaturesParams> {
 public:
-	explicit GetChannelFeatures(ApiClient *apiClient);
+	explicit GetChannelFeatures(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetChannelFeaturesParams& parameters) const override;
+	QString path(const GetChannelFeaturesParams& parameters) const override;
 	QUrlQuery query(const GetChannelFeaturesParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getchannelitems.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/baseitemdtoqueryresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetChannelItems : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::BaseItemDtoQueryResult, GetChannelItemsParams> {
 public:
-	explicit GetChannelItems(ApiClient *apiClient);
+	explicit GetChannelItems(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetChannelItemsParams& parameters) const override;
+	QString path(const GetChannelItemsParams& parameters) const override;
 	QUrlQuery query(const GetChannelItemsParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getchannelmappingoptions.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/channelmappingoptionsdto.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetChannelMappingOptions : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::ChannelMappingOptionsDto, GetChannelMappingOptionsParams> {
 public:
-	explicit GetChannelMappingOptions(ApiClient *apiClient);
+	explicit GetChannelMappingOptions(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetChannelMappingOptionsParams& parameters) const override;
+	QString path(const GetChannelMappingOptionsParams& parameters) const override;
 	QUrlQuery query(const GetChannelMappingOptionsParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getchannels.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/baseitemdtoqueryresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetChannels : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::BaseItemDtoQueryResult, GetChannelsParams> {
 public:
-	explicit GetChannels(ApiClient *apiClient);
+	explicit GetChannels(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetChannelsParams& parameters) const override;
+	QString path(const GetChannelsParams& parameters) const override;
 	QUrlQuery query(const GetChannelsParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getconfiguration.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/serverconfiguration.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetConfiguration : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::ServerConfiguration, GetConfigurationParams> {
 public:
-	explicit GetConfiguration(ApiClient *apiClient);
+	explicit GetConfiguration(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetConfigurationParams& parameters) const override;
+	QString path(const GetConfigurationParams& parameters) const override;
 	QUrlQuery query(const GetConfigurationParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getconfigurationpages.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getconnectionmanager.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getconnectionmanager_2.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getconnectionmanager_3.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getcontentdirectory.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getcontentdirectory_2.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getcontentdirectory_3.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getcountries.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getcriticreviews.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/baseitemdtoqueryresult.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetCriticReviews : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::BaseItemDtoQueryResult, GetCriticReviewsParams> {
 public:
-	explicit GetCriticReviews(ApiClient *apiClient);
+	explicit GetCriticReviews(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetCriticReviewsParams& parameters) const override;
+	QString path(const GetCriticReviewsParams& parameters) const override;
 	QUrlQuery query(const GetCriticReviewsParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getcultures.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getcurrentuser.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/userdto.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetCurrentUser : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::UserDto, GetCurrentUserParams> {
 public:
-	explicit GetCurrentUser(ApiClient *apiClient);
+	explicit GetCurrentUser(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetCurrentUserParams& parameters) const override;
+	QString path(const GetCurrentUserParams& parameters) const override;
 	QUrlQuery query(const GetCurrentUserParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getdashboardconfigurationpage.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 
 namespace Jellyfin {
 namespace Loader {

core/include/JellyfinQt/loader/http/getdefaultdirectorybrowser.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/defaultdirectorybrowserinfodto.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetDefaultDirectoryBrowser : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::DefaultDirectoryBrowserInfoDto, GetDefaultDirectoryBrowserParams> {
 public:
-	explicit GetDefaultDirectoryBrowser(ApiClient *apiClient);
+	explicit GetDefaultDirectoryBrowser(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetDefaultDirectoryBrowserParams& parameters) const override;
+	QString path(const GetDefaultDirectoryBrowserParams& parameters) const override;
 	QUrlQuery query(const GetDefaultDirectoryBrowserParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getdefaultlistingprovider.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/listingsproviderinfo.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetDefaultListingProvider : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::ListingsProviderInfo, GetDefaultListingProviderParams> {
 public:
-	explicit GetDefaultListingProvider(ApiClient *apiClient);
+	explicit GetDefaultListingProvider(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetDefaultListingProviderParams& parameters) const override;
+	QString path(const GetDefaultListingProviderParams& parameters) const override;
 	QUrlQuery query(const GetDefaultListingProviderParams& parameters) const override;
 };
 

core/include/JellyfinQt/loader/http/getdefaultmetadataoptions.h

@@ -32,9 +32,10 @@
 
 #include <optional>
 
+#include "JellyfinQt/support/jsonconv.h"
 #include "JellyfinQt/support/loader.h"
-#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/loader/requesttypes.h"
+#include "JellyfinQt/apiclient.h"
 #include "JellyfinQt/dto/metadataoptions.h"
 
 namespace Jellyfin {
@@ -46,10 +47,10 @@ namespace HTTP {
  */
 class GetDefaultMetadataOptions : public Jellyfin::Support::HttpLoader<Jellyfin::DTO::MetadataOptions, GetDefaultMetadataOptionsParams> {
 public:
-	explicit GetDefaultMetadataOptions(ApiClient *apiClient);
+	explicit GetDefaultMetadataOptions(ApiClient *apiClient = nullptr);
 
 protected:
-	QString url(const GetDefaultMetadataOptionsParams& parameters) const override;
+	QString path(const GetDefaultMetadataOptionsParams& parameters) const override;
 	QUrlQuery query(const GetDefaultMetadataOptionsParams& parameters) const override;
 };