diff options
author | Petr Mrázek <peterix@gmail.com> | 2014-02-06 09:32:44 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2014-02-06 09:32:44 +0100 |
commit | f8df07c3272c0e02f31f46fda8a429292c7a446a (patch) | |
tree | 31af739dd416f521787ed970af05fb1de8b01222 /logic/Mod.cpp | |
parent | b4b6091372310f4a811180cffde3ea5611881e6c (diff) | |
download | MultiMC-f8df07c3272c0e02f31f46fda8a429292c7a446a.tar MultiMC-f8df07c3272c0e02f31f46fda8a429292c7a446a.tar.gz MultiMC-f8df07c3272c0e02f31f46fda8a429292c7a446a.tar.lz MultiMC-f8df07c3272c0e02f31f46fda8a429292c7a446a.tar.xz MultiMC-f8df07c3272c0e02f31f46fda8a429292c7a446a.zip |
Small tweaks to make things better.
Diffstat (limited to 'logic/Mod.cpp')
-rw-r--r-- | logic/Mod.cpp | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/logic/Mod.cpp b/logic/Mod.cpp index 6732446d..22ac36c8 100644 --- a/logic/Mod.cpp +++ b/logic/Mod.cpp @@ -164,6 +164,16 @@ void Mod::ReadMCModInfo(QByteArray contents) m_name = firstObj.value("name").toString(); m_version = firstObj.value("version").toString(); m_homeurl = firstObj.value("url").toString(); + m_homeurl = m_homeurl.trimmed(); + if(!m_homeurl.isEmpty()) + { + // fix up url. + if (!m_homeurl.startsWith("http://") && !m_homeurl.startsWith("https://") && + !m_homeurl.startsWith("ftp://")) + { + m_homeurl.prepend("http://"); + } + } m_description = firstObj.value("description").toString(); QJsonArray authors = firstObj.value("authors").toArray(); if (authors.size() == 0) @@ -178,7 +188,8 @@ void Mod::ReadMCModInfo(QByteArray contents) } m_credits = firstObj.value("credits").toString(); return; - }; + } + ; QJsonParseError jsonError; QJsonDocument jsonDoc = QJsonDocument::fromJson(contents, &jsonError); // this is the very old format that had just the array @@ -227,17 +238,17 @@ void Mod::ReadLiteModInfo(QByteArray contents) QJsonParseError jsonError; QJsonDocument jsonDoc = QJsonDocument::fromJson(contents, &jsonError); auto object = jsonDoc.object(); - if(object.contains("name")) + if (object.contains("name")) { m_mod_id = m_name = object.value("name").toString(); } - if(object.contains("version")) + if (object.contains("version")) { - m_version=object.value("version").toString(""); + m_version = object.value("version").toString(""); } else { - m_version=object.value("revision").toString(""); + m_version = object.value("revision").toString(""); } m_mcversion = object.value("mcversion").toString(); m_authors = object.value("author").toString(); |