Merge lp:~lore-mattei/unity-lens-files/unity-lens-files-lp878052 into lp:unity-lens-files

[Lorenzo Mattei]

For local files only, gets the folder name from uri and checks if it is hidden. If so, skips the file.

[Bernhard Kaindl (benkai)]

I think merging this should be a clear cut, I wonder why it takes so long.

review: Approve

[Omer Akram (om26er)]

I will try to ping someone on Monday.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Technically it only solves this partially, since it only checks the
state of the immediate parent dir. ~/.foo/bar/secret.txt would still
show up. Recursively stat()ing the parent dirs is not very fun either.

I suggested some point in the past that we do a simple heuristic that
I think is "good enough" - simply checking if the path string contains
a "/." pattern.

Unmerged revisions

229. By Lorenzo Mattei on 2012-04-28

Skip files in hidden folders.

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-04-05 16:11:45 +0000
+++ src/daemon.vala	2012-04-28 20:45:25 +0000
@@ -1007,12 +1007,15 @@
         FileType file_type = FileType.UNKNOWN;
         if (file.is_native ())
         {
-          // hidden files should be ignored
+          // hidden files and folders should be ignored
           try
           {
+            File directory = File.new_for_uri (Path.get_dirname(uri));
+            FileInfo dir_info = directory.query_info (check_size ?
+              ATTRS_TYPE_SIZE_HIDDEN : ATTRS_TYPE_HIDDEN, 0, null);
             FileInfo info = file.query_info (check_size ?
               ATTRS_TYPE_SIZE_HIDDEN : ATTRS_TYPE_HIDDEN, 0, null);
-            if (info.get_is_hidden())
+            if (info.get_is_hidden() || dir_info.get_is_hidden())
               continue;
             if (check_size &&
               (info.get_size () < min_size || info.get_size () > max_size))