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

[Michal Hruby]

Fix activation of bookmark URIs. Standard URIs now also fall through so unity will activate them (that way they're launched using proper AppLaunchContext).

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

214. By Michal Hruby on 2012-03-06

Make sure folders are not duplicated

[Mikkel Kamstrup Erlandsen (kamstrup)]

did know you could do 'if (flag in flags)' in Vala. That is crazy cool :-)

7 Unity.FilesLens.append_events_sorted (results, results_model,
8 - 0, int64.MAX, false,
9 - category_id);
10 + 0, int64.MAX, 0,
11 + null, category_id);

Can you use ResultFlags.NONE instead of 0 to improve legibility here?

80 + private const string ATTR_TYPE_AND_HIDDEN = FILE_ATTRIBUTE_STANDARD_TYPE +
81 + "," + FILE_ATTRIBUTE_STANDARD_IS_HIDDEN;
82 + private const string ATTR_SIZE_AND_HIDDEN = FILE_ATTRIBUTE_STANDARD_TYPE +
83 + "," + FILE_ATTRIBUTE_STANDARD_SIZE +
84 + "," + FILE_ATTRIBUTE_STANDARD_IS_HIDDEN;

I think you should change the name of ATTR_SIZE_AND_HIDDEN since it's slightly misleading (excluding the TYPE). Maybe just ATTR_TYPE_HIDDEN and ATTR_TYPE_HIDDEN_SIZE?

Otherwise looking great!

review: Needs Fixing

[Mikkel Kamstrup Erlandsen (kamstrup)]

s/did know/did not know/

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

215. By Michal Hruby on 2012-03-12

Improve readability

[Michal Hruby (mhr3)]

And pushed!

[Mikkel Kamstrup Erlandsen (kamstrup)]

And liking!

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-03-02 11:15:51 +0000
+++ src/daemon.vala	2012-03-12 10:07:24 +0000
@@ -404,8 +404,8 @@
           Categories.FILES_AND_FOLDERS : Categories.RECENT_FILES;
 
         Unity.FilesLens.append_events_sorted (results, results_model,
-                                              0, int64.MAX, false,
-                                              category_id);
+                                              0, int64.MAX, ResultFlags.NONE,
+                                              null, category_id);
 
         /* Add downloads catagory if we don't have a search */
         if (has_search == false)
@@ -477,7 +477,7 @@
         {
           Unity.FilesLens.append_events_sorted (results, txn,
                                                 min_size, max_size,
-                                                false);
+                                                ResultFlags.SKIP_FOLDERS);
         }
 
         /* get recently downloaded files */
@@ -511,14 +511,26 @@
           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);
+          GLib.List<Bookmark> matching_bookmarks;
+          if (has_search)
+            matching_bookmarks = bookmarks.prefix_search (search.search_string);
+          else
+            matching_bookmarks = bookmarks.list ();
+          append_bookmarks (matching_bookmarks, results_model,
+                            Categories.FOLDERS);
+
+          /* make sure we don't duplicate the bookmark uris */
+          var bookmark_uris = new Gee.HashSet<string> ();
+          foreach (var bookmark_obj in matching_bookmarks)
+          {
+            /* uri has bookmark: scheme */
+            bookmark_uris.add (bookmark_obj.dnd_uri);
+          }
 
           Unity.FilesLens.append_events_sorted (results, results_model,
                                                 min_size, max_size,
-                                                true);
+                                                ResultFlags.USE_ORIGIN,
+                                                bookmark_uris);
         }
         else
         {
@@ -846,13 +858,12 @@
     {
       debug (@"Activating: $uri");
       try {
-        if (!bookmarks.launch_if_bookmark (uri))
-          AppInfo.launch_default_for_uri (uri, null);
-        return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
+        if (bookmarks.launch_if_bookmark (uri))
+          return new Unity.ActivationResponse (Unity.HandledType.HIDE_DASH);
       } catch (GLib.Error error) {
         warning ("Failed to launch URI %s", uri);
-        return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED);
       }
+      return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED);
     }
 
     private void on_zeitgeist_changed ()
@@ -863,16 +874,27 @@
     }
   }
 
-  private const string ATTR_HIDDEN = FILE_ATTRIBUTE_STANDARD_IS_HIDDEN;
-  private const string ATTR_SIZE_AND_HIDDEN = FILE_ATTRIBUTE_STANDARD_SIZE +
-    "," + FILE_ATTRIBUTE_STANDARD_IS_HIDDEN;
+  private const string ATTRS_TYPE_HIDDEN = FILE_ATTRIBUTE_STANDARD_TYPE +
+    "," + FILE_ATTRIBUTE_STANDARD_IS_HIDDEN;
+  private const string ATTRS_TYPE_SIZE_HIDDEN = FILE_ATTRIBUTE_STANDARD_TYPE +
+    "," + FILE_ATTRIBUTE_STANDARD_SIZE +
+    "," + FILE_ATTRIBUTE_STANDARD_IS_HIDDEN;
+
+  [Flags]
+  public enum ResultFlags
+  {
+    NONE = 0,
+    USE_ORIGIN,
+    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,
                                     Dee.Model results,
                                     int64 min_size, int64 max_size,
-                                    bool use_origin,
+                                    ResultFlags flags,
+                                    Gee.Set<string>? excluded_uris = null,
                                     int category_override = -1)
   {
     foreach (var ev in events)
@@ -886,7 +908,7 @@
         string display_name;
         string mimetype;
 
-        if (use_origin)
+        if (ResultFlags.USE_ORIGIN in flags)
         {
           uri = su.get_origin ();
           display_name = "";
@@ -902,6 +924,7 @@
         }
         if (uri == null) continue;
         File file = File.new_for_uri (uri);
+        if (excluded_uris != null && file.get_uri () in excluded_uris) continue;
 
         if (display_name == null || display_name == "")
         {
@@ -911,11 +934,14 @@
         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()) {
+        FileType file_type = FileType.UNKNOWN;
+        if (file.is_native ())
+        {
           // hidden files should be ignored
-          try {
+          try
+          {
             FileInfo info = file.query_info (check_size ?
-              ATTR_SIZE_AND_HIDDEN : ATTR_HIDDEN, 0, null);
+              ATTRS_TYPE_SIZE_HIDDEN : ATTRS_TYPE_HIDDEN, 0, null);
             if (info.get_is_hidden())
               continue;
             if (check_size &&
@@ -923,7 +949,10 @@
             {
               continue;
             }
-          } catch (GLib.Error e) {
+            file_type = info.get_file_type ();
+          }
+          catch (GLib.Error e) 
+          {
             // as error occurred file must be missing therefore ignoring it
             continue;
           }
@@ -932,13 +961,15 @@
 
         uint category_id;
         string comment = file.get_parse_name ();
-        
+
+        var is_dir = file_type == FileType.DIRECTORY;
+        if (is_dir && ResultFlags.SKIP_FOLDERS in flags) continue;
+
         if (category_override >= 0)
           category_id = category_override;
         else
-          category_id = file.query_file_type (0, null) == FileType.DIRECTORY ?
-                                     Categories.FOLDERS : Categories.RECENT;
-            
+          category_id = is_dir ? Categories.FOLDERS : Categories.RECENT;
+
         results.append (uri, icon, category_id, mimetype,
                         display_name, comment);
 

=== modified file 'src/folder.vala'
--- src/folder.vala	2011-09-29 12:06:45 +0000
+++ src/folder.vala	2012-03-12 10:07:24 +0000
@@ -187,7 +187,7 @@
       var uris = new List<string> ();
       uris.append (uri);
       
-      launcher.launch_uris (uris, new AppLaunchContext());
+      launcher.launch_uris (uris, null);
       
       return true;
     }