Use async NetworkManager in MuseSoundsRepository

Author: RomanPudashkin

src/musesounds/internal/musesoundsrepository.cpp

@@ -5,7 +5,7 @@
  * MuseScore
  * Music Composition & Notation
  *
- * Copyright (C) 2024 MuseScore Limited and others
+ * Copyright (C) 2025 MuseScore Limited and others
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -24,8 +24,6 @@
 
 #include "serialization/json.h"
 
-#include "global/concurrency/concurrent.h"
-
 using namespace mu::musesounds;
 using namespace muse;
 using namespace muse::network;
@@ -46,37 +44,7 @@ static muse::UriQuery correctThumbnailSize(const UriQuery& uri)
     return UriQuery(uriStr.toStdString());
 }
 
-void MuseSoundsRepository::init()
-{
-    auto soundsCallBack = [this](const RetVal<SoundCatalogueInfoList>& result) {
-        if (!result.ret) {
-            LOGE() << result.ret.toString();
-            return;
-        }
-
-        {
-            std::lock_guard lock(m_mutex);
-            m_soundsСatalogs = result.val;
-        }
-
-        m_soundsСatalogsChanged.notify();
-    };
-
-    Concurrent::run(this, &MuseSoundsRepository::th_requestSounds, configuration()->soundsUri(), soundsCallBack);
-}
-
-const SoundCatalogueInfoList& MuseSoundsRepository::soundsCatalogueList() const
-{
-    std::lock_guard lock(m_mutex);
-    return m_soundsСatalogs;
-}
-
-async::Notification MuseSoundsRepository::soundsCatalogueListChanged() const
-{
-    return m_soundsСatalogsChanged;
-}
-
-QByteArray MuseSoundsRepository::soundsRequestJson() const
+static QByteArray soundsRequestJson()
 {
     QLocale locale = QLocale();
     String localeStr = locale.bcp47Name() + "-" + QLocale::territoryToCode(locale.territory());
@@ -114,35 +82,51 @@ QByteArray MuseSoundsRepository::soundsRequestJson() const
     return JsonDocument(json).toJson(JsonDocument::Format::Compact).toQByteArray();
 }
 
-void MuseSoundsRepository::th_requestSounds(const UriQuery& soundsUri, std::function<void(RetVal<SoundCatalogueInfoList>)> callBack) const
+void MuseSoundsRepository::init()
 {
     TRACEFUNC;
 
-    network::deprecated::INetworkManagerPtr networkManager = networkManagerCreator()->makeDeprecatedNetworkManager();
+    QUrl url = QUrl(QString::fromStdString(configuration()->soundsUri().toString()));
+    QByteArray jsonData = soundsRequestJson();
     RequestHeaders headers = configuration()->headers();
 
-    QByteArray jsonData = soundsRequestJson();
-    QBuffer receivedData(&jsonData);
-    OutgoingDevice device(&receivedData);
+    auto device = std::make_shared<QBuffer>();
+    device->setData(jsonData);
+    auto receivedData = std::make_shared<QBuffer>();
 
-    Ret soundsItemsRet = networkManager->post(QUrl(QString::fromStdString(soundsUri.toString())), &device, &receivedData, headers);
-    if (!soundsItemsRet) {
-        callBack(soundsItemsRet);
-        return;
-    }
+    m_networkManager = networkManagerCreator()->makeNetworkManager();
+    m_networkManager->post(url, device, receivedData, headers)
+    .onResolve(this, [this, receivedData](const muse::Ret& ret) {
+        if (!ret) {
+            LOGE() << ret.toString();
+            return;
+        }
 
-    RetVal<SoundCatalogueInfoList> result;
+        RetVal<SoundCatalogueInfoList> result;
 
-    std::string err;
-    JsonDocument soundsInfoDoc = JsonDocument::fromJson(ByteArray::fromQByteArray(receivedData.data()), &err);
-    if (!err.empty()) {
-        result.ret = make_ret(Ret::Code::InternalError, err);
-    } else {
-        result.ret = make_ok();
-        result.val = parseSounds(soundsInfoDoc);
-    }
+        std::string err;
+        JsonDocument soundsInfoDoc = JsonDocument::fromJson(ByteArray::fromQByteArray(receivedData->data()), &err);
+        if (!err.empty()) {
+            result.ret = make_ret(Ret::Code::InternalError, err);
+        } else {
+            result.ret = make_ok();
+            result.val = parseSounds(soundsInfoDoc);
+        }
+
+        m_soundsСatalogs = result.val;
+        m_soundsСatalogsChanged.notify();
+        m_networkManager = nullptr;
+    });
+}
+
+const SoundCatalogueInfoList& MuseSoundsRepository::soundsCatalogueList() const
+{
+    return m_soundsСatalogs;
+}
 
-    callBack(result);
+async::Notification MuseSoundsRepository::soundsCatalogueListChanged() const
+{
+    return m_soundsСatalogsChanged;
 }
 
 SoundCatalogueInfoList MuseSoundsRepository::parseSounds(const JsonDocument& soundsDoc) const

src/musesounds/internal/musesoundsrepository.h

@@ -5,7 +5,7 @@
  * MuseScore
  * Music Composition & Notation
  *
- * Copyright (C) 2024 MuseScore Limited and others
+ * Copyright (C) 2025 MuseScore Limited and others
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -23,6 +23,7 @@
 #pragma once
 
 #include "modularity/ioc.h"
+#include "async/asyncable.h"
 #include "network/inetworkmanagercreator.h"
 #include "imusesoundsconfiguration.h"
 
@@ -33,7 +34,7 @@ class JsonDocument;
 }
 
 namespace mu::musesounds {
-class MuseSoundsRepository : public IMuseSoundsRepository, public muse::Injectable
+class MuseSoundsRepository : public IMuseSoundsRepository, public muse::Injectable, public muse::async::Asyncable
 {
     muse::ThreadSafeInject<muse::network::INetworkManagerCreator> networkManagerCreator = { this };
     muse::ThreadSafeInject<IMuseSoundsConfiguration> configuration = { this };
@@ -48,13 +49,10 @@ class MuseSoundsRepository : public IMuseSoundsRepository, public muse::Injectab
     muse::async::Notification soundsCatalogueListChanged() const override;
 
 private:
-    QByteArray soundsRequestJson() const;
-    void th_requestSounds(const muse::UriQuery& soundsUri, std::function<void(muse::RetVal<SoundCatalogueInfoList>)> callBack) const;
-
     SoundCatalogueInfoList parseSounds(const muse::JsonDocument& soundsDoc) const;
 
-    mutable std::mutex m_mutex;
     SoundCatalogueInfoList m_soundsСatalogs;
     muse::async::Notification m_soundsСatalogsChanged;
+    muse::network::INetworkManagerPtr m_networkManager;
 };
 }