Merge lp:~jeremywootten/pantheon-files/fix-folder-no-execute into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Handle no execute permissions gracefully

For folders with no execute permission, show the "readonly" emblem (since it is possible to list the contents).

Show "Unknown" for size, type, and modified of files where the relevant attribute is not obtainable (e.g. within a folder with no execute permission).

[Zisu Andrei (matzipan)]

As argumented before, I personally don't think "Unknown" is a good descriptive string, which means we have to wait until the string freeze is over to merge this in.

Also, some comments inline.

review: Needs Fixing

[Jeremy Wootten (jeremywootten)]

Suggestions for a more suitable string are welcome but it has to be short (in all languages). "Hidden"? "Inaccessible"?

[Zisu Andrei (matzipan)]

"Inaccessible" might actually be a good one, since we are literally describing something that cannot be accessed.

[lp:~jeremywootten/pantheon-files/fix-folder-no-execute]

2302. By Jeremy Wootten on 2016-09-03

Use 'Inaccessible' for size and modified if no info

2303. By Jeremy Wootten on 2016-09-03

Merge trunk, resolve conflict

[Zisu Andrei (matzipan)]

review: Approve (code and functionality)

=== modified file 'libcore/gof-file.c'
--- libcore/gof-file.c	2016-08-29 17:49:53 +0000
+++ libcore/gof-file.c	2016-09-03 16:29:09 +0000
@@ -343,10 +343,14 @@
 gof_file_update_size (GOFFile *file)
 {
     g_free (file->format_size);
-    if (gof_file_is_folder (file) || gof_file_is_root_network_folder (file))
+
+    if (gof_file_is_folder (file) || gof_file_is_root_network_folder (file)) {
         file->format_size = g_strdup ("—");
-    else
+    } else if (g_file_info_has_attribute (file->info, G_FILE_ATTRIBUTE_STANDARD_SIZE)) {
         file->format_size = g_format_size (file->size);
+    } else {
+        file->format_size = g_strdup (_("Inaccessible"));
+    }
 }
 
 static void
@@ -524,7 +528,11 @@
     /* sizes */
     gof_file_update_size (file);
     /* modified date */
-    file->formated_modified = gof_file_get_formated_time (file, G_FILE_ATTRIBUTE_TIME_MODIFIED);
+    if (g_file_info_has_attribute (file->info, G_FILE_ATTRIBUTE_TIME_MODIFIED)) {
+        file->formated_modified = gof_file_get_formated_time (file, G_FILE_ATTRIBUTE_TIME_MODIFIED);
+    } else {
+        file->formated_modified = g_strdup (_("Inaccessible"));
+    }
     /* icon */
     if (file->is_directory) {
         gof_file_get_folder_icon_from_uri_or_path (file);
@@ -1333,6 +1341,14 @@
     } else {
         return TRUE;  /* We will just have to assume we can write to the file */
     }
+
+    gboolean can_write = g_file_info_get_attribute_boolean (file->info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE);
+
+    if (file->directory && g_file_info_has_attribute (file->info, G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE)) {
+        return can_write && g_file_info_get_attribute_boolean (file->info, G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE);
+    }
+
+    return can_write;
 }
 
 gboolean