Lyrics: Refactor

This commit is contained in:
Jonas Kvinge
2025-03-08 23:26:44 +01:00
parent b02b114caf
commit 1173d5f865
23 changed files with 544 additions and 836 deletions

View File

@@ -30,6 +30,7 @@
#include <QJsonObject>
#include "includes/shared_ptr.h"
#include "core/jsonbaserequest.h"
#include "lyricsprovider.h"
class NetworkAccessManager;
@@ -41,10 +42,19 @@ class JsonLyricsProvider : public LyricsProvider {
public:
explicit JsonLyricsProvider(const QString &name, const bool enabled, const bool authentication_required, const SharedPtr<NetworkAccessManager> network, QObject *parent = nullptr);
class JsonObjectResult : public ReplyDataResult {
public:
JsonObjectResult(const ErrorCode _error_code, const QString &_error_message = QString()) : ReplyDataResult(_error_code, _error_message) {}
JsonObjectResult(const QJsonObject &_json_object) : ReplyDataResult(ErrorCode::Success), json_object(_json_object) {}
QJsonObject json_object;
};
protected:
QByteArray ExtractData(QNetworkReply *reply);
QJsonObject ExtractJsonObj(const QByteArray &data);
QJsonObject ExtractJsonObj(QNetworkReply *reply);
virtual JsonObjectResult GetJsonObject(const QByteArray &data);
virtual JsonObjectResult GetJsonObject(QNetworkReply *reply);
virtual QJsonValue GetJsonValue(const QJsonObject &json_object, const QString &name);
virtual QJsonArray GetJsonArray(const QJsonObject &json_object, const QString &name);
};
#endif // JSONLYRICSPROVIDER_H