diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-03-02 03:03:44 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-03-02 09:16:58 +0100 |
| commit | b54839b8976b5c1455c838828f2bc92cdeb178eb (patch) | |
| tree | 35919484c98a541aff87622aef30bee37ef464cf /logic/minecraft/MojangVersionFormat.cpp | |
| parent | 80b81c2c1e2185b457d167d3d446ac2e1ca95579 (diff) | |
| download | MultiMC-b54839b8976b5c1455c838828f2bc92cdeb178eb.tar MultiMC-b54839b8976b5c1455c838828f2bc92cdeb178eb.tar.gz MultiMC-b54839b8976b5c1455c838828f2bc92cdeb178eb.tar.lz MultiMC-b54839b8976b5c1455c838828f2bc92cdeb178eb.tar.xz MultiMC-b54839b8976b5c1455c838828f2bc92cdeb178eb.zip | |
NOISSUE eliminate timestamp strings
Diffstat (limited to 'logic/minecraft/MojangVersionFormat.cpp')
| -rw-r--r-- | logic/minecraft/MojangVersionFormat.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/logic/minecraft/MojangVersionFormat.cpp b/logic/minecraft/MojangVersionFormat.cpp index d1a27f9f..e28a38ab 100644 --- a/logic/minecraft/MojangVersionFormat.cpp +++ b/logic/minecraft/MojangVersionFormat.cpp @@ -45,14 +45,8 @@ VersionFilePtr MojangVersionFormat::versionFileFromJson(const QJsonDocument &doc readString(root, "assets", out->assets); - if (!parse_timestamp(root.value("releaseTime").toString(""), out->m_releaseTimeString, out->m_releaseTime)) - { - out->addProblem(PROBLEM_WARNING, QObject::tr("Invalid 'releaseTime' timestamp")); - } - if (!parse_timestamp(root.value("time").toString(""), out->m_updateTimeString, out->m_updateTime)) - { - out->addProblem(PROBLEM_WARNING, QObject::tr("Invalid 'time' timestamp")); - } + out->m_releaseTime = timeFromS3Time(root.value("releaseTime").toString("")); + out->m_updateTime = timeFromS3Time(root.value("time").toString("")); if (root.contains("minimumLauncherVersion")) { @@ -90,8 +84,8 @@ static QJsonDocument versionFileToJson(VersionFilePtr patch) writeString(root, "minecraftArguments", patch->overwriteMinecraftArguments); writeString(root, "type", patch->type); writeString(root, "assets", patch->assets); - writeString(root, "releaseTime", patch->m_releaseTimeString); - writeString(root, "time", patch->m_updateTimeString); + writeString(root, "releaseTime", timeToS3Time(patch->m_releaseTime)); + writeString(root, "time", timeToS3Time(patch->m_updateTime)); if (!patch->addLibs.isEmpty()) { |