Merge lp:~renatofilho/unity-lens-video/unity-lens-videos-dconf into lp:unity-lens-video

[Renato Araujo Oliveira Filho]

Implemented support for videos search in a pre-configure folder.

Due the async call of updatedb command some changes was necessary to avoid problems with the cache database.

Created a temporary cache file for each directory;
The cache file is update in each directory change instead of every search;

To test it you need install and compile the gconf scheme:
  Install: python setup.py install
  Compile schema: glib-compile-schemas /usr/share/glib-2.0/schemas/

[lp:~renatofilho/unity-lens-video/unity-lens-videos-dconf]

70. By Renato Araujo Oliveira Filho on 2012-04-04

Implemented support for recusrsive folder change.
Cache file name now is based on folder name.

71. By Renato Araujo Oliveira Filho on 2012-04-04

Fixed search function to work with new file monitor API.

72. By Renato Araujo Oliveira Filho on 2012-04-04

Fixed recursive monitor when moving a folder.

Unmerged revisions

72. By Renato Araujo Oliveira Filho on 2012-04-04

Fixed recursive monitor when moving a folder.

71. By Renato Araujo Oliveira Filho on 2012-04-04

Fixed search function to work with new file monitor API.

70. By Renato Araujo Oliveira Filho on 2012-04-04

Implemented support for recusrsive folder change.
Cache file name now is based on folder name.

69. By Renato Araujo Oliveira Filho on 2012-04-03

Implemented support for search videos in a pre-configured folder;

=== added file 'com.canonical.Unity.VideosLens.gschema.xml'
--- com.canonical.Unity.VideosLens.gschema.xml	1970-01-01 00:00:00 +0000
+++ com.canonical.Unity.VideosLens.gschema.xml	2012-04-03 22:50:25 +0000
@@ -0,0 +1,9 @@
+<schemalist>
+  <schema path="/desktop/unity/lenses/videos/" id="com.canonical.Unity.VideosLens" gettext-domain="unity-lens-videos">
+    <key type="as" name="extra-folders">
+        <default>[]</default>
+        <summary>Extra folders used for find for videos</summary>
+        <description>Key for storing extra folders where the video lens will find for videos. </description>
+    </key>
+  </schema>
+</schemalist>

=== modified file 'setup.py'
--- setup.py	2012-03-20 22:00:58 +0000
+++ setup.py	2012-04-03 22:50:25 +0000
@@ -12,5 +12,6 @@
       data_files=[
     ('lib/unity-lens-video', ['src/unity-lens-video']),
     ('share/dbus-1/services', ['unity-lens-video.service']),
+    ('share/glib-2.0/schemas', ['com.canonical.Unity.VideosLens.gschema.xml']),
     ], cmdclass={"build":  build_extra.build_extra,
                  "build_i18n": build_i18n.build_i18n,})

=== modified file 'src/unity-lens-video'
--- src/unity-lens-video	2012-04-03 14:37:36 +0000
+++ src/unity-lens-video	2012-04-03 22:50:25 +0000
@@ -25,6 +25,7 @@
 from zeitgeist.client import ZeitgeistClient
 from zeitgeist import client, datamodel
 import time
+import tempfile
 
 #pylint: disable=E0611
 from gi.repository import (
@@ -85,10 +86,10 @@
 LOCAL_VIDEOS = _("My Videos")
 
 BUS_NAME = "net.launchpad.lens.video"
+DCONF_VIDEO_KEY = "com.canonical.Unity.VideosLens"
 FOLDER = GLib.get_user_special_dir(GLib.USER_DIRECTORY_VIDEOS)
 HOME_FOLDER = GLib.get_home_dir()
 CACHE = "%s/unity-lens-video" % GLib.get_user_cache_dir()
-DB = "videos.db"
 Q = []
 Q_MAX = 3
 ZG = ZeitgeistClient()
@@ -98,8 +99,7 @@
     
     """Creation of a lens with a local scope."""
 
-    def __init__(self):
-        
+    def __init__(self):        
         #Create the lens
         self._lens = Unity.Lens.new("/net/launchpad/lens/video", "video")
         self._lens.props.search_hint = HINT
@@ -126,8 +126,8 @@
 
         filters = []
         self._lens.props.filters = filters
-        
-        
+
+
         # Create the scope
         self._scope = Unity.Scope.new("/net/launchpad/lens/video/main")
         self._scope.search_in_global = True
@@ -140,6 +140,62 @@
         self._lens.add_local_scope(self._scope)
         self._lens.export()
 
+        #Load extra folders
+        self._scan_folders = [FOLDER]
+        try:
+            settings = Gio.Settings.new(DCONF_VIDEO_KEY)
+            self._scan_folders.extend(settings.get_strv("extra-folders"))
+        except GLib.GError:
+            print "Can not read extra-folders configuration"
+
+        self.start_dir_monitors()
+
+    def update_file_database(self, folder, cache_name):
+        """Update video cache"""
+        if (folder != HOME_FOLDER):
+            try:               
+                GLib.spawn_async(['/usr/bin/updatedb', '-o', cache_name,
+                                  '-l', '0', '-U', folder])
+            except GLib.GError:
+                print "Can't create the database, will retry."
+
+
+    def on_directory_changed(self, filemonitor, g_file, other_file, event_type, folder):
+        """This function will be called for any change on scan folder"""
+        if event_type == Gio.FileMonitorEvent.CREATED:
+            file_type = g_file.query_file_type(Gio.FileQueryInfoFlags.NONE, None)
+            #If is a file change wait for CHANGES_DONE_HINT event (wait copy or move file)
+            if file_type is Gio.FileType.REGULAR:
+                return
+
+        self.update_file_database(folder, filemonitor._cache_file.name)
+        
+
+    def start_dir_monitors(self):
+        """Check for the existence of the cache folder, create it if needed,
+           and start directory monitors. """
+        if not Gio.file_new_for_path(CACHE).query_exists(None):
+            Gio.file_new_for_path(CACHE).make_directory(None)
+                
+        self._monitors = []
+        for folder in self._scan_folders:
+            g_file = Gio.file_new_for_path(folder)
+            if g_file.query_exists(None):
+                file_type = g_file.query_file_type(Gio.FileQueryInfoFlags.NONE, None)
+
+            if file_type is Gio.FileType.DIRECTORY:
+                monitor = g_file.monitor_directory(Gio.FileMonitorFlags.NONE, None)
+
+                if monitor:
+                    # Create a temporary file for each monitor and keep that
+                    # alive until the monitor get destroyed
+                    monitor._cache_file = tempfile.NamedTemporaryFile(suffix='.db', prefix='video', dir=CACHE)
+                    monitor._folder = folder
+                    self._monitors.append(monitor)
+                    monitor.connect("changed", self.on_directory_changed, folder)
+                    # Initialize database
+                    self.update_file_database(folder, monitor._cache_file.name)
+
     def on_filtering_changed(self, *_):
         """Run another search when a filter change is notified."""
         self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
@@ -176,37 +232,36 @@
                 self.update_results_model(search_string, model, 'lens', cancellable, search_status)
 
     def update_results_model(self, search, model, cat, cancellable, search_status):
-        """Check for the existence of the cache folder, create it if needed,
-        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:
-                GLib.spawn_async(['/usr/bin/updatedb', '-o', CACHE+'/'+DB,
-                                  '-l', '0', '-U', FOLDER])
-            except GLib.GError:
-                print "Can't create the database, will retry."
-
-        if self.is_file(CACHE+'/'+DB):
-            try:
-                results = GLib.spawn_sync(None,
-                                          ['/usr/bin/locate',
-                                           '-id', CACHE+'/'+DB,
-                                           FOLDER+'*'+search+'*' ],
-                                          None, 0, None, None)
-            except GLib.GError:
-                results = None
+        results = ""
+        for monitor in self._monitors:
+            if monitor._cache_file:
+                locate_results = None
+                try:
+                    #locale accept more then one database as argument but since 
+                    #the pattern used has the folder name we need to call this
+                    #for each folder
+                    locate_results = GLib.spawn_sync(None,
+                                              ['/usr/bin/locate',
+                                               '-id', monitor._cache_file.name,
+                                               monitor._folder+'*'+search+'*' ],
+                                              None, 0, None, None)
+                except GLib.GError:
+                    locate_results = None
+                else:
+                    # spawn_sync returns bool, stdout, stderr, exit_status
+                    if locate_results[3] == 0:
+                        locate_results = locate_results[1]
+                    else:
+                        locate_results = None
             else:
-                # spawn_sync returns bool, stdout, stderr, exit_status
-                if results[3] == 0:
-                    results = results[1]
-                else:
-                    results = None
-        else:
-            results = None
+                locate_results = None
+
+            if locate_results:
+                results += locate_results
+
         result_list = []
         blacklist = self.get_blacklist ()
-        if results:
+        if len(results) > 0:
                 video_counter = 0
                 print len(results.split('\n'))
                 for video in results.split('\n'):