summaryrefslogtreecommitdiffstats
path: root/logic/lists
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-03-02 02:08:01 +0100
committerPetr Mrázek <peterix@gmail.com>2014-03-02 02:08:01 +0100
commit5a344a293323993eabbe2165d01cbb9a4220201c (patch)
treec2de828e79cdec42dbf794bfb011da87d6fb34dc /logic/lists
parent053b938beb7bb47fc63ec1ec2df519573629e32b (diff)
downloadMultiMC-5a344a293323993eabbe2165d01cbb9a4220201c.tar
MultiMC-5a344a293323993eabbe2165d01cbb9a4220201c.tar.gz
MultiMC-5a344a293323993eabbe2165d01cbb9a4220201c.tar.lz
MultiMC-5a344a293323993eabbe2165d01cbb9a4220201c.tar.xz
MultiMC-5a344a293323993eabbe2165d01cbb9a4220201c.zip
Gather and store liteloader metadata.
Diffstat (limited to 'logic/lists')
-rw-r--r--logic/lists/LiteLoaderVersionList.cpp55
-rw-r--r--logic/lists/LiteLoaderVersionList.h11
2 files changed, 54 insertions, 12 deletions
diff --git a/logic/lists/LiteLoaderVersionList.cpp b/logic/lists/LiteLoaderVersionList.cpp
index b8cea442..ef95eefd 100644
--- a/logic/lists/LiteLoaderVersionList.cpp
+++ b/logic/lists/LiteLoaderVersionList.cpp
@@ -92,7 +92,6 @@ void LiteLoaderVersionList::updateListData(QList<BaseVersionPtr> versions)
LLListLoadTask::LLListLoadTask(LiteLoaderVersionList *vlist)
{
m_list = vlist;
- vlistReply = nullptr;
}
LLListLoadTask::~LLListLoadTask()
@@ -102,23 +101,49 @@ LLListLoadTask::~LLListLoadTask()
void LLListLoadTask::executeTask()
{
setStatus(tr("Loading LiteLoader version list..."));
- auto worker = MMC->qnam();
- vlistReply = worker->get(QNetworkRequest(QUrl(URLConstants::LITELOADER_URL)));
- connect(vlistReply, SIGNAL(finished()), this, SLOT(listDownloaded()));
+ auto job = new NetJob("Version index");
+ // we do not care if the version is stale or not.
+ auto liteloaderEntry = MMC->metacache()->resolveEntry("liteloader", "versions.json");
+
+ // verify by poking the server.
+ liteloaderEntry->stale = true;
+
+ job->addNetAction(listDownload = CacheDownload::make(QUrl(URLConstants::LITELOADER_URL),
+ liteloaderEntry));
+
+ connect(listDownload.get(), SIGNAL(failed(int)), SLOT(listFailed()));
+
+ listJob.reset(job);
+ connect(listJob.get(), SIGNAL(succeeded()), SLOT(listDownloaded()));
+ connect(listJob.get(), SIGNAL(progress(qint64, qint64)), SIGNAL(progress(qint64, qint64)));
+ listJob->start();
+}
+
+void LLListLoadTask::listFailed()
+{
+ emitFailed("Failed to load LiteLoader version list.");
+ return;
}
void LLListLoadTask::listDownloaded()
{
- if (vlistReply->error() != QNetworkReply::NoError)
+ QByteArray data;
{
- vlistReply->deleteLater();
- emitFailed("Failed to load LiteLoader version list" + vlistReply->errorString());
- return;
+ auto dlJob = listDownload;
+ auto filename = std::dynamic_pointer_cast<CacheDownload>(dlJob)->getTargetFilepath();
+ QFile listFile(filename);
+ if (!listFile.open(QIODevice::ReadOnly))
+ {
+ emitFailed("Failed to open the LiteLoader version list.");
+ return;
+ }
+ data = listFile.readAll();
+ listFile.close();
+ dlJob.reset();
}
QJsonParseError jsonError;
- QJsonDocument jsonDoc = QJsonDocument::fromJson(vlistReply->readAll(), &jsonError);
- vlistReply->deleteLater();
+ QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError);
if (jsonError.error != QJsonParseError::NoError)
{
@@ -140,7 +165,12 @@ void LLListLoadTask::listDownloaded()
emitFailed("Error parsing version list JSON: missing 'versions' object");
return;
}
- const QJsonObject versions = root.value("versions").toObject();
+
+ auto meta = root.value("meta").toObject();
+ QString description = meta.value("description").toString(tr("This is a lightweight loader for mods that don't change game mechanics."));
+ QString defaultUrl = meta.value("url").toString("http://dl.liteloader.com");
+ QString authors = meta.value("authors").toString("Mumfrey");
+ auto versions = root.value("versions").toObject();
QList<BaseVersionPtr> tempList;
for (auto vIt = versions.begin(); vIt != versions.end(); ++vIt)
@@ -170,6 +200,9 @@ void LLListLoadTask::listDownloaded()
version->md5 = artefact.value("md5").toString();
version->timestamp = artefact.value("timestamp").toDouble();
version->tweakClass = artefact.value("tweakClass").toString();
+ version->authors = authors;
+ version->description = description;
+ version->defaultUrl = defaultUrl;
const QJsonArray libs = artefact.value("libraries").toArray();
for (auto lIt = libs.begin(); lIt != libs.end(); ++lIt)
{
diff --git a/logic/lists/LiteLoaderVersionList.h b/logic/lists/LiteLoaderVersionList.h
index 8f761caf..bfc913e5 100644
--- a/logic/lists/LiteLoaderVersionList.h
+++ b/logic/lists/LiteLoaderVersionList.h
@@ -22,6 +22,7 @@
#include "BaseVersionList.h"
#include "logic/tasks/Task.h"
#include "logic/BaseVersion.h"
+#include <logic/net/NetJob.h>
class LLListLoadTask;
class QNetworkReply;
@@ -46,6 +47,7 @@ public:
return version;
}
+ // important info
QString version;
QString file;
QString mcVersion;
@@ -54,6 +56,11 @@ public:
bool isLatest;
QString tweakClass;
QStringList libraries;
+
+ // meta
+ QString defaultUrl;
+ QString description;
+ QString authors;
};
typedef std::shared_ptr<LiteLoaderVersion> LiteLoaderVersionPtr;
@@ -96,8 +103,10 @@ public:
protected
slots:
void listDownloaded();
+ void listFailed();
protected:
- QNetworkReply *vlistReply;
+ NetJobPtr listJob;
+ CacheDownloadPtr listDownload;
LiteLoaderVersionList *m_list;
};