Merge lp:~stolowski/unity-lens-shopping/restore-category-icons into lp:unity-lens-shopping

[Paweł Stołowski]

Restored support for category icons (merged rev. 25..24).

Restored support for category icons (merged rev. 25..24).

[Michal Hruby (mhr3)]

+1

review: Approve

=== modified file 'src/scope.vala'
--- src/scope.vala	2012-10-03 11:07:45 +0000
+++ src/scope.vala	2012-10-11 09:21:22 +0000
@@ -390,13 +390,32 @@
 
         if (image_uri != "")
         {
-          // TODO: what to do if we have price but no icon?
           var file = File.new_for_uri (image_uri);
           var icon = new AnnotatedIcon (new FileIcon (file));
           // FIXME: dash doesn't like empty string as ribbon
-          icon.ribbon = price == null || price == "" ? " " : price; 
-          // FIXME: the service doesn't expose categories yet
-          // icon.category = CategoryType.BOOK;
+          icon.ribbon = price == null || price == "" ? " " : price;
+
+          unowned string category = "";
+          if (result.has_member ("category"))
+            category = result.get_string_member ("category");
+          switch (category)
+          {
+            case "application":
+              icon.category = CategoryType.APPLICATION;
+              break;
+            case "movie":
+              icon.category = CategoryType.MOVIE;
+              break;
+            case "music":
+              icon.category = CategoryType.MUSIC;
+              break;
+            case "book":
+              icon.category = CategoryType.BOOK;
+              break;
+            default:
+              icon.category = CategoryType.HOME; // will use generic icon
+              break;
+          }
           image_uri = icon.to_string ();
         }
 
 
=== modified file 'tests/manual-tests/shopping-lens-tests.txt'
--- tests/manual-tests/shopping-lens-tests.txt	2012-10-03 12:13:26 +0000
+++ tests/manual-tests/shopping-lens-tests.txt	2012-10-11 09:21:22 +0000
@@ -24,7 +24,7 @@
 
 Expected Result:
 Verify that Applications / Files & Folders / Music / Video / More suggestions home lens categories
-(if results are available for them) are ordered by number of results, with personal content taking precedence 
+(if results are available for them) are ordered by number of results, with personal content taking precedence
 (applications, local music files, local videos etc. are considered personal content) over shopping results,
 with an exception that 'More suggestions' is displayed no further than on 3rd position.
 Verify that shopping results have orange price ribbons on top of item pictures.
@@ -84,6 +84,18 @@
 Expected Results:
 An empty preview should be displayed. Note that performing searches without internet connectivity will not return any results in the "More suggestions" category.
 
+Emblems on icons provided by the Shopping lens
+----------------------------------------------------
+Whenever there are results from the shopping lens, emblems are present on the icons.
+
+Setup:
+Internet connectivity.
+
+Perform a search so that some results in the "More suggestions" category are displayed. (for example search for "novel")
+
+Expected Results:
+All items that are displayed have an icon categorizing the product - either a music icon, book, movie, or a generic shopping bag icon along with a price.
+
 'Disable' Shopping Lens Search
 ----------------------------------------------------
 Disabling the shopping lens should not show any result.