Merge lp:~mhr3/unity-lens-files/fix-841847 into lp:unity-lens-files

[Michal Hruby]

Support selection of multiple filters at once, also simplify various code paths. UNBLOCK

[lp:~mhr3/unity-lens-files/fix-841847]

209. By Michal Hruby on 2012-01-27

Add missing commit

210. By Michal Hruby on 2012-01-27

Bump valac requirement

[Mikkel Kamstrup Erlandsen (kamstrup)]

Tested against Unity trunk and works very well.

460 +/*
461 private string get_current_type ()
462 {
463 - /* Get the current type to filter by */
464 + // Get the current type to filter by
465 var filter = scope.get_filter ("type") as RadioOptionFilter;
466 Unity.FilterOption? option = filter.get_active_option ();
467 return option == null ? "all" : option.id;
468 }
469 -
470 +*/

Any specific reason to keep this in?

Apart from the that the code looks great.

On the behavior: One change from the current ways is that the Folders category now lists recent folders after the Gtk bookmarks. Is that intentional? (fwiw, I found use of it already while testing this branch - so if it wasn't on purpose we might want to check with John if we can keep it... :-))

review: Needs Information

[Michal Hruby (mhr3)]

> Tested against Unity trunk and works very well.
>
> 460 +/*
> 461 private string get_current_type ()
> 462 {
> 463 - /* Get the current type to filter by */
> 464 + // Get the current type to filter by
> 465 var filter = scope.get_filter ("type") as RadioOptionFilter;
> 466 Unity.FilterOption? option = filter.get_active_option ();
> 467 return option == null ? "all" : option.id;
> 468 }
> 469 -
> 470 +*/
>
> Any specific reason to keep this in?
>

I kept it so if design changed its mind we could revert back to using it. OTOH we could just use the current functions and they'd return single element arrays - I'll remove it.

> Apart from the that the code looks great.
>
> On the behavior: One change from the current ways is that the Folders category
> now lists recent folders after the Gtk bookmarks. Is that intentional? (fwiw,
> I found use of it already while testing this branch - so if it wasn't on
> purpose we might want to check with John if we can keep it... :-))

Yes, before this change the files lens wasn't really searching folders (unless you explicitly selected the Folder filter), so that got fixed.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Ok great. I am happy then :-)

(test wise, this branch has similar status as https://code.launchpad.net/~mhr3/unity-lens-applications/fix-841847/+merge/90150. It is in some sense a refactoring - and it is very hard to test with our current tooling. I took extra care in review and test runs to remedy this)

review: Approve

[lp:~mhr3/unity-lens-files/fix-841847]

211. By Michal Hruby on 2012-01-30

Remove unused method

[Mikkel Kamstrup Erlandsen (kamstrup)]

Even better :-)

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-01-12 15:33:11 +0000
+++ configure.ac	2012-01-30 10:08:25 +0000
@@ -16,7 +16,7 @@
 # Init the other things we depend on
 #####################################################
 AM_MAINTAINER_MODE
-AM_PROG_VALAC([0.12.1])
+AM_PROG_VALAC([0.14.0])
 AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["No valac compiler found."])])
 AC_PROG_CC
 AM_PROG_CC_C_O

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-01-23 14:24:55 +0000
+++ src/daemon.vala	2012-01-30 10:08:25 +0000
@@ -16,7 +16,6 @@
  * Authored by Mikkel Kamstrup Erlandsen <[e-mail]>
  *
  */
-using Dee;
 using Zeitgeist;
 using Zeitgeist.Timestamp;
 using Config;
@@ -42,10 +41,6 @@
      * we use to query Zeitgeist */
     private HashTable<string, Event> type_templates;
 
-    /* Keep track of the previous search, so we can determine when to
-     * filter down the result set instead of rebuilding it */
-    private LensSearch? previous_search;
-    
     construct
     {
       prepare_type_templates();
@@ -62,8 +57,6 @@
       populate_filters();
       lens.add_local_scope (scope);
       
-      previous_search = null;
-      
       /* Bring up Zeitgeist interfaces */
       log = new Zeitgeist.Log();
       index = new Zeitgeist.Index();
@@ -145,7 +138,7 @@
 
       /* Type filter */
       {
-        var filter = new RadioOptionFilter ("type", _("Type"));
+        var filter = new CheckOptionFilter ("type", _("Type"));
         filter.sort_type = OptionsFilter.SortType.DISPLAY_NAME;
 
         filter.add_option ("documents", _("Documents"));
@@ -210,14 +203,11 @@
       type_templates = new HashTable<string, Event> (str_hash, str_equal);
       Event event;
 
-      /* HACK ALERT: All the (event as GLib.Object).ref() are needed because
-       *             GPtrArray doesn't grab a ref to the event objects */
-
       /* Section.ALL_FILES */
       event = new Event.full("", ZG_USER_ACTIVITY, "",
                              new Subject.full ("file:*",
                                                "", "", "", "", "", ""));
-      type_templates.insert ("all", (event as GLib.Object).ref() as Event);
+      type_templates["all"] = event;
       
       /* Section.DOCUMENTS */
       event = new Event.full("", ZG_USER_ACTIVITY, "",
@@ -227,32 +217,32 @@
                              new Subject.full ("file:*",
                                                "!"+NFO_PRESENTATION,
                                                "", "", "", "", ""));
-      type_templates.insert ("documents", (event as GLib.Object).ref() as Event);
+      type_templates["documents"] = event;
 
       /* Section.FOLDERS
        * - we're using special ORIGIN queries here */
       event = new Event.full("", ZG_USER_ACTIVITY, "",
                              new Subject.full ("file:*",
                                                "", "", "", "", "", ""));
-      type_templates.insert ("folders", (event as GLib.Object).ref() as Event);
+      type_templates["folders"] = event;
 
       /* Section.IMAGES */
       event = new Event.full("", ZG_USER_ACTIVITY, "",
                              new Subject.full ("file:*",
                                                NFO_IMAGE, "", "", "", "", ""));
-      type_templates.insert ("images", (event as GLib.Object).ref() as Event);
+      type_templates["images"] = event;
       
       /* Section.AUDIO */
       event = new Event.full("", ZG_USER_ACTIVITY, "",
                              new Subject.full ("file:*",
                                                NFO_AUDIO, "", "", "", "", ""));
-      type_templates.insert ("audio", (event as GLib.Object).ref() as Event);
+      type_templates["audio"] = event;
 
       /* Section.VIDEOS */
       event = new Event.full("", ZG_USER_ACTIVITY, "",
                              new Subject.full ("file:*",
                                                NFO_VIDEO, "", "", "", "", ""));
-      type_templates.insert ("videos", (event as GLib.Object).ref() as Event);
+      type_templates["videos"] = event;
 
       /* Section.PRESENTATIONS
        * FIXME: Zeitgeist logger needs to user finer granularity
@@ -261,7 +251,7 @@
       event = new Event.full("", ZG_USER_ACTIVITY, "",
                              new Subject.full ("file:*",
                                                NFO_PRESENTATION, "", "", "", "", ""));
-      type_templates.insert ("presentations", (event as GLib.Object).ref() as Event);
+      type_templates["presentations"] = event;
 
       /* Section.OTHER 
        * Note that subject templates are joined with logical AND */
@@ -284,22 +274,67 @@
                                            "!"+NFO_PRESENTATION,
                                            "",
                                            "", "", "", ""));
-      type_templates.insert ("other", (event as GLib.Object).ref() as Event);
-    }
-
-    private bool search_is_invalid (LensSearch? search)
-    {
-      /* This boolean expression is unfolded as we seem to get
-       * some null dereference if we join them in a big || expression */
-      if (search == null)
-        return true;
-      else if (search.search_string == null)
-        return true;
+      type_templates["other"] = event;
+    }
+
+    private const string[] ALL_TYPES =
+    {
+      "documents",
+      "folders",
+      "images",
+      "audio",
+      "videos",
+      "presentations",
+      "other"
+    };
+
+    private GenericArray<Event> create_template (OptionsFilter? filter)
+    {
+      var templates = new GenericArray<Event> ();
+
+      if (filter == null || !filter.filtering)
+      {
+        /* Section.ALL_FILES */
+        templates.add (type_templates["all"]);
+        return templates;
+      }
+
+      string[] types = {};
+
+      foreach (unowned string type_id in ALL_TYPES)
+      {
+        var option = filter.get_option (type_id);
+        if (option == null || !option.active) continue;
+
+        types += type_id;
+      }
+
+      if (types.length == ALL_TYPES.length)
+      {
+        /* Section.ALL_FILES */
+        templates.add (type_templates["all"]);
+        return templates;
+      }
+
+      foreach (unowned string type_id in types)
+      {
+        // we need to handle folders separately
+        if (type_id == "folders") continue;
+
+        templates.add (type_templates[type_id]);
+      }
+
+      return templates;
+    }
+
+    private bool is_search_empty (LensSearch search)
+    {
+      if (search.search_string == null) return true;
       
-      return search.search_string.strip() == "";
+      return search.search_string.strip () == "";
     }
 
-    private string prepare_search_string (LensSearch? search)
+    private string prepare_search_string (LensSearch search)
     {
       var s = search.search_string;
 
@@ -322,61 +357,44 @@
     private async void update_global_search_async (LensSearch search,
                                                    Cancellable cancellable)
     {
-      if (search_is_invalid (search))
-        {
-          yield update_global_without_search_async (search, cancellable);
-          return;
-        }
-    
+      var has_search = !is_search_empty (search);
+      var results_model = search.results_model;
+
       /*
        * For global searches we collate all results under one category heading
        * called Files & Folders
        */
-    
-      var results_model = search.results_model;
-      
-      var search_string = prepare_search_string (search);
-
-      var templates = new PtrArray.sized(1);
-      templates.add (type_templates.lookup ("all"));
 
       try {
         /* Get results ranked by recency */
-        var timer = new Timer ();
-        var results = yield index.search (search_string,
-                                          new Zeitgeist.TimeRange.anytime(),
-                                          templates,
-                                          0,
+        var results = yield run_zg_query (search,
+                                          new Zeitgeist.TimeRange.anytime (),
+                                          ResultType.MOST_RECENT_SUBJECTS,
+                                          null,
                                           20,
-                                          ResultType.MOST_RECENT_SUBJECTS,
                                           cancellable);
 
-        timer.stop ();
-        debug ("Found %u/%u global results for search '%s' in %fms",
-               results.size (), results.estimated_matches (),
-               search_string, timer.elapsed()*1000);
-
-
         results_model.clear ();
 
-        var checked_url = urls.check_url (search.search_string);
-        if (checked_url != null)
+        /* check if the thing typed isn't a url (like facebook.com) */
+        if (has_search)
+        {
+          var checked_url = urls.check_url (search.search_string);
+          if (checked_url != null)
           {
             results_model.append (checked_url, urls.icon,
                                   Categories.FILES_AND_FOLDERS,
                                   "text/html", search.search_string,
                                   checked_url, checked_url);
           }
-        
-        int64 min_size, max_size;
-        get_current_size_limits (out min_size, out max_size);
+        }
 
         Unity.FilesLens.append_events_sorted (results, results_model,
-                                              min_size, max_size, false,
+                                              0, int64.MAX, false,
                                               Categories.FILES_AND_FOLDERS);
-        
+
         /* Add downloads catagory if we don't have a search */
-        if (search_is_invalid (search))
+        if (has_search == false)
         {
           yield update_downloads_async (results_model, cancellable,
                                         search.search_string,
@@ -394,79 +412,133 @@
     private async void update_search_async (LensSearch search,
                                             Cancellable cancellable)
     {
-      if (search_is_invalid (search))
-        {
-          yield update_without_search_async (search, cancellable);
-          return;
-        }
-
       var results_model = search.results_model;
-
-      var search_string = prepare_search_string (search);
-
-      string type_id = get_current_type ();
-
-      bool origin_grouping = type_id == "folders";
-      var result_type = origin_grouping ? ResultType.MOST_RECENT_ORIGIN
-                                        : ResultType.MOST_RECENT_SUBJECTS;
-
-      /* Grab the pre-compiled template we're going to use */
-      var templates = new PtrArray.sized(1);
-      templates.add (type_templates.lookup (type_id));
-
-      try {
+      var txn = new Dee.Transaction (results_model);
+      var has_search = !is_search_empty (search);
+
+      var filter = scope.get_filter ("type") as OptionsFilter;
+
+      var active_filters = get_current_types ();
+      bool only_folders = active_filters != null &&
+        active_filters.length == 1 && active_filters[0] == "folders";
+      uint timer_id = 0;
+
+      try
+      {
         /* Get results ranked by recency */
-        var timer = new Timer ();
-        var results = yield index.search (search_string,
-                                          get_current_timerange (),
-                                          templates,
-                                          0,
-                                          50,
-                                          result_type,
-                                          cancellable);
-
-        timer.stop ();
-        debug ("Found %u/%u results for search '%s' in %fms",
-               results.size (), results.estimated_matches (),
-               search_string, timer.elapsed()*1000);
-
-        results_model.clear ();
-
-        var checked_url = urls.check_url (search.search_string);
-        if (checked_url != null)
+        ResultSet? results = null;
+        if (!only_folders)
+        {
+          results = yield run_zg_query (search,
+                                        get_current_timerange (),
+                                        ResultType.MOST_RECENT_SUBJECTS,
+                                        filter,
+                                        50,
+                                        cancellable);
+        }
+
+        txn.clear ();
+
+        /* check if the thing typed isn't a url (like facebook.com) */
+        if (has_search)
+        {
+          var checked_url = urls.check_url (search.search_string);
+          if (checked_url != null)
           {
-            results_model.append (checked_url, urls.icon, Categories.RECENT,
-                                  "text/html", search.search_string,
-                                  checked_url, checked_url);
+            txn.append (checked_url, urls.icon, Categories.RECENT,
+                        "text/html", search.search_string,
+                        checked_url, checked_url);
           }
-
-        var bookmark_matches = bookmarks.prefix_search (search.search_string);
-        append_bookmarks (bookmark_matches, results_model, Categories.FOLDERS);
-
+        }
+
+        /* apply filters to results found by zeitgeist */
         int64 min_size, max_size;
         get_current_size_limits (out min_size, out max_size);
 
-        Unity.FilesLens.append_events_sorted (results, results_model,
-                                              min_size, max_size,
-                                              origin_grouping);
+        if (results != null)
+        {
+          Unity.FilesLens.append_events_sorted (results, txn,
+                                                min_size, max_size,
+                                                false);
+        }
 
-        yield update_downloads_async (results_model, cancellable,
+        /* get recently downloaded files */
+        yield update_downloads_async (txn, cancellable,
                                       search.search_string);
 
+        /* commit if the origin query is taking too long, if we committed right
+         * away, we'd cause flicker */
+        if (txn.get_n_rows () > 0)
+        {
+          /* here be something magical */
+          timer_id = Timeout.add (200, () =>
+          {
+            if (!cancellable.is_cancelled () && !txn.is_committed ())
+            {
+              txn.commit ();
+            }
+            timer_id = 0;
+            return false;
+          });
+        }
+
+        /* folders are last category we need, update the model directly */
+        if (filter == null ||
+            !filter.filtering || filter.get_option ("folders").active)
+        {
+          results = yield run_zg_query (search, get_current_timerange (),
+                                        ResultType.MOST_RECENT_ORIGIN,
+                                        null, 50, cancellable);
+
+          if (!txn.is_committed ()) txn.commit ();
+
+          /* add bookmarks first */
+          append_bookmarks (has_search ?
+            bookmarks.prefix_search (search.search_string) : bookmarks.list (),
+            results_model,
+            Categories.FOLDERS);
+
+          Unity.FilesLens.append_events_sorted (results, results_model,
+                                                min_size, max_size,
+                                                true);
+        }
+        else
+        {
+          /* just commit */
+          if (!txn.is_committed ()) txn.commit ();
+        }
+
       } catch (IOError.CANCELLED ioe) {
         return;
       } catch (GLib.Error e) {
+        /* if we weren't cancelled, commit the transaction */
         warning ("Error performing global search '%s': %s",
                  search.search_string, e.message);
+        if (!txn.is_committed ()) txn.commit ();
+      } finally {
+        if (timer_id != 0) Source.remove (timer_id);
       }
     }
 
-    private string get_current_type ()
+    private string[]? get_current_types ()
     {
-      /* Get the current type to filter by */
-      var filter = scope.get_filter ("type") as RadioOptionFilter;
-      Unity.FilterOption? option =  filter.get_active_option ();
-      return option == null ? "all" : option.id;
+      /* returns null if the filter is disabled / all options selected */
+      var filter = scope.get_filter ("type") as CheckOptionFilter;
+
+      if (filter == null || !filter.filtering) return null;
+      string[] types = {};
+
+      foreach (unowned string type_id in ALL_TYPES)
+      {
+        var option = filter.get_option (type_id);
+        if (option == null || !option.active) continue;
+
+        types += type_id;
+      }
+
+      if (types.length == ALL_TYPES.length) return null;
+
+      return types;
     }
 
     private TimeRange get_current_timerange ()
@@ -556,99 +628,52 @@
       }
     }
 
-    private async void update_without_search_async (LensSearch search,
-                                                    Cancellable cancellable)
-    {
-      var results_model = search.results_model;
-
-      string type_id = get_current_type ();
-
-      bool origin_grouping = type_id == "folders";
-      var result_type = origin_grouping ? ResultType.MOST_RECENT_ORIGIN
-                                        : ResultType.MOST_RECENT_SUBJECTS;
-
-
-      /* Grab the pre-compiled template we're going to use */
-      var templates = new PtrArray.sized(1);
-      templates.add (type_templates.lookup (type_id));
-
-      try {
-        /* Get results ranked by recency */
-        var timer = new Timer ();
-        var results = yield log.find_events (get_current_timerange (),
-                                             templates,
-                                             Zeitgeist.StorageState.ANY,
-                                             100,
-                                             result_type,
-                                             cancellable);
-
-        timer.stop ();
-        debug ("Found %u/%u no search results in %fms",
-               results.size (), results.estimated_matches (),
-               timer.elapsed()*1000);
-
-        results_model.clear ();
-
-        if (type_id == "all" || type_id == "folders")
-        {
-          append_bookmarks (bookmarks.list (), results_model, Categories.FOLDERS);
-        }
-
-        int64 min_size, max_size;
-        get_current_size_limits (out min_size, out max_size);
-
-        Unity.FilesLens.append_events_sorted (results, results_model,
-                                              min_size, max_size,
-                                              origin_grouping);
-
-        yield update_downloads_async (results_model, cancellable);
-
-      } catch (IOError.CANCELLED ioe) {
-        return;
-      } catch (GLib.Error e) {
-        warning ("Error performing empty search: %s",
-                 e.message);
-      }
-    }
-    
-    private async void update_global_without_search_async (LensSearch search,
-                                                           Cancellable cancellable)
-    {
-      var results_model = search.results_model;
-
-      /* Grab the pre-compiled template we're going to use */
-      var templates = new PtrArray.sized(1);
-      templates.add (type_templates.lookup ("all"));
-
-      try {
-        /* Get results ranked by recency */
-        var timer = new Timer ();
-        var results = yield log.find_events (new Zeitgeist.TimeRange.anytime(),
-                                             templates,
-                                             Zeitgeist.StorageState.ANY,
-                                             20,
-                                             ResultType.MOST_RECENT_SUBJECTS,
-                                             cancellable);
-
-        timer.stop ();
-        debug ("Found %u/%u global results in %fms",
-               results.size (), results.estimated_matches (),
-               timer.elapsed()*1000);
-
-        results_model.clear ();
-
-        Unity.FilesLens.append_events_sorted (results, results_model,
-                                              int64.MIN, int64.MAX,
-                                              false, Categories.RECENT_FILES);
-
-        yield update_downloads_async (results_model, cancellable);
-        
-      } catch (IOError.CANCELLED ioe) {
-        return;
-      } catch (GLib.Error e) {
-        warning ("Error performing empty search: %s",
-                 e.message);
-      }
+    private async ResultSet run_zg_query (LensSearch search,
+                                          TimeRange time_range,
+                                          ResultType result_type,
+                                          OptionsFilter? filters,
+                                          uint num_results,
+                                          Cancellable cancellable) throws Error
+    {
+      ResultSet results;
+      var timer = new Timer ();
+      var templates = create_template (filters);
+
+      /* Copy the templates to a PtrArray which libzg expects */
+      var ptr_arr = new PtrArray ();
+      for (int i = 0; i < templates.length; i++)
+      {
+        ptr_arr.add (templates[i]);
+      }
+
+      /* Get results ranked by recency */
+      if (is_search_empty (search))
+      {
+        results = yield log.find_events (time_range,
+                                         (owned) ptr_arr,
+                                         Zeitgeist.StorageState.ANY,
+                                         num_results,
+                                         result_type,
+                                         cancellable);
+      }
+      else
+      {
+        var search_string = prepare_search_string (search);
+
+        results = yield index.search (search_string,
+                                      time_range,
+                                      (owned) ptr_arr,
+                                      0, // offset
+                                      num_results,
+                                      result_type,
+                                      cancellable);
+      }
+
+      debug ("Found %u/%u no search results in %fms",
+             results.size (), results.estimated_matches (),
+             timer.elapsed()*1000);
+
+      return results;
     }
 
     private void append_bookmarks (GLib.List<Bookmark> bookmarks,
@@ -709,8 +734,8 @@
           continue;
 
         // check if type matches
-        var type_id = get_current_type ();
-        if (type_id != "all" && !Utils.file_info_matches_type (info, type_id))
+        var types = get_current_types ();
+        if (types != null && !Utils.file_info_matches_any (info, types))
           continue;
         
         // check if size is within bounds
@@ -762,75 +787,75 @@
                                     bool use_origin,
                                     int category_override = -1)
   {
-     foreach (var ev in events)
+    foreach (var ev in events)
+    {
+      if (ev.num_subjects() > 0)
       {
-        if (ev.num_subjects() > 0)
-          {
-            // FIXME: We only use the first subject...
-            Zeitgeist.Subject su = ev.get_subject(0);
-
-            string uri;
-            string display_name;
-            string mimetype;
-
-            if (use_origin)
-            {
-              uri = su.get_origin ();
-              display_name = "";
-              mimetype = "inode/directory";
-            }
-            else
-            {
-              uri = su.get_uri ();
-              display_name = su.get_text ();
-              mimetype = su.get_mimetype ();
-              mimetype = su.get_mimetype () != null ?
-                         su.get_mimetype () : "application/octet-stream";
-            }
-            if (uri == null) continue;
-            File file = File.new_for_uri (uri);
-
-            if (display_name == null || display_name == "")
-            {
-              display_name = Path.get_basename (file.get_parse_name ());
-            }
-
-            bool check_size = min_size > 0 || max_size < int64.MAX;
-            /* Don't check existence on non-native files as http:// and
-             * friends are *very* expensive to query */
-            if (file.is_native()) {
-              // hidden files should be ignored
-              try {
-                FileInfo info = file.query_info (check_size ?
-                  ATTR_SIZE_AND_HIDDEN : ATTR_HIDDEN, 0, null);
-                if (info.get_is_hidden())
-                  continue;
-                if (check_size &&
-                  (info.get_size () < min_size || info.get_size () > max_size))
-                {
-                  continue;
-                }
-              } catch (GLib.Error e) {
-                // as error occurred file must be missing therefore ignoring it
-                continue;
-              }
-            }
-            string icon = Utils.get_icon_for_uri (uri, mimetype);
-
-            uint category_id;
-            string comment = file.get_parse_name ();
+        // FIXME: We only use the first subject...
+        Zeitgeist.Subject su = ev.get_subject(0);
+
+        string uri;
+        string display_name;
+        string mimetype;
+
+        if (use_origin)
+        {
+          uri = su.get_origin ();
+          display_name = "";
+          mimetype = "inode/directory";
+        }
+        else
+        {
+          uri = su.get_uri ();
+          display_name = su.get_text ();
+          mimetype = su.get_mimetype ();
+          mimetype = su.get_mimetype () != null ?
+                     su.get_mimetype () : "application/octet-stream";
+        }
+        if (uri == null) continue;
+        File file = File.new_for_uri (uri);
+
+        if (display_name == null || display_name == "")
+        {
+          display_name = Path.get_basename (file.get_parse_name ());
+        }
+
+        bool check_size = min_size > 0 || max_size < int64.MAX;
+        /* Don't check existence on non-native files as http:// and
+         * friends are *very* expensive to query */
+        if (file.is_native()) {
+          // hidden files should be ignored
+          try {
+            FileInfo info = file.query_info (check_size ?
+              ATTR_SIZE_AND_HIDDEN : ATTR_HIDDEN, 0, null);
+            if (info.get_is_hidden())
+              continue;
+            if (check_size &&
+              (info.get_size () < min_size || info.get_size () > max_size))
+            {
+              continue;
+            }
+          } catch (GLib.Error e) {
+            // as error occurred file must be missing therefore ignoring it
+            continue;
+          }
+        }
+        string icon = Utils.get_icon_for_uri (uri, mimetype);
+
+        uint category_id;
+        string comment = file.get_parse_name ();
+        
+        if (category_override >= 0)
+          category_id = category_override;
+        else
+          category_id = file.query_file_type (0, null) == FileType.DIRECTORY ?
+                                     Categories.FOLDERS : Categories.RECENT;
             
-            if (category_override >= 0)
-              category_id = category_override;
-            else
-              category_id = file.query_file_type (0, null) == FileType.DIRECTORY ?
-                                         Categories.FOLDERS : Categories.RECENT;
-                
-            results.append (uri, icon, category_id, mimetype,
-                            display_name, comment);
+        results.append (uri, icon, category_id, mimetype,
+                        display_name, comment);
 
-          }
       }
-   }
+    }
+  }
 } /* namespace */
 

=== modified file 'src/utils.vala'
--- src/utils.vala	2011-12-06 17:54:02 +0000
+++ src/utils.vala	2012-01-30 10:08:25 +0000
@@ -322,6 +322,15 @@
       return yield list_dir_internal (folder, name_filter);
     }
 
+    public bool file_info_matches_any (FileInfo info, string[] types)
+    {
+      foreach (unowned string type_id in types)
+      {
+        if (file_info_matches_type (info, type_id)) return true;
+      }
+      return false;
+    }
+
     public bool file_info_matches_type (FileInfo info, string type_id)
     {
       unowned string content_type = info.get_content_type ();