Merge lp:~jeremywootten/pantheon-files/show-root-file-system-free-space into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Additional information shown for mounts in sidebar (lp:1467672)

This branch changes tooltips in the sidebar to show (where available) the filesystem type, free space and total size of mounts in addition to the mount point - including for network mounts.

It also removes some seemingly redundant tooltips.

It also adds a diskspace graphic to the "File System" bookmark.

[Cody Garver (codygarver)]

Mounted samba share tooltips display as "smb://server/mountpoint - Unknown type". Should it really say "Unknown type"?

review: Needs Fixing

[Jeremy Wootten (jeremywootten)]

On my system the file type is given as "cifs". I am running a samba server on a Linux machine, not Windows though. It could be a limitation of gvfs and/or the server you are running? Files just shows what GLib.query_filesystem_info () returns so I am not sure it can be fixed other than showing something other than "Unknown".

=== modified file 'libcore/AbstractSidebar.vala'
--- libcore/AbstractSidebar.vala	2016-05-06 10:36:16 +0000
+++ libcore/AbstractSidebar.vala	2016-05-10 21:36:43 +0000
@@ -122,6 +122,6 @@
                                                   Volume? volume,
                                                   Mount? mount,
                                                   uint index,
-                                                  string tooltip) ;
+                                                  string? tooltip = null) ;
     }
 }

=== modified file 'libcore/FileUtils.vala'
--- libcore/FileUtils.vala	2016-05-06 10:36:16 +0000
+++ libcore/FileUtils.vala	2016-05-10 21:36:43 +0000
@@ -269,23 +269,24 @@
 
     private bool can_browse_scheme (string scheme) {
         switch (scheme) {
-            case Marlin.ROOT_FS_URI:
-            case Marlin.TRASH_URI:
-            case Marlin.NETWORK_URI:
-            case Marlin.RECENT_URI:
-            case Marlin.SMB_URI:
+            case Marlin.AFP_URI:
+            case Marlin.DAV_URI:
+            case Marlin.DAVS_URI:
+            case Marlin.SFTP_URI:
+            case Marlin.FTP_URI:
+            case Marlin.MTP_URI:
+                return false;
+            default:
                 return true;
-            default:
-                return false;
         }
     }
 }
 
 namespace Marlin {
     public const string ROOT_FS_URI = "file://";
-    public const string TRASH_URI = "trash:///";
-    public const string NETWORK_URI = "network:///";
-    public const string RECENT_URI = "recent:///";
+    public const string TRASH_URI = "trash://";
+    public const string NETWORK_URI = "network://";
+    public const string RECENT_URI = "recent://";
     public const string AFP_URI = "afp://";
     public const string DAV_URI = "dav://";
     public const string DAVS_URI = "davs://";

=== modified file 'libcore/marlin-icons.h'
--- libcore/marlin-icons.h	2015-05-03 06:44:42 +0000
+++ libcore/marlin-icons.h	2016-05-10 21:36:43 +0000
@@ -5,8 +5,8 @@
 #define MARLIN_ICON_NETWORK_SERVER  "network-server"
 #define MARLIN_ICON_FILESYSTEM      "drive-harddisk-system"
 
-#define MARLIN_TRASH_URI            "trash:///"
-#define MARLIN_NETWORK_URI          "network:///"
+#define MARLIN_TRASH_URI            "trash://"
+#define MARLIN_NETWORK_URI          "network://"
 
 #define MARLIN_ICON_FOLDER          "folder"
 #define MARLIN_ICON_FOLDER_REMOTE   "folder-remote"

=== modified file 'libwidgets/View/SearchResults.vala'
--- libwidgets/View/SearchResults.vala	2016-05-06 10:36:16 +0000
+++ libwidgets/View/SearchResults.vala	2016-05-10 21:36:43 +0000
@@ -30,7 +30,7 @@
 
             public Match (FileInfo info, string path_string, File parent)
             {
-                Object (name: info.get_name (),
+                Object (name: info.get_display_name (),
                         mime: info.get_content_type (),
                         icon: info.get_icon (),
                         path_string: path_string,
@@ -817,6 +817,7 @@
         }
 
         string ATTRIBUTES = FileAttribute.STANDARD_NAME + "," +
+                            FileAttribute.STANDARD_DISPLAY_NAME + "," +
                             FileAttribute.STANDARD_CONTENT_TYPE + "," +
                             FileAttribute.STANDARD_IS_HIDDEN + "," +
                             FileAttribute.STANDARD_TYPE + "," +
@@ -824,11 +825,13 @@
 
         void visit (string term, bool include_hidden, Cancellable cancel)
         {
+
             FileEnumerator enumerator;
             var folder = directory_queue.poll ();
 
-            if (folder == null)
+            if (folder == null) {
                 return;
+            }
 
             var depth = 0;
 
@@ -840,8 +843,9 @@
                 depth++;
             }
 
-            if (depth > MAX_DEPTH)
+            if ((search_current_directory_only && depth > 1) || depth > MAX_DEPTH) {
                 return;
+            }
 
             try {
                 enumerator = folder.enumerate_children (ATTRIBUTES, 0, cancel);
@@ -854,20 +858,23 @@
             FileInfo info = null;
             try {
                 while (!cancel.is_cancelled () && (info = enumerator.next_file (null)) != null) {
-                    if (info.get_is_hidden () && !include_hidden)
+                    if (info.get_is_hidden () && !include_hidden) {
                         continue;
+                    }
 
                     if (info.get_file_type () == FileType.DIRECTORY && !search_current_directory_only) {
                         directory_queue.add (folder.resolve_relative_path (info.get_name ()));
                     }
 
-                    if (term_matches (term, info.get_name ()))
+                    if (term_matches (term, info.get_display_name ())) {
                         new_results.add (new Match (info, path_string, folder));
+                    }
                 }
-            } catch (Error e) {}
+            } catch (Error e) {warning ("Error enumerating in visit");}
 
-            if (new_results.size < 1)
+            if (new_results.size < 1) {
                 return;
+            }
 
             if (!cancel.is_cancelled ()) {
                 var new_count = display_count + new_results.size;

=== modified file 'src/View/Sidebar.vala'
--- src/View/Sidebar.vala	2016-05-06 10:36:16 +0000
+++ src/View/Sidebar.vala	2016-05-10 21:36:43 +0000
@@ -344,7 +344,7 @@
                                                    Volume? volume,
                                                    Mount? mount,
                                                    uint index,
-                                                   string tooltip) {
+                                                   string? tooltip = null) {
             Gdk.Pixbuf? pixbuf = null;
             if (icon != null) {
                 Marlin.IconInfo? icon_info = Marlin.IconInfo.lookup (icon, Marlin.IconSize.SMALLEST);
@@ -421,8 +421,9 @@
         }
 
         private void update_places () {
-            Gtk.TreeIter iter;
+            Gtk.TreeIter iter, last_iter;
             string mount_uri;
+            GLib.File root;
 
             this.last_selected_uri = null;
             this.n_builtins_before = 0;
@@ -507,27 +508,29 @@
 
 
             /* Add Filesystem BUILTIN */
-            add_place (Marlin.PlaceType.BUILT_IN,
-                       iter,
-                       _("File System"),
-                       new ThemedIcon.with_default_fallbacks (Marlin.ICON_FILESYSTEM),
-                       "file:///",
-                       null,
-                       null,
-                       null,
-                       0,
-                       _("Open the contents of the FileSystem"));
+            last_iter = add_place (Marlin.PlaceType.BUILT_IN,
+                                       iter,
+                                       _("File System"),
+                                       new ThemedIcon.with_default_fallbacks (Marlin.ICON_FILESYSTEM),
+                                       Marlin.ROOT_FS_URI,
+                                       null,
+                                       null,
+                                       null,
+                                       0,
+                                       null);
+
+            add_device_tooltip (last_iter, PF.FileUtils.get_file_for_path (Marlin.ROOT_FS_URI));
 
             /* Add all connected drives */
             GLib.List<GLib.Drive> drives = volume_monitor.get_connected_drives ();
             GLib.List<GLib.Volume> volumes;
             foreach (GLib.Drive drive in drives) {
                 volumes = drive.get_volumes ();
-                if (volumes != null)
+                if (volumes != null) {
                     add_volumes (iter, drive, volumes);
+                } else if (drive.is_media_removable () &&
+                           !drive.is_media_check_automatic ()) {
 
-                else if (drive.is_media_removable ()
-                     && !drive.is_media_check_automatic ()) {
                     /* If the drive has no mountable volumes and we cannot detect media change.. we
                      * display the drive in the sidebar so the user can manually poll the drive by
                      * right clicking and selecting "Rescan..."
@@ -546,7 +549,7 @@
                                null,
                                null,
                                0,
-                               (_("Mount and open %s")).printf (name));
+                               null);
                 }
             }
             /* add all volumes that are not associated with a drive */
@@ -557,23 +560,19 @@
 
                 var mount = volume.get_mount ();
                 if (mount != null) {
-                    var root = mount.get_default_location ();
-                    var it = add_place (Marlin.PlaceType.MOUNTED_VOLUME,
-                                        iter,
-                                        mount.get_name (),
-                                        mount.get_icon (),
-                                        root.get_uri (),
-                                        null,
-                                        volume,
-                                        mount,
-                                        0,
-                                        root.get_parse_name ());
+                    root = mount.get_default_location ();
+                    last_iter = add_place (Marlin.PlaceType.MOUNTED_VOLUME,
+                                           iter,
+                                           mount.get_name (),
+                                           mount.get_icon (),
+                                           root.get_uri (),
+                                           null,
+                                           volume,
+                                           mount,
+                                           0,
+                                           null);
 
-                    uint64 fs_capacity, fs_free;
-                    get_filesystem_space (root, out fs_capacity, out fs_free);
-                    store.@set (it,
-                                Column.FREE_SPACE, fs_free,
-                                Column.DISK_SIZE, fs_capacity);
+                    add_device_tooltip (last_iter, root);
                 } else {
                 /* see comment above in why we add an icon for an unmounted mountable volume */
                     var name = volume.get_name ();
@@ -600,7 +599,7 @@
                 if (volume != null)
                     continue;
 
-                var root = mount.get_default_location ();
+                root = mount.get_default_location ();
                 if (root.is_native ()) {
                     string scheme = root.get_uri_scheme ();
                     if (scheme == "archive" ) {
@@ -612,16 +611,18 @@
                     continue;
                 }
 
-                add_place (Marlin.PlaceType.MOUNTED_VOLUME,
-                           iter,
-                           mount.get_name (),
-                           mount.get_icon (),
-                           root.get_uri (),
-                           null,
-                           null,
-                           mount,
-                           0,
-                           root.get_parse_name ());
+                last_iter = add_place (Marlin.PlaceType.MOUNTED_VOLUME,
+                                       iter,
+                                       mount.get_name (),
+                                       mount.get_icon (),
+                                       root.get_uri (),
+                                       null,
+                                       null,
+                                       mount,
+                                       0,
+                                       null);
+
+                add_device_tooltip (last_iter, root);
             }
 
             /* ADD NETWORK CATEGORY */
@@ -635,7 +636,7 @@
             /* Add network mounts */
             network_mounts.reverse ();
             foreach (Mount mount in network_mounts) {
-                var root = mount.get_default_location ();
+                root = mount.get_default_location ();
                 /* get_smb_share_from_uri will return the uri unaltered if does not have
                  * the smb scheme so we need not test.  This is required because the mount
                  * does not return the true root location of the share but the location used
@@ -643,16 +644,18 @@
                  */
                 string uri = PF.FileUtils.get_smb_share_from_uri (root.get_uri ());
 
-                add_place (Marlin.PlaceType.BUILT_IN,
-                           iter,
-                           mount.get_name (),
-                           mount.get_icon (),
-                           uri,
-                           null,
-                           null,
-                           mount,
-                           0,
-                           uri);
+                last_iter = add_place (Marlin.PlaceType.BUILT_IN,
+                                       iter,
+                                       mount.get_name (),
+                                       mount.get_icon (),
+                                       uri,
+                                       null,
+                                       null,
+                                       mount,
+                                       0,
+                                       null);
+
+                add_device_tooltip (last_iter, root);
             }
 
             /* Add Entire Network BUILTIN */
@@ -714,13 +717,9 @@
                                            volume,
                                            mount,
                                            0,
-                                           root.get_parse_name ());
+                                           null);
 
-                    uint64 fs_capacity, fs_free;
-                    get_filesystem_space (root, out fs_capacity, out fs_free);
-                    store.@set (last_iter,
-                                Column.FREE_SPACE, fs_free,
-                                Column.DISK_SIZE, fs_capacity);
+                    add_device_tooltip (last_iter, root);
                 } else {
                     /* Do show the unmounted volumes in the sidebar;
                     * this is so the user can mount it (in case automounting
@@ -740,12 +739,13 @@
                                volume,
                                null,
                                0,
-                               (_("Mount and open %s")).printf (name));
+                               null);
                 }
             }
         }
 
-        private void get_filesystem_space (GLib.File root, out uint64 fs_capacity, out uint64 fs_free) {
+        private void get_filesystem_space_and_type (GLib.File root, out uint64 fs_capacity,
+                                                    out uint64 fs_free, out string type) {
             GLib.FileInfo info;
             try {
                 info = root.query_filesystem_info ("filesystem::*", null);
@@ -756,10 +756,45 @@
             }
             fs_capacity = 0;
             fs_free = 0;
+            type = _("Unknown type");
             if (info != null) {
-                fs_capacity = info.get_attribute_uint64 (FileAttribute.FILESYSTEM_SIZE);
-                fs_free = info.get_attribute_uint64 (FileAttribute.FILESYSTEM_FREE);
-            }
+                if (info.has_attribute (FileAttribute.FILESYSTEM_SIZE)) {
+                    fs_capacity = info.get_attribute_uint64 (FileAttribute.FILESYSTEM_SIZE);
+                }
+                if (info.has_attribute (FileAttribute.FILESYSTEM_FREE)) {
+                    fs_free = info.get_attribute_uint64 (FileAttribute.FILESYSTEM_FREE);
+                }
+                if (info.has_attribute (FileAttribute.FILESYSTEM_TYPE)) {
+                    type = info.get_attribute_as_string (FileAttribute.FILESYSTEM_TYPE);
+                }
+            }
+        }
+
+        private string get_tooltip_for_device (GLib.File location, uint64 fs_capacity,
+                                               uint64 fs_free, string type) {
+            var sb = new StringBuilder ("");
+            sb.append (PF.FileUtils.sanitize_path (location.get_parse_name ()));
+            if (type != null && type != "") {
+                sb.append (" - ");
+                sb.append (type);
+            }
+            if (fs_capacity > 0) {
+                sb.append (" ");
+                sb.append (_("(%s Free of %s)").printf (format_size (fs_free), format_size (fs_capacity)));
+            }
+
+            return sb.str.replace ("&", "&amp;").replace (">", "&gt;").replace ("<", "&lt;");
+        }
+
+        private void add_device_tooltip (Gtk.TreeIter iter, GLib.File root) {
+            uint64 fs_capacity, fs_free;
+            string fs_type;
+            get_filesystem_space_and_type (root, out fs_capacity, out fs_free, out fs_type);
+            var tooltip = get_tooltip_for_device (root, fs_capacity, fs_free, fs_type);
+            store.@set (iter,
+                        Column.FREE_SPACE, fs_free,
+                        Column.DISK_SIZE, fs_capacity,
+                        Column.TOOLTIP, tooltip);
         }
 
 /* DRAG N DROP FUNCTIONS START */
@@ -967,7 +1002,7 @@
             var real_action = context.get_selected_action ();
             if (real_action == Gdk.DragAction.ASK) {
                 var actions = context.get_actions ();
-                if (drop_uri.has_prefix ("trash:///"))
+                if (drop_uri.has_prefix ("trash://"))
                     actions &= Gdk.DragAction.MOVE;
 
                 real_action = dnd_handler.drag_drop_action_ask ((Gtk.Widget)tree_view, window, actions);
@@ -1163,7 +1198,7 @@
             store.@get (iter, Column.URI, out uri, Column.PLUGIN_CALLBACK, out f);
 
             if (uri != null) {
-                var location = File.new_for_uri (uri);
+                var location = PF.FileUtils.get_file_for_path (uri);
                 /* Navigate to the clicked location */
                 if (flags == Marlin.OpenFlag.NEW_WINDOW) {
                     window.add_window (location, Marlin.ViewMode.CURRENT);
@@ -1533,8 +1568,11 @@
                                              Gtk.TreeIter iter) {
 
             var crt = renderer as Gtk.CellRendererText;
-            bool is_category;
-            model.@get (iter, Column.IS_CATEGORY, out is_category, -1);
+            bool is_category, show_eject_button;
+            uint64 disk_size = 0;
+            model.@get (iter, Column.IS_CATEGORY, out is_category,
+                              Column.DISK_SIZE, out disk_size,
+                              Column.SHOW_EJECT, out show_eject_button, -1);
 
             if (is_category) {
                 crt.weight = 900;
@@ -1543,6 +1581,15 @@
             } else {
                 crt.weight_set = false;
                 crt.ypad = BOOKMARK_YPAD;
+                if (disk_size > 0) {
+                    /* Make disk space graphic same length whether or not eject button displayed */
+                    var crd = renderer as Marlin.CellRendererDisk;
+                    if (!show_eject_button) {
+                        crd.rpad = eject_button_size + ICON_XPAD * 2;
+                    } else {
+                        crd.rpad = 0;
+                    }
+                }
             }
         }
 

=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2016-04-30 11:18:13 +0000
+++ src/View/Window.vala	2016-05-10 21:36:43 +0000
@@ -986,7 +986,7 @@
                 return;
             }
 
-            var tip_location = GLib.File.new_for_uri (unescaped_tip_uri);
+            var tip_location = PF.FileUtils.get_file_for_path (unescaped_tip_uri);
             var relative_path = root_location.get_relative_path (tip_location);
             GLib.File gfile;
 
@@ -996,7 +996,7 @@
 
                 foreach (string dir in dirs) {
                     uri += (GLib.Path.DIR_SEPARATOR_S + dir);
-                    gfile = GLib.File.new_for_uri (uri);
+                    gfile = PF.FileUtils.get_file_for_path (uri);
 
                     mwcols.add_location (gfile, mwcols.current_slot);
                 }