Merge lp:~chipaca/unity-lens-video/no-moar-zombies into lp:unity-lens-video

[John Lenton]

Gets rid of the zombies, via switching from subprocess to GLib.spawn_sync and spawn_async.

The zombies issue could've been fixed with waitpid, but then moving to vala would've been harder. This way it's GLibs all the way down.

=== modified file 'src/unity-lens-video'
--- src/unity-lens-video	2012-02-24 08:26:51 +0000
+++ src/unity-lens-video	2012-02-26 00:07:21 +0000
@@ -22,7 +22,6 @@
 import locale
 import os
 import sys
-import subprocess
 from zeitgeist import client, datamodel
 
 #pylint: disable=E0611
@@ -176,14 +175,14 @@
 
     def update_results_model(self, search, model, cat):
         """Check for the existence of the cache folder, create it if needed,
-        the run the search method."""
+        and run the search method."""
         if not Gio.file_new_for_path(CACHE).query_exists(None):
             Gio.file_new_for_path(CACHE).make_directory(None)
         if FOLDER != HOME_FOLDER:
             try:
-                subprocess.Popen(['updatedb', 
-                    '-o', CACHE+'/'+DB, '-l', '0', '-U', FOLDER])
-            except (subprocess.CalledProcessError):
+                GLib.spawn_async(['/usr/bin/updatedb', '-o', CACHE+'/'+DB,
+                                  '-l', '0', '-U', FOLDER])
+            except GLib.GError:
                 print "Can't create the database, will retry."
 
         result_sets = []
@@ -220,10 +219,19 @@
         
         if self.is_file(CACHE+'/'+DB):
             try:
-                results = subprocess.check_output(
-                    ['locate', '-id', CACHE+'/'+DB, FOLDER+'*'+search+'*' ])
-            except (subprocess.CalledProcessError):
+                results = GLib.spawn_sync(None,
+                                          ['/usr/bin/locate',
+                                           '-id', CACHE+'/'+DB,
+                                           FOLDER+'*'+search+'*' ],
+                                          None, 0, None, None)
+            except GLib.GError:
                 results = None
+            else:
+                # spawn_sync returns bool, stdout, stderr, exit_status
+                if results[3] == 0:
+                    results = results[1]
+                else:
+                    results = None
         else:
             results = None
         if results:
@@ -328,9 +336,9 @@
                     Q.remove(process)
             if len(Q) < Q_MAX:
                 try:
-                    p = subprocess.Popen(['totem-video-thumbnailer', 
-                    video_path, icon_check])
-                    Q.append(p.pid)
+                    p = GLib.spawn_async(['/usr/bin/totem-video-thumbnailer', 
+                                          video_path, icon_check])
+                    Q.append(p[0])
                     if self.is_file(icon_check):
                         icon_path = icon_check
                 except: