Scrobbler: Refactor

src/scrobbler/scrobblerservice.h

@@ -1,6 +1,6 @@
 /*
  * Strawberry Music Player
- * Copyright 2018-2023, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2018-2025, Jonas Kvinge <jonas@jkvinge.net>
  *
  * Strawberry is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,31 +22,29 @@
 
 #include "config.h"
 
-#include <QObject>
 #include <QPair>
-#include <QList>
-#include <QVariant>
 #include <QByteArray>
 #include <QString>
-#include <QJsonObject>
 
 #include "includes/shared_ptr.h"
 #include "core/song.h"
+#include "core/jsonbaserequest.h"
 
 #include "scrobblersettingsservice.h"
 
-class ScrobblerService : public QObject {
+class ScrobblerService : public JsonBaseRequest {
   Q_OBJECT
 
  public:
-  explicit ScrobblerService(const QString &name, const SharedPtr<ScrobblerSettingsService> settings, QObject *parent);
+  explicit ScrobblerService(const QString &name, const SharedPtr<NetworkAccessManager> network, const SharedPtr<ScrobblerSettingsService> settings, QObject *parent);
 
   QString name() const { return name_; }
+  QString service_name() const override { return name_; }
 
   virtual void ReloadSettings() = 0;
 
   virtual bool enabled() const { return false; }
-  virtual bool authenticated() const { return false; }
+  virtual bool authenticated() const override { return false; }
 
   virtual void UpdateNowPlaying(const Song &song) = 0;
   virtual void ClearPlaying() = 0;
@@ -57,12 +55,8 @@ class ScrobblerService : public QObject {
   virtual bool submitted() const { return false; }
 
  protected:
-  using Param = QPair<QString, QString>;
-  using ParamList = QList<Param>;
   using EncodedParam = QPair<QByteArray, QByteArray>;
 
-  bool ExtractJsonObj(const QByteArray &data, QJsonObject &json_obj, QString &error_description);
-
   QString StripAlbum(const QString &album) const;
   QString StripTitle(const QString &title) const;