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

Finish assets update for 1.7.3

Browse Source
This commit is contained in:
Petr Mrázek
2013-12-10 07:12:52 +01:00
parent 8db2e5db81
commit 3f5c46a1c4
20 changed files with 203 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
logic/net/FileDownload.cpp → logic/net/MD5EtagDownload.cpp
View File

@ -14,12 +14,12 @@
*/
#include "MultiMC.h"
#include "FileDownload.h"
#include "MD5EtagDownload.h"
#include <pathutils.h>
#include <QCryptographicHash>
#include "logger/QsLog.h"
FileDownload::FileDownload(QUrl url, QString target_path) : NetAction()
MD5EtagDownload::MD5EtagDownload(QUrl url, QString target_path) : NetAction()
{
m_url = url;
m_target_path = target_path;
@ -27,7 +27,7 @@ FileDownload::FileDownload(QUrl url, QString target_path) : NetAction()
m_status = Job_NotStarted;
}
void FileDownload::start()
void MD5EtagDownload::start()
{
QString filename = m_target_path;
m_output_file.setFileName(filename);
@ -58,7 +58,7 @@ void FileDownload::start()
return;
}
QLOG_INFO() << "Downloading " << m_url.toString();
QLOG_INFO() << "Downloading " << m_url.toString() << " expecting " << m_expected_md5;
QNetworkRequest request(m_url);
request.setRawHeader(QString("If-None-Match").toLatin1(), m_expected_md5.toLatin1());
request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)");
@ -75,19 +75,19 @@ void FileDownload::start()
connect(rep, SIGNAL(readyRead()), SLOT(downloadReadyRead()));
}
void FileDownload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
void MD5EtagDownload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
{
emit progress(index_within_job, bytesReceived, bytesTotal);
}
void FileDownload::downloadError(QNetworkReply::NetworkError error)
void MD5EtagDownload::downloadError(QNetworkReply::NetworkError error)
{
// error happened during download.
// TODO: log the reason why
m_status = Job_Failed;
}
void FileDownload::downloadFinished()
void MD5EtagDownload::downloadFinished()
{
// if the download succeeded
if (m_status != Job_Failed)
@ -96,6 +96,7 @@ void FileDownload::downloadFinished()
m_status = Job_Finished;
m_output_file.close();
QLOG_INFO() << "Finished " << m_url.toString() << " got " << m_reply->rawHeader("ETag").constData();
m_reply.reset();
emit succeeded(index_within_job);
return;
@ -110,7 +111,7 @@ void FileDownload::downloadFinished()
}
}
void FileDownload::downloadReadyRead()
void MD5EtagDownload::downloadReadyRead()
{
if (!m_output_file.isOpen())
{

10
logic/net/FileDownload.h → logic/net/MD5EtagDownload.h
View File

@ -18,8 +18,8 @@
#include "NetAction.h"
#include <QFile>
typedef std::shared_ptr<class FileDownload> FileDownloadPtr;
class FileDownload : public NetAction
typedef std::shared_ptr<class MD5EtagDownload> Md5EtagDownloadPtr;
class MD5EtagDownload : public NetAction
{
Q_OBJECT
public:
@ -35,10 +35,10 @@ public:
QFile m_output_file;
public:
explicit FileDownload(QUrl url, QString target_path);
static FileDownloadPtr make(QUrl url, QString target_path)
explicit MD5EtagDownload(QUrl url, QString target_path);
static Md5EtagDownloadPtr make(QUrl url, QString target_path)
{
return FileDownloadPtr(new FileDownload(url, target_path));
return Md5EtagDownloadPtr(new MD5EtagDownload(url, target_path));
}
protected
slots:

2
logic/net/NetJob.cpp
View File

@ -16,7 +16,7 @@
#include "NetJob.h"
#include "pathutils.h"
#include "MultiMC.h"
#include "FileDownload.h"
#include "MD5EtagDownload.h"
#include "ByteArrayDownload.h"
#include "CacheDownload.h"

2
logic/net/NetJob.h
View File

@ -18,7 +18,7 @@
#include <QLabel>
#include "NetAction.h"
#include "ByteArrayDownload.h"
#include "FileDownload.h"
#include "MD5EtagDownload.h"
#include "CacheDownload.h"
#include "HttpMetaCache.h"
#include "ForgeXzDownload.h"