Merge lp:~kamstrup/unity-lens-applications/home-lenses into lp:unity-lens-applications

[Mikkel Kamstrup Erlandsen]

Implement the new home screen policy. That is when we don't have a global search show the Recent Apps category. When we do have a global search then only show the Applications category. See also https://code.launchpad.net/~kamstrup/unity/home-lenses/+merge/89669

[Michal Hruby (mhr3)]

Can we try to merge all the queue_search_changed() calls into a single method, so it's not all over the place?

review: Needs Fixing

[Mikkel Kamstrup Erlandsen (kamstrup)]

Pushed fix. Please re-review

[lp:~kamstrup/unity-lens-applications/home-lenses]

261. By Mikkel Kamstrup Erlandsen on 2012-01-23

Collect some of all our queue_search_changed() requests into one mark_dirty() method

[Michal Hruby (mhr3)]

Great!

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-01-18 17:02:52 +0000
+++ src/daemon.vala	2012-01-23 14:09:24 +0000
@@ -88,8 +88,8 @@
       zg_index = new Zeitgeist.Index();
       monitor = new Zeitgeist.Monitor (new Zeitgeist.TimeRange.from_now (),
                                        zg_templates);
-      monitor.events_inserted.connect (on_zeitgeist_changed);
-      monitor.events_deleted.connect (on_zeitgeist_changed);
+      monitor.events_inserted.connect (mark_dirty);
+      monitor.events_deleted.connect (mark_dirty);
       log.install_monitor (monitor);
       
       this.gp_settings = new Settings ("com.canonical.Unity.ApplicationsLens");
@@ -164,7 +164,7 @@
       scope.activate_uri.connect (activate);
 
       /* Listen for changes in the installed applications */
-      AppInfoManager.get_default().changed.connect (on_appinfo_changed);
+      AppInfoManager.get_default().changed.connect (mark_dirty);
       
       /* Now start the RunEntry */
       runner = new Unity.ApplicationsLens.Runner (this);
@@ -177,12 +177,11 @@
       }
       
       favorite_apps = Unity.LauncherFavorites.get_default ();
+      favorite_apps.changed.connect(mark_dirty);
+
       app_watcher = new AppWatcher ();
-      app_watcher.running_applications_changed.connect (() =>
-      {
-        scope.queue_search_changed (SearchType.GLOBAL);
-        scope.queue_search_changed (SearchType.DEFAULT);
-      });
+      app_watcher.running_applications_changed.connect (mark_dirty);
+
       
       lens = new Unity.Lens ("/com/canonical/unity/lens/applications", "applications");
       lens.search_hint = _("Search Applications");
@@ -224,6 +223,10 @@
       var cat = new Unity.Category (_("Recently Used"),
                                     new FileIcon (icon_dir.get_child ("group-recent.svg")));
       categories.append (cat);
+      
+      cat = new Unity.Category (_("Recent Apps"),
+                                    new FileIcon (icon_dir.get_child ("group-apps.svg")));
+      categories.append (cat);
 
       cat = new Unity.Category (_("Installed"),
                                 new FileIcon (icon_dir.get_child ("group-installed.svg")));
@@ -232,7 +235,11 @@
       cat = new Unity.Category (_("Apps Available for Download"),
                                 new FileIcon (icon_dir.get_child ("group-downloads.svg")));
       categories.append (cat);
-
+      
+      cat = new Unity.Category (_("Applications"),
+                                new FileIcon (icon_dir.get_child ("group-apps.svg")));
+      categories.append (cat);
+      
       lens.categories = categories;
     }
 
@@ -327,9 +334,7 @@
     {
       build_app_menu_index ();
       
-      debug ("Updating result models");
-      scope.queue_search_changed (SearchType.DEFAULT);
-      scope.queue_search_changed (SearchType.GLOBAL);
+      mark_dirty ();
 
       return false;
     }
@@ -346,10 +351,10 @@
       zg_templates.add ((ev as GLib.Object).ref());
     }
 
-    private void on_zeitgeist_changed ()
+    private void mark_dirty ()
     {
-      scope.invalidate_search (SearchType.DEFAULT);
-      scope.invalidate_search (SearchType.GLOBAL);
+      scope.queue_search_changed (SearchType.DEFAULT);
+      scope.queue_search_changed (SearchType.GLOBAL);
     }
 
     private string prepare_zg_search_string (Unity.LensSearch? search,
@@ -492,15 +497,21 @@
     private async void update_global_search (Unity.LensSearch search,
                                              Cancellable cancellable)
     {
+      /*
+       * In global search, with a non-empty search string, we collate all
+       * hits under one Applications category
+       */
+      
+      if (Utils.search_is_invalid (search))
+        {
+          yield update_global_without_search (search, cancellable);
+          return;
+        }
+      
       var model = search.results_model;
     
       model.clear ();
       
-      if (Utils.search_is_invalid (search))
-      {
-        return;
-      }
-      
       var search_string = prepare_pkg_search_string (search, "all");
       Set<string> installed_uris = new HashSet<string> ();
       Set<string> available_uris = new HashSet<string> ();
@@ -509,28 +520,11 @@
                                            Unity.Package.SearchType.PREFIX,
                                            Unity.Package.Sort.BY_RELEVANCY);      
       add_pkg_search_result (appresults, installed_uris, available_uris, model,
-                             Category.INSTALLED);
+                             Category.APPLICATIONS);
       
       timer.stop ();
       debug ("Global search listed %i Installed apps in %fms for query: %s",
              appresults.num_hits, timer.elapsed ()*1000, search_string);
-
-      // Dowloadable Apps search disabled from global search
-      // See https://bugs.launchpad.net/unity-lens-applications/+bug/733669
-      /*
-      if (pkgsearcher != null)
-        {
-          timer.start ();
-          var pkgresults = pkgsearcher.search (search_string, 20,
-                                               Unity.Package.SearchType.PREFIX,
-                                               Unity.Package.Sort.BY_RELEVANCY);
-          add_pkg_search_result (pkgresults, installed_uris, available_uris,
-                                 model, Category.AVAILABLE);
-          timer.stop ();
-          debug ("Global search listed %i Available apps in %fms for query: %s",
-                 pkgresults.num_hits, timer.elapsed ()*1000, search_string);
-        }
-      */
       
       /* Allow new searches once we enter an idle again.
        * We don't do it directly from here as that could mean we start
@@ -539,6 +533,49 @@
       search.finished ();
     }
     
+    private async void update_global_without_search (Unity.LensSearch search,
+                                                     Cancellable cancellable)
+    {
+      /*
+       * In global search, with an empty search string, we show just Recent Apps
+       * Excluding apps with icons in the launcher (be they running or faves)
+       */
+      var model = search.results_model;      
+      
+      Timer timer = new Timer ();
+
+      var zg_search_string = prepare_zg_search_string (search, "all");
+
+      if (local_apps_active () && display_recent_apps) {
+        try {
+          var results = yield zg_index.search (zg_search_string,
+                                               new Zeitgeist.TimeRange.anytime(),
+                                               zg_templates,
+                                               0,
+                                               40,
+                                               Zeitgeist.ResultType.MOST_RECENT_SUBJECTS,
+                                               cancellable);
+
+          model.clear ();
+          append_events_with_category (results, model, Category.RECENT_APPS, false);
+
+          timer.stop ();
+          debug ("Entry search found %u/%u Recently Used apps in %fms for query '%s'",
+                 results.size (), results.estimated_matches (),
+                 timer.elapsed()*1000, zg_search_string);
+
+        } catch (IOError.CANCELLED ioe) {
+          // no need to bother
+          return;
+        } catch (GLib.Error e) {
+          warning ("Error performing search '%s': %s",
+                   search.search_string, e.message);
+        }
+      }
+
+      search.finished ();
+    }
+    
     private string prepare_pkg_search_string (Unity.LensSearch? search, string type_id="all")
     {
       if (Utils.search_is_invalid (search))
@@ -625,12 +662,6 @@
       
       return icon;
     }
-
-    private void on_appinfo_changed (string id, AppInfo? appinfo)
-    {
-      debug ("Application changed: %s", id);
-      //update_scope_results_model.begin ();
-    }
     
     private void add_pkg_search_result (Unity.Package.SearchResult results,
                                         Set<string> installed_uris,
@@ -677,6 +708,7 @@
         switch (category)
         {
           case Category.INSTALLED:
+          case Category.APPLICATIONS:
             installed_uris.add (uri);
             display_name = app.get_display_name ();
             comment = app.get_description ();
@@ -833,7 +865,8 @@
           string desktop_id = Utils.get_desktop_id_for_actor (app_uri);
           
           /* Discard Recently Used apps that are in the launcher */
-          if (category_id == Category.RECENT &&
+          if ((category_id == Category.RECENT ||
+               category_id == Category.RECENT_APPS) &&
               !include_favorites &&
               (favorite_apps.has_app_id (desktop_id)
               || app_watcher.has_app_id (desktop_id)))
 
=== modified file 'src/schemas.vala'
--- src/schemas.vala	2012-01-05 12:36:04 +0000
+++ src/schemas.vala	2012-01-23 14:09:24 +0000
@@ -32,10 +32,10 @@
  public enum Category
   {
     RECENT,
+    RECENT_APPS,
     INSTALLED,
     AVAILABLE,
-    EMPTY_SEARCH,
-    EMPTY_SECTION
+    APPLICATIONS,
   }
   
   public enum RunnerCategory