Get rid of QNAM (now subclassed and less needy). Basic LWJGL download and extraction.
This commit is contained in:
Petr Mrázek
@ -1,65 +0,0 @@
|
||||
#pragma once
|
||||
#include "jobqueue.h"
|
||||
#include <QtNetwork>
|
||||
|
||||
/**
|
||||
* A single file for the downloader/cache to process.
|
||||
*/
|
||||
class LIBUTIL_EXPORT DownloadJob : public Job
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
DownloadJob(QUrl url,
|
||||
QString rel_target_path = QString(),
|
||||
QString expected_md5 = QString()
|
||||
);
|
||||
static JobPtr create(QUrl url, QString rel_target_path = QString(), QString expected_md5 = QString());
|
||||
|
||||
DownloadJob(QSharedPointer<QNetworkAccessManager> net_mgr,
|
||||
QUrl url,
|
||||
QString rel_target_path = QString(),
|
||||
QString expected_md5 = QString()
|
||||
);
|
||||
static JobPtr create(QSharedPointer<QNetworkAccessManager> net_mgr,
|
||||
QUrl url,
|
||||
QString rel_target_path = QString(),
|
||||
QString expected_md5 = QString()
|
||||
);
|
||||
|
||||
public slots:
|
||||
virtual void start();
|
||||
|
||||
private slots:
|
||||
void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);;
|
||||
void downloadError(QNetworkReply::NetworkError error);
|
||||
void downloadFinished();
|
||||
void downloadReadyRead();
|
||||
|
||||
public:
|
||||
/// the associated network manager
|
||||
QSharedPointer<QNetworkAccessManager> m_manager;
|
||||
/// the network reply
|
||||
QSharedPointer<QNetworkReply> m_reply;
|
||||
/// source URL
|
||||
QUrl m_url;
|
||||
|
||||
/// if true, check the md5sum against a provided md5sum
|
||||
/// also, if a file exists, perform an md5sum first and don't download only if they don't match
|
||||
bool m_check_md5;
|
||||
/// the expected md5 checksum
|
||||
QString m_expected_md5;
|
||||
|
||||
/// save to file?
|
||||
bool m_save_to_file;
|
||||
/// is the saving file already open?
|
||||
bool m_opened_for_saving;
|
||||
/// if saving to file, use the one specified in this string
|
||||
QString m_target_path;
|
||||
/// this is the output file, if any
|
||||
QFile m_output_file;
|
||||
/// if not saving to file, downloaded data is placed here
|
||||
QByteArray m_data;
|
||||
|
||||
/// The file's status
|
||||
JobStatus m_status;
|
||||
};
|
||||
@ -1,180 +0,0 @@
|
||||
#pragma once
|
||||
#include <QtCore>
|
||||
#include "libutil_config.h"
|
||||
|
||||
enum JobStatus
|
||||
{
|
||||
Job_NotStarted,
|
||||
Job_InProgress,
|
||||
Job_Finished,
|
||||
Job_Failed
|
||||
};
|
||||
|
||||
class JobList;
|
||||
|
||||
class LIBUTIL_EXPORT Job : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
protected:
|
||||
explicit Job(): QObject(0){};
|
||||
public:
|
||||
virtual ~Job() {};
|
||||
signals:
|
||||
void finish();
|
||||
void fail();
|
||||
void progress(qint64 current, qint64 total);
|
||||
public slots:
|
||||
virtual void start() = 0;
|
||||
};
|
||||
typedef QSharedPointer<Job> JobPtr;
|
||||
|
||||
/**
|
||||
* A list of jobs, to be processed one by one.
|
||||
*/
|
||||
class LIBUTIL_EXPORT JobList : public QObject
|
||||
{
|
||||
friend class JobListQueue;
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
||||
JobList() : QObject(0)
|
||||
{
|
||||
m_status = Job_NotStarted;
|
||||
current_job_idx = 0;
|
||||
}
|
||||
JobStatus getStatus()
|
||||
{
|
||||
return m_status;
|
||||
}
|
||||
void add(JobPtr dlable)
|
||||
{
|
||||
if(m_status == Job_NotStarted)
|
||||
m_jobs.append(dlable);
|
||||
//else there's a bug. TODO: catch the bugs
|
||||
}
|
||||
JobPtr getFirstJob()
|
||||
{
|
||||
if(m_jobs.size())
|
||||
return m_jobs[0];
|
||||
else
|
||||
return JobPtr();
|
||||
}
|
||||
void start()
|
||||
{
|
||||
current_job_idx = 0;
|
||||
auto job = m_jobs[current_job_idx];
|
||||
|
||||
connect(job.data(), SIGNAL(progress(qint64,qint64)), SLOT(currentJobProgress(qint64,qint64)));
|
||||
connect(job.data(), SIGNAL(finish()), SLOT(currentJobFinished()));
|
||||
connect(job.data(), SIGNAL(fail()), SLOT(currentJobFailed()));
|
||||
job->start();
|
||||
emit started();
|
||||
}
|
||||
private slots:
|
||||
void currentJobFinished()
|
||||
{
|
||||
if(current_job_idx == m_jobs.size() - 1)
|
||||
{
|
||||
m_status = Job_Finished;
|
||||
emit finished();
|
||||
}
|
||||
else
|
||||
{
|
||||
current_job_idx++;
|
||||
auto job = m_jobs[current_job_idx];
|
||||
connect(job.data(), SIGNAL(progress(qint64,qint64)), SLOT(currentJobProgress(qint64,qint64)));
|
||||
connect(job.data(), SIGNAL(finish()), SLOT(currentJobFinished()));
|
||||
connect(job.data(), SIGNAL(fail()), SLOT(currentJobFailed()));
|
||||
job->start();
|
||||
}
|
||||
}
|
||||
void currentJobFailed()
|
||||
{
|
||||
m_status = Job_Failed;
|
||||
emit failed();
|
||||
}
|
||||
void currentJobProgress(qint64 current, qint64 total)
|
||||
{
|
||||
if(!total)
|
||||
return;
|
||||
|
||||
int total_jobs = m_jobs.size();
|
||||
|
||||
if(!total_jobs)
|
||||
return;
|
||||
|
||||
float job_chunk = 1000.0 / float(total_jobs);
|
||||
float cur = current;
|
||||
float tot = total;
|
||||
float last_chunk = (cur / tot) * job_chunk;
|
||||
|
||||
float list_total = job_chunk * current_job_idx + last_chunk;
|
||||
emit progress(qint64(list_total), 1000LL);
|
||||
}
|
||||
private:
|
||||
QVector<JobPtr> m_jobs;
|
||||
/// The overall status of this job list
|
||||
JobStatus m_status;
|
||||
int current_job_idx;
|
||||
signals:
|
||||
void progress(qint64 current, qint64 total);
|
||||
void started();
|
||||
void finished();
|
||||
void failed();
|
||||
};
|
||||
typedef QSharedPointer<JobList> JobListPtr;
|
||||
|
||||
|
||||
/**
|
||||
* A queue of job lists! The job lists fail or finish as units.
|
||||
*/
|
||||
class LIBUTIL_EXPORT JobListQueue : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
JobListQueue(QObject *p = 0):
|
||||
QObject(p),
|
||||
currentIndex(0),
|
||||
is_running(false){}
|
||||
|
||||
void enqueue(JobListPtr job)
|
||||
{
|
||||
jobs.enqueue(job);
|
||||
|
||||
// finish or fail, we should catch that and start the next one
|
||||
connect(job.data(),SIGNAL(finished()), SLOT(startNextJob()));
|
||||
connect(job.data(),SIGNAL(failed()), SLOT(startNextJob()));
|
||||
|
||||
if(!is_running)
|
||||
{
|
||||
QTimer::singleShot(0, this, SLOT(startNextJob()));
|
||||
}
|
||||
}
|
||||
|
||||
private slots:
|
||||
void startNextJob()
|
||||
{
|
||||
if (jobs.isEmpty())
|
||||
{
|
||||
currentJobList.clear();
|
||||
currentIndex = 0;
|
||||
is_running = false;
|
||||
emit finishedAllJobs();
|
||||
return;
|
||||
}
|
||||
|
||||
currentJobList = jobs.dequeue();
|
||||
is_running = true;
|
||||
currentIndex = 0;
|
||||
currentJobList->start();
|
||||
}
|
||||
|
||||
signals:
|
||||
void finishedAllJobs();
|
||||
|
||||
private:
|
||||
JobListPtr currentJobList;
|
||||
QQueue<JobListPtr> jobs;
|
||||
unsigned currentIndex;
|
||||
bool is_running;
|
||||
};
|
||||
@ -1,36 +0,0 @@
|
||||
/* Copyright 2013 MultiMC Contributors
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef NETUTILS_H
|
||||
#define NETUTILS_H
|
||||
|
||||
#include <QObject>
|
||||
|
||||
#include <QNetworkReply>
|
||||
#include <QEventLoop>
|
||||
|
||||
namespace NetUtils
|
||||
{
|
||||
|
||||
inline void waitForNetRequest(QNetworkReply *netReply)
|
||||
{
|
||||
QEventLoop loop;
|
||||
loop.connect(netReply, SIGNAL(finished()), SLOT(quit()));
|
||||
loop.exec();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif // NETUTILS_H
|
||||
Reference in New Issue
Block a user