Merge lp:~stolowski/unity-lens-files/hidden-files into lp:unity-lens-files

[Paweł Stołowski]

Check paths for "/." substring to exclude hidden files. Added manual test.

Check paths for "/." substring to exclude hidden files. Added manual test.

[Michal Hruby (mhr3)]

Looks good. +1

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-09-18 11:39:18 +0000
+++ src/daemon.vala	2012-11-05 11:40:31 +0000
@@ -24,9 +24,9 @@
 using Gee;
 
 namespace Unity.FilesLens {
-  
+
   const string ICON_PATH = Config.DATADIR + "/icons/unity-icon-theme/places/svg/";
-  
+
   public class Daemon : GLib.Object
   {
     private Zeitgeist.Log log;
@@ -75,11 +75,11 @@
       populate_categories ();
       populate_filters ();
       lens.add_local_scope (scope);
-      
+
       /* Bring up Zeitgeist interfaces */
       log = new Zeitgeist.Log ();
       index = new Zeitgeist.Index ();
-      
+
       /* Listen for all file:// related events from Zeitgeist */
       var templates = new PtrArray ();
       var event = new Zeitgeist.Event ();
@@ -95,7 +95,7 @@
 
       bookmarks = new Bookmarks ();
       urls = new UrlChecker ();
- 
+
       devices = new Devices ();
       devices.changed.connect (() => {
         /* make sure our results are fresh */
@@ -204,7 +204,7 @@
       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);
@@ -234,7 +234,7 @@
                              new Subject.full (uri_prefix,
                                                "", "", "", "", "", ""));
       templates["all"] = event;
-      
+
       /* Section.DOCUMENTS */
       event = new Event.full("", manifestation, "",
                              new Subject.full (uri_prefix,
@@ -257,7 +257,7 @@
                              new Subject.full (uri_prefix,
                                                NFO_IMAGE, "", "", "", "", ""));
       templates["images"] = event;
-      
+
       /* Section.AUDIO */
       event = new Event.full("", manifestation, "",
                              new Subject.full (uri_prefix,
@@ -279,7 +279,7 @@
                                                NFO_PRESENTATION, "", "", "", "", ""));
       templates["presentations"] = event;
 
-      /* Section.OTHER 
+      /* Section.OTHER
        * Note that subject templates are joined with logical AND */
       event = new Event.full("", manifestation, "");
       event.add_subject (new Subject.full (uri_prefix,
@@ -377,7 +377,7 @@
     private bool is_search_empty (LensSearch search)
     {
       if (search.search_string == null) return true;
-      
+
       return search.search_string.strip () == "";
     }
 
@@ -400,7 +400,7 @@
 
       return s;
     }
-    
+
     private async void update_global_search_async (LensSearch search,
                                                    Cancellable cancellable)
     {
@@ -423,7 +423,7 @@
 
         results_model.clear ();
 
-        /* check if the thing typed isn't a url (like facebook.com) 
+        /* check if the thing typed isn't a url (like facebook.com)
          * or isn't a remote mountable url (like ftp://ftp.ubuntu.com)*/
         var url_type = UrlType.UNKNOWN;
         var checked_url = urls.check_url (search.search_string, out url_type);
@@ -505,7 +505,7 @@
                  search.search_string, e.message);
       }
     }
-    
+
     private async void update_search_async (LensSearch search,
                                             Cancellable cancellable)
     {
@@ -536,13 +536,13 @@
 
         txn.clear ();
 
-        /* check if the thing typed isn't a url (like facebook.com) 
+        /* check if the thing typed isn't a url (like facebook.com)
          * or isn't a remote mountable url (like ftp://ftp.ubuntu.com)*/
-        var url_type = UrlType.UNKNOWN; 
+        var url_type = UrlType.UNKNOWN;
         var checked_url = urls.check_url (search.search_string, out url_type);
         if (checked_url != null)
         {
-          txn.append (checked_url, urls.get_icon_for_type(url_type), 
+          txn.append (checked_url, urls.get_icon_for_type(url_type),
                 Categories.RECENT,
                 "text/html", search.search_string,
                 checked_url, checked_url);
@@ -625,7 +625,7 @@
                                                 bookmark_uris);
 
           GLib.List<Device> matching_devices;
- 
+
           if (has_search)
             matching_devices = devices.search (search.search_string);
           else
@@ -709,7 +709,7 @@
         return;
       }
 
-      int64[] sizes = 
+      int64[] sizes =
       {
         0,
         1024,
@@ -934,7 +934,7 @@
         }
       } while (info != null);
       file_iter.close();
-      
+
       if (dirs != null)
       {
         while (!dirs.is_empty())
@@ -949,7 +949,7 @@
     {
       debug ("Previewing: %s",  uri);
       Unity.GenericPreview preview = null;
-      
+
       string real_uri;
       if (Bookmark.is_bookmark_uri (uri))
       {
@@ -1031,7 +1031,7 @@
           {
             total_size = finfo.get_size ();
             preview.add_info (new InfoHint ("size", _("Size"), null, GLib.format_size (total_size)));
-        
+
             var open_folder_action = new Unity.PreviewAction ("open-dir", _("Show in Folder"), null);
             open_folder_action.activated.connect (on_preview_open_folder);
             preview.add_action (open_folder_action);
@@ -1085,7 +1085,7 @@
         free_capacity = file_info.get_attribute_uint64 (GLib.FileAttribute.FILESYSTEM_FREE);
 
         contents_size = total_capacity - free_capacity;
-        
+
       } catch (Error e) {
         warning ("Failed to query filesystem info: %s", e.message);
       }
@@ -1157,9 +1157,9 @@
     {
       debug (@"Activating: $uri");
       try {
-        if (bookmarks.launch_if_bookmark (uri) || devices.launch_if_device (uri)) 
+        if (bookmarks.launch_if_bookmark (uri) || devices.launch_if_device (uri))
           return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
-          
+
         /* this code ensures that a file manager will be used
          * * if uri it's a remote location that should be mounted */
         var url_type = UrlType.UNKNOWN;
@@ -1234,6 +1234,10 @@
           if (excluded_uris != null && origin in excluded_uris) continue;
           if (!(origin in origins) && f.is_native () && f.query_exists ())
           {
+            string? path = f.get_path ();
+            if (path != null && path.contains ("/."))
+              continue;
+
             var display_name = Path.get_basename (f.get_parse_name ());
             if (display_name.casefold ().has_prefix (folded_search))
             {
@@ -1306,7 +1310,8 @@
           {
             FileInfo info = file.query_info (check_size ?
               ATTRS_TYPE_SIZE_HIDDEN : ATTRS_TYPE_HIDDEN, 0, null);
-            if (info.get_is_hidden())
+            string? path = file.get_path ();
+            if (path != null && path.contains ("/."))
               continue;
             if (check_size &&
               (info.get_size () < min_size || info.get_size () > max_size))
@@ -1356,4 +1361,3 @@
     }
   }
 } /* namespace */
-
 
=== added file 'tests/manual/misc.txt'
--- tests/manual/misc.txt	1970-01-01 00:00:00 +0000
+++ tests/manual/misc.txt	2012-11-05 11:40:31 +0000
@@ -0,0 +1,14 @@
+Hidden files / dirs are not displayed
+-------------------------------------
+Test that hidden files, hidden folders, or normal files in hidden folders are not displayed in search results.
+
+Setup:
+Create a few combinations of hidden files/folders using nautilus (CTRL+H in nautilus to view hidden files), e.g. ~/.Foo/bar.txt, ~/.foo.txt, ~/.Foo/bar/baz.txt.
+Update locatedb (e.g. sudo /etc/cron.daily/mlocate).
+
+Actions:
+Type search queries such as "Foo", "bar", "baz" in the dash search query.
+
+Expected Result:
+Verify none of the newly created hidden files are displayed in the Dash home view with empty search.
+Verify none of the hidden files are displayed after entering a search query.