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

Merge branch 'master' into develop

Browse Source 
Conflicts:
	CMakeLists.txt
	changelog.md
This commit is contained in:
Petr Mrázek 2014-07-20 14:23:14 +02:00
commit c91adfb3d1
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog.md
View File

@ -3,6 +3,9 @@
##0.5.0
- In development...
##0.4.1
- Fix LWJGL version list (SourceForge has changed the download API)
##0.4.0
- Jar support in 1.6+
- Deprecated legacy instances

13
logic/LwjglVersionList.cpp
View File

@ -22,7 +22,7 @@
#include "logger/QsLog.h"
#define RSS_URL "http://sourceforge.net/api/file/index/project-id/58488/mtime/desc/rss"
#define RSS_URL "http://sourceforge.net/projects/java-game-lib/rss"
LWJGLVersionList::LWJGLVersionList(QObject *parent) : QAbstractListModel(parent)
{
@ -84,7 +84,7 @@ void LWJGLVersionList::loadList()
setLoading(true);
auto worker = MMC->qnam();
QNetworkRequest req(QUrl(RSS_URL));
req.setRawHeader("Accept", "text/xml");
req.setRawHeader("Accept", "application/rss+xml, text/xml, */*");
req.setRawHeader("User-Agent", "MultiMC/5.0 (Uncached)");
reply = worker->get(req);
connect(reply, SIGNAL(finished()), SLOT(netRequestComplete()));
@ -110,7 +110,8 @@ void LWJGLVersionList::netRequestComplete()
QString xmlErrorMsg;
int errorLine;
if (!doc.setContent(reply->readAll(), false, &xmlErrorMsg, &errorLine))
auto rawData = reply->readAll();
if (!doc.setContent(rawData, false, &xmlErrorMsg, &errorLine))
{
failed("Failed to load LWJGL list. XML error: " + xmlErrorMsg + " at line " +
QString::number(errorLine));
@ -146,10 +147,10 @@ void LWJGLVersionList::netRequestComplete()
QUrl url(link);
if (!url.isValid())
{
QLOG_INFO() << "LWJGL version URL isn't valid:" << link << "Skipping.";
QLOG_WARN() << "LWJGL version URL isn't valid:" << link << "Skipping.";
continue;
}
QLOG_INFO() << "Discovered LWGL version" << name << "at" << link;
tempList.append(LWJGLVersion::Create(name, link));
}
}
@ -183,7 +184,7 @@ const PtrLWJGLVersion LWJGLVersionList::getVersion(const QString &versionName)
void LWJGLVersionList::failed(QString msg)
{
QLOG_INFO() << msg;
QLOG_ERROR() << msg;
emit loadListFailed(msg);
}