Merge lp:~mhr3/unity-lens-applications/fix-964325 into lp:unity-lens-applications

[Michal Hruby]

Fix regression where Installed apps category wasn't sorted alphabetically

Fixes a regression where items in the "Installed" category weren't sorted alphabetically (if there's no search). We applied the popularity sorting even when the search string was empty, which shouldn't have been the case.

Added manual test, since the applications are sorted according to current locale which is non-trivial to check in bash.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Looks correct

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-03-12 18:47:05 +0000
+++ src/daemon.vala	2012-03-27 10:20:25 +0000
@@ -472,6 +472,7 @@
                                               Unity.Package.Sort.BY_NAME);
       if (local_apps_active ())
       {
+        if (has_search) resort_pkg_search_results (appresults);
         add_pkg_search_result (appresults, installed_uris, available_uris,
                                transaction, Category.INSTALLED);
       }
@@ -578,7 +579,8 @@
       var timer = new Timer ();
       var appresults = appsearcher.search (search_string, 0,
                                            Unity.Package.SearchType.PREFIX,
-                                           Unity.Package.Sort.BY_RELEVANCY);      
+                                           Unity.Package.Sort.BY_RELEVANCY);
+      resort_pkg_search_results (appresults);
       add_pkg_search_result (appresults, installed_uris, available_uris, model,
                              Category.APPLICATIONS);
       
@@ -792,6 +794,33 @@
 
       return desktop_id;
     }
+
+    /* 
+     * Performs secondary level sorting of the results according to popularity
+     * of individual desktop files.
+     */
+    private void resort_pkg_search_results (Unity.Package.SearchResult results)
+    {
+      results.results.sort_with_data ((a, b) =>
+      {
+        /* We'll cluster the relevancies into a couple of bins, because
+         * there can be multiple terms adding to the relevancy (especially
+         * when doing one/two character prefix searches - ie a "f*" search
+         * will have slightly higher relevancy for item with name "Search
+         * _f_or _f_iles" than "_F_irefox", and that's not what we want)
+         */
+        int rel_a = a.relevancy / 10;
+        int rel_b = b.relevancy / 10;
+        if (rel_a == rel_b)
+        {
+          string id_a = extract_desktop_id (a.desktop_file);
+          string id_b = extract_desktop_id (b.desktop_file);
+          rel_a = popularity_map["application://" + id_a];
+          rel_b = popularity_map["application://" + id_b];
+        }
+        return rel_b - rel_a; // we want higher relevancy first
+      });
+    }
     
     private void add_pkg_search_result (Unity.Package.SearchResult results,
                                         Set<string> installed_uris,
@@ -804,29 +833,6 @@
       var ratings_filter = scope.get_filter ("rating") as RatingsFilter;
       uint n_added = 0;
 
-      if (category != Category.AVAILABLE)
-      {
-        results.results.sort_with_data ((a, b) =>
-        {
-          /* We'll cluster the relevancies into a couple of bins, because
-           * there can be multiple terms adding to the relevancy (especially
-           * when doing one/two character prefix searches - ie a "f*" search
-           * will have slightly higher relevancy for item with name "Search
-           * _f_or _f_iles" than "_F_irefox", and that's not what we want)
-           */
-          int rel_a = a.relevancy / 10;
-          int rel_b = b.relevancy / 10;
-          if (rel_a == rel_b)
-          {
-            string id_a = extract_desktop_id (a.desktop_file);
-            string id_b = extract_desktop_id (b.desktop_file);
-            rel_a = popularity_map["application://" + id_a];
-            rel_b = popularity_map["application://" + id_b];
-          }
-          return rel_b - rel_a; // we want higher relevancy first
-        });
-      }
-
       foreach (var pkginfo in results.results)
       {
       	if (pkginfo.desktop_file == null)

=== added directory 'tests/manual'
=== added file 'tests/manual/sort-order.txt'
--- tests/manual/sort-order.txt	1970-01-01 00:00:00 +0000
+++ tests/manual/sort-order.txt	2012-03-27 10:20:25 +0000
@@ -0,0 +1,9 @@
+Sort order
+==========
+Tests that the sort order of the "Installed" category is alphabetical.
+
+#. Open the Dash and switch to the application lens.
+#. Make sure that the search string is empty.
+
+Outcome
+  The "Installed" category should be shown and the items within should be sorted alphabetically (respecting sorting of your locale).