Skip to content

Add async network manager #31178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+994 −513
Open

Add async network manager #31178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29348e9
Deprecate sync NetworkManager
RomanPudashkin Nov 24, 2025
d149a96
Add async NetworkManager
RomanPudashkin Nov 24, 2025
e569569
Use async NetworkManager in MuseSamplerCheckUpdateService
RomanPudashkin Nov 24, 2025
f3c27bd
Use async NetworkManager in LearnService
RomanPudashkin Nov 24, 2025
887a834
Use async NetworkManager in MuseSoundsRepository
RomanPudashkin Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/framework/cloud/audiocom/audiocomservice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ Ret AudioComService::downloadAccountInfo()
TRACEFUNC;

QBuffer receivedData;
INetworkManagerPtr manager = networkManagerCreator()->makeNetworkManager();
deprecated::INetworkManagerPtr manager = networkManagerCreator()->makeDeprecatedNetworkManager();
Ret ret = manager->get(AUDIOCOM_USER_INFO_API_URL, &receivedData, headers());

if (!ret) {
Expand Down Expand Up @@ -185,7 +185,7 @@ bool AudioComService::doUpdateTokens()
QBuffer receivedData(&jsonData);
OutgoingDevice device(&receivedData);

INetworkManagerPtr manager = networkManagerCreator()->makeNetworkManager();
deprecated::INetworkManagerPtr manager = networkManagerCreator()->makeDeprecatedNetworkManager();
Ret ret = manager->post(serverConfig.refreshApiUrl, &device, &receivedData, headers());

if (!ret) {
Expand All @@ -208,7 +208,7 @@ ProgressPtr AudioComService::uploadAudio(QIODevice& audioData, const QString& au
{
ProgressPtr progress = std::make_shared<Progress>();

INetworkManagerPtr manager = networkManagerCreator()->makeNetworkManager();
deprecated::INetworkManagerPtr manager = networkManagerCreator()->makeDeprecatedNetworkManager();
manager->progress().progressChanged().onReceive(this, [progress](int64_t current, int64_t total, const std::string& message) {
progress->progress(current, total, message);
});
Expand Down Expand Up @@ -251,7 +251,7 @@ ProgressPtr AudioComService::uploadAudio(QIODevice& audioData, const QString& au
return progress;
}

Ret AudioComService::doUploadAudio(network::INetworkManagerPtr uploadManager, QIODevice& audioData, const QString& audioFormat)
Ret AudioComService::doUploadAudio(network::deprecated::INetworkManagerPtr uploadManager, QIODevice& audioData, const QString& audioFormat)
{
TRACEFUNC;

Expand Down Expand Up @@ -300,7 +300,7 @@ Ret AudioComService::doUploadAudio(network::INetworkManagerPtr uploadManager, QI
return ret;
}

Ret AudioComService::doUpdateVisibility(network::INetworkManagerPtr manager, const QUrl& url, Visibility visibility)
Ret AudioComService::doUpdateVisibility(network::deprecated::INetworkManagerPtr manager, const QUrl& url, Visibility visibility)
{
QUrl patchUrl(AUDIOCOM_API_ROOT_URL + "/audio/" + idFromCloudUrl(url).toQString());

Expand All @@ -319,7 +319,8 @@ Ret AudioComService::doUpdateVisibility(network::INetworkManagerPtr manager, con
return ret;
}

Ret AudioComService::doCreateAudio(network::INetworkManagerPtr manager, const QString& title, int size, const QString& audioFormat,
Ret AudioComService::doCreateAudio(network::deprecated::INetworkManagerPtr manager, const QString& title, int size,
const QString& audioFormat,
const QUrl& existingUrl, Visibility visibility, bool replaceExisting)
{
TRACEFUNC;
Expand Down Expand Up @@ -375,7 +376,7 @@ Ret AudioComService::doCreateAudio(network::INetworkManagerPtr manager, const QS

void AudioComService::notifyServerAboutFailUpload(const QUrl& failUrl, const QString& token)
{
INetworkManagerPtr manager = networkManagerCreator()->makeNetworkManager();
deprecated::INetworkManagerPtr manager = networkManagerCreator()->makeDeprecatedNetworkManager();

QBuffer receivedData;

Expand All @@ -387,7 +388,7 @@ void AudioComService::notifyServerAboutFailUpload(const QUrl& failUrl, const QSt

void AudioComService::notifyServerAboutSuccessUpload(const QUrl& successUrl, const QString& token)
{
INetworkManagerPtr manager = networkManagerCreator()->makeNetworkManager();
deprecated::INetworkManagerPtr manager = networkManagerCreator()->makeDeprecatedNetworkManager();

QBuffer receivedData;
QBuffer outData;
Expand Down
6 changes: 3 additions & 3 deletions src/framework/cloud/audiocom/audiocomservice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ class AudioComService : public IAudioComService, public AbstractCloudService, pu

network::RequestHeaders headers(const QString& token = QString()) const;

Ret doUploadAudio(network::INetworkManagerPtr uploadManager, QIODevice& audioData, const QString& audioFormat);
Ret doCreateAudio(network::INetworkManagerPtr manager, const QString& title, int size, const QString& audioFormat,
Ret doUploadAudio(network::deprecated::INetworkManagerPtr uploadManager, QIODevice& audioData, const QString& audioFormat);
Ret doCreateAudio(network::deprecated::INetworkManagerPtr manager, const QString& title, int size, const QString& audioFormat,
const QUrl& existingUrl, Visibility visibility, bool replaceExisting);

Ret doUpdateVisibility(network::INetworkManagerPtr manager, const QUrl& url, Visibility visibility);
Ret doUpdateVisibility(network::deprecated::INetworkManagerPtr manager, const QUrl& url, Visibility visibility);

void notifyServerAboutFailUpload(const QUrl& failUrl, const QString& token);
void notifyServerAboutSuccessUpload(const QUrl& successUrl, const QString& token);
Expand Down
4 changes: 2 additions & 2 deletions src/framework/cloud/internal/abstractcloudservice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ void AbstractCloudService::signOut()
}

QBuffer receivedData;
INetworkManagerPtr manager = networkManagerCreator()->makeNetworkManager();
deprecated::INetworkManagerPtr manager = networkManagerCreator()->makeDeprecatedNetworkManager();
Ret ret = manager->get(signOutUrl.val, &receivedData, m_serverConfig.headers);
if (!ret) {
printServerReply(receivedData);
Expand Down Expand Up @@ -326,7 +326,7 @@ ValCh<AccountInfo> AbstractCloudService::accountInfo() const
Ret AbstractCloudService::checkCloudIsAvailable() const
{
QBuffer receivedData;
INetworkManagerPtr manager = networkManagerCreator()->makeNetworkManager();
deprecated::INetworkManagerPtr manager = networkManagerCreator()->makeDeprecatedNetworkManager();
Ret ret = manager->get(m_serverConfig.serverAvailabilityUrl, &receivedData, m_serverConfig.headers);

if (!ret) {
Expand Down
21 changes: 11 additions & 10 deletions src/framework/cloud/musescorecom/musescorecomservice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ Ret MuseScoreComService::downloadAccountInfo()
}

QBuffer receivedData;
INetworkManagerPtr manager = networkManagerCreator()->makeNetworkManager();
deprecated::INetworkManagerPtr manager = networkManagerCreator()->makeDeprecatedNetworkManager();
Ret ret = manager->get(userInfoUrl.val, &receivedData, headers());

if (!ret) {
Expand Down Expand Up @@ -179,7 +179,7 @@ bool MuseScoreComService::doUpdateTokens()
QBuffer receivedData;
OutgoingDevice device(&multiPart);

INetworkManagerPtr manager = networkManagerCreator()->makeNetworkManager();
deprecated::INetworkManagerPtr manager = networkManagerCreator()->makeDeprecatedNetworkManager();
Ret ret = manager->post(serverConfig().refreshApiUrl, &device, &receivedData, headers());

if (!ret) {
Expand Down Expand Up @@ -224,7 +224,7 @@ RetVal<ScoreInfo> MuseScoreComService::downloadScoreInfo(int scoreId)
}

QBuffer receivedData;
INetworkManagerPtr manager = networkManagerCreator()->makeNetworkManager();
deprecated::INetworkManagerPtr manager = networkManagerCreator()->makeDeprecatedNetworkManager();
Ret ret = manager->get(scoreInfoUrl.val, &receivedData, headers());

if (!ret) {
Expand Down Expand Up @@ -273,7 +273,7 @@ async::Promise<ScoresList> MuseScoreComService::downloadScoresList(int scoresPer
}

QBuffer receivedData;
INetworkManagerPtr manager = networkManagerCreator()->makeNetworkManager();
deprecated::INetworkManagerPtr manager = networkManagerCreator()->makeDeprecatedNetworkManager();
Ret ret = manager->get(scoresListUrl.val, &receivedData, headers());

if (!ret) {
Expand Down Expand Up @@ -329,7 +329,7 @@ ProgressPtr MuseScoreComService::downloadScore(int scoreId, QIODevice& scoreData
{
ProgressPtr progress = std::make_shared<Progress>();

INetworkManagerPtr manager = networkManagerCreator()->makeNetworkManager();
deprecated::INetworkManagerPtr manager = networkManagerCreator()->makeDeprecatedNetworkManager();
manager->progress().progressChanged().onReceive(this, [progress](int64_t current, int64_t total, const std::string& message) {
progress->progress(current, total, message);
});
Expand All @@ -348,7 +348,7 @@ ProgressPtr MuseScoreComService::downloadScore(int scoreId, QIODevice& scoreData
return progress;
}

Ret MuseScoreComService::doDownloadScore(network::INetworkManagerPtr downloadManager, int scoreId, QIODevice& scoreData,
Ret MuseScoreComService::doDownloadScore(network::deprecated::INetworkManagerPtr downloadManager, int scoreId, QIODevice& scoreData,
const QString& hash, const QString& secret)
{
TRACEFUNC;
Expand Down Expand Up @@ -383,7 +383,7 @@ ProgressPtr MuseScoreComService::uploadScore(QIODevice& scoreData, const QString
{
ProgressPtr progress = std::make_shared<Progress>();

INetworkManagerPtr manager = networkManagerCreator()->makeNetworkManager();
deprecated::INetworkManagerPtr manager = networkManagerCreator()->makeDeprecatedNetworkManager();
manager->progress().progressChanged().onReceive(this, [progress](int64_t current, int64_t total, const std::string& message) {
progress->progress(current, total, message);
});
Expand Down Expand Up @@ -414,7 +414,7 @@ ProgressPtr MuseScoreComService::uploadAudio(QIODevice& audioData, const QString
{
ProgressPtr progress = std::make_shared<Progress>();

INetworkManagerPtr manager = networkManagerCreator()->makeNetworkManager();
deprecated::INetworkManagerPtr manager = networkManagerCreator()->makeDeprecatedNetworkManager();
manager->progress().progressChanged().onReceive(this, [progress](int64_t current, int64_t total, const std::string& message) {
progress->progress(current, total, message);
});
Expand All @@ -432,7 +432,7 @@ ProgressPtr MuseScoreComService::uploadAudio(QIODevice& audioData, const QString
return progress;
}

RetVal<ValMap> MuseScoreComService::doUploadScore(INetworkManagerPtr uploadManager, QIODevice& scoreData, const QString& title,
RetVal<ValMap> MuseScoreComService::doUploadScore(deprecated::INetworkManagerPtr uploadManager, QIODevice& scoreData, const QString& title,
Visibility visibility, const QUrl& sourceUrl, int revisionId)
{
TRACEFUNC;
Expand Down Expand Up @@ -549,7 +549,8 @@ RetVal<ValMap> MuseScoreComService::doUploadScore(INetworkManagerPtr uploadManag
return result;
}

Ret MuseScoreComService::doUploadAudio(network::INetworkManagerPtr uploadManager, QIODevice& audioData, const QString& audioFormat,
Ret MuseScoreComService::doUploadAudio(network::deprecated::INetworkManagerPtr uploadManager, QIODevice& audioData,
const QString& audioFormat,
const QUrl& sourceUrl)
{
TRACEFUNC;
Expand Down
7 changes: 4 additions & 3 deletions src/framework/cloud/musescorecom/musescorecomservice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,14 @@ class MuseScoreComService : public IMuseScoreComService, public AbstractCloudSer

network::RequestHeaders headers() const;

Ret doDownloadScore(network::INetworkManagerPtr downloadManager, int scoreId, QIODevice& scoreData,
Ret doDownloadScore(network::deprecated::INetworkManagerPtr downloadManager, int scoreId, QIODevice& scoreData,
const QString& hash = QString(), const QString& secret = QString());

RetVal<ValMap> doUploadScore(network::INetworkManagerPtr uploadManager, QIODevice& scoreData, const QString& title,
RetVal<ValMap> doUploadScore(network::deprecated::INetworkManagerPtr uploadManager, QIODevice& scoreData, const QString& title,
Visibility visibility, const QUrl& sourceUrl = QUrl(), int revisionId = 0);

Ret doUploadAudio(network::INetworkManagerPtr uploadManager, QIODevice& audioData, const QString& audioFormat, const QUrl& sourceUrl);
Ret doUploadAudio(network::deprecated::INetworkManagerPtr uploadManager, QIODevice& audioData, const QString& audioFormat,
const QUrl& sourceUrl);
};
}

Expand Down
4 changes: 2 additions & 2 deletions src/framework/languages/internal/languagesservice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ void LanguagesService::th_update(const QString& languageCode, Progress progress)
bool LanguagesService::canUpdate(const QString& languageCode)
{
QBuffer buff;
INetworkManagerPtr networkManagerPtr = networkManagerCreator()->makeNetworkManager();
deprecated::INetworkManagerPtr networkManagerPtr = networkManagerCreator()->makeDeprecatedNetworkManager();

Ret ret = networkManagerPtr->get(configuration()->languagesUpdateUrl().toString(), &buff);
if (!ret) {
Expand Down Expand Up @@ -413,7 +413,7 @@ Ret LanguagesService::downloadLanguage(const QString& languageCode, Progress pro
progress.progress(0, 0, downloadingStatusTitle);

QBuffer qbuff;
INetworkManagerPtr networkManagerPtr = networkManagerCreator()->makeNetworkManager();
deprecated::INetworkManagerPtr networkManagerPtr = networkManagerCreator()->makeDeprecatedNetworkManager();

networkManagerPtr->progress().progressChanged().onReceive(
this, [&progress, &downloadingStatusTitle](int64_t current, int64_t total, const std::string&) {
Expand Down
Loading
Loading