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/AssetsUtils.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/AssetsUtils.cpp')
| -rw-r--r-- | api/logic/minecraft/AssetsUtils.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/api/logic/minecraft/AssetsUtils.cpp b/api/logic/minecraft/AssetsUtils.cpp index 7a525abe..bb630528 100644 --- a/api/logic/minecraft/AssetsUtils.cpp +++ b/api/logic/minecraft/AssetsUtils.cpp @@ -25,7 +25,9 @@ #include "AssetsUtils.h" #include "FileSystem.h" -#include "net/MD5EtagDownload.h" +#include "net/Download.h" +#include "net/ChecksumValidator.h" + namespace AssetsUtils { @@ -191,7 +193,12 @@ NetActionPtr AssetObject::getDownloadAction() QFileInfo objectFile(getLocalPath()); if ((!objectFile.isFile()) || (objectFile.size() != size)) { - auto objectDL = MD5EtagDownload::make(getUrl(), objectFile.filePath()); + auto objectDL = Net::Download::makeFile(getUrl(), objectFile.filePath()); + if(hash.size()) + { + auto rawHash = QByteArray::fromHex(hash.toLatin1()); + objectDL->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, rawHash)); + } objectDL->m_total_progress = size; return objectDL; } |