Merge lp:~aacid/unity-scopes-shell/no_contains_before_value into lp:unity-scopes-shell

[Albert Astals Cid]

Don't call Result::contains and then Result::value

Doing that means two searches in the map for every query, we can just call value()
and in the exceptional case it throws catch the exception and return QVariant()

[Paweł Stołowski (stolowski)]

Looks, good, +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:166
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/265/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/265/rebuild

review: Approve (continuous-integration)

=== modified file 'src/Unity/resultsmodel.cpp'
--- src/Unity/resultsmodel.cpp	2014-08-27 17:54:20 +0000
+++ src/Unity/resultsmodel.cpp	2014-11-25 10:04:47 +0000
@@ -112,15 +112,17 @@
         return QVariant();
     }
     std::string const& realFieldName = mappingIt->second;
-    if (!result->contains(realFieldName)) {
-        return QVariant();
-    }
-    scopes::Variant const& v = result->value(realFieldName);
-    if (v.which() != scopes::Variant::Type::String) {
-        return QVariant();
-    }
-
-    return QString::fromStdString(v.get_string());
+    try {
+        scopes::Variant const& v = result->value(realFieldName);
+        if (v.which() != scopes::Variant::Type::String) {
+            return QVariant();
+        }
+        return QString::fromStdString(v.get_string());
+    } catch (...) {
+        // value() throws if realFieldName is empty or the result
+        // doesn't have a value for it
+        return QVariant();
+    }
 }
 
 QVariant
@@ -130,30 +132,33 @@
     if (mappingIt == m_componentMapping.end()) {
         return QVariant();
     }
-    std::string const& realFieldName = mappingIt->second;
-    if (!result->contains(realFieldName)) {
-        return QVariant();
-    }
-    scopes::Variant const& v = result->value(realFieldName);
-    if (v.which() != scopes::Variant::Type::Array) {
-        return QVariant();
-    }
-
-    QVariantList attributes;
-    scopes::VariantArray arr(v.get_array());
-    for (unsigned i = 0; i < arr.size(); i++) {
-        if (arr[i].which() != scopes::Variant::Type::Dict) {
-            continue;
-        }
-        QVariantMap attribute(scopeVariantToQVariant(arr[i]).toMap());
-        attributes << QVariant(attribute);
-        // we'll limit the number of attributes
-        if (attributes.size() >= m_maxAttributes) {
-            break;
-        }
-    }
-
-    return attributes;
+    try {
+        std::string const& realFieldName = mappingIt->second;
+        scopes::Variant const& v = result->value(realFieldName);
+        if (v.which() != scopes::Variant::Type::Array) {
+            return QVariant();
+        }
+
+        QVariantList attributes;
+        scopes::VariantArray arr(v.get_array());
+        for (unsigned i = 0; i < arr.size(); i++) {
+            if (arr[i].which() != scopes::Variant::Type::Dict) {
+                continue;
+            }
+            QVariantMap attribute(scopeVariantToQVariant(arr[i]).toMap());
+            attributes << QVariant(attribute);
+            // we'll limit the number of attributes
+            if (attributes.size() >= m_maxAttributes) {
+                break;
+            }
+        }
+
+        return attributes;
+    } catch (...) {
+        // value() throws if realFieldName is empty or the result
+        // doesn't have a value for it
+        return QVariant();
+    }
 }
 
 QHash<int, QByteArray> ResultsModel::roleNames() const