Merge lp:~stolowski/unity-lens-applications/fuzzy-public-content into lp:~unity-team/unity-lens-applications/libunity7-compatible

[Paweł Stołowski]

Mark results of libcolumbus fuzzy searches as 'default' content (as opposed to 'personal'). Also mark apps returned by software-center-dbus-provider as 'default', unless they were purchased before.

Mark results of libcolumbus fuzzy searches as 'default' content (as opposed to 'personal'). Also mark apps returned by software-center-dbus-provider as 'default', unless they were purchased before.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:347
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~stolowski/unity-lens-applications/fuzzy-public-content/+merge/162978/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-applications-libunity7-compatible-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-applications-libunity7-compatible-raring-amd64-ci/17

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-applications-libunity7-compatible-ci/17/rebuild

review: Needs Fixing (continuous-integration)

[Michal Hruby (mhr3)]

18 + var result_type = (category == Category.INSTALLED && !results.fuzzy_search) ?

Should be category != Category.AVAILABLE && ...

review: Needs Fixing

[lp:~stolowski/unity-lens-applications/fuzzy-public-content]

348. By Paweł Stołowski on 2013-05-08

Fixed conditional to treat all apps from category other than AVAILABLE as personal content, as this also includes
more categories than just INSTALLED (e.g. RECENT apps).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:348
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-applications-libunity7-compatible-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-applications-libunity7-compatible-raring-amd64-ci/18

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-applications-libunity7-compatible-ci/18/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

This doesn't really fix the linked bug, merely moves the results to non-first place (and only in some cases).

That being said, I'm approving this, but don't think the status of the linked bug changed.

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2013-05-01 19:19:03 +0000
+++ src/daemon.vala	2013-05-08 16:01:27 +0000
@@ -914,7 +914,7 @@
 
         model.append (uri, icon_obj,
                       category,
-                      Unity.ResultType.PERSONAL,
+                      pinfo != null && pinfo.paid ? Unity.ResultType.PERSONAL : Unity.ResultType.DEFAULT,
                       "application/x-desktop",
                       app.application_name,
                       "", //comment
@@ -1013,7 +1013,7 @@
           icon_str = icon.to_string ();
         }
 
-        var result_type = category == Category.INSTALLED ?
+        var result_type = (category != Category.AVAILABLE && !results.fuzzy_search) ?
           Unity.ResultType.PERSONAL : Unity.ResultType.DEFAULT;
         model.append (uri, icon_str,
                       category,

=== modified file 'src/unity-package-search.cc'
--- src/unity-package-search.cc	2013-04-29 21:25:01 +0000
+++ src/unity-package-search.cc	2013-05-08 16:01:27 +0000
@@ -680,6 +680,7 @@
     // Retrieve the results, note that we build the result->results
     // list in reverse order and then reverse it before we return it
     result->num_hits = matches.get_matches_estimated ();
+    result->fuzzy_search = false;
 
     for (Xapian::MSetIterator i = matches.begin(); i != matches.end(); ++i)
       {
@@ -731,6 +732,7 @@
       }
 
     result->results = g_slist_reverse (result->results);
+    result->fuzzy_search = true;
     return result;
 }
 
@@ -819,6 +821,7 @@
   g_hash_table_unref (unique);
 
   result->num_hits = num_matches;
+  result->fuzzy_search = false;
   return result;
 }
 
@@ -835,6 +838,7 @@
 
   result = g_slice_new0 (UnityPackageSearchResult);
   result->num_hits = n_apps;
+  result->fuzzy_search = false;
   lastdocid = searcher->db->get_lastdocid ();
 
   /* Since we really just pick random apps we may end up with dupes */
@@ -976,6 +980,7 @@
   }
 
   result->num_hits = num_matches;
+  result->fuzzy_search = false;
   return result;
 }
 

=== modified file 'src/unity-package-search.h'
--- src/unity-package-search.h	2013-04-29 21:25:01 +0000
+++ src/unity-package-search.h	2013-05-08 16:01:27 +0000
@@ -37,8 +37,9 @@
 
 typedef struct
 {
-        GSList *results;
-        gint    num_hits;
+    GSList *results;
+    gint    num_hits;
+    gboolean fuzzy_search;
 } UnityPackageSearchResult;
 
 typedef struct

=== modified file 'vapi/unity-package-search.vapi'
--- vapi/unity-package-search.vapi	2013-04-29 21:25:01 +0000
+++ vapi/unity-package-search.vapi	2013-05-08 16:01:27 +0000
@@ -43,6 +43,7 @@
       public SearchResult ();
       public GLib.SList<PackageInfo> results;
       public int num_hits;
+      public bool fuzzy_search;
     }
     
     [Compact]