Merge lp:~mhr3/unity-lens-applications/exclude-running-apps into lp:unity-lens-applications

[Michal Hruby]

Exclude running applications (not just favourites) from the Recent list. Also; set the "no-results-hint" hint when we have zero results.

[Michal Hruby (mhr3)]

Note that this requires https://code.launchpad.net/~mhr3/bamf/non-chatty-signals/+merge/88462 to be merged.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Looks perfect! Holding on branch approval until we land the bamf requirements

review: Approve

[Michal Hruby (mhr3)]

The bamf branch is in!

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-10-06 11:53:27 +0000
+++ src/Makefile.am	2012-01-18 17:10:28 +0000
@@ -51,6 +51,7 @@
   $(NULL)
 
 unity_applications_daemon_VALASOURCES = \
+  app-watcher.vala \
   config.vala \
   daemon.vala \
   main.vala \

=== added file 'src/app-watcher.vala'
--- src/app-watcher.vala	1970-01-01 00:00:00 +0000
+++ src/app-watcher.vala	2012-01-18 17:10:28 +0000
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Michal Hruby <[e-mail]>
+ *
+ */
+
+using Unity;
+using Gee;
+ 
+namespace Unity.ApplicationsLens
+{ 
+
+  public class AppWatcher : Object
+  {
+    private string[] prefixes;
+    Gee.Set<string> running_apps;
+
+    public AppWatcher ()
+    {
+      Object ();
+    }
+
+    public bool has_app_id (string desktop_id)
+    {
+      return desktop_id in running_apps;
+    }
+
+    public signal void running_applications_changed ();
+
+    construct
+    {
+      running_apps = new HashSet<string> ();
+      foreach (unowned string data_dir in Environment.get_system_data_dirs ())
+      {
+        prefixes += Path.build_path (Path.DIR_SEPARATOR_S,
+                                     data_dir,
+                                     "applications",
+                                     Path.DIR_SEPARATOR_S, null);
+      }
+
+      var connection = Bus.get_sync (BusType.SESSION);
+      connection.signal_subscribe ("org.ayatana.bamf",
+                                   "org.ayatana.bamf.matcher",
+                                   "RunningApplicationsChanged",
+                                   "/org/ayatana/bamf/matcher",
+                                   null,
+                                   DBusSignalFlags.NONE,
+                                   this.running_apps_changed);
+      connection.call.begin ("org.ayatana.bamf",
+                             "/org/ayatana/bamf/matcher",
+                             "org.ayatana.bamf.matcher",
+                             "RunningApplicationsDesktopFiles",
+                             null,
+                             null,
+                             0,
+                             -1,
+                             null,
+                             this.got_running_apps);
+    }
+
+    private void got_running_apps (Object? src_obj,
+                                   AsyncResult res)
+    {
+      var connection = src_obj as DBusConnection;
+      try
+      {
+        Variant reply = connection.call.end (res);
+        string[] paths = (string[]) reply.get_child_value (0);
+
+        foreach (var p in paths) running_apps.add (extract_desktop_id (p));
+        this.running_applications_changed ();
+      }
+      catch (Error e)
+      {
+        warning ("%s", e.message);
+      }
+    }
+
+    private void running_apps_changed (DBusConnection connection,
+                                       string sender_name,
+                                       string object_path,
+                                       string interface_name,
+                                       string signal_name,
+                                       Variant parameters)
+    {
+      if (!parameters.is_of_type (new VariantType ("(asas)")))
+      {
+        warning ("RunningApplicationsChanged signal has incorrect type!");
+        return;
+      }
+
+      Variant opened_apps_variant;
+      Variant closed_apps_variant;
+      parameters.get ("(@as@as)", out opened_apps_variant,
+                                  out closed_apps_variant);
+      string[] opened_paths = (string[]) opened_apps_variant;
+      string[] closed_paths = (string[]) closed_apps_variant;
+
+      foreach (unowned string closed in closed_paths)
+        running_apps.remove (extract_desktop_id (closed));
+      foreach (unowned string opened in opened_paths)
+        running_apps.add (extract_desktop_id (opened));
+
+      this.running_applications_changed ();
+    }
+
+    private string extract_desktop_id (string path)
+    {
+      if (!path.has_prefix ("/")) return path;
+
+      /* fdo menu-spec compliant desktop id extraction */
+      foreach (unowned string prefix in prefixes)
+      {
+        if (path.has_prefix (prefix))
+        {
+          string without_prefix = path.substring (prefix.length);
+          if (Path.DIR_SEPARATOR_S in without_prefix)
+            return without_prefix.replace (Path.DIR_SEPARATOR_S, "-");
+
+          return without_prefix;
+        }
+      }
+
+      return Path.get_basename (path);
+    }
+  }
+
+}

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-01-16 09:38:11 +0000
+++ src/daemon.vala	2012-01-18 17:10:28 +0000
@@ -61,7 +61,8 @@
     /* 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 AppWatcher app_watcher;
+
     private PtrArray zg_templates;
     
     /* Gnome menu structure - also used to check whether apps are installed */
@@ -176,6 +177,12 @@
       }
       
       favorite_apps = Unity.LauncherFavorites.get_default ();
+      app_watcher = new AppWatcher ();
+      app_watcher.running_applications_changed.connect (() =>
+      {
+        scope.queue_search_changed (SearchType.GLOBAL);
+        scope.queue_search_changed (SearchType.DEFAULT);
+      });
       
       lens = new Unity.Lens ("/com/canonical/unity/lens/applications", "applications");
       lens.search_hint = _("Search Applications");
@@ -473,6 +480,12 @@
         }
       }
 
+      if (model.get_n_rows () == 0)
+      {
+        search.set_reply_hint ("no-results-hint", 
+          _("Sorry, there are no applications that match your search."));
+      }
+
       search.finished ();
     }
     
@@ -822,7 +835,8 @@
           /* Discard Recently Used apps that are in the launcher */
           if (category_id == Category.RECENT &&
               !include_favorites &&
-              favorite_apps.has_app_id (desktop_id))
+              (favorite_apps.has_app_id (desktop_id)
+              || app_watcher.has_app_id (desktop_id)))
             continue;
 
           var appmanager = AppInfoManager.get_default ();