Skip to content

Commit 29348e9

Browse files
RomanPudashkinRomanPudashkin
committed
Deprecate sync NetworkManager
1 parent 2d3ad6d commit 29348e9

28 files changed

+74
-70
lines changed

‎src/framework/cloud/audiocom/audiocomservice.cpp‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ Ret AudioComService::downloadAccountInfo()
133133
TRACEFUNC;
134134

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

139139
if (!ret) {
@@ -185,7 +185,7 @@ bool AudioComService::doUpdateTokens()
185185
QBuffer receivedData(&jsonData);
186186
OutgoingDevice device(&receivedData);
187187

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

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

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

254-
Ret AudioComService::doUploadAudio(network::INetworkManagerPtr uploadManager, QIODevice& audioData, const QString& audioFormat)
254+
Ret AudioComService::doUploadAudio(network::deprecated::INetworkManagerPtr uploadManager, QIODevice& audioData, const QString& audioFormat)
255255
{
256256
TRACEFUNC;
257257

@@ -300,7 +300,7 @@ Ret AudioComService::doUploadAudio(network::INetworkManagerPtr uploadManager, QI
300300
return ret;
301301
}
302302

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

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

322-
Ret AudioComService::doCreateAudio(network::INetworkManagerPtr manager, const QString& title, int size, const QString& audioFormat,
322+
Ret AudioComService::doCreateAudio(network::deprecated::INetworkManagerPtr manager, const QString& title, int size,
323+
const QString& audioFormat,
323324
const QUrl& existingUrl, Visibility visibility, bool replaceExisting)
324325
{
325326
TRACEFUNC;
@@ -375,7 +376,7 @@ Ret AudioComService::doCreateAudio(network::INetworkManagerPtr manager, const QS
375376

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

380381
QBuffer receivedData;
381382

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

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

392393
QBuffer receivedData;
393394
QBuffer outData;

‎src/framework/cloud/audiocom/audiocomservice.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ class AudioComService : public IAudioComService, public AbstractCloudService, pu
6161

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

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

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

7070
void notifyServerAboutFailUpload(const QUrl& failUrl, const QString& token);
7171
void notifyServerAboutSuccessUpload(const QUrl& successUrl, const QString& token);

‎src/framework/cloud/internal/abstractcloudservice.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ void AbstractCloudService::signOut()
283283
}
284284

285285
QBuffer receivedData;
286-
INetworkManagerPtr manager = networkManagerCreator()->makeNetworkManager();
286+
deprecated::INetworkManagerPtr manager = networkManagerCreator()->makeDeprecatedNetworkManager();
287287
Ret ret = manager->get(signOutUrl.val, &receivedData, m_serverConfig.headers);
288288
if (!ret) {
289289
printServerReply(receivedData);
@@ -326,7 +326,7 @@ ValCh<AccountInfo> AbstractCloudService::accountInfo() const
326326
Ret AbstractCloudService::checkCloudIsAvailable() const
327327
{
328328
QBuffer receivedData;
329-
INetworkManagerPtr manager = networkManagerCreator()->makeNetworkManager();
329+
deprecated::INetworkManagerPtr manager = networkManagerCreator()->makeDeprecatedNetworkManager();
330330
Ret ret = manager->get(m_serverConfig.serverAvailabilityUrl, &receivedData, m_serverConfig.headers);
331331

332332
if (!ret) {

‎src/framework/cloud/musescorecom/musescorecomservice.cpp‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Ret MuseScoreComService::downloadAccountInfo()
132132
}
133133

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

138138
if (!ret) {
@@ -179,7 +179,7 @@ bool MuseScoreComService::doUpdateTokens()
179179
QBuffer receivedData;
180180
OutgoingDevice device(&multiPart);
181181

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

185185
if (!ret) {
@@ -224,7 +224,7 @@ RetVal<ScoreInfo> MuseScoreComService::downloadScoreInfo(int scoreId)
224224
}
225225

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

230230
if (!ret) {
@@ -273,7 +273,7 @@ async::Promise<ScoresList> MuseScoreComService::downloadScoresList(int scoresPer
273273
}
274274

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

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

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

351-
Ret MuseScoreComService::doDownloadScore(network::INetworkManagerPtr downloadManager, int scoreId, QIODevice& scoreData,
351+
Ret MuseScoreComService::doDownloadScore(network::deprecated::INetworkManagerPtr downloadManager, int scoreId, QIODevice& scoreData,
352352
const QString& hash, const QString& secret)
353353
{
354354
TRACEFUNC;
@@ -383,7 +383,7 @@ ProgressPtr MuseScoreComService::uploadScore(QIODevice& scoreData, const QString
383383
{
384384
ProgressPtr progress = std::make_shared<Progress>();
385385

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

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

435-
RetVal<ValMap> MuseScoreComService::doUploadScore(INetworkManagerPtr uploadManager, QIODevice& scoreData, const QString& title,
435+
RetVal<ValMap> MuseScoreComService::doUploadScore(deprecated::INetworkManagerPtr uploadManager, QIODevice& scoreData, const QString& title,
436436
Visibility visibility, const QUrl& sourceUrl, int revisionId)
437437
{
438438
TRACEFUNC;
@@ -549,7 +549,8 @@ RetVal<ValMap> MuseScoreComService::doUploadScore(INetworkManagerPtr uploadManag
549549
return result;
550550
}
551551

552-
Ret MuseScoreComService::doUploadAudio(network::INetworkManagerPtr uploadManager, QIODevice& audioData, const QString& audioFormat,
552+
Ret MuseScoreComService::doUploadAudio(network::deprecated::INetworkManagerPtr uploadManager, QIODevice& audioData,
553+
const QString& audioFormat,
553554
const QUrl& sourceUrl)
554555
{
555556
TRACEFUNC;

‎src/framework/cloud/musescorecom/musescorecomservice.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,14 @@ class MuseScoreComService : public IMuseScoreComService, public AbstractCloudSer
7171

7272
network::RequestHeaders headers() const;
7373

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

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

80-
Ret doUploadAudio(network::INetworkManagerPtr uploadManager, QIODevice& audioData, const QString& audioFormat, const QUrl& sourceUrl);
80+
Ret doUploadAudio(network::deprecated::INetworkManagerPtr uploadManager, QIODevice& audioData, const QString& audioFormat,
81+
const QUrl& sourceUrl);
8182
};
8283
}
8384

‎src/framework/languages/internal/languagesservice.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ void LanguagesService::th_update(const QString& languageCode, Progress progress)
377377
bool LanguagesService::canUpdate(const QString& languageCode)
378378
{
379379
QBuffer buff;
380-
INetworkManagerPtr networkManagerPtr = networkManagerCreator()->makeNetworkManager();
380+
deprecated::INetworkManagerPtr networkManagerPtr = networkManagerCreator()->makeDeprecatedNetworkManager();
381381

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

415415
QBuffer qbuff;
416-
INetworkManagerPtr networkManagerPtr = networkManagerCreator()->makeNetworkManager();
416+
deprecated::INetworkManagerPtr networkManagerPtr = networkManagerCreator()->makeDeprecatedNetworkManager();
417417

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

‎src/framework/learn/internal/learnservice.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ void LearnService::th_requestPlaylist(const QUrl& playlistUrl, std::function<voi
110110
{
111111
TRACEFUNC;
112112

113-
network::INetworkManagerPtr networkManager = networkManagerCreator()->makeNetworkManager();
113+
deprecated::INetworkManagerPtr networkManager = networkManagerCreator()->makeDeprecatedNetworkManager();
114114
RequestHeaders headers = configuration()->headers();
115115

116116
QBuffer playlistInfoData;

‎src/framework/network/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ set(MODULE_SRC
2626
${CMAKE_CURRENT_LIST_DIR}/networkmodule.h
2727
${CMAKE_CURRENT_LIST_DIR}/networkerrors.h
2828
${CMAKE_CURRENT_LIST_DIR}/networktypes.h
29-
${CMAKE_CURRENT_LIST_DIR}/inetworkmanager.h
29+
${CMAKE_CURRENT_LIST_DIR}/deprecated/inetworkmanager.h
3030
${CMAKE_CURRENT_LIST_DIR}/inetworkmanagercreator.h
3131
${CMAKE_CURRENT_LIST_DIR}/inetworkconfiguration.h
3232

33-
${CMAKE_CURRENT_LIST_DIR}/internal/networkmanager.cpp
34-
${CMAKE_CURRENT_LIST_DIR}/internal/networkmanager.h
33+
${CMAKE_CURRENT_LIST_DIR}/internal/deprecated/networkmanager.cpp
34+
${CMAKE_CURRENT_LIST_DIR}/internal/deprecated/networkmanager.h
3535
${CMAKE_CURRENT_LIST_DIR}/internal/networkmanagercreator.cpp
3636
${CMAKE_CURRENT_LIST_DIR}/internal/networkmanagercreator.h
3737
${CMAKE_CURRENT_LIST_DIR}/internal/networkconfiguration.cpp

‎src/framework/network/inetworkmanager.h‎ renamed to ‎src/framework/network/deprecated/inetworkmanager.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424

2525
#include "types/ret.h"
2626
#include "global/progress.h"
27-
#include "networktypes.h"
27+
#include "../networktypes.h"
2828

2929
class QUrl;
3030

31-
namespace muse::network {
31+
namespace muse::network::deprecated {
3232
class INetworkManager
3333
{
3434
public:

‎src/framework/network/inetworkmanagercreator.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#define MUSE_NETWORK_INETWORKMANAGERCREATOR_H
2424

2525
#include "modularity/imoduleinterface.h"
26-
#include "inetworkmanager.h"
26+
#include "deprecated/inetworkmanager.h"
2727

2828
namespace muse::network {
2929
class INetworkManagerCreator : MODULE_EXPORT_INTERFACE
@@ -33,7 +33,7 @@ class INetworkManagerCreator : MODULE_EXPORT_INTERFACE
3333
public:
3434
virtual ~INetworkManagerCreator() = default;
3535

36-
virtual INetworkManagerPtr makeNetworkManager() const = 0;
36+
virtual deprecated::INetworkManagerPtr makeDeprecatedNetworkManager() const = 0;
3737
};
3838
}
3939

0 commit comments

Comments
 (0)