diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-05-28 19:54:17 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-06-05 23:55:39 +0200 |
| commit | a1abbd9e05c80584d831b1d12c27c5f7d731cece (patch) | |
| tree | 3324eaf37efa228e07a0e3136952673f0bc3405a /api/logic/minecraft/MinecraftVersionList.cpp | |
| parent | a750f6e63c783730380c19788deff2acfb3f4836 (diff) | |
| download | MultiMC-a1abbd9e05c80584d831b1d12c27c5f7d731cece.tar MultiMC-a1abbd9e05c80584d831b1d12c27c5f7d731cece.tar.gz MultiMC-a1abbd9e05c80584d831b1d12c27c5f7d731cece.tar.lz MultiMC-a1abbd9e05c80584d831b1d12c27c5f7d731cece.tar.xz MultiMC-a1abbd9e05c80584d831b1d12c27c5f7d731cece.zip | |
NOISSUE refactor *Download into more, smaller pieces
* Download is now Download.
* Download uses Sink subclasses to process various events.
* Validators can be used to further customize the Sink behaviour.
Diffstat (limited to 'api/logic/minecraft/MinecraftVersionList.cpp')
| -rw-r--r-- | api/logic/minecraft/MinecraftVersionList.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/api/logic/minecraft/MinecraftVersionList.cpp b/api/logic/minecraft/MinecraftVersionList.cpp index a5cc3a39..4e4eafbc 100644 --- a/api/logic/minecraft/MinecraftVersionList.cpp +++ b/api/logic/minecraft/MinecraftVersionList.cpp @@ -68,6 +68,7 @@ slots: protected: NetJobPtr specificVersionDownloadJob; + QByteArray versionIndexData; std::shared_ptr<MinecraftVersion> updatedVersion; MinecraftVersionList *m_list; }; @@ -410,7 +411,7 @@ MCVListVersionUpdateTask::MCVListVersionUpdateTask(MinecraftVersionList *vlist, void MCVListVersionUpdateTask::executeTask() { auto job = new NetJob("Version index"); - job->addNetAction(ByteArrayDownload::make(QUrl(updatedVersion->getUrl()))); + job->addNetAction(Net::Download::makeByteArray(QUrl(updatedVersion->getUrl()), &versionIndexData)); specificVersionDownloadJob.reset(job); connect(specificVersionDownloadJob.get(), SIGNAL(succeeded()), SLOT(json_downloaded())); connect(specificVersionDownloadJob.get(), SIGNAL(failed(QString)), SIGNAL(failed(QString))); @@ -420,12 +421,11 @@ void MCVListVersionUpdateTask::executeTask() void MCVListVersionUpdateTask::json_downloaded() { - NetActionPtr DlJob = specificVersionDownloadJob->first(); - auto data = std::dynamic_pointer_cast<ByteArrayDownload>(DlJob)->m_data; specificVersionDownloadJob.reset(); QJsonParseError jsonError; - QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError); + QJsonDocument jsonDoc = QJsonDocument::fromJson(versionIndexData, &jsonError); + versionIndexData.clear(); if (jsonError.error != QJsonParseError::NoError) { |