Fix Sourceforge lwjgl version index download.

2 files changed, 18 insertions, 15 deletions

diff --git a/logic/lists/InstanceList.cpp b/logic/lists/InstanceList.cpp
index 4446ff22..7081dc6f 100644
--- a/logic/lists/InstanceList.cpp
+++ b/logic/lists/InstanceList.cpp
@@ -204,7 +204,7 @@ void InstanceList::loadGroupList(QMap<QString, QString> &groupMap)
 	// if the root of the json wasn't an object, fail
 	if (!jsonDoc.isObject())
 	{
-		qWarning("Invalid group file. Root entry should be an object.");
+		QLOG_WARN() << "Invalid group file. Root entry should be an object.";
 		return;
 	}
 
@@ -217,7 +217,7 @@ void InstanceList::loadGroupList(QMap<QString, QString> &groupMap)
 	// Get the groups. if it's not an object, fail
 	if (!rootObj.value("groups").isObject())
 	{
-		qWarning("Invalid group list JSON: 'groups' should be an object.");
+		QLOG_WARN() << "Invalid group list JSON: 'groups' should be an object.";
 		return;
 	}
 
@@ -230,21 +230,21 @@ void InstanceList::loadGroupList(QMap<QString, QString> &groupMap)
 		// If not an object, complain and skip to the next one.
 		if (!iter.value().isObject())
 		{
-			qWarning(QString("Group '%1' in the group list should "
-							 "be an object.")
-						 .arg(groupName)
-						 .toUtf8());
+			QLOG_WARN() << QString("Group '%1' in the group list should "
+								   "be an object.")
+							   .arg(groupName)
+							   .toUtf8();
 			continue;
 		}
 
 		QJsonObject groupObj = iter.value().toObject();
 		if (!groupObj.value("instances").isArray())
 		{
-			qWarning(QString("Group '%1' in the group list is invalid. "
-							 "It should contain an array "
-							 "called 'instances'.")
-						 .arg(groupName)
-						 .toUtf8());
+			QLOG_WARN() << QString("Group '%1' in the group list is invalid. "
+								   "It should contain an array "
+								   "called 'instances'.")
+							   .arg(groupName)
+							   .toUtf8();
 			continue;
 		}
 
diff --git a/logic/lists/LwjglVersionList.cpp b/logic/lists/LwjglVersionList.cpp
index 3333e86c..df46d7be 100644
--- a/logic/lists/LwjglVersionList.cpp
+++ b/logic/lists/LwjglVersionList.cpp
@@ -83,7 +83,10 @@ void LWJGLVersionList::loadList()
 
 	setLoading(true);
 	auto worker = MMC->qnam();
-	reply = worker->get(QNetworkRequest(QUrl(RSS_URL)));
+	QNetworkRequest req(QUrl(RSS_URL));
+	req.setRawHeader("Accept", "text/xml");
+	req.setRawHeader("User-Agent", "MultiMC/5.0 (Uncached)");
+	reply = worker->get(req);
 	connect(reply, SIGNAL(finished()), SLOT(netRequestComplete()));
 }
 
@@ -127,7 +130,7 @@ void LWJGLVersionList::netRequestComplete()
 			QDomElement linkElement = getDomElementByTagName(items.at(i).toElement(), "link");
 			if (linkElement.isNull())
 			{
-				qWarning() << "Link element" << i << "in RSS feed doesn't exist! Skipping.";
+				QLOG_INFO() << "Link element" << i << "in RSS feed doesn't exist! Skipping.";
 				continue;
 			}
 
@@ -143,7 +146,7 @@ void LWJGLVersionList::netRequestComplete()
 				QUrl url(link);
 				if (!url.isValid())
 				{
-					qWarning() << "LWJGL version URL isn't valid:" << link << "Skipping.";
+					QLOG_INFO() << "LWJGL version URL isn't valid:" << link << "Skipping.";
 					continue;
 				}
 
@@ -180,7 +183,7 @@ const PtrLWJGLVersion LWJGLVersionList::getVersion(const QString &versionName)
 
 void LWJGLVersionList::failed(QString msg)
 {
-	qWarning() << msg;
+	QLOG_INFO() << msg;
 	emit loadListFailed(msg);
 }