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

Fixed timestamp parsing in version lists.

Browse Source
This commit is contained in:
Andrew
2013-05-08 17:25:46 -05:00
parent 5f781b3053
commit 159404f444
1 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libmultimc/src/minecraftversionlist.cpp
View File

@@ -152,24 +152,7 @@ inline QDomElement getDomElementByTagName(QDomElement parent, QString tagname)
inline QDateTime timeFromS3Time(QString str) inline QDateTime timeFromS3Time(QString str)
{ {
const QString fmt("yyyy-MM-dd'T'HH:mm:ss'.000Z'"); return QDateTime::fromString(str, Qt::ISODate);
return QDateTime::fromString(str, fmt);
}
inline QDateTime timeFromMCVListTime(QString str)
{
int operatorPos = str.indexOf("+", str.indexOf("T"));
if (operatorPos == -1)
operatorPos = str.indexOf("-", str.indexOf("T"));
if (operatorPos)
operatorPos = str.length();
const QString fmt("yyyy-MM-dd'T'HH:mm:ss'+02:00'");
// It's a dark templar!
QDateTime dt = QDateTime::fromString(str.left(operatorPos), fmt);
return dt;
} }
@@ -257,7 +240,7 @@ bool MCVListLoadTask::loadFromVList()
QJsonObject version = versions[i].toObject(); QJsonObject version = versions[i].toObject();
QString versionID = version.value("id").toString(""); QString versionID = version.value("id").toString("");
QString versionTimeStr = version.value("time").toString(""); QString versionTimeStr = version.value("releaseTime").toString("");
QString versionTypeStr = version.value("type").toString(""); QString versionTypeStr = version.value("type").toString("");
Q_ASSERT_X(!versionID.isEmpty(), "loadFromVList", Q_ASSERT_X(!versionID.isEmpty(), "loadFromVList",
@@ -274,7 +257,7 @@ bool MCVListLoadTask::loadFromVList()
// Now, process that info and add the version to the list. // Now, process that info and add the version to the list.
// Parse the timestamp. // Parse the timestamp.
QDateTime versionTime = timeFromMCVListTime(versionTimeStr); QDateTime versionTime = timeFromS3Time(versionTimeStr);
Q_ASSERT_X(versionTime.isValid(), "loadFromVList", Q_ASSERT_X(versionTime.isValid(), "loadFromVList",
QString("in versions array, index %1's timestamp failed to parse"). QString("in versions array, index %1's timestamp failed to parse").