Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add queued downloader, some super-minor UI tweaks in stuff that's not even visible yet.

Browse Source
This commit is contained in:
Petr Mrázek 2013-06-30 22:39:57 +02:00
parent 38fb702e78
commit e49b818698
3 changed files with 419 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@ -268,13 +268,24 @@ libUtil libSettings libMultiMC libGroupView
${MultiMC_LINK_ADDITIONAL_LIBS})
ADD_DEPENDENCIES(MultiMC MultiMCLauncher libUtil libSettings libMultiMC libGroupView)
IF(DEFINED MMC_KEYRING_TEST)
# test.cpp
ADD_EXECUTABLE(Test test.cpp)
QT5_USE_MODULES(Test Core)
TARGET_LINK_LIBRARIES(Test libUtil libSettings)
option(BUILD_KEYRING_TEST "Build the simple keyring test binary" OFF)
IF(BUILD_KEYRING_TEST)
# test.cpp
ADD_EXECUTABLE(Test test.cpp)
QT5_USE_MODULES(Test Core)
TARGET_LINK_LIBRARIES(Test libUtil libSettings)
ENDIF()
option(BUILD_ASSET_TEST "Build the asset sync test binary" OFF)
IF(BUILD_ASSET_TEST)
# test.cpp
ADD_EXECUTABLE(AssetTest asset_test.cpp)
QT5_USE_MODULES(AssetTest Core Network)
TARGET_LINK_LIBRARIES(AssetTest libUtil libMultiMC libSettings)
ENDIF()
################################ INSTALLATION AND PACKAGING ################################
# use QtCreator's QTDIR var
IF(DEFINED ENV{QTDIR})

354
asset_test.cpp Normal file
View File

@ -0,0 +1,354 @@
#include <QtCore>
#include <QtNetwork>
#include <QDebug>
#include <QtXml/QtXml>
enum DlStatus
{
Dl_NotStarted,
Dl_InProgress,
Dl_Finished,
Dl_Failed
};
/**
* A single file for the downloader/cache to process.
*/
struct Downloadable
{
Downloadable(QUrl url, QString rel_target_path = QString(), QString expected_md5 = QString())
:m_url(url), m_rel_target_path(rel_target_path), m_expected_md5(expected_md5)
{
m_check_md5 = m_expected_md5.size();
m_save_to_file = m_rel_target_path.size();
status = Dl_NotStarted;
};
/// 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;
/// if saving to file, use the one specified in this string
QString m_rel_target_path;
/// if not saving to file, downloaded data is placed here
QByteArray data;
/// The file's status
DlStatus status;
};
typedef QSharedPointer<Downloadable> DownloadablePtr;
class Downloader;
/**
* A downloader job, which can have multiple files
* the user of the downloader is responsible for creating it
* and connecting its signals to his own slots.
*/
class DLJob : public QObject
{
friend class Downloader;
Q_OBJECT
public:
DLJob ( QUrl what , QObject* parent = 0 ) : QObject(parent)
{
m_status = Dl_NotStarted;
m_downloads.append(DownloadablePtr(new Downloadable(what)));
}
DlStatus getStatus()
{
return m_status;
}
QByteArray getFirstFileData()
{
if(!m_downloads.size())
return QByteArray();
else return m_downloads[0]->data;
}
private:
void emitStart()
{
m_status = Dl_InProgress;
emit started();
}
void emitFail()
{
m_status = Dl_Failed;
emit failed();
}
void emitFinish()
{
m_status = Dl_Finished;
emit finished();
}
private:
QVector<DownloadablePtr> m_downloads;
/// The job's status
DlStatus m_status;
signals:
void started();
void finished();
void failed();
};
typedef QSharedPointer<DLJob> DLJobPtr;
/**
* The downloader itself. Make one, use it.
* User is responsible for keeping it around until all the jobs either finish or fail.
*/
class Downloader : public QObject
{
Q_OBJECT
public:
Downloader(QObject *p = 0):
QObject(p),
nam(new QNetworkAccessManager(this)),
currentReply(0),
currentIndex(0){}
void enqueue(DLJobPtr job)
{
if(jobs.empty())
QTimer::singleShot(0, this, SLOT(startNextJob()));
jobs.enqueue(job);
}
private slots:
void startNextJob()
{
if (jobs.isEmpty())
{
currentJob.clear();
currentIndex = 0;
emit finishedAllJobs();
return;
}
currentJob = jobs.dequeue();
currentIndex = 0;
currentJob->emitStart();
startNextDownload();
}
void startNextDownload()
{
// NO-OP... makes no sense, should be detected as error likely
if(!currentJob)
return;
// we finished the current job. Good job.
if(currentIndex >= currentJob->m_downloads.size())
{
currentJob->emitFinish();
QTimer::singleShot(0, this, SLOT(startNextJob()));
return;
}
DownloadablePtr dlable = currentJob->m_downloads[currentIndex];
if(dlable->m_save_to_file)
{
QString filename = dlable->m_rel_target_path;
currentOutput.setFileName(filename);
// if there already is a file and md5 checking is in effect
if(currentOutput.exists() && dlable->m_check_md5)
{
// and it can be opened
if(currentOutput.open(QIODevice::ReadOnly))
{
// check the md5 against the expected one
QString hash = QCryptographicHash::hash(currentOutput.readAll(), QCryptographicHash::Md5).toHex().constData();
currentOutput.close();
// skip this file if they match
if(hash == dlable->m_expected_md5)
{
currentIndex++;
QTimer::singleShot(0, this, SLOT(startNextDownload()));
return;
}
}
}
if (!currentOutput.open(QIODevice::WriteOnly))
{
/*
* TODO: Can't open the file... the job failed
*/
currentJob->emitFail();
currentJob.clear();
currentIndex = 0;
QTimer::singleShot(0, this, SLOT(startNextJob()));
return;
}
}
QNetworkRequest request(dlable->m_url);
QNetworkReply * rep = nam->get(request);
currentReply = QSharedPointer<QNetworkReply>(rep, &QObject::deleteLater);
connect(rep, SIGNAL(downloadProgress(qint64,qint64)), SLOT(downloadProgress(qint64,qint64)));
connect(rep, SIGNAL(finished()), SLOT(downloadFinished()));
connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), SLOT(downloadError(QNetworkReply::NetworkError)));
connect(rep, SIGNAL(readyRead()), SLOT(downloadReadyRead()));
}
void downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
{
// eventually, progress bars. yeah.
};
void downloadError(QNetworkReply::NetworkError error)
{
// error happened during download. :<
DownloadablePtr dlable = currentJob->m_downloads[currentIndex];
//TODO: log the reason why
dlable->status = Dl_Failed;
}
void downloadFinished()
{
DownloadablePtr dlable = currentJob->m_downloads[currentIndex];
// if the download succeeded
if(dlable->status != Dl_Failed)
{
// nothing went wrong...
dlable->status = Dl_Finished;
// save the data to the downloadable if we aren't saving to file
if(!dlable->m_save_to_file)
{
dlable->data = currentReply->readAll();
}
else
{
currentOutput.close();
}
//TODO: check md5 here!
// continue with the next download, if any
currentIndex ++;
QTimer::singleShot(0, this, SLOT(startNextDownload()));
return;
}
// else the download failed
else
{
if(dlable->m_save_to_file)
{
currentOutput.close();
currentOutput.remove();
}
}
}
void downloadReadyRead()
{
DownloadablePtr dlable = currentJob->m_downloads[currentIndex];
if(dlable->m_save_to_file)
{
currentOutput.write(currentReply->readAll());
}
};
signals:
void finishedAllJobs();
public slots:
private:
QSharedPointer<QNetworkAccessManager> nam;
DLJobPtr currentJob;
QSharedPointer<QNetworkReply> currentReply;
QQueue<DLJobPtr> jobs;
QFile currentOutput;
unsigned currentIndex;
};
inline QDomElement getDomElementByTagName(QDomElement parent, QString tagname)
{
QDomNodeList elementList = parent.elementsByTagName(tagname);
if (elementList.count())
return elementList.at(0).toElement();
else
return QDomElement();
}
class DlMachine : public QObject
{
Q_OBJECT
public slots:
void fetchFinished()
{
QByteArray ba = jptr->getFirstFileData();
QString xmlErrorMsg;
QDomDocument doc;
if (!doc.setContent(ba, false, &xmlErrorMsg))
{
qDebug() << "Failed to process s3.amazonaws.com/Minecraft.Resources. XML error:" <<
xmlErrorMsg << ba;
}
QRegExp etag_match(".*([a-f0-9]{32}).*");
QDomNodeList contents = doc.elementsByTagName("Contents");
for (int i = 0; i < contents.length(); i++)
{
QDomElement element = contents.at(i).toElement();
if (element.isNull())
continue;
QDomElement keyElement = getDomElementByTagName(element, "Key");
QDomElement lastmodElement = getDomElementByTagName(element, "LastModified");
QDomElement etagElement = getDomElementByTagName(element, "ETag");
QDomElement sizeElement = getDomElementByTagName(element, "Size");
if (keyElement.isNull() || lastmodElement.isNull() || etagElement.isNull() || sizeElement.isNull())
continue;
QString keyStr = keyElement.text();
QString lastModStr = lastmodElement.text();
QString etagStr = etagElement.text();
QString sizeStr = sizeElement.text();
//Filter folder keys
if (sizeStr == "0")
continue;
//TODO:Need to get ETag keys to be valid strings not "" ""
qDebug() << keyStr << " " << lastModStr << " " << etagStr << sizeStr;
}
qApp->quit();
}
void fetchStarted()
{
qDebug() << " Started downloading!";
}
public:
void start()
{
DLJob *job = new DLJob(QUrl("http://s3.amazonaws.com/Minecraft.Resources/"));
connect(job, SIGNAL(finished()), SLOT(fetchFinished()));
connect(job, SIGNAL(started()), SLOT(fetchStarted()));
jptr.reset(job);
dl.enqueue(jptr);
}
Downloader dl;
DLJobPtr jptr;
};
int main(int argc, char *argv[])
{
QCoreApplication app(argc, argv);
DlMachine dl;
dl.start();
return app.exec();
}
#include "asset_test.moc"

98
gui/modeditwindow.ui
View File

@ -17,7 +17,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
<number>3</number>
</property>
<widget class="QWidget" name="jarModsTab">
<attribute name="title">
@ -81,54 +81,6 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="mlModsTab">
<attribute name="title">
<string>Mods</string>
</attribute>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QListView" name="mlModListView"/>
</item>
<item>
<layout class="QVBoxLayout" name="mlModsButtonBox">
<item>
<widget class="QPushButton" name="addMlModButton">
<property name="text">
<string>&amp;Add</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="delMlModButton">
<property name="text">
<string>&amp;Remove</string>
</property>
</widget>
</item>
<item>
<spacer name="mlModsButtonSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="viewMlModFolderButton">
<property name="text">
<string>&amp;View Folder</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="coreModsTab">
<attribute name="title">
<string>Core Mods</string>
@ -177,6 +129,54 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="mlModsTab">
<attribute name="title">
<string>Mods</string>
</attribute>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QListView" name="mlModListView"/>
</item>
<item>
<layout class="QVBoxLayout" name="mlModsButtonBox">
<item>
<widget class="QPushButton" name="addMlModButton">
<property name="text">
<string>&amp;Add</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="delMlModButton">
<property name="text">
<string>&amp;Remove</string>
</property>
</widget>
</item>
<item>
<spacer name="mlModsButtonSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="viewMlModFolderButton">
<property name="text">
<string>&amp;View Folder</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="texturePacksTab">
<attribute name="title">
<string>Texture Packs</string>