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/wonko | |
| 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/wonko')
| -rw-r--r-- | api/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp | 4 | ||||
| -rw-r--r-- | api/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/api/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp b/api/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp index 727ec89d..32d2071d 100644 --- a/api/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp +++ b/api/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp @@ -15,7 +15,7 @@ #include "BaseWonkoEntityRemoteLoadTask.h" -#include "net/CacheDownload.h" +#include "net/Download.h" #include "net/HttpMetaCache.h" #include "net/NetJob.h" #include "wonko/format/WonkoFormat.h" @@ -37,7 +37,7 @@ void BaseWonkoEntityRemoteLoadTask::executeTask() auto entry = ENV.metacache()->resolveEntry("wonko", url().toString()); entry->setStale(true); - m_dl = CacheDownload::make(url(), entry); + m_dl = Net::Download::makeCached(url(), entry); job->addNetAction(m_dl); connect(job, &NetJob::failed, this, &BaseWonkoEntityRemoteLoadTask::emitFailed); connect(job, &NetJob::succeeded, this, &BaseWonkoEntityRemoteLoadTask::networkFinished); diff --git a/api/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h b/api/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h index 91ed6af0..d2bdd5a2 100644 --- a/api/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h +++ b/api/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h @@ -18,6 +18,11 @@ #include "tasks/Task.h" #include <memory> +namespace Net +{ + class Download; +} + class BaseWonkoEntity; class WonkoIndex; class WonkoVersionList; @@ -43,7 +48,7 @@ private: void executeTask() override; BaseWonkoEntity *m_entity; - std::shared_ptr<class CacheDownload> m_dl; + std::shared_ptr<Net::Download> m_dl; }; class WonkoIndexRemoteLoadTask : public BaseWonkoEntityRemoteLoadTask |