Merge lp:~asac/bamf/match-apps-by-startup-wm-class into lp:bamf/0.4

[Alexander Sack]

see: https://bugs.launchpad.net/bamf/+bug/693231

[Alexander Sack (asac)]

as you might see i extended the dumb .index format by adding an optional column for the WM class ... using a token "BAMF_WM_CLASS::${wmclass}" to make it easier to recognize it.

Also I moved to GKeyFile API for parsing the .desktop file because the GAppInfo thing doesn't export StartupWMClass= info.

[Jason Smith (jassmith)]

Lovely work, initial review looks good, I need to run it through internal testing.

[Alexander Sack (asac)]

ping ... would like to upload a new package to natty to natty during holiday season ... ;) happy new year!

[Andrea Cimitan (cimi)]

The bug seems to be already fixed during this year, closing the merge request

Unmerged revisions

368. By Alexander Sack on 2010-12-09

add support for StartupWMClass to match window_class for more cases
* extend .index file format to allow the final column to optionally have a BAMF_WM_CLASS::StartupWMClass field
* prefer StartupWMClass as desktop_id if available and only fall back to .desktop filename as heuristic
  -> example of affected apps are firefox dailes that have special WM_CLASS/codename aka Minefield instead of Firefox-4.0 etc.

Note: new perl magic to generate bamf.index is:
  perl -ne '/^(.*?)=(.*)/; $$d{$ARGV}{$1} = $2; END { for $f (keys %$d) { printf "%s\t%s%s\n", $f =~ m{.*/([^/]+)$}, $$d{$f}{'Exec'},$$d{$f}{'StartupWMClass'} ? "\tBAMF_WM_CLASS::$$d{$f}{'StartupWMClass'}" : "" } }' /usr/share/applications/*.desktop > /path/to/bamf.index

=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2010-09-24 14:53:16 +0000
+++ src/bamf-matcher.c	2010-12-22 00:24:59 +0000
@@ -408,24 +408,35 @@
                             GHashTable *desktop_file_table,
                             GHashTable *desktop_id_table)
 {
-  GAppInfo *desktop_file;
+  GKeyFile *desktop_file;
   char *exec;
   char *path;
   GString *desktop_id; /* is ok... really */
+  gchar *desktop_id_char;
 
   g_return_if_fail (BAMF_IS_MATCHER (self));
 
-  desktop_file = G_APP_INFO (g_desktop_app_info_new_from_filename (file));
-
-  if (!G_IS_APP_INFO (desktop_file))
-    return;
-
-  exec = g_strdup (g_app_info_get_commandline (desktop_file));
+  desktop_file = g_key_file_new ();
+  if (!desktop_file)
+    return;
+  if (!g_key_file_load_from_file (desktop_file, file, G_KEY_FILE_NONE, NULL)) {
+    g_key_file_free (desktop_file);
+    return;
+  }
+
+  exec = g_key_file_get_value (desktop_file, "Desktop Entry", "Exec", NULL);
   
   if (!exec)
     return;
 
-  g_object_unref (desktop_file);
+  desktop_id_char = g_key_file_get_value (desktop_file, "Desktop Entry", "StartupWMClass", NULL);
+  if (desktop_id_char) {
+    desktop_id = g_string_new (g_ascii_strdown (desktop_id_char, -1));
+    g_free (desktop_id_char);
+  } else {
+    desktop_id = NULL;
+  }
+  g_key_file_free (desktop_file);
 
   if (exec_string_should_be_processed (self, exec))
     {
@@ -440,11 +451,13 @@
       exec = tmp;
     }
 
-  path = g_path_get_basename (file);
-  desktop_id = g_string_new (path);
-  g_free (path);
-
-  desktop_id = g_string_truncate (desktop_id, desktop_id->len - 8); /* remove last 8 characters for .desktop */
+  /* if StartupWMClass didnt exist, go for .desktop path as heuristic */
+  if (!desktop_id) {
+    path = g_path_get_basename (file);
+    desktop_id = g_string_new (path);
+    desktop_id = g_string_truncate (desktop_id, desktop_id->len - 8); /* remove last 8 characters for .desktop */
+    g_free (path);
+  }
   
   insert_data_into_tables (self, file, exec, desktop_id->str, desktop_file_table, desktop_id_table);
 
@@ -530,6 +543,7 @@
       char *exec;
       GString *desktop_id;
       GString *filename;
+      char *bamf_wm_class;
 
       gchar **parts = g_strsplit (line, "\t", 3);
 
@@ -545,9 +559,21 @@
       filename = g_string_new (name);
       g_free ((gpointer) name);
 
-      desktop_id = g_string_new (parts[0]);
-      g_string_truncate (desktop_id, desktop_id->len - 8);
-      
+      /*
+       * if we have a third column in index file it means we have a StatupWMClass which
+       * is a better desktop_id/window_class than the desktop filename stripped by .desktop.
+       * e.g. firefox-4.0.desktop dailies have window class "Minefield"
+       * since Exec can be a multi whitespace token we expect a BAMF_WM_CLASS:: to indicate
+       * a StartupWMClass info
+       */
+      bamf_wm_class = parts[2] ? strstr(parts[2], "BAMF_WM_CLASS::") : NULL;
+      if (!bamf_wm_class) {
+        desktop_id = g_string_new (parts[0]);
+        g_string_truncate (desktop_id, desktop_id->len - 8);
+      } else {
+        desktop_id = g_string_new (g_ascii_strdown(bamf_wm_class + 15 /* strlen ("BAMF_WM_CLASS::") */, -1));
+      }
+
       insert_data_into_tables (self, filename->str, exec, desktop_id->str, desktop_file_table, desktop_id_table);
 
       g_string_free (desktop_id, TRUE);