Small tweaks to the assets - delete extra files
This commit is contained in:
parent
8f5516ceb6
commit
a23323a01e
@ -13,19 +13,11 @@ inline QDomElement getDomElementByTagName(QDomElement parent, QString tagname)
|
|||||||
return QDomElement();
|
return QDomElement();
|
||||||
}
|
}
|
||||||
|
|
||||||
// a job that removes all files from the base folder that don't match the whitelist
|
class ThreadedDeleter : public QThread
|
||||||
// runs in whatever thread owns the queue. it is fast though.
|
|
||||||
class NukeAndPaveJob: public Job
|
|
||||||
{
|
{
|
||||||
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit NukeAndPaveJob(QString base, QStringList whitelist)
|
void run()
|
||||||
:Job()
|
|
||||||
{
|
|
||||||
QDir dir(base);
|
|
||||||
m_base = dir.absolutePath();
|
|
||||||
m_whitelist = whitelist;
|
|
||||||
};
|
|
||||||
virtual void start()
|
|
||||||
{
|
{
|
||||||
QDirIterator iter(m_base, QDirIterator::Subdirectories);
|
QDirIterator iter(m_base, QDirIterator::Subdirectories);
|
||||||
QStringList nuke_list;
|
QStringList nuke_list;
|
||||||
@ -51,13 +43,37 @@ public:
|
|||||||
f.remove();
|
f.remove();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
emit finish();
|
|
||||||
};
|
};
|
||||||
private:
|
|
||||||
QString m_base;
|
QString m_base;
|
||||||
QStringList m_whitelist;
|
QStringList m_whitelist;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class NukeAndPaveJob: public Job
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
|
||||||
|
explicit NukeAndPaveJob(QString base, QStringList whitelist)
|
||||||
|
:Job()
|
||||||
|
{
|
||||||
|
QDir dir(base);
|
||||||
|
deleterThread.m_base = dir.absolutePath();
|
||||||
|
deleterThread.m_whitelist = whitelist;
|
||||||
|
};
|
||||||
|
public slots:
|
||||||
|
virtual void start()
|
||||||
|
{
|
||||||
|
connect(&deleterThread, SIGNAL(finished()), SLOT(threadFinished()));
|
||||||
|
deleterThread.start();
|
||||||
|
};
|
||||||
|
void threadFinished()
|
||||||
|
{
|
||||||
|
emit finish();
|
||||||
|
}
|
||||||
|
private:
|
||||||
|
ThreadedDeleter deleterThread;
|
||||||
|
};
|
||||||
|
|
||||||
class DlMachine : public QObject
|
class DlMachine : public QObject
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
@ -84,7 +100,7 @@ public slots:
|
|||||||
qDebug() << "Failed to process s3.amazonaws.com/Minecraft.Resources. XML error:" <<
|
qDebug() << "Failed to process s3.amazonaws.com/Minecraft.Resources. XML error:" <<
|
||||||
xmlErrorMsg << ba;
|
xmlErrorMsg << ba;
|
||||||
}
|
}
|
||||||
QRegExp etag_match(".*([a-f0-9]{32}).*");
|
//QRegExp etag_match(".*([a-f0-9]{32}).*");
|
||||||
QDomNodeList contents = doc.elementsByTagName("Contents");
|
QDomNodeList contents = doc.elementsByTagName("Contents");
|
||||||
|
|
||||||
JobList *job = new JobList();
|
JobList *job = new JobList();
|
||||||
|
@ -47,7 +47,13 @@ void GameUpdateTask::executeTask()
|
|||||||
// Get a pointer to the version object that corresponds to the instance's version.
|
// Get a pointer to the version object that corresponds to the instance's version.
|
||||||
MinecraftVersion *targetVersion = (MinecraftVersion *)MinecraftVersionList::getMainList().
|
MinecraftVersion *targetVersion = (MinecraftVersion *)MinecraftVersionList::getMainList().
|
||||||
findVersion(m_inst->intendedVersion());
|
findVersion(m_inst->intendedVersion());
|
||||||
Q_ASSERT_X(targetVersion != NULL, "game update", "instance's intended version is not an actual version");
|
if(targetVersion == NULL)
|
||||||
|
{
|
||||||
|
//Q_ASSERT_X(targetVersion != NULL, "game update", "instance's intended version is not an actual version");
|
||||||
|
setState(StateFinished);
|
||||||
|
emit gameUpdateComplete(m_response);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Make directories
|
// Make directories
|
||||||
QDir binDir(m_inst->binDir());
|
QDir binDir(m_inst->binDir());
|
||||||
|
Loading…
Reference in New Issue
Block a user