From a1abbd9e05c80584d831b1d12c27c5f7d731cece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 28 May 2016 19:54:17 +0200 Subject: 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. --- api/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp | 4 ++-- api/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'api/logic/wonko') 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 +namespace Net +{ + class Download; +} + class BaseWonkoEntity; class WonkoIndex; class WonkoVersionList; @@ -43,7 +48,7 @@ private: void executeTask() override; BaseWonkoEntity *m_entity; - std::shared_ptr m_dl; + std::shared_ptr m_dl; }; class WonkoIndexRemoteLoadTask : public BaseWonkoEntityRemoteLoadTask -- cgit v1.2.3