Merge lp:~mhr3/unity-lens-applications/use-sources into lp:unity-lens-applications

[Michal Hruby]

Make the apps lens scope provide sources.

[lp:~mhr3/unity-lens-applications/use-sources]

253. By Michal Hruby on 2012-01-12

Merge with lp:~kamstrup/unity-lens-applications/recent-apps

Unmerged revisions

=== modified file 'data/com.canonical.Unity.AppsLens.gschema.xml.in.in'
--- data/com.canonical.Unity.AppsLens.gschema.xml.in.in	2011-11-15 13:41:30 +0000
+++ data/com.canonical.Unity.AppsLens.gschema.xml.in.in	2012-01-12 10:56:28 +0000
@@ -5,10 +5,10 @@
       <summary>Display Apps Available for Download in the Applications lens.</summary>
       <description>Display Apps Available for Download in the Applications lens.</description>
     </key>
-    <key type="b" name="display-most-used-apps">
+    <key type="b" name="display-recent-apps">
       <default>true</default>
-      <summary>Display Most Used Apps in the Applications lens.</summary>
-      <description>Display Most Used Apps in the Applications lens.</description>
+      <summary>Display Recently Used apps in the Applications lens.</summary>
+      <description>Display Recently Used Apps in the Applications lens.</description>
     </key>
   </schema>
   <schema path="/desktop/unity/runner/" id="com.canonical.Unity.Runner" gettext-domain="unity-lens-applications">

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2011-12-07 16:21:04 +0000
+++ src/daemon.vala	2012-01-12 10:56:28 +0000
@@ -32,6 +32,7 @@
   {
     private Zeitgeist.Log log;
     private Zeitgeist.Index zg_index;
+    private Zeitgeist.Monitor monitor;
     
     /* The searcher for online material may be null if it fails to load
      * the Xapian index from the Software Center */
@@ -46,6 +47,10 @@
     
     private Unity.ApplicationsLens.Runner runner;
 
+    /* Keep references to the FilterOptions for sources */
+    private FilterOption local_apps_option;
+    private FilterOption usc_apps_option;
+
     /* For each section we have a set filtering query we use to restrict
      * Xapian queries to that type */
     private HashTable<string, string> type_queries;
@@ -53,8 +58,9 @@
     private Gee.List<string> image_extensions;
     private HashTable<string,Icon> file_icon_cache;
     
-    /* We remember the previous search so we can figure out if we should do
-     * incremental filtering of the result models */
+    /* Monitor the favorite apps in the launcher, so we can filter them
+     * out of the results for Recent Apps */
+    private Unity.LauncherFavorites favorite_apps;
         
     private PtrArray zg_templates;
     
@@ -66,10 +72,10 @@
 
     private Settings gp_settings;
 
-    private const string DISPLAY_MOST_USED_APPS_KEY = "display-most-used-apps";
+    private const string DISPLAY_RECENT_APPS_KEY = "display-recent-apps";
     private const string DISPLAY_AVAILABLE_APPS_KEY = "display-available-apps";
 
-    public bool display_most_used_apps { get; set; default = true; }
+    public bool display_recent_apps { get; set; default = true; }
     public bool display_available_apps { get; set; default = true; }
 
     construct
@@ -79,9 +85,14 @@
 
       log = new Zeitgeist.Log();
       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);
+      log.install_monitor (monitor);
       
       this.gp_settings = new Settings ("com.canonical.Unity.ApplicationsLens");
-      this.gp_settings.bind(DISPLAY_MOST_USED_APPS_KEY, this, "display_most_used_apps", SettingsBindFlags.GET);
+      this.gp_settings.bind(DISPLAY_RECENT_APPS_KEY, this, "display_recent_apps", SettingsBindFlags.GET);
       this.gp_settings.bind(DISPLAY_AVAILABLE_APPS_KEY, this, "display_available_apps", SettingsBindFlags.GET);
 
       pkgsearcher = new Unity.Package.Searcher ();
@@ -106,14 +117,24 @@
       image_extensions.add ("ico");
       image_extensions.add ("tif");
       image_extensions.add ("jpg");
-      
+
       build_app_menu_index ();
-      
+
       file_icon_cache = new HashTable<string,Icon>(str_hash, str_equal);
 
       scope = new Unity.Scope ("/com/canonical/unity/scope/applications");
       //scope.icon = @"$(Config.PREFIX)/share/unity/themes/applications.png";
-      
+
+      // TRANSLATORS: Please make sure this string is short enough to fit
+      // into the filter button
+      local_apps_option = scope.sources.add_option ("local", _("Local Apps"));
+      if (display_available_apps)
+      {
+        // TRANSLATORS: Please make sure this string is short enough to fit
+        // into the filter button
+        usc_apps_option = scope.sources.add_option ("usc", _("Software Center"));
+      }
+
       scope.generate_search_key.connect ((lens_search) =>
       {
         return lens_search.search_string.strip ();
@@ -133,6 +154,12 @@
         scope.queue_search_changed (SearchType.DEFAULT);
       });
 
+      /* And also if the sources change */
+      scope.active_sources_changed.connect (() =>
+      {
+        scope.queue_search_changed (SearchType.DEFAULT);
+      });
+
       scope.activate_uri.connect (activate);
 
       /* Listen for changes in the installed applications */
@@ -147,11 +174,14 @@
         uri_regex = null;
         critical ("Failed to compile URI regex. URL launching will be disabled");
       }
-
+      
+      favorite_apps = Unity.LauncherFavorites.get_default ();
+      
       lens = new Unity.Lens ("/com/canonical/unity/lens/applications", "applications");
       lens.search_hint = _("Search Applications");
       lens.visible = true;
       lens.search_in_global = true;
+      lens.sources_display_name = _("Sources");
       populate_categories ();
       populate_filters();
       lens.add_local_scope (scope);
@@ -184,8 +214,8 @@
       GLib.List<Unity.Category> categories = new GLib.List<Unity.Category> ();
       File icon_dir = File.new_for_path (ICON_PATH);
 
-      var cat = new Unity.Category (_("Most Frequently Used"),
-                                    new FileIcon (icon_dir.get_child ("group-mostused.svg")));
+      var cat = new Unity.Category (_("Recently Used"),
+                                    new FileIcon (icon_dir.get_child ("group-recent.svg")));
       categories.append (cat);
 
       cat = new Unity.Category (_("Installed"),
@@ -233,6 +263,20 @@
 
       lens.filters = filters;
     }
+
+    private bool local_apps_active ()
+    {
+      if (scope.sources.filtering && local_apps_option != null)
+        return local_apps_option.active;
+      return true;
+    }
+
+    private bool usc_apps_active ()
+    {
+      if (scope.sources.filtering && usc_apps_option != null)
+        return usc_apps_option.active;
+      return true;
+    }
   
     /* Load xdg menu info and build a Xapian index over it.
      * Do throttled re-index if the menu changes */
@@ -288,13 +332,18 @@
       /* Create a template that activation of applications */
       zg_templates = new PtrArray.sized(1);
       var ev = new Zeitgeist.Event.full (ZG_ACCESS_EVENT, ZG_USER_ACTIVITY, "",
-                             new Subject.full ("application://*",
+                             new Subject.full ("application*",
                                                "", //NFO_SOFTWARE,
                                                "",
                                                "", "", "", ""));
       zg_templates.add ((ev as GLib.Object).ref());
     }
 
+    private void on_zeitgeist_changed ()
+    {
+      scope.invalidate_search (SearchType.DEFAULT);
+    }
+
     private string prepare_zg_search_string (Unity.LensSearch? search,
                                              string type_id="all")
     {
@@ -341,27 +390,28 @@
 
       var zg_search_string = prepare_zg_search_string (search, type_id);
 
+      var transaction = new Dee.Transaction (model);
+      transaction.clear ();
+
       /* Even though the Installed apps search is super fast, we wait here
        * for the Most Popular search to finish, because otherwise we'll update
        * the Installed category too soon and this will cause flicker
        * in the Dash. (lp:868192) */
 
-      if (this.display_most_used_apps) {
+      if (local_apps_active () && display_recent_apps) {
         try {
-          debug ("SEARCH_STRING: %s", zg_search_string);
           var results = yield zg_index.search (zg_search_string,
                                                new Zeitgeist.TimeRange.anytime(),
                                                zg_templates,
-                                               Zeitgeist.StorageState.ANY,
+                                               0,
                                                20,
-                                               Zeitgeist.ResultType.MOST_POPULAR_SUBJECTS,
+                                               Zeitgeist.ResultType.MOST_RECENT_SUBJECTS,
                                                cancellable);
 
-          model.clear ();
-          append_events_with_category (results, model, Category.MOST_USED);
-          
+          append_events_with_category (results, transaction, Category.RECENT, has_search);
+
           timer.stop ();
-          debug ("Entry search found %u/%u Most Used apps in %fms for query '%s'",
+          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);
 
@@ -371,12 +421,11 @@
         } catch (GLib.Error e) {
           warning ("Error performing search '%s': %s",
                    search.search_string, e.message);
-          model.clear ();
         }
-      } else {
-        model.clear ();
       }
 
+      transaction.commit ();
+
       timer.start ();
       Set<string> installed_uris = new HashSet<string> ();
       Set<string> available_uris = new HashSet<string> ();
@@ -385,15 +434,20 @@
                                            has_search ?
                                               Unity.Package.Sort.BY_RELEVANCY :
                                               Unity.Package.Sort.BY_NAME);
-      add_pkg_search_result (appresults, installed_uris, available_uris, model,
-                             Category.INSTALLED);
-      
+      if (local_apps_active ())
+      {
+        add_pkg_search_result (appresults, installed_uris, available_uris,
+                               model, Category.INSTALLED);
+      }
+
       timer.stop ();
       debug ("Entry search listed %i Installed apps in %fms for query: %s",
              appresults.num_hits, timer.elapsed ()*1000, pkg_search_string);
 
       /* If we don't have a search we display 6 random apps */
-      if (has_search && this.display_available_apps && pkgsearcher != null)
+      if (usc_apps_active () && display_available_apps && pkgsearcher != null)
+      {
+        if (has_search)
         {
           timer.start ();
           var pkgresults = pkgsearcher.search (pkg_search_string, 50,
@@ -405,7 +459,7 @@
           debug ("Entry search listed %i Available apps in %fms for query: %s",
                  pkgresults.num_hits, timer.elapsed ()*1000, pkg_search_string);
         }
-      else if (this.display_available_apps && pkgsearcher != null)
+        else
         {
           timer.start ();
           string? filter_query = prepare_pkg_search_string (null, type_id);
@@ -416,7 +470,8 @@
           debug ("Entry search listed %i random Available apps in %fms",
                  random_pkgresults.num_hits, timer.elapsed ()*1000);
         }
-      
+      }
+
       search.finished ();
     }
     
@@ -745,8 +800,9 @@
     /* Appends the subject URIs from a set of Zeitgeist.Events to our Dee.Model
      * assuming that these events are already sorted */
     public void append_events_with_category (Zeitgeist.ResultSet events,
-                                          Dee.Model results,
-                                          uint category_id)
+                                             Dee.Model results,
+                                             uint category_id,
+                                             bool include_favorites)
     {
       foreach (var ev in events)
         {
@@ -761,7 +817,12 @@
         
           /* Assert that we indeed have a known application as actor */
           string desktop_id = Utils.get_desktop_id_for_actor (app_uri);
-          string full_path;
+          
+          /* Discard Recently Used apps that are in the launcher */
+          if (category_id == Category.RECENT &&
+              !include_favorites &&
+              favorite_apps.has_app_id (desktop_id))
+            continue;
 
           var appmanager = AppInfoManager.get_default ();
           AppInfo? app = appmanager.lookup (desktop_id);
@@ -771,8 +832,8 @@
           
           if (!app.should_show ())
             continue;
-
-          full_path = appmanager.get_path (desktop_id);
+          
+          string full_path = appmanager.get_path (desktop_id);
           string full_uri = full_path != null ? "file://" + full_path : app_uri;
 
           results.append (app_uri, app.get_icon().to_string(), category_id,

=== modified file 'src/schemas.vala'
--- src/schemas.vala	2011-08-04 07:27:33 +0000
+++ src/schemas.vala	2012-01-12 10:56:28 +0000
@@ -31,7 +31,7 @@
   
  public enum Category
   {
-    MOST_USED,
+    RECENT,
     INSTALLED,
     AVAILABLE,
     EMPTY_SEARCH,