Merge lp:~unity-team/unity-scopes-shell/max-attrs-count into lp:unity-scopes-shell

[Michal Hruby]

Make the number of maximum attributes configurable by the scope and expose it to shell.

Make the number of maximum attributes configurable by the scope and expose it to shell.

[Albert Astals Cid (aacid)]

Looks good :)

review: Approve

=== modified file 'src/Unity/categories.cpp'
--- src/Unity/categories.cpp	2014-07-08 16:47:30 +0000
+++ src/Unity/categories.cpp	2014-07-24 15:29:20 +0000
@@ -39,7 +39,7 @@
 namespace scopes_ng {
 
 // FIXME: this should be in a common place
-#define CATEGORY_JSON_DEFAULTS R"({"schema-version":1,"template": {"category-layout":"grid","card-layout":"vertical","card-size":"small","overlay-mode":null,"collapsed-rows":2}, "components": { "title":null, "art": { "aspect-ratio":1.0, "fill-mode":"crop" }, "subtitle":null, "mascot":null, "emblem":null, "summary":null, "attributes":null, "background":null }, "resources":{}})"
+#define CATEGORY_JSON_DEFAULTS R"({"schema-version":1,"template": {"category-layout":"grid","card-layout":"vertical","card-size":"small","overlay-mode":null,"collapsed-rows":2}, "components": { "title":null, "art": { "aspect-ratio":1.0, "fill-mode":"crop" }, "subtitle":null, "mascot":null, "emblem":null, "summary":null, "attributes": { "max-count":2 }, "background":null }, "resources":{}})"
 
 class CategoryData
 {
@@ -140,6 +140,15 @@
         return result;
     }
 
+    int getMaxAttributes() const
+    {
+        QJsonObject components_obj = m_components.toObject();
+        QJsonObject attrs_obj = components_obj.value("attributes").toObject();
+        QJsonValue max_count_val = attrs_obj.value("max-count");
+
+        return max_count_val.toInt(2);
+    }
+
     QVector<int> updateAttributes(scopes::Category::SCPtr category)
     {
         QVector<int> roles;
@@ -355,6 +364,7 @@
                 resultsModel = catData->resultsModel();
                 if (resultsModel) {
                     resultsModel->setComponentsMapping(catData->getComponentsMapping());
+                    resultsModel->setMaxAtrributesCount(catData->getMaxAttributes());
                 }
             }
             beginInsertRows(QModelIndex(), emptyIndex, emptyIndex);
@@ -369,6 +379,7 @@
                 resultsModel = catData->resultsModel();
                 if (resultsModel) {
                     resultsModel->setComponentsMapping(catData->getComponentsMapping());
+                    resultsModel->setMaxAtrributesCount(catData->getMaxAttributes());
                 }
                 QModelIndex changedIndex(this->index(index));
                 dataChanged(changedIndex, changedIndex, changedRoles);
@@ -386,6 +397,7 @@
         m_categories.insert(emptyIndex, QSharedPointer<CategoryData>(catData));
         resultsModel->setCategoryId(QString::fromStdString(category->id()));
         resultsModel->setComponentsMapping(catData->getComponentsMapping());
+        resultsModel->setMaxAtrributesCount(catData->getMaxAttributes());
         m_categoryResults[category->id()] = resultsModel;
 
         endInsertRows();
@@ -438,6 +450,7 @@
         }
         if (catData->resultsModel()) {
             catData->resultsModel()->setComponentsMapping(catData->getComponentsMapping());
+            catData->resultsModel()->setMaxAtrributesCount(catData->getMaxAttributes());
         }
         QModelIndex changeIndex(index(idx));
         QVector<int> roles;

=== modified file 'src/Unity/resultsmodel.cpp'
--- src/Unity/resultsmodel.cpp	2014-05-19 09:58:14 +0000
+++ src/Unity/resultsmodel.cpp	2014-07-24 15:29:20 +0000
@@ -28,10 +28,9 @@
 
 using namespace unity;
 
-const int MAX_ATTRIBUTES = 3;
-
 ResultsModel::ResultsModel(QObject* parent)
  : unity::shell::scopes::ResultsModelInterface(parent)
+ , m_maxAttributes(2)
 {
 }
 
@@ -64,6 +63,11 @@
     }
 }
 
+void ResultsModel::setMaxAtrributesCount(int count)
+{
+    m_maxAttributes = count;
+}
+
 void ResultsModel::addResults(QList<std::shared_ptr<unity::scopes::CategorisedResult>> const& results)
 {
     if (results.count() == 0) return;
@@ -136,6 +140,7 @@
     }
 
     QVariantList attributes;
+    QString defaultStyle("default");
     scopes::VariantArray arr(v.get_array());
     for (unsigned i = 0; i < arr.size(); i++) {
         if (arr[i].which() != scopes::Variant::Type::Dict) {
@@ -150,11 +155,11 @@
             continue;
         }
         if (!attribute.contains("style")) {
-            attribute["style"] = QString("default");
+            attribute["style"] = defaultStyle;
         }
         attributes << QVariant(attribute);
         // we'll limit the number of attributes
-        if (attributes.size() >= MAX_ATTRIBUTES) {
+        if (attributes.size() >= m_maxAttributes) {
             break;
         }
     }

=== modified file 'src/Unity/resultsmodel.h'
--- src/Unity/resultsmodel.h	2014-05-19 09:58:14 +0000
+++ src/Unity/resultsmodel.h	2014-07-24 15:29:20 +0000
@@ -50,6 +50,7 @@
     /* setters */
     void setCategoryId(QString const& id) override;
     void setComponentsMapping(QHash<QString, QString> const& mapping);
+    void setMaxAtrributesCount(int count);
 
 private:
     QVariant componentValue(unity::scopes::CategorisedResult const* result, std::string const& fieldName) const;
@@ -58,6 +59,7 @@
     std::unordered_map<std::string, std::string> m_componentMapping;
     QList<std::shared_ptr<unity::scopes::CategorisedResult>> m_results;
     QString m_categoryId;
+    int m_maxAttributes;
 };
 
 } // namespace scopes_ng

=== modified file 'tests/data/mock-scope/mock-scope.cpp'
--- tests/data/mock-scope/mock-scope.cpp	2014-07-04 14:42:30 +0000
+++ tests/data/mock-scope/mock-scope.cpp	2014-07-24 15:29:20 +0000
@@ -77,7 +77,7 @@
         }
         else if (query_ == "attributes")
         {
-            CategoryRenderer rating_rndr(R"({"schema-version": 1, "components": {"title": "title", "attributes": "attributes"}})");
+            CategoryRenderer rating_rndr(R"({"schema-version": 1, "components": {"title": "title", "attributes": {"field": "attributes", "max-count":3}}})");
             auto cat = reply->register_category("cat1", "Category 1", "", rating_rndr);
             CategorisedResult res(cat);
             res.set_uri("test:uri");