Merge lp:~kamstrup/unity-lens-files/home-lenses into lp:unity-lens-files

[Mikkel Kamstrup Erlandsen]

Implement the new home screen policy. That is; when we don't have a global search show the Recent Files and Downloads categories (in that order), and when we do have a global search show only a Files and Folders category. See also https://code.launchpad.net/~kamstrup/unity/home-lenses/+merge/89669

[Michal Hruby (mhr3)]

Looks fine.

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-lens-files/7/console reported an error when processing this lp:~kamstrup/unity-lens-files/home-lenses branch.
Not merging it.

[Michal Hruby (mhr3)]

Don't be lazy bot!

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-01-16 18:09:28 +0000
+++ src/daemon.vala	2012-01-23 12:01:17 +0000
@@ -185,6 +185,10 @@
       var cat = new Unity.Category (_("Recent"),
                                     new FileIcon (icon_dir.get_child ("group-recent.svg")));
       categories.append (cat);
+      
+      cat = new Unity.Category (_("Recent Files"),
+                                new FileIcon (icon_dir.get_child ("group-recent.svg")));
+      categories.append (cat);
 
       cat =  new Unity.Category (_("Downloads"),
                                  new FileIcon (icon_dir.get_child ("group-downloads.svg")));
@@ -194,6 +198,10 @@
                                 new FileIcon (icon_dir.get_child ("group-folders.svg")));
       categories.append (cat);
 
+      cat = new Unity.Category (_("Files & Folders"),
+                                new FileIcon (icon_dir.get_child ("group-folders.svg")));
+      categories.append (cat);
+
       lens.categories = categories;
     }
 
@@ -314,13 +322,18 @@
     private async void update_global_search_async (LensSearch search,
                                                    Cancellable cancellable)
     {
-      var results_model = search.results_model;
-
       if (search_is_invalid (search))
         {
-          results_model.clear ();
+          yield update_global_without_search_async (search, cancellable);
           return;
         }
+    
+      /*
+       * 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);
 
@@ -349,18 +362,26 @@
         var checked_url = urls.check_url (search.search_string);
         if (checked_url != null)
           {
-            results_model.append (checked_url, urls.icon, Categories.RECENT,
+            results_model.append (checked_url, urls.icon,
+                                  Categories.FILES_AND_FOLDERS,
                                   "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);
         
         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);
+                                              min_size, max_size, false,
+                                              Categories.FILES_AND_FOLDERS);
+        
+        /* Add downloads catagory if we don't have a search */
+        if (search_is_invalid (search))
+        {
+          yield update_downloads_async (results_model, cancellable,
+                                        search.search_string,
+                                        Categories.FILES_AND_FOLDERS);
+        }
 
       } catch (IOError.CANCELLED ioe) {
         return;
@@ -589,6 +610,46 @@
                  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 void append_bookmarks (GLib.List<Bookmark> bookmarks,
                                    Dee.Model results_model,
@@ -603,7 +664,9 @@
     }
 
     private async void update_downloads_async (Dee.Model results_model,
-        Cancellable cancellable, string? name_filter = null) throws IOError
+                                               Cancellable cancellable,
+                                               string? name_filter = null,
+                                               int category_override = -1) throws IOError
     {
       // FIXME: Store the Downloads folder and update on changes
       unowned string download_path =
@@ -612,7 +675,7 @@
       SList<FileInfo> downloads;
 
       try {
-        if (name_filter != null)
+        if (name_filter != null && name_filter != "")
           downloads = yield Utils.list_dir_filtered (download_dir, name_filter);
         else
           downloads = yield Utils.list_dir (download_dir);
@@ -654,7 +717,12 @@
         int64 size = info.get_size ();
         if (size < min_size || size > max_size)
           continue;
-
+        
+        uint category_id = Categories.DOWNLOADS;
+        
+        if (category_override >= 0)
+          category_id = category_override;
+        
         results_model.append (uri, icon_hint, Categories.DOWNLOADS,
                               mimetype, info.get_display_name (), uri);
       }
@@ -691,7 +759,8 @@
   public void append_events_sorted (Zeitgeist.ResultSet events,
                                     Dee.Model results,
                                     int64 min_size, int64 max_size,
-                                    bool use_origin)
+                                    bool use_origin,
+                                    int category_override = -1)
   {
      foreach (var ev in events)
       {
@@ -751,8 +820,12 @@
             uint category_id;
             string comment = file.get_parse_name ();
             
-            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);
 
 
=== modified file 'src/schemas.vala'
--- src/schemas.vala	2011-08-04 15:26:32 +0000
+++ src/schemas.vala	2012-01-23 12:01:17 +0000
@@ -39,7 +39,10 @@
   public enum Categories
   {
     RECENT,
+    RECENT_FILES,
     DOWNLOADS,
-    FOLDERS
+    FOLDERS,
+    FILES_AND_FOLDERS,
+    
   }
 }