Merge lp:~lemonboy/pantheon-files/update-free-space into lp:~elementary-apps/pantheon-files/trunk

[The Lemon Man]

Update the size-related fields for networked filesystems.

[Jeremy Wootten (jeremywootten)]

The indicator does not update until the Sidebar is refreshed and this does not happen unless e.g. the bookmarks are moved, renamed, deleted. However, the freespace indicator does display correctly for NFS at the time of mounting. It should be clarified whether this is sufficient to meet the requirements of the bounty; the bug report is not specific on this matter. I would say the freespace indicators should update whenever the freespace changes for any of the mounted volumes (not just NFS).

[lp:~lemonboy/pantheon-files/update-free-space]

1967. By The Lemon Man on 2015-11-15

Update the sidebar on uri change.

[Jeremy Wootten (jeremywootten)]

The free space now updates on reload (F5). This has to be done manually for local mounts if the free space changes due to pasting or deleting files since this does not trigger a reload for local devices (FileMonitor signals are used to update the view).
While it would be nice to have the freespace indicators automatically update, it can be added in another branch. I will approve this branch.

review: Approve

=== modified file 'src/View/Sidebar.vala'
--- src/View/Sidebar.vala	2015-11-14 13:21:54 +0000
+++ src/View/Sidebar.vala	2015-11-15 20:44:29 +0000
@@ -559,16 +559,22 @@
                 var mount = volume.get_mount ();
                 if (mount != null) {
                     var root = mount.get_default_location ();
-                    add_place (Marlin.PlaceType.MOUNTED_VOLUME,
-                               iter,
-                               mount.get_name (),
-                               mount.get_icon (),
-                               root.get_uri (),
-                               null,
-                               volume,
-                               mount,
-                               0,
-                               root.get_parse_name ());
+                    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 ());
+
+                    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);
                 } else {
                 /* see comment above in why we add an icon for an unmounted mountable volume */
                     var name = volume.get_name ();
@@ -2007,8 +2013,9 @@
         }
 
         private void loading_uri_callback (string location) {
-                set_matching_selection (location);
-                slot_location = location;
+            set_matching_selection (location);
+            slot_location = location;
+            update_places();
         }
 
         private void trash_state_changed_cb (Marlin.TrashMonitor trash_monitor, bool state) {