fix reply bug when combining sources and extensions

Suwayomi · Oct 9, 2022 · 98b354a · 98b354a
1 parent 9912b76
commit 98b354a
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 8 deletions.
diff --git a/src/models/ExtensionModel.cpp b/src/models/ExtensionModel.cpp
@@ -32,11 +32,11 @@ void ExtensionModel::classBegin() { }
  *****************************************************************************/
 void ExtensionModel::componentComplete()
 {
-  _networkManager->get("extension/list");
+  _networkManager->getExtensions("extension/list");
 
   connect(
       _networkManager,
-      &NetworkManager::receivedReply,
+      &NetworkManager::receiveExtensions,
       this,
       &ExtensionModel::receivedReply);
 }
@@ -48,8 +48,6 @@ void ExtensionModel::componentComplete()
  *****************************************************************************/
 void ExtensionModel::receivedReply(const QJsonDocument& reply)
 {
-  disconnect(_networkManager, &NetworkManager::receivedReply, this, nullptr);
-
   beginResetModel();
   _extensions.clear();
 

diff --git a/src/models/SourcesModel.cpp b/src/models/SourcesModel.cpp
@@ -32,11 +32,11 @@ void SourcesModel::classBegin() { }
  *****************************************************************************/
 void SourcesModel::componentComplete()
 {
-  _networkManager->get("source/list");
+  _networkManager->getSources("source/list");
 
   connect(
       _networkManager,
-      &NetworkManager::receivedReply,
+      &NetworkManager::receiveSources,
       this,
       &SourcesModel::receivedReply);
 }
@@ -48,8 +48,6 @@ void SourcesModel::componentComplete()
  *****************************************************************************/
 void SourcesModel::receivedReply(const QJsonDocument& reply)
 {
-  disconnect(_networkManager, &NetworkManager::receivedReply, this, nullptr);
-
   beginResetModel();
   _sources.clear();
 

diff --git a/src/networkmanager.cpp b/src/networkmanager.cpp
@@ -119,6 +119,25 @@ void NetworkManager::getUpdates(const QString &endpoint)
   getEndpoint(endpoint, &NetworkManager::updatesReply);
 }
 
+/********************************************************************
+ *
+ *  get()
+ *
+ ********************************************************************/
+void NetworkManager::getSources(const QString &endpoint)
+{
+  getEndpoint(endpoint, &NetworkManager::sourcesReply);
+}
+/********************************************************************
+ *
+ *  get()
+ *
+ ********************************************************************/
+void NetworkManager::getExtensions(const QString &endpoint)
+{
+  getEndpoint(endpoint, &NetworkManager::extensionsReply);
+}
+
 /********************************************************************
  *
  *  post()
@@ -232,6 +251,20 @@ void NetworkManager::chaptersReply() { emit receiveChapters(processReply()); }
  ********************************************************************/
 void NetworkManager::updatesReply() { emit receiveUpdates(processReply()); }
 
+/********************************************************************
+ *
+ *  userReply()
+ *
+ ********************************************************************/
+void NetworkManager::sourcesReply() { emit receiveSources(processReply()); }
+
+/********************************************************************
+ *
+ *  userReply()
+ *
+ ********************************************************************/
+void NetworkManager::extensionsReply() { emit receiveExtensions(processReply()); }
+
 /********************************************************************
  *
  *  patchReply()

diff --git a/src/networkmanager.h b/src/networkmanager.h
@@ -28,13 +28,17 @@ class NetworkManager : public QObject, public QQmlNetworkAccessManagerFactory
   void receivedReply(const QJsonDocument &reply);
   void receiveChapters(const QJsonDocument &reply);
   void receiveUpdates(const QJsonDocument &reply);
+  void receiveSources(const QJsonDocument &reply);
+  void receiveExtensions(const QJsonDocument &reply);
   void abortChapterRequest();
   void receivePatch();
 
 private slots:
   void endpointReply();
   void chaptersReply();
   void updatesReply();
+  void sourcesReply();
+  void extensionsReply();
   void patchReply();
 
 public:
@@ -53,6 +57,8 @@ private slots:
     const std::function<void(const QJsonDocument &)> &func);
   void getChapters(const QString &endpoint);
   void getUpdates(const QString &endpoint);
+  void getSources(const QString &endpoint);
+  void getExtensions(const QString &endpoint);
   void deleteResource(const QString &endpoint);
   // TODO needs similar to patch for extra arguments
   void post(const QString &endpoint, const QUrlQuery &query);