CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE refactor *Download into more, smaller pieces

Browse Source 
* Download is now Download.
* Download uses Sink subclasses to process various events.
* Validators can be used to further customize the Sink behaviour.
This commit is contained in:
Petr Mrázek
2016-05-28 19:54:17 +02:00
parent a750f6e63c
commit a1abbd9e05
51 changed files with 824 additions and 765 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/logic/trans/TranslationDownloader.cpp
View File

@ -1,6 +1,6 @@
#include "TranslationDownloader.h"
#include "net/NetJob.h"
#include "net/CacheDownload.h"
#include "net/Download.h"
#include "net/URLConstants.h"
#include "Env.h"
#include <QDebug>
@ -12,7 +12,7 @@ void TranslationDownloader::downloadTranslations()
{
qDebug() << "Downloading Translations Index...";
m_index_job.reset(new NetJob("Translations Index"));
m_index_task = ByteArrayDownload::make(QUrl("http://files.multimc.org/translations/index"));
m_index_task = Net::Download::makeByteArray(QUrl("http://files.multimc.org/translations/index"), &m_data);
m_index_job->addNetAction(m_index_task);
connect(m_index_job.get(), &NetJob::failed, this, &TranslationDownloader::indexFailed);
connect(m_index_job.get(), &NetJob::succeeded, this, &TranslationDownloader::indexRecieved);
@ -22,17 +22,15 @@ void TranslationDownloader::indexRecieved()
{
qDebug() << "Got translations index!";
m_dl_job.reset(new NetJob("Translations"));
QList<QByteArray> lines = m_index_task->m_data.split('\n');
QList<QByteArray> lines = m_data.split('\n');
m_data.clear();
for (const auto line : lines)
{
if (!line.isEmpty())
{
MetaEntryPtr entry = ENV.metacache()->resolveEntry("translations", "mmc_" + line);
entry->setStale(true);
CacheDownloadPtr dl = CacheDownload::make(
QUrl(URLConstants::TRANSLATIONS_BASE_URL + line),
entry);
m_dl_job->addNetAction(dl);
m_dl_job->addNetAction(Net::Download::makeCached(QUrl(URLConstants::TRANSLATIONS_BASE_URL + line), entry));
}
}
connect(m_dl_job.get(), &NetJob::succeeded, this, &TranslationDownloader::dlGood);

8
api/logic/trans/TranslationDownloader.h
View File

@ -6,8 +6,9 @@
#include <QObject>
#include <net/NetJob.h>
#include "multimc_logic_export.h"
class ByteArrayDownload;
namespace Net{
class Download;
}
class NetJob;
class MULTIMC_LOGIC_EXPORT TranslationDownloader : public QObject
@ -26,7 +27,8 @@ private slots:
void dlGood();
private:
std::shared_ptr<ByteArrayDownload> m_index_task;
std::shared_ptr<Net::Download> m_index_task;
NetJobPtr m_dl_job;
NetJobPtr m_index_job;
QByteArray m_data;
};