From 9760d4155f454399b045d3962245abbd69f3e351 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Sun, 17 Jun 2012 13:02:22 +0200
Subject: Make ServerInfo parsing slightly more robust.

- Don't assume the list of release targets to be the same as the list of
  release-candidate targets.
- Don't try to construct a download URL for releases with an empty release
  version.

Change-Id: Icc3098a9db9e3d00261c32f4b9c2999ecc716380
---
 rbutil/rbutilqt/base/serverinfo.cpp | 15 +++++++++------
 rbutil/rbutilqt/base/serverinfo.h   |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/rbutil/rbutilqt/base/serverinfo.cpp b/rbutil/rbutilqt/base/serverinfo.cpp
index 995cc1fe74..fd46f13a8b 100644
--- a/rbutil/rbutilqt/base/serverinfo.cpp
+++ b/rbutil/rbutilqt/base/serverinfo.cpp
@@ -56,7 +56,10 @@ void ServerInfo::readBuildInfo(QString file)
     setValue(ServerInfo::BleedingDate, date.toString(Qt::ISODate));
 
     info.beginGroup("release");
-    QStringList keys = info.allKeys();
+    QStringList releasekeys = info.allKeys();
+    info.endGroup();
+    info.beginGroup("release-candidate");
+    QStringList rckeys = info.allKeys();
     info.endGroup();
 
     // get base platforms, handle variants with platforms in the loop
@@ -75,13 +78,13 @@ void ServerInfo::readBuildInfo(QString file)
         // - <target>=<version>. In this case the URL is constructed.
         // - <target>=<version>,<url>.
         info.beginGroup("release");
-        if(keys.contains(platforms.at(i))) {
+        if(releasekeys.contains(platforms.at(i))) {
             QStringList entry = info.value(platforms.at(i)).toStringList();
             releaseVersion = entry.at(0);
             if(entry.size() > 1) {
                 releaseUrl = entry.at(1);
             }
-            else {
+            else if(!releaseVersion.isEmpty()) {
                 // construct release download URL
                 releaseUrl = releaseBaseUrl;
                 releaseUrl.replace("%MODEL%", platforms.at(i));
@@ -91,10 +94,10 @@ void ServerInfo::readBuildInfo(QString file)
         info.endGroup();
         // "release-candidate" section currently only support the 2nd format.
         info.beginGroup("release-candidate");
-        if(keys.contains(platforms.at(i))) {
+        if(rckeys.contains(platforms.at(i))) {
             QStringList entry = info.value(platforms.at(i)).toStringList();
-            relCandidateVersion = entry.at(0);
             if(entry.size() > 1) {
+                relCandidateVersion = entry.at(0);
                 relCandidateUrl = entry.at(1);
             }
         }
@@ -183,7 +186,7 @@ QVariant ServerInfo::platformValue(QString platform, enum ServerInfos info)
     s.replace(":platform:", platform);
     QString d = ServerInfoList[i].def;
     d.replace(":platform:", platform);
-    qDebug() << "[ServerInfo] GET" << s << serverInfos.value(s, d).toString();
+    qDebug() << "[ServerInfo] GET:" << s << serverInfos.value(s, d).toString();
     return serverInfos.value(s, d);
 }
 
diff --git a/rbutil/rbutilqt/base/serverinfo.h b/rbutil/rbutilqt/base/serverinfo.h
index 7021c3f154..ea68fd7fc4 100644
--- a/rbutil/rbutilqt/base/serverinfo.h
+++ b/rbutil/rbutilqt/base/serverinfo.h
@@ -49,7 +49,7 @@ class ServerInfo : public QObject
 
     private:
         //! set a server info value
-        static void setValue(enum ServerInfos setting , QVariant value);
+        static void setValue(enum ServerInfos setting, QVariant value);
         //! set a value for a server info for a named platform.
         static void setPlatformValue(QString platform, enum ServerInfos setting, QVariant value);
         //! you shouldnt call this, its a fully static class
-- 
cgit v1.2.3