Merge lp:~mhr3/unity-lens-files/folder-fixes into lp:unity-lens-files

[Michal Hruby]

Fixes Folder filter and bookmarks displaying deleted directories.

[Mikkel Kamstrup Erlandsen (kamstrup)]

I can confirm that it works :-) However, I'd like to refactor this a bit. The idea so far has been to keep all bookmarks logic contained in the Bookmarks class in folders.vala.

I suggest that the filtering be moved into that class an automatically taken care of when you call bookmarks.prefix_search() or bookmarks.list().

Also - there's no reason to do async IO here since we have no UI to block :-). In fact async IO is to be taken cautiously inside the lens daemons because it warrants the need for reentrancy safety for fast changing queries (the daemons protect somewhat against this at a higher level, but still).

Otherwise good!

review: Needs Fixing

[Michal Hruby (mhr3)]

> I can confirm that it works :-) However, I'd like to refactor this a bit. The
> idea so far has been to keep all bookmarks logic contained in the Bookmarks
> class in folders.vala.
>
> I suggest that the filtering be moved into that class an automatically taken
> care of when you call bookmarks.prefix_search() or bookmarks.list().
>

Fair enough, I'll fix that.

> Also - there's no reason to do async IO here since we have no UI to block :-).
> In fact async IO is to be taken cautiously inside the lens daemons because it
> warrants the need for reentrancy safety for fast changing queries (the daemons
> protect somewhat against this at a higher level, but still).
>
> Otherwise good!

TBH, I'm not sure doing everything synchronously is such a good idea, true we do not have a UI to block, but we make the subsequent queries execute slower, imo the correct solution would be to add a Cancellable instance to each query and call cancel on it if the lens gets a new query. But perhaps this would be something for P.

[Mikkel Kamstrup Erlandsen (kamstrup)]

ok, I like :-)

There's a small gotcha - that we can address in a later patch: When showing all folder I can see my "ratings-query" directory. But when searching for "rat" it doesn't show in the result set. I think we may be matching against the wrong field...

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2011-09-21 09:05:51 +0000
+++ src/daemon.vala	2011-09-22 08:51:29 +0000
@@ -376,7 +376,7 @@
         get_current_size_limits (out min_size, out max_size);
 
         Unity.FilesLens.append_events_sorted (results, results_model,
-                                              min_size, max_size);
+                                              min_size, max_size, false);
 
       } catch (GLib.Error e) {
         warning ("Error performing global search '%s': %s",
@@ -414,8 +414,9 @@
 
       string type_id = get_current_type ();
 
-      var result_type = type_id == "folder" ? ResultType.MOST_RECENT_ORIGIN
-                                            : ResultType.MOST_RECENT_SUBJECTS;
+      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);
@@ -457,7 +458,8 @@
         /* FIXME: Add downloads */
         
         Unity.FilesLens.append_events_sorted (results, results_model,
-                                              min_size, max_size);
+                                              min_size, max_size,
+                                              origin_grouping);
 
       } catch (GLib.Error e) {
         warning ("Error performing global search '%s': %s",
@@ -582,8 +584,10 @@
       
       string type_id = get_current_type ();
 
-      var result_type = type_id == "folder" ? ResultType.MOST_RECENT_ORIGIN
-                                            : ResultType.MOST_RECENT_SUBJECTS;
+      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);
@@ -606,8 +610,10 @@
 
         results_model.clear ();
 
-        if (type_id == "all" || type_id == "folder")
-          append_bookmarks (bookmarks.list(), results_model);
+        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);
@@ -615,7 +621,8 @@
         yield update_downloads_async (results_model);
 
         Unity.FilesLens.append_events_sorted (results, results_model,
-                                              min_size, max_size);
+                                              min_size, max_size,
+                                              origin_grouping);
 
       } catch (GLib.Error e) {
         warning ("Error performing empty search: %s",
@@ -636,7 +643,7 @@
 
     private void append_bookmarks (GLib.List<Bookmark> bookmarks,
                                    Dee.Model results_model,
-                                   Categories category = Categories.FOLDERS)
+                                   Categories category)
     {
       foreach (var bookmark in bookmarks)
       {
@@ -727,7 +734,8 @@
    * these events are already sorted with descending timestamps */
   public void append_events_sorted (Zeitgeist.ResultSet events,
                                     Dee.Model results,
-                                    int64 min_size, int64 max_size)
+                                    int64 min_size, int64 max_size,
+                                    bool use_origin)
   {
      foreach (var ev in events)
       {
@@ -735,13 +743,33 @@
           {
             // FIXME: We only use the first subject...
             Zeitgeist.Subject su = ev.get_subject(0);
-            
-            string uri = su.get_uri ();
-            string display_name = su.get_text ();
-            string mimetype = su.get_mimetype () != null ?
-                          su.get_mimetype () : "application/octet-stream";
+
+            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 */
@@ -762,34 +790,16 @@
                 continue;
               }
             }
-#if 0    
-            if (section == Section.FOLDERS)
-              {
-                File dir = File.new_for_uri(uri).get_parent();
-                uri = dir.get_uri ();
-                try{
-                  FileInfo info = dir.query_info (FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
-                                                FileQueryInfoFlags.NONE);
-                display_name = info.get_display_name ();
-              } catch (GLib.Error e) {
-                /* Bugger, we fall back to basename, which might not be
-                 * valid UTF8... */
-                warning ("Unable to get display name for %s", uri);
-                display_name = dir.get_basename ();
-              }
-              mimetype = "inode/directory";
-              }
-#endif           
             string icon = Utils.get_icon_for_uri (uri, mimetype);
-            
+
             uint category_id;
-            string comment = "";
+            string comment = file.get_parse_name ();
             
-            category_id = file.query_file_type (0, null) == FileType.DIRECTORY ? Categories.FOLDERS
-                                                                          : Categories.RECENT;
+            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/folder.vala'
--- src/folder.vala	2011-08-04 15:26:32 +0000
+++ src/folder.vala	2011-09-22 08:51:29 +0000
@@ -94,10 +94,58 @@
         bookmarks.append (bookmark);
       }
     }
-    
-    public unowned List<Bookmark> list ()
-    {
-      return bookmarks;
+
+    /* makes sure the uris exist on the filesystem (checks only native uris) */
+    private GLib.List<Bookmark> filter_bookmarks (List<Bookmark> bm_list)
+    {
+      var result = new GLib.List<Bookmark> ();
+
+      foreach (var bookmark in bm_list)
+      {
+        File f = File.new_for_uri (bookmark.uri);
+        if (f.is_native () && !f.query_exists ()) continue;
+
+        result.prepend (bookmark);
+      }
+
+      result.reverse ();
+      return result;
+    }
+#if 0
+    private async GLib.List<Bookmark> filter_bookmarks_async (owned GLib.List<Bookmark> bm_list)
+    {
+      var result = new GLib.List<Bookmark> ();
+
+      foreach (var bookmark in bm_list)
+      {
+        File f = File.new_for_uri (bookmark.uri);
+        if (f.is_native ())
+        {
+          bool exists;
+          try
+          {
+            var info = yield f.query_info_async (FILE_ATTRIBUTE_STANDARD_TYPE,
+                                                 0, Priority.DEFAULT, null);
+            exists = info.get_file_type () != FileType.UNKNOWN;
+          }
+          catch (Error err)
+          {
+            exists = false;
+          }
+          if (!exists)
+            continue;
+        }
+
+        result.prepend (bookmark);
+      }
+      result.reverse ();
+      return result;
+    }
+#endif
+
+    public List<Bookmark> list ()
+    {
+      return filter_bookmarks (bookmarks);
     }
     
     public List<Bookmark> prefix_search (string search)
@@ -118,7 +166,7 @@
         }
       }
       
-      return (owned) matches;
+      return filter_bookmarks (matches);
     }
   
   }