Merge lp:~stolowski/unity-scope-home/fix-1219911 into lp:unity-scope-home

[Paweł Stołowski]

Properly handle info hints and subtitle when parsing previews from Smart Scopes Server. Don't print errors if 'attribution' is missing.

Properly handle info hints when parsing previews from Smart Scopes Server. Handle subtitle when parsing generic preview. Don't print errors if 'attribution' is missing.

[Michal Hruby (mhr3)]

LGTM

review: Approve

[lp:~stolowski/unity-scope-home/fix-1219911]

160. By Paweł Stołowski on 2013-09-03

Fixed variable name.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:159
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/82/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-amd64-ci/46
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-armhf-ci/46/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-i386-ci/46

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/82/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/smart-scopes-preview-parser.vala'
--- src/smart-scopes-preview-parser.vala	2013-06-06 15:28:32 +0000
+++ src/smart-scopes-preview-parser.vala	2013-09-03 10:09:03 +0000
@@ -45,7 +45,7 @@
 
   public interface PreviewJsonParser: Object
   {
-    internal void get_base_attributes (Json.Object obj, out string title, out string subtitle, out string description, out GLib.Icon? icon, out string? attribution) //TODO actions
+    internal void get_base_attributes (Json.Object obj, out string title, out string subtitle, out string description, out GLib.Icon? icon, out string? attribution)
     {
       title = obj.get_string_member ("title");
       subtitle = obj.get_string_member ("subtitle");
@@ -57,9 +57,12 @@
       if (description.length == 0 && obj.has_member ("description"))
         description = obj.get_string_member ("description");
 
-      attribution = obj.get_string_member ("attribution");
-      if (attribution != null && attribution != "")
-        description += "\n──────────────\n<small>" + Markup.escape_text (attribution) + "</small>";
+      if (obj.has_member ("attribution"))
+      {
+        attribution = obj.get_string_member ("attribution");
+        if (attribution != null && attribution != "")
+          description += "\n──────────────\n<small>" + Markup.escape_text (attribution) + "</small>";
+      }
 
       if (obj.has_member ("image_hint"))
       {
@@ -73,6 +76,30 @@
       }
     }
 
+    internal void get_info_hints (Json.Object obj, Preview preview)
+    {
+      if (obj.has_member ("info"))
+      {
+        var info_array = obj.get_array_member ("info");
+
+        info_array.foreach_element ((_array, _index, _node) =>
+        {
+          var info_obj = _node.get_object ();
+          var info_hint_id = info_obj.get_string_member ("id");
+          var info_icon_hint = info_obj.get_string_member ("icon_hint");
+          var info_name = info_obj.get_string_member ("display_name");
+          var info_value = info_obj.get_string_member ("value");
+
+          var icon_file = GLib.File.new_for_uri (info_icon_hint);
+          var info_icon = new GLib.FileIcon (icon_file);
+          
+          var info = new Unity.InfoHint (info_hint_id, info_name, info_icon, info_value);
+
+          preview.add_info (info);
+        });
+      }
+    }
+
     internal void get_actions (Json.Object obj, Preview preview)
     {
       if (obj.has_member ("actions"))
@@ -105,13 +132,15 @@
   {
     public Preview? parse (Json.Object obj)
     {
-      string title, description;
+      string title, subtitle, description;
       string? attribution;
       GLib.Icon? icon;
 
-      get_base_attributes (obj, out title, null, out description, out icon, out attribution);
+      get_base_attributes (obj, out title, out subtitle, out description, out icon, out attribution);
       var preview = new GenericPreview (title, description, icon);
+      preview.subtitle = subtitle;
       get_actions (obj, preview);
+      get_info_hints (obj, preview);
 
       return preview;
     }
@@ -129,6 +158,7 @@
 
       var preview = new MusicPreview (title, subtitle, icon);
       get_actions (obj, preview);
+      get_info_hints (obj, preview);
 
       var tracks_array = obj.get_array_member ("tracks");
       tracks_array.foreach_element ((_array, _index, _node) =>