0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Piddle-farting with 1.6 instances. Now with more json!

Browse Source
This commit is contained in:
Petr Mrázek 2013-07-09 00:52:03 +02:00
parent ee5583251d
commit dd86061f0f
4 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libmultimc/src/gameupdatetask.cpp
View File

@ -95,7 +95,6 @@ void GameUpdateTask::versionFileFinished()
exit(0);
}
Q_ASSERT_X(jsonDoc.isObject(), "loadFromVList", "jsonDoc is not an object");
if(!jsonDoc.isObject())
{
error("Error reading version file.");
@ -103,6 +102,10 @@ void GameUpdateTask::versionFileFinished()
}
QJsonObject root = jsonDoc.object();
/*
* FIXME: this distinction is pretty weak. The only other option
* is to have a list of all the legacy versions.
*/
QString args = root.value("processArguments").toString("legacy");
if(args == "legacy")
{
@ -110,8 +113,26 @@ void GameUpdateTask::versionFileFinished()
return;
}
// save the version file in $instanceId/version.json and versions/$version/$version.json
QString version_id = targetVersion->descriptor();
QString mc_dir = m_inst->minecraftDir();
QString inst_dir = m_inst->rootDir();
QString version1 = PathCombine(inst_dir, "/version.json");
QString version2 = QString("versions/") + version_id + "/" + version_id + ".json";
DownloadJob::ensurePathExists(version1);
DownloadJob::ensurePathExists(version2);
QFile vfile1 (version1);
QFile vfile2 (version2);
vfile1.open(QIODevice::Truncate | QIODevice::WriteOnly );
vfile2.open(QIODevice::Truncate | QIODevice::WriteOnly );
vfile1.write(DlJob->m_data);
vfile2.write(DlJob->m_data);
vfile1.close();
vfile2.close();
// download the right jar, save it in versions/$version/$version.jar
// determine and download all the libraries, save them in libraries/whatever...
error("MC 1.6 isn't supported yet...");
exit(0);
}

5
libutil/include/dlqueue.h
View File

@ -5,13 +5,16 @@
/**
* A single file for the downloader/cache to process.
*/
class DownloadJob : public Job
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());
public:
static bool ensurePathExists(QString filenamepath);
public slots:
virtual void start();

7
libutil/include/jobqueue.h
View File

@ -1,5 +1,6 @@
#pragma once
#include <QtCore>
#include "libutil_config.h"
enum JobStatus
{
@ -11,7 +12,7 @@ enum JobStatus
class JobList;
class Job : public QObject
class LIBUTIL_EXPORT Job : public QObject
{
Q_OBJECT
protected:
@ -30,7 +31,7 @@ typedef QSharedPointer<Job> JobPtr;
/**
* A list of jobs, to be processed one by one.
*/
class JobList : public QObject
class LIBUTIL_EXPORT JobList : public QObject
{
friend class JobListQueue;
Q_OBJECT
@ -127,7 +128,7 @@ typedef QSharedPointer<JobList> JobListPtr;
/**
* A queue of job lists! The job lists fail or finish as units.
*/
class JobListQueue : public QObject
class LIBUTIL_EXPORT JobListQueue : public QObject
{
Q_OBJECT
public:

39
libutil/src/dlqueue.cpp
View File

@ -17,6 +17,13 @@ JobPtr DownloadJob::create ( QUrl url, QString target_path, QString expected_md5
return JobPtr ( new DownloadJob ( url, target_path, expected_md5 ) );
}
bool DownloadJob::ensurePathExists(QString filenamepath)
{
QFileInfo a ( filenamepath );
QDir dir;
return (dir.mkpath ( a.path() ));
}
void DownloadJob::start()
{
m_manager.reset ( new QNetworkAccessManager() );
@ -24,34 +31,26 @@ void DownloadJob::start()
{
QString filename = m_target_path;
m_output_file.setFileName ( filename );
// if there already is a file and md5 checking is in effect
if ( m_output_file.exists() && m_check_md5 )
// if there already is a file and md5 checking is in effect and it can be opened
if ( m_check_md5 && m_output_file.exists() && m_output_file.open ( QIODevice::ReadOnly ) )
{
// and it can be opened
if ( m_output_file.open ( QIODevice::ReadOnly ) )
// check the md5 against the expected one
QString hash = QCryptographicHash::hash ( m_output_file.readAll(), QCryptographicHash::Md5 ).toHex().constData();
m_output_file.close();
// skip this file if they match
if ( hash == m_expected_md5 )
{
// check the md5 against the expected one
QString hash = QCryptographicHash::hash ( m_output_file.readAll(), QCryptographicHash::Md5 ).toHex().constData();
m_output_file.close();
// skip this file if they match
if ( hash == m_expected_md5 )
{
qDebug() << "Skipping " << m_url.toString() << ": md5 match.";
emit finish();
return;
}
qDebug() << "Skipping " << m_url.toString() << ": md5 match.";
emit finish();
return;
}
}
QFileInfo a ( filename );
QDir dir;
if ( !dir.mkpath ( a.path() ) )
if(!ensurePathExists(filename))
{
/*
* error when making the folder structure
*/
emit fail();
return;
}
if ( !m_output_file.open ( QIODevice::WriteOnly ) )
{
/*