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

[Michal Hruby]

Add also directory results to non-empty global searches

Searches in home lens do not include folders.

Extract folders for the uris we find and add them to the results (add to the beginning if they prefix match, to the end otherwise).

Added a manual test.

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

226. By Michal Hruby on 2012-04-04

Add a manual test

[Gord Allott (gordallott)]

Seems good, +1

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-03-20 10:33:37 +0000
+++ src/daemon.vala	2012-04-04 10:14:28 +0000
@@ -428,9 +428,28 @@
         var category_id = has_search ?
           Categories.FILES_AND_FOLDERS : Categories.RECENT_FILES;
 
-        Unity.FilesLens.append_events_sorted (results, results_model,
-                                              0, int64.MAX, ResultFlags.NONE,
-                                              null, category_id);
+        Set<string>? bookmark_uris = null;
+        if (has_search)
+        {
+          /* add bookmarks first */
+          GLib.List<Bookmark> matching_bookmarks;
+          matching_bookmarks = bookmarks.prefix_search (search.search_string);
+          append_bookmarks (matching_bookmarks, results_model, category_id);
+
+          /* make sure we don't duplicate the bookmark uris */
+          bookmark_uris = new Gee.HashSet<string> ();
+          foreach (var bookmark_obj in matching_bookmarks)
+          {
+            /* uri has bookmark: scheme */
+            bookmark_uris.add (bookmark_obj.dnd_uri);
+          }
+        }
+
+        var result_flags = has_search ? ResultFlags.EXTRACT_ORIGINS : 0;
+        Unity.FilesLens.append_events_sorted (search.search_string,
+                                              results, results_model,
+                                              0, int64.MAX, result_flags,
+                                              bookmark_uris, category_id);
 
         /* Add downloads catagory if we don't have a search */
         if (has_search == false)
@@ -443,7 +462,8 @@
                                         cancellable,
                                         true);
 
-          Unity.FilesLens.append_events_sorted (results, results_model,
+          Unity.FilesLens.append_events_sorted (search.search_string,
+                                                results, results_model,
                                                 0, int64.MAX, ResultFlags.NONE,
                                                 null, Categories.DOWNLOADS);
         }
@@ -512,7 +532,8 @@
 
         if (results != null)
         {
-          Unity.FilesLens.append_events_sorted (results, txn,
+          Unity.FilesLens.append_events_sorted (search.search_string,
+                                                results, txn,
                                                 min_size, max_size,
                                                 ResultFlags.SKIP_FOLDERS);
         }
@@ -526,7 +547,8 @@
                                       cancellable,
                                       true);
 
-        Unity.FilesLens.append_events_sorted (results, txn,
+        Unity.FilesLens.append_events_sorted (search.search_string,
+                                              results, txn,
                                               min_size, max_size,
                                               ResultFlags.NONE,
                                               null, Categories.DOWNLOADS);
@@ -574,7 +596,8 @@
             bookmark_uris.add (bookmark_obj.dnd_uri);
           }
 
-          Unity.FilesLens.append_events_sorted (results, results_model,
+          Unity.FilesLens.append_events_sorted (search.search_string,
+                                                results, results_model,
                                                 min_size, max_size,
                                                 ResultFlags.USE_ORIGIN,
                                                 bookmark_uris);
@@ -879,12 +902,14 @@
   {
     NONE = 0,
     USE_ORIGIN,
+    EXTRACT_ORIGINS,
     SKIP_FOLDERS,
   }
 
   /* Appends a set of Zeitgeist.Events to our Dee.Model assuming that
    * these events are already sorted with descending timestamps */
-  public void append_events_sorted (Zeitgeist.ResultSet? events,
+  public void append_events_sorted (string search_string,
+                                    Zeitgeist.ResultSet? events,
                                     Dee.Model results,
                                     int64 min_size, int64 max_size,
                                     ResultFlags flags,
@@ -892,12 +917,62 @@
                                     int category_override = -1)
   {
     if (events == null) return;
+    uint category_id;
+    Set<string>? extracted_directories = null;
+
+    if (ResultFlags.EXTRACT_ORIGINS in flags)
+    {
+      var folded_search = search_string.casefold ();
+      var origins = new HashSet<string> ();
+      // loop through all found events, take a look at origin field, add it
+      // to result set if it matches our search
+      // NOTE: using separate zg query with MOST_RECENT_ORIGINS grouping
+      // is more likely to find relevant directories, but is much slower
+      // than this kind of "approximation"
+      foreach (var ev in events)
+      {
+        if (ev.num_subjects () > 0)
+        {
+          string origin = ev.get_subject (0).get_origin ();
+          if (origin == null || origin == "") continue;
+          var f = File.new_for_uri (origin);
+          origin = f.get_uri ();
+          if (excluded_uris != null && origin in excluded_uris) continue;
+          if (!(origin in origins) && f.is_native () && f.query_exists ())
+          {
+            var display_name = Path.get_basename (f.get_parse_name ());
+            if (display_name.casefold ().has_prefix (folded_search))
+            {
+              string mimetype = "inode/directory";
+              string icon = Utils.get_icon_for_uri (origin, mimetype);
+              if (category_override >= 0)
+                category_id = category_override;
+              else
+                category_id = Categories.FOLDERS;
+              results.append (origin, icon, category_id, mimetype,
+                              display_name, "", origin);
+            }
+            else
+            {
+              if (extracted_directories == null)
+              {
+                extracted_directories = new HashSet<string> ();
+              }
+              extracted_directories.add (origin);
+            }
+            origins.add (origin);
+          }
+        }
+      }
+      // we need this because of way ResultSet works with foreach
+      if (events.size () > 0) events.seek (0);
+    }
     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);
+        Zeitgeist.Subject su = ev.get_subject (0);
 
         string uri;
         string display_name;
@@ -946,15 +1021,13 @@
             }
             file_type = info.get_file_type ();
           }
-          catch (GLib.Error e) 
+          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 ();
 
         var is_dir = file_type == FileType.DIRECTORY;
@@ -966,8 +1039,25 @@
           category_id = is_dir ? Categories.FOLDERS : Categories.RECENT;
 
         results.append (uri, icon, category_id, mimetype,
-                        display_name, comment);
-
+                        display_name, comment, uri);
+
+      }
+    }
+
+    if (extracted_directories != null)
+    {
+      foreach (var dir_uri in extracted_directories)
+      {
+        var f = File.new_for_uri (dir_uri);
+        var display_name = Path.get_basename (f.get_parse_name ());
+        string mimetype = "inode/directory";
+        string icon = Utils.get_icon_for_uri (dir_uri, mimetype);
+        if (category_override >= 0)
+          category_id = category_override;
+        else
+          category_id = Categories.FOLDERS;
+        results.append (dir_uri, icon, category_id, mimetype,
+                        display_name, "", dir_uri);
       }
     }
   }
 
=== added file 'tests/manual/folders.txt'
--- tests/manual/folders.txt	1970-01-01 00:00:00 +0000
+++ tests/manual/folders.txt	2012-04-04 10:14:28 +0000
@@ -0,0 +1,10 @@
+Folders
+=======
+Tests that global searches find folders as well as files.
+
+#. Open the Dash.
+#. Perform a generic search in the home view. (for example 'd')
+
+Outcome
+  You should see "Files and Folders" category with both folders starting with 'd', followed by files containing 'd' or residing in a folder with 'd' in name.
+