Merge lp:~jeremywootten/pantheon-files/various-fixes-part4 into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Enable bookmark, create non-existent, drop onto location bar for remote locations; do not show incorrect size for servers and networks.

This branches fixes a number of minor issues around remote folders and networking:
1) Allow bookmarking and navigation to non-folder files on remote locations.
2) Creation of bookmarks by dropping non-folders on remote locations onto sidebar
3) Creation of non-existent folders on remote locations when entered into location bar
4) Do not show "0 bytes" as size for servers on network (lp: 1400731)
5) Fix drop files onto breadcrumbs for remote locations.

[lp:~jeremywootten/pantheon-files/various-fixes-part4]

2053. By Jeremy Wootten on 2016-02-28

Handle size of network root folders in OverlayBar and PropertiesWindow

=== modified file 'libcore/gof-directory-async.vala'
--- libcore/gof-directory-async.vala	2016-01-27 19:58:35 +0000
+++ libcore/gof-directory-async.vala	2016-02-28 13:09:08 +0000
@@ -157,7 +157,8 @@
     private async void prepare_directory (GOFFileLoadedFunc? file_loaded_func) {
         bool success = yield get_file_info ();
         if (success) {
-            if (is_local && !file.is_folder ()) {
+            if (!file.is_folder () && !file.is_root_network_folder ()) {
+                warning ("Trying to load a non-folder - finding parent");
                 var parent = file.is_connected ? location.get_parent () : null;
                 if (parent != null) {
                     file = GOF.File.get (parent);
@@ -165,9 +166,14 @@
                     location = parent;
                     success = yield get_file_info ();
                 } else {
+                    warning ("Parent is null for file %s", file.uri);
                     success = false;
                 }
+            } else {
+
             }
+        } else {
+            warning ("Failed to get file info for file %s", file.uri);
         }
         make_ready (success, file_loaded_func); /* Only place that should call this function */
     }
@@ -180,7 +186,6 @@
         if (is_local) {
             return file.ensure_query_info ();
         }
-
         /* Must be non-local */
         if (!is_local && !yield check_network ()) {
             file.is_connected = false;
@@ -225,10 +230,10 @@
         }
         if (success) {
             debug ("got file info");
-            file.ensure_query_info ();
+            file.update ();
             return true;
         } else {
-            debug ("Failed to get file info for %s", file.uri);
+            warning ("Failed to get file info for %s", file.uri);
             return false;
         }
     }
@@ -246,6 +251,7 @@
                 file.is_connected = true;
             } else {
                 file.is_connected = false;
+                file.is_mounted = false;
                 warning ("Mount_mountable failed: %s", e.message);
                 if (e is IOError.PERMISSION_DENIED || e is IOError.FAILED_HANDLED) {
                     permission_denied = true;
@@ -292,7 +298,10 @@
     private void make_ready (bool ready, GOFFileLoadedFunc? file_loaded_func = null) {
         can_load = ready;
         if (!can_load) {
-            debug ("%s cannot load", file.uri);
+            warning ("%s cannot load.  Connected %s, Mounted %s, Exists %s", file.uri,
+                                                                             file.is_connected.to_string (),
+                                                                             file.is_mounted.to_string (),
+                                                                             file.exists.to_string ());
             state = State.NOT_LOADED; /* ensure state is correct */
             done_loading ();
             return;

=== modified file 'libcore/gof-file.c'
--- libcore/gof-file.c	2016-02-24 10:49:57 +0000
+++ libcore/gof-file.c	2016-02-28 13:09:08 +0000
@@ -343,7 +343,7 @@
 gof_file_update_size (GOFFile *file)
 {
     g_free (file->format_size);
-    if (gof_file_is_folder (file))
+    if (gof_file_is_folder (file) || gof_file_is_root_network_folder (file))
         file->format_size = g_strdup ("—");
     else
         file->format_size = g_format_size (file->size);

=== modified file 'libwidgets/View/BreadcrumbsEntry.vala'
--- libwidgets/View/BreadcrumbsEntry.vala	2016-01-17 18:33:58 +0000
+++ libwidgets/View/BreadcrumbsEntry.vala	2016-02-28 13:09:08 +0000
@@ -489,7 +489,7 @@
             GOF.File? file;
             var el = get_element_from_coordinates (x, y);
             if (el != null) {
-                file = GOF.File.get (GLib.File.new_for_path (get_path_from_element (el)));
+                file = GOF.File.get (GLib.File.new_for_commandline_arg (get_path_from_element (el)));
                 file.ensure_query_info ();
                 return file;
             }

=== modified file 'src/View/OverlayBar.vala'
--- src/View/OverlayBar.vala	2016-01-23 12:05:47 +0000
+++ src/View/OverlayBar.vala	2016-02-28 13:09:08 +0000
@@ -159,7 +159,7 @@
             string str = "";
             status = "";
             if (goffile != null) { /* a single file is hovered or selected */
-                if (goffile.is_network_uri_scheme ()) {
+                if (goffile.is_network_uri_scheme () || goffile.is_root_network_folder ()) {
                     str = goffile.get_display_target_uri ();
                 } else if (!goffile.is_folder ()) {
                     /* if we have an image, see if we can get its resolution */
@@ -232,9 +232,9 @@
             string str;
             cancellable = null;
 
+            status = "%s - %s (".printf (goffile.info.get_name (), goffile.formated_type);
+
             if (deep_counter != null) {
-                status = "%s - %s (".printf (goffile.info.get_name (), goffile.formated_type);
-
                 if (deep_counter.dirs_count > 0) {
                     str = ngettext (_("%u sub-folder, "), _("%u sub-folders, "), deep_counter.dirs_count);
                     status += str.printf (deep_counter.dirs_count);
@@ -245,13 +245,22 @@
                     status += str.printf (deep_counter.files_count);
                 }
 
-                status += format_size (deep_counter.total_size);
+                if (deep_counter.total_size == 0) {
+                    status += _("unknown size");
+                } else {
+                    status += format_size (deep_counter.total_size);
+                }
                 
-                if (deep_counter.file_not_read > 0)
-                    status += " approx - %u files not readable".printf (deep_counter.file_not_read);
-
-                status += ")";
+                if (deep_counter.file_not_read > 0) {
+                    if (deep_counter.total_size > 0) {
+                        status += " approx - %u files not readable".printf (deep_counter.file_not_read);
+                    } else {
+                        status += " %u files not readable".printf (deep_counter.file_not_read);
+                    }
+                }
             }
+
+            status += ")";
         }
 
         private void scan_list (GLib.List<GOF.File>? files) {

=== modified file 'src/View/PropertiesWindow.vala'
--- src/View/PropertiesWindow.vala	2016-02-24 10:49:57 +0000
+++ src/View/PropertiesWindow.vala	2016-02-28 13:09:08 +0000
@@ -438,6 +438,10 @@
         size_warning_image.hide ();
 
         foreach (GOF.File gof in files) {
+            if (gof.is_root_network_folder ()) {
+                size_label.label = _("unknown");
+                continue;
+            }
             if (gof.is_directory) {
                 folder_count++;
                 var d = new Marlin.DeepCount (gof.location);

=== modified file 'src/View/Sidebar.vala'
--- src/View/Sidebar.vala	2016-02-14 15:22:19 +0000
+++ src/View/Sidebar.vala	2016-02-28 13:09:08 +0000
@@ -837,8 +837,11 @@
                 this.store.@get (iter, Column.URI, out uri);
                 if (uri != null) {
                     GOF.File file = GOF.File.get_by_uri (uri);
-                    if (file.ensure_query_info ())
+                    if (file.ensure_query_info ()) {
                         file.accepts_drop (drag_list, context, out action);
+                    } else {
+                        warning ("Could not ensure query info for %s when dropping onto sidebar", file.location.get_uri ());
+                    }
                 }
             }
 
@@ -924,14 +927,18 @@
             Gtk.TreeViewDropPosition drop_pos;
             if (compute_drop_position (tree_view, x, y, out tree_path, out drop_pos)) {
                 Gtk.TreeIter iter;
-                if (!store.get_iter (out iter, tree_path))
+                if (!store.get_iter (out iter, tree_path)) {
+                    warning ("Could not retrieve tree path after drop onto sidebar");
                     return false;
+                }
 
                 if (drop_pos == Gtk.TreeViewDropPosition.BEFORE
                  || drop_pos == Gtk.TreeViewDropPosition.AFTER)
                     return process_drop_between (iter, drop_pos, info);
                 else
                     return process_drop_onto (iter, context, info);
+            } else {
+                warning ("compute drop position failed after drop onto sidebar");
             }
             return false;
         }
@@ -1011,8 +1018,7 @@
         }
 
         private  bool can_accept_file_as_bookmark (GLib.File file) {
-            GLib.FileType ftype = file.query_file_type (GLib.FileQueryInfoFlags.NONE, null);
-            return ftype == GLib.FileType.DIRECTORY;
+            return file.query_exists (null);
         }
 
         private bool can_accept_files_as_bookmarks (List<GLib.File> items) {
@@ -1028,8 +1034,10 @@
         }
 
         private void drop_drag_list (uint position) {
-            if (drag_list == null)
+            if (drag_list == null) {
+                warning ("dropped a null drag list");
                 return;
+            }
 
             GLib.List<string> uris = null;
             drag_list.@foreach ((file) => {
@@ -1109,7 +1117,7 @@
             path = null;
             int num_rows = store.iter_n_children (null);
             if (!tree_view.get_dest_row_at_pos (x, y, out path, out drop_position)) {
-                warning ("compute_drop position dest_row_at_pos UNKNOWN");
+                warning ("tree_view.get_dest_row_at_pos failed in sidebar");
                 return false;
             }
 

=== modified file 'src/marlin-deep-count.vala'
--- src/marlin-deep-count.vala	2015-06-28 18:22:54 +0000
+++ src/marlin-deep-count.vala	2016-02-28 13:09:08 +0000
@@ -68,7 +68,8 @@
                     /* Check for sparse file, allocated size will be smaller, for normal files allocated size
                      * includes overhead size so we don't use it for those here
                      */
-                    if (allocated_size < file_size && f.get_file_type () != FileType.DIRECTORY)
+                    /* Network files may not have allocated size attribute so ignore zero result */
+                    if (allocated_size > 0 && allocated_size < file_size && f.get_file_type () != FileType.DIRECTORY)
                         file_size = allocated_size;
 
                     total_size += file_size;