Merge lp:~jamesh/unity-lens-applications/libunity7-phablet into lp:unity-lens-applications

[James Henstridge]

Merge the phablet branch into trunk, making the removal of non-touch apps conditional on using the phablet API.

Merge the phablet branch changes into the trunk branch.

I have made the removal of non-touch apps conditional on a search.hints["phablet"] == true, so behaviour should not change the results for the desktop.

The phablet UI will need to provide this hint to have the search results filtered (and if we change the hint, this scope will need updating).

This is just a straight port of the changes in the branch as a first step: filtering the results should eventually be handled within the search index.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:342
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/13/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

The changelog entries should be dropped, IMO.

Can we go for form_factor == "phone" || form_factor == "tablet" or similar? This way we could support more flexibility later.

Let's go for a string hint of "form_factor" with values "desktop" (default), "phone", "tablet" for now.

review: Needs Fixing

[Michal Hruby (mhr3)]

128 + key_file.load_from_file(full_path, GLib.KeyFileFlags.NONE);
129 + try {
130 + x_ubuntu_touch = key_file.get_boolean("Desktop Entry", "X-Ubuntu-Touch");

Would be also nice to be able to cache this somehow. Couldn't we just use OnlyShowIn=Ubuntu;UbuntuTouch?

review: Needs Information

[Michal Hruby (mhr3)]

Or maybe a special Category?

[Michal Hruby (mhr3)]

> Or maybe a special Category?

FWIW bzoltan is investigating this possibility.

[Michal Hruby (mhr3)]

Ok, we agreed with bzoltan, Saviq and tvoss to use `Category=X-Ubuntu-Touch;` instead (of course there may be more categories defined, as per desktop file spec).

[lp:~jamesh/unity-lens-applications/libunity7-phablet]

343. By James Henstridge on 2013-06-14

Switch hint to "form-factor".

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:343
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/14/rebuild

review: Approve (continuous-integration)

[lp:~jamesh/unity-lens-applications/libunity7-phablet]

344. By James Henstridge on 2013-06-14

Bump version to allow upgrades from Phablet installs, and remove extra
changelog entries as requested.

[James Henstridge (jamesh)]

I've updated the search hint as requested by Saviq. Do you want the code refactored to do category based filtering, or is it okay to leave that for a second merge proposal?

This branch is really just a merge of the existing phablet branch changes plus the search hint changes.

[lp:~jamesh/unity-lens-applications/libunity7-phablet]

345. By James Henstridge on 2013-06-14

Remove version bump completely, after discussing with Saviq on IRC.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:344
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/15/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

No apps have the Categories defined yet, so let's leave it as is for now.

Other than the version bump we discussed, seems good to go. Will report back after I've tested the whole stack on devices.

[lp:~jamesh/unity-lens-applications/libunity7-phablet]

346. By James Henstridge on 2013-06-14

Add a comment noting that the X-Ubuntu-Touch changes need to be fixed
when we move over to identifying the apps by category.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:345
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/16/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:346
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/6

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

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

LGTM

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2013-06-12 20:42:34 +0000
+++ src/daemon.vala	2013-06-14 08:28:25 +0000
@@ -505,6 +505,18 @@
       return app == null;
     }
 
+    private bool is_phablet_ui (DeprecatedScopeSearch search)
+    {
+      // XXX: this will need changing when the hint is finalised.
+      unowned Variant? v = search.hints["form-factor"];
+      if (v != null)
+      {
+        string form_factor = v.get_string();
+        return form_factor == "phone" || form_factor == "tablet";
+      }
+      return false;
+    }
+
     private async void update_scope_search (DeprecatedScopeSearch search,
                                             GLib.Cancellable cancellable)
     {
@@ -521,6 +533,7 @@
 
       bool has_filter = (type_filter != null && type_filter.filtering);
       bool has_search = !Utils.is_search_empty (search_string);
+      bool running_on_phablet = is_phablet_ui (search);
 
       Timer timer = new Timer ();
 
@@ -543,7 +556,8 @@
       {
         if (has_search) resort_pkg_search_results (appresults);
         add_pkg_search_result (appresults, installed_uris, available_uris,
-                               transaction, Category.INSTALLED);
+                               transaction, Category.INSTALLED,
+                               0, running_on_phablet);
       }
 
       timer.stop ();
@@ -605,7 +619,8 @@
                                                Unity.Package.SearchType.PREFIX,
                                                Unity.Package.Sort.BY_RELEVANCY);
           add_pkg_search_result (pkgresults, installed_uris, available_uris,
-                                 model, Category.AVAILABLE);
+                                 model, Category.AVAILABLE,
+                                 0, running_on_phablet);
           timer.stop ();
           debug ("Entry search listed %i Available apps in %fms for query: %s",
                  pkgresults.num_hits, timer.elapsed ()*1000, pkg_search_string);
@@ -617,7 +632,7 @@
 
           var pkgresults = pkgsearcher.get_apps (filter_query, MAX_APP_FOR_DOWNLOAD_FOR_EMPTY_QUERY, filter_cb);
           purchase_info.from_pkgresults (pkgresults);
-          add_pkg_search_result (pkgresults, installed_uris, available_uris, model, Category.AVAILABLE, MAX_APP_FOR_DOWNLOAD_FOR_EMPTY_QUERY);
+          add_pkg_search_result (pkgresults, installed_uris, available_uris, model, Category.AVAILABLE, MAX_APP_FOR_DOWNLOAD_FOR_EMPTY_QUERY, running_on_phablet);
           timer.stop ();
           debug ("Entry search listed %i Available apps in %fms",
                  pkgresults.num_hits, timer.elapsed ()*1000);
@@ -679,6 +694,7 @@
         return;
       }
 
+      bool running_on_phablet = is_phablet_ui (search);
       var model = search.results_model;
 
       model.clear ();
@@ -692,7 +708,7 @@
                                            Unity.Package.Sort.BY_RELEVANCY);
       resort_pkg_search_results (appresults);
       add_pkg_search_result (appresults, installed_uris, available_uris, model,
-                             Category.APPLICATIONS);
+                             Category.APPLICATIONS, 0, running_on_phablet);
 
       timer.stop ();
       debug ("Global search listed %i Installed apps in %fms for query: %s",
@@ -933,7 +949,8 @@
                                         Set<string> available_uris,
                                         Dee.Model model,
                                         Category category,
-                                        uint max_add=0)
+                                        uint max_add,
+                                        bool running_on_phablet)
     {
       var appmanager = AppInfoManager.get_default();
       uint n_added = 0;
@@ -950,6 +967,30 @@
         AppInfo? app = appmanager.lookup (desktop_id);
         full_path = appmanager.get_path (desktop_id);
 
+        if (running_on_phablet)
+        {
+          // XXX: This filtering should be pushed down to the Xapian
+          // index and query builder logic.
+          bool x_ubuntu_touch = false;
+          if (full_path != null)
+          {
+            GLib.KeyFile key_file = new GLib.KeyFile();
+            key_file.load_from_file(full_path, GLib.KeyFileFlags.NONE);
+            try {
+              x_ubuntu_touch = key_file.get_boolean("Desktop Entry", "X-Ubuntu-Touch");
+            }
+            catch (GLib.KeyFileError e)
+            {
+              x_ubuntu_touch = false;
+            }
+          }
+
+          if (!x_ubuntu_touch)
+          {
+            continue;
+          }
+        }
+
         /* De-dupe by 'application://foo.desktop' URI. Also note that we need
          * to de-dupe before we chuck out NoDisplay app infos, otherwise they'd
          * show up from alternate sources */