Merge lp:~jeremywootten/pantheon-files/various-fixes-part2-load-network-locations-better into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Make loading and reloading of directories asynchronous.

This branch is the second part of a series aimed at improving the handling of remote locations.
It aims to make the loading of directories fully asynchronous so as to prevent blocking of the interface especially when restoring remote locations that have become unavailable or require a password.

A number of related changes are made to the reloading process and the location bar context menu.

The branch has been tested using ftp:// sftp:// afp:// and smb:// servers on the local network.

TO TEST.
1. Open folders to various servers in different/multiple tabs and windows
2. Navigate within and between folders on each server using all available methods.
3. Close and reopen Files without disconnecting the servers.
4. Close Files, unmount the servers, reopen Files
5. Close Files, break the network link (without unmounting) and reopen Files

In most cases the interface should not block; in the worst case Files will not attempt to load a folder for more than 15 seconds.

[lp:~jeremywootten/pantheon-files/various-fixes-part2-load-network-locations-better]

2046. By Jeremy Wootten on 2016-01-27

Fix reloading of non-existent folder after creation

=== modified file 'libcore/AbstractSlot.vala'
--- libcore/AbstractSlot.vala	2015-12-26 19:42:49 +0000
+++ libcore/AbstractSlot.vala	2016-01-27 19:54:54 +0000
@@ -76,6 +76,7 @@
         protected abstract void make_view ();
         public abstract void cancel ();
         public abstract void close ();
+        public abstract FileInfo? lookup_file_info (GLib.File loc);
 
         public virtual void zoom_out () {}
         public virtual void zoom_in () {}

=== modified file 'libcore/CMakeLists.txt'
--- libcore/CMakeLists.txt	2015-12-02 14:34:10 +0000
+++ libcore/CMakeLists.txt	2016-01-27 19:54:54 +0000
@@ -20,6 +20,7 @@
     BookmarkList.vala
     DndHandler.vala
     Enums.vala
+    FileUtils.vala
     gof-callwhenready.vala
     gof-directory-async.vala
     gof-preferences.vala

=== added file 'libcore/FileUtils.vala'
--- libcore/FileUtils.vala	1970-01-01 00:00:00 +0000
+++ libcore/FileUtils.vala	2016-01-27 19:54:54 +0000
@@ -0,0 +1,25 @@
+/***
+    Copyright (C) 2015 Elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+    PURPOSE. See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program. If not, see <http://www.gnu.org/licenses/>.
+
+    Authors : Jeremy Wootten <[e-mail]>
+***/
+namespace PF.FileUtils {
+        const string reserved_chars = (GLib.Uri.RESERVED_CHARS_GENERIC_DELIMITERS + GLib.Uri.RESERVED_CHARS_SUBCOMPONENT_DELIMITERS + " ");
+
+    public string? escape_uri (string uri, bool allow_utf8 = true) {
+        string rc = reserved_chars.replace("#", "").replace ("*","");
+        return Uri.escape_string ((Uri.unescape_string (uri) ?? uri), rc , allow_utf8);
+    }
+}

=== modified file 'libcore/gof-directory-async.vala'
--- libcore/gof-directory-async.vala	2015-12-28 18:36:55 +0000
+++ libcore/gof-directory-async.vala	2016-01-27 19:54:54 +0000
@@ -23,6 +23,10 @@
 public class GOF.Directory.Async : Object {
     public delegate void GOFFileLoadedFunc (GOF.File file);
 
+    private uint load_timeout_id = 0;
+    private const int ENUMERATE_TIMEOUT_SEC = 10;
+    private const int QUERY_INFO_TIMEOUT_SEC = 15;
+
     public GLib.File location;
     public GLib.File? selected_file = null;
     public GOF.File file;
@@ -40,7 +44,7 @@
         LOADING,
         LOADED
     }
-    public State state = State.NOT_LOADED;
+    private State state = State.NOT_LOADED;
 
     private HashTable<GLib.File,GOF.File> file_hash;
     public uint files_count;
@@ -49,14 +53,15 @@
 
     private Cancellable cancellable;
     private FileMonitor? monitor = null;
-
     private List<unowned GOF.File>? sorted_dirs = null;
 
     public signal void file_loaded (GOF.File file);
     public signal void file_added (GOF.File file);
     public signal void file_changed (GOF.File file);
     public signal void file_deleted (GOF.File file);
-    public signal void icon_changed (GOF.File file);
+    public signal void icon_changed (GOF.File file); /* Called directly by GOF.File - handled by AbstractDirectoryView
+                                                        Gets emitted for any kind of file operation */
+ 
     public signal void done_loading ();
     public signal void thumbs_loaded ();
     public signal void need_reload ();
@@ -75,22 +80,24 @@
     }
 
     private string scheme;
-    public bool is_local;
-    public bool is_trash;
-    public bool is_network;
-    public bool is_recent;
-    public bool has_mounts;
-    public bool has_trash_dirs;
-    public bool can_load;
-    private bool is_cached = false;
+    public bool is_local {get; private set;}
+    public bool is_trash {get; private set;}
+    public bool is_network {get; private set;}
+    public bool is_recent {get; private set;}
+    public bool has_mounts {get; private set;}
+    public bool has_trash_dirs {get; private set;}
+    public bool can_load {get; private set;}
+    private bool is_ready = false;
 
     public bool is_cancelled {
         get { return cancellable.is_cancelled (); }
     }
 
     private Async (GLib.File _file) {
-        location = _file;
+        /* Ensure uri is correctly escaped */
+        location = GLib.File.new_for_uri (PF.FileUtils.escape_uri (_file.get_uri ()));
         file = GOF.File.get (location);
+
         cancellable = new Cancellable ();
         state = State.NOT_LOADED;
         can_load = false;
@@ -99,7 +106,16 @@
         is_trash = (scheme == "trash");
         is_recent = (scheme == "recent");
         is_local = is_trash || is_recent || (scheme == "file");
-        is_network = !is_local && ("ftp ftps afp dav davs".contains (scheme));
+        is_network = !is_local && ("ftp sftp afp dav davs".contains (scheme));
+
+        dir_cache_lock.@lock (); /* will always have been created via call to public static functions from_file () or from_gfile () */
+        directory_cache.insert (location.dup (), this);
+        dir_cache_lock.unlock ();
+
+        this.add_toggle_ref ((ToggleNotify) toggle_ref_notify);
+        this.unref ();
+
+        file_hash = new HashTable<GLib.File, GOF.File> (GLib.File.hash, GLib.File.equal);
     }
 
     ~Async () {
@@ -108,168 +124,190 @@
             disconnect_volume_monitor_signals ();
     }
 
+    /** Views call the following function with null parameter - file_loaded and done_loading
+      * signals are emitted and cause the view and view container to update.
+      *
+      * LocationBar calls this function, with a callback, on its own Async instances in order
+      * to perform filename completion.- Emitting a done_loaded signal in that case would cause
+      * the premature ending of text entry.
+     **/
     public void init (GOFFileLoadedFunc? file_loaded_func = null) {
-        if (state == State.LOADING) { /* Could happen reloading multiple windows */
-            return;
+        if (state == State.LOADING) {
+            return; /* Do not re-enter */
         }
-        state = State.LOADING;
+        var previous_state = state;
+
         cancellable.cancel ();
-        cancellable.reset ();
-        if (file_hash != null && file_hash.size () > 0) { /* false on first visit or when reloading */
-            list_cached_files (file_loaded_func); /* will call make ready when done */
-        } else if (!prepare_directory (file_loaded_func)) { /* Returns true if has already called make_ready () or will do so in a callback */
-            make_ready (false);
+        cancellable = new Cancellable ();
+
+        /* If we already have a loaded file cache just list them */ 
+        if (previous_state == State.LOADED) {
+            list_cached_files (file_loaded_func);
+        /* else fully initialise the directory */
+        } else {
+            state = State.LOADING;
+            prepare_directory.begin (file_loaded_func);
         }
-        /* Otherwise the directory will be prepared and the done_loaded signal emitted when ready */
+        /* done_loaded signal is emitted when ready */
     }
 
     /* This is also called when reloading the directory so that another attempt to connect to
      * the network is made
      */
-    private bool prepare_directory (GOFFileLoadedFunc? file_loaded_func) {
-        if (!get_file_info (file_loaded_func)) {
-            return false;
-        } else if (is_local && !file.is_folder ()) {
-            if (!can_try_parent ()) {
-                return false;
-            } else {
-                return get_file_info (file_loaded_func);
-            }
-        }
-        return true;
-    }
-
-    private bool can_try_parent () {
-        if (file.is_connected) {
-            GLib.File? parent = location.get_parent ();
-            if (parent != null) {
-                file = GOF.File.get (parent);
-                selected_file = location.dup ();
-                location = parent;
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private bool get_file_info (GOFFileLoadedFunc? file_loaded_func) {
-        if (!is_local && !check_network ()) {
-            return false;
-        }
+    private async void prepare_directory (GOFFileLoadedFunc? file_loaded_func) {
+        bool success = yield get_file_info ();
+        if (success) {
+            if (is_local && !file.is_folder ()) {
+                var parent = file.is_connected ? location.get_parent () : null;
+                if (parent != null) {
+                    file = GOF.File.get (parent);
+                    selected_file = location.dup ();
+                    location = parent;
+                    success = yield get_file_info ();
+                } else {
+                    success = false;
+                }
+            }
+        }
+        make_ready (success, file_loaded_func); /* Only place that should call this function */
+    }
+
+    private async bool get_file_info () {
         /* Force info to be refreshed - the GOF.File may have been created already by another part of the program
          * that did not ensure the correct info Aync purposes, and retrieved from cache (bug 1511307).
          */
-        file.info = null; 
-        if (!file.ensure_query_info()) { /* should set file.exists and file.connected appropriately */
-            if (is_local || !file.is_connected || !file.exists) {
-                return false;
-            }
-        }
-
-        if (!is_local) {
-            mount_mountable.begin ((obj,res) => {
-                bool success = false;
-                try {
-                    mount_mountable.end (res);
-                    success = true;
-                } catch (Error e) {
-                    if (e is IOError.ALREADY_MOUNTED) {
-                        success = true;
-                    } else {
-                        warning ("mount_mountable failed: %s", e.message);
-                        if (e is IOError.PERMISSION_DENIED ||
-                            e is IOError.FAILED_HANDLED) {
-
-                            permission_denied = true;
-                        }
-                    }
-                }
-                make_ready (success, file_loaded_func);
-            });
-        } else {
-            make_ready (true, file_loaded_func);
-        }
-        return true;
-    }
-
-    private void set_confirm_trash () {
-        bool to_confirm = true;
-        if (is_trash) {
-            to_confirm = false;
-            var mounts = VolumeMonitor.get ().get_mounts ();
-            if (mounts != null) {
-                foreach (GLib.Mount m in mounts) {
-                    to_confirm |= (m.can_eject () && Marlin.FileOperations.has_trash_files (m));
-                }
-            }
-        }
-        Preferences.get_default ().confirm_trash = to_confirm;
-    }
-
-    private void connect_volume_monitor_signals () {
-        var vm = VolumeMonitor.get();
-        vm.mount_changed.connect (on_mount_changed);
-    }
-    private void disconnect_volume_monitor_signals () {
-        var vm = VolumeMonitor.get();
-        vm.mount_changed.disconnect (on_mount_changed);
-    }
-
-    private void on_mount_changed () {
-        need_reload ();
-    }
-
-
-    public bool check_network () {
+        file.info = null;
+        if (is_local) {
+            return file.ensure_query_info ();
+        }
+
+        /* Must be non-local */
+        if (!is_local && !yield check_network ()) {
+            file.is_connected = false;
+            return false;
+        } else {
+            if (!yield try_query_info ()) { /* may already be mounted */
+                if (yield mount_mountable ()) {
+                /* Previously mounted Samba servers still appear mounted even if disconnected
+                 * e.g. by unplugging the network cable.  So the following function can block for
+                 * a long time; we therefore use a timeout */
+                    debug ("successful mount %s", file.uri);
+                    return yield try_query_info ();
+                } else {
+                    return false;
+                }
+            } else {
+                return true;
+            }
+        }
+    }
+
+    private async bool try_query_info () {
+        cancellable = new Cancellable ();
+        bool querying = true;
+        assert (load_timeout_id == 0);
+        load_timeout_id = Timeout.add_seconds (QUERY_INFO_TIMEOUT_SEC, () => {
+            if (querying) {
+                warning ("Cancelled after timeout in query info async %s", file.uri);
+                cancellable.cancel ();
+                load_timeout_id = 0;
+            }
+            return false;
+        });
+
+        bool success = yield query_info_async (file, null, cancellable);
+        querying = false;
+        cancel_timeout (ref load_timeout_id);
+        if (cancellable.is_cancelled ()) {
+            warning ("Failed to get info - timed out and cancelled");
+            file.is_connected = false;
+            return false;
+        }
+        if (success) {
+            debug ("got file info");
+            file.ensure_query_info ();
+            return true;
+        } else {
+            debug ("Failed to get file info for %s", file.uri);
+            return false;
+        }
+    }
+
+    private async bool mount_mountable () {
+        try {
+            var mount_op = new Gtk.MountOperation (null);
+            yield location.mount_enclosing_volume (0, mount_op, cancellable);
+            var mount = location.find_enclosing_mount ();
+            debug ("Found enclosing mount %s", mount != null ? mount.get_name () : "null");
+            return mount != null;
+        } catch (Error e) {
+            if (e is IOError.ALREADY_MOUNTED) {
+                debug ("Already mounted %s", file.uri);
+                file.is_connected = true;
+            } else {
+                file.is_connected = false;
+                warning ("Mount_mountable failed: %s", e.message);
+                if (e is IOError.PERMISSION_DENIED || e is IOError.FAILED_HANDLED) {
+                    permission_denied = true;
+                }
+            }
+            return false;
+        }
+    }
+
+    public async bool check_network () {
         var net_mon = GLib.NetworkMonitor.get_default ();
         var net_available = net_mon.get_network_available ();
 
-        if (!net_available && is_network) {
-            SocketConnectable? connectable = null;
-            try {
-                connectable = NetworkAddress.parse_uri (file.uri, 21);
-            }
-            catch (GLib.Error e) {}
+        bool success = false;
 
-            if (connectable != null) {
+        if (net_available) {
+                SocketConnectable? connectable = null;
+            if (!is_network) { /* e.g. smb://  */
+                /* TODO:  Find a way of verifying samba server still connected;  gvfs does not detect
+                 * when network connection is broken - still appears mounted and connected */
+                success = true;
+            } else {
                 try {
-                    net_mon.can_reach (connectable);
+                    connectable = NetworkAddress.parse_uri (file.uri, 21);
+                    success = true;
+                    /* Try to connect for real.  This should time out after about 15 seconds if
+                     * the host is not reachable */
+                    var scl = new SocketClient ();
+                    var sc = yield scl.connect_async (connectable, cancellable);
+                    success = (sc != null && sc.is_connected ());
+                    debug ("Attempt to connect to %s %s", file.uri, success ? "succeeded" : "failed");
                 }
                 catch (GLib.Error e) {
                     warning ("Error connecting to connectable %s - %s", file.uri, e.message);
-                   return false;
                 }
             }
-
-
+        } else {
+            warning ("No network available");
         }
-        return true;
+        return success;
     }
+     
 
     private void make_ready (bool ready, GOFFileLoadedFunc? file_loaded_func = null) {
         can_load = ready;
         if (!can_load) {
+            debug ("%s cannot load", file.uri);
+            state = State.NOT_LOADED; /* ensure state is correct */
             done_loading ();
             return;
-        } else if (!is_cached) {
-            assert (directory_cache != null);
-            directory_cache.insert (location, this);
-
-            this.add_toggle_ref ((ToggleNotify) toggle_ref_notify);
-            this.unref ();
-
-            debug ("created dir %s ref_count %u", this.file.uri, this.ref_count);
-            file_hash = new HashTable<GLib.File,GOF.File> (GLib.File.hash, GLib.File.equal);
+        } else if (!is_ready) {
             uri_contain_keypath_icons = "/icons" in file.uri || "/.icons" in file.uri;
-
-            try {
-                monitor = location.monitor_directory (0);
-                monitor.rate_limit = 100;
-                monitor.changed.connect (directory_changed);
-            } catch (IOError e) {
-                if (!(e is IOError.NOT_MOUNTED)) {
-                    /* Will fail for remote filesystems - not an error */
-                    debug ("directory monitor failed: %s %s", e.message, file.uri);
+            if (file_loaded_func == null && is_local) {
+                try {
+                    monitor = location.monitor_directory (0);
+                    monitor.rate_limit = 100;
+                    monitor.changed.connect (directory_changed);
+                } catch (IOError e) {
+                    if (!(e is IOError.NOT_MOUNTED)) {
+                        /* Will fail for remote filesystems - not an error */
+                        debug ("directory monitor failed: %s %s", e.message, file.uri);
+                    }
                 }
             }
 
@@ -288,10 +326,37 @@
                 connect_volume_monitor_signals ();
             }
 
-            is_cached = true;
+            is_ready = true;
         }
         /* May be loading for the first time or reloading after clearing directory info */
-        load (file_loaded_func);
+        list_directory_async.begin (file_loaded_func);
+    }
+
+    private void set_confirm_trash () {
+        bool to_confirm = true;
+        if (is_trash) {
+            to_confirm = false;
+            var mounts = VolumeMonitor.get ().get_mounts ();
+            if (mounts != null) {
+                foreach (GLib.Mount m in mounts) {
+                    to_confirm |= (m.can_eject () && Marlin.FileOperations.has_trash_files (m));
+                }
+            }
+        }
+        Preferences.get_default ().confirm_trash = to_confirm;
+    }
+
+    private void connect_volume_monitor_signals () {
+        var vm = VolumeMonitor.get();
+        vm.mount_changed.connect (on_mount_changed);
+    }
+    private void disconnect_volume_monitor_signals () {
+        var vm = VolumeMonitor.get();
+        vm.mount_changed.disconnect (on_mount_changed);
+    }
+
+    private void on_mount_changed () {
+        need_reload ();
     }
 
     private static void toggle_ref_notify (void* data, Object object, bool is_last) {
@@ -308,8 +373,11 @@
     }
 
     public void cancel () {
+        /* This should only be called when closing the view - it will cancel initialisation of the directory */
         cancellable.cancel ();
         cancel_thumbnailing ();
+        cancel_timeout (ref load_timeout_id);
+        cancel_timeout (ref idle_consume_changes_id);
     }
 
     public void cancel_thumbnailing () {
@@ -320,101 +388,109 @@
         }
     }
 
+    public void reload () {
+        clear_directory_info ();
+        init ();
+    }
+
     /** Called in preparation for a reload **/
-    public void clear_directory_info () {
-        if (state != State.LOADED) { /* Could get called multiple times if multiple windows reload the same directory */
-            return;
+    private void clear_directory_info () {
+        if (state == State.LOADING) {
+            return; /* Do not re-enter */
         }
         cancel ();
-
-        if (idle_consume_changes_id != 0) {
-            Source.remove ((uint) idle_consume_changes_id);
-            idle_consume_changes_id = 0;
-        }
-
-        if (file_hash != null)
-            file_hash.remove_all ();
-
+        file_hash.remove_all ();
         monitor = null;
         sorted_dirs = null;
         files_count = 0;
         state = State.NOT_LOADED;
     }
 
-    /** Views call the following function with null parameter - file_loaded and done_loading
-      * signals are emitted and cause the view and view container to update.
-      *
-      * LocationBar calls this function, with a callback, on its own Async instances in order
-      * to perform filename completion.- Emitting a done_loaded signal in that case would cause
-      * the premature ending of text entry.
-     **/
-    private void load (GOFFileLoadedFunc? file_loaded_func = null) {
+    private void list_cached_files (GOFFileLoadedFunc? file_loaded_func = null) {
+        if (state != State.LOADED) {
+            warning ("list cached files called in %s state - not expected to happen", state.to_string ());
+            return;
+        }
+        state = State.LOADING;
+        bool show_hidden = is_trash || Preferences.get_default ().pref_show_hidden_files;
+        foreach (GOF.File gof in file_hash.get_values ()) {
+            if (gof != null) {
+                after_load_file (gof, show_hidden, file_loaded_func);
+            }
+        }
+        state = State.LOADED;
+        after_loading (file_loaded_func);
+    }
+
+    private async void list_directory_async (GOFFileLoadedFunc? file_loaded_func) {
         /* Should only be called after creation and if reloaded */
-        if (!is_cached || file_hash != null && file_hash.size () > 0) {
+        if (!is_ready || file_hash.size () > 0) {
             critical ("(Re)load directory called when not cleared");
             return;
         }
+
         if (!can_load) {
             warning ("load called when cannot load - not expected to happen");
-            after_loading (file_loaded_func);
-            return;
-        }
-
-        if (state != State.LOADING) {
-            warning ("load called in loaded or loading state - not expected to happen");
-            return;
-        }
-
+            return;
+        }
+
+        if (state == State.LOADED) {
+            warning ("load called when already loaded - not expected to happen");
+            return;
+        }
+        if (load_timeout_id > 0) {
+            warning ("load called when timeout already running - not expected to happen");
+            return;
+        }
+
+        cancellable = new Cancellable ();
         longest_file_name = "";
         permission_denied = false;
-
-        list_directory.begin (file_loaded_func);
-    }
-
-    private void list_cached_files (GOFFileLoadedFunc? file_loaded_func = null) {
-        if (state == State.NOT_LOADED) {
-            warning ("list cached files called in unloaded state - not expected to happen");
-            return;
-        }
+        can_load = true;
+        files_count = 0;
+        state = State.LOADING;
         bool show_hidden = is_trash || Preferences.get_default ().pref_show_hidden_files;
-        foreach (GOF.File gof in file_hash.get_values ()) {
-            if (gof != null) {
-                after_load_file (gof, show_hidden, file_loaded_func);
-            }
-        }
-        after_loading (file_loaded_func);
-    }
 
-    private async void list_directory (GOFFileLoadedFunc? file_loaded_func) {
         try {
-            bool show_hidden = is_trash || Preferences.get_default ().pref_show_hidden_files;
-            var e = yield this.location.enumerate_children_async (gio_attrs, 0, 0, cancellable);
-            while (state == State.LOADING) {
+            /* This may hang for a long time if the connection was closed but is still mounted so we
+             * impose a time limit */
+            load_timeout_id = Timeout.add_seconds (ENUMERATE_TIMEOUT_SEC, () => {
+                cancellable.cancel ();
+                load_timeout_id = 0;
+                return false;
+            });
+
+            var e = yield this.location.enumerate_children_async (gio_attrs, 0, Priority.HIGH, cancellable);
+            cancel_timeout (ref load_timeout_id);
+
+            GOF.File? gof;
+            GLib.File loc;
+            while (!cancellable.is_cancelled ()) {
                 var files = yield e.next_files_async (200, 0, cancellable);
                 if (files == null) {
-                    state = State.LOADED;
+                    break;
                 } else {
                     foreach (var file_info in files) {
-                        GLib.File loc = location.get_child (file_info.get_name ());
-                        GOF.File? gof = GOF.File.cache_lookup (loc);
-
-                        if (gof == null)
-                            gof = new GOF.File (loc, location);
-
+                        loc = location.get_child (file_info.get_name ());
+                        assert (loc != null);
+                        gof = GOF.File.cache_lookup (loc);
+
+                        if (gof == null) {
+                            gof = new GOF.File (loc, location); /*does not add to GOF file cache */
+                        }
                         gof.info = file_info;
                         gof.update ();
 
                         file_hash.insert (gof.location, gof);
-
                         after_load_file (gof, show_hidden, file_loaded_func);
-
                         files_count++;
                     }
                 }
             }
+            state = State.LOADED;
         } catch (Error err) {
             warning ("Listing directory error: %s %s", err.message, file.uri);
-
+            can_load = false;
             if (err is IOError.NOT_FOUND || err is IOError.NOT_DIRECTORY) {
                 file.exists = false;
             } else if (err is IOError.PERMISSION_DENIED)
@@ -422,6 +498,7 @@
             else if (err is IOError.NOT_MOUNTED)
                 file.is_mounted = false;
         }
+
         after_loading (file_loaded_func);
     }
 
@@ -438,10 +515,16 @@
     }
 
     private void after_loading (GOFFileLoadedFunc? file_loaded_func) {
-        if (file_loaded_func == null && !cancellable.is_cancelled ()) {
+        /* If loading failed reset */
+        debug ("after loading state is %s", state.to_string ());
+        if (state == State.LOADING) {
+            state = State.NOT_LOADED; /* else clear directory info will fail */
+            clear_directory_info ();
+            can_load = false;
+        }
+        if (file_loaded_func == null) {
             done_loading ();
         }
-        state = State.LOADED;
     }
 
     public void block_monitor () {
@@ -456,8 +539,6 @@
             monitor_blocked = false;
             monitor.changed.connect (directory_changed);
         }
-        if (!is_local)
-            need_reload ();
     }
 
     private void update_longest_file_name (GOF.File gof) {
@@ -470,7 +551,7 @@
             return;
         }
         if (state != State.LOADED) {
-            load ();
+            list_directory_async.begin (null);
         } else {
             list_cached_files ();
         }
@@ -495,12 +576,6 @@
         }
     }
 
-    public async void mount_mountable () throws Error {
-        /**TODO** pass GtkWindow *parent to Gtk.MountOperation */
-        var mount_op = new Gtk.MountOperation (null);
-        yield location.mount_enclosing_volume (0, mount_op, cancellable);
-    }
-
     public GOF.File? file_hash_lookup_location (GLib.File? location) {
         if (location != null && location is GLib.File) {
             GOF.File? result = file_hash.lookup (location);
@@ -512,13 +587,12 @@
         }
     }
 
-    public void file_hash_add_file (GOF.File gof) {
-        file_hash.insert (gof.location, gof);
+    public void file_hash_add_file (GOF.File gof) { /* called directly by GOF.File */
+        file_hash.insert (gof.location, gof); 
     }
 
-    public GOF.File file_cache_find_or_insert (GLib.File file,
-        bool update_hash = false)
-    {
+    public GOF.File file_cache_find_or_insert (GLib.File file, bool update_hash = false) {
+        assert (file != null);
         GOF.File? result = file_hash.lookup (file);
         /* Although file_hash.lookup returns an unowned value, Vala will add a reference
          * as the return value is owned.  This matches the behaviour of GOF.File.cache_lookup */ 
@@ -539,18 +613,22 @@
     /**TODO** move this to GOF.File */
     private delegate void func_query_info (GOF.File gof);
 
-    private async void query_info_async (GOF.File gof, func_query_info? f = null) {
+    private async bool query_info_async (GOF.File gof, func_query_info? f = null, Cancellable? cancellable = null) {
+        gof.info = null;
         try {
             gof.info = yield gof.location.query_info_async (gio_attrs,
                                                             FileQueryInfoFlags.NONE,
-                                                            Priority.DEFAULT);
+                                                            Priority.DEFAULT,
+                                                            cancellable);
             if (f != null)
                 f (gof);
         } catch (Error err) {
-            debug ("query info failed, %s %s", err.message, gof.uri);
-            if (err is IOError.NOT_FOUND)
+            warning ("query info failed, %s %s", err.message, gof.uri);
+            if (err is IOError.NOT_FOUND) {
                 gof.exists = false;
+            }
         }
+        return gof.info != null;
     }
 
     private void changed_and_refresh (GOF.File gof) {
@@ -674,19 +752,10 @@
             if (!value) {
                 if (list_fchanges_count >= FCHANGES_MAX) {
                     need_reload ();
-                } else {
+                } else if (list_fchanges_count > 0) {
                     list_fchanges.reverse ();
-
-                    /* do not autosize during multiple changes */
-                    bool tln = track_longest_name;
-                    track_longest_name = false;
-
-                    foreach (var fchange in list_fchanges)
+                    foreach (var fchange in list_fchanges) {
                         real_directory_changed (fchange.file, null, fchange.event);
-
-                    if (tln) {
-                        track_longest_name = true;
-                        list_cached_files ();
                     }
                 }
             }
@@ -698,6 +767,7 @@
 
     public static void notify_files_changed (List<GLib.File> files) {
         foreach (var loc in files) {
+            assert (loc != null);
             Async? parent_dir = cache_lookup_parent (loc);
             GOF.File? gof = null;
             if (parent_dir != null) {
@@ -729,6 +799,7 @@
         bool found;
 
         foreach (var loc in files) {
+            assert (loc != null);
             Async? dir = cache_lookup_parent (loc);
 
             if (dir != null) {
@@ -770,11 +841,10 @@
     }
 
     public static Async from_gfile (GLib.File file) {
+        assert (file != null);
         /* Note: cache_lookup creates directory_cache if necessary */
         Async?  dir = cache_lookup (file);
-        if (dir != null && !dir.is_local)
-                dir = null;
-
+        /* Both local and non-local files can be cached */
         return dir ?? new Async (file);
     }
 
@@ -783,6 +853,7 @@
     }
 
     public static void remove_file_from_cache (GOF.File gof) {
+        assert (gof != null);
         Async? dir = cache_lookup (gof.directory);
         if (dir != null)
             dir.file_hash.remove (gof.location);
@@ -797,9 +868,9 @@
             return null;
         }
 
-        if (file == null)
-            return null;
-
+        if (file == null) {
+            critical ("Null file received in Async cache_lookup");
+        }
         dir_cache_lock.@lock ();
         cached_dir = directory_cache.lookup (file);
 
@@ -813,6 +884,8 @@
                 cached_dir = null;
                 directory_cache.remove (file);
             }
+        } else {
+            debug ("Dir %s not in cache", file.get_uri ());
         }
         dir_cache_lock.unlock ();
 
@@ -820,6 +893,10 @@
     }
 
     public static Async? cache_lookup_parent (GLib.File file) {
+        if (file == null) {
+            warning ("Null file submitted to cache lookup parent");
+            return null;
+        }
         GLib.File? parent = file.get_parent ();
         return parent != null ? cache_lookup (parent) : cache_lookup (file);
     }
@@ -837,6 +914,7 @@
         /* We have to remove the dir's subfolders from cache too */
         if (removed) {
             foreach (var gfile in file_hash.get_keys ()) {
+                assert (gfile != null);
                 var dir = cache_lookup (gfile);
                 if (dir != null)
                     dir.remove_dir_from_cache ();
@@ -863,25 +941,18 @@
     }
 
     public bool is_empty () {
-        uint file_hash_count = 0;
-
-        if (file_hash != null)
-            file_hash_count = file_hash.size ();
-
-        if (state == State.LOADED && file_hash_count == 0)
-            return true;
-
-        return false;
+        return (state == State.LOADED && file_hash.size () == 0); /* only return true when loaded to avoid temporary appearance of empty message while loading */
     }
 
-    public unowned List<unowned GOF.File>? get_sorted_dirs () {
-        if (state != State.LOADED)
+    public unowned List<GOF.File>? get_sorted_dirs () {
+        if (state != State.LOADED) { /* Can happen if pathbar tries to load unloadable directory */
             return null;
+        }
 
         if (sorted_dirs != null)
             return sorted_dirs;
 
-        foreach (var gof in file_hash.get_values()) {
+        foreach (var gof in file_hash.get_values()) { /* returns owned values */
             if (!gof.is_hidden && (gof.is_folder () || gof.is_smb_server ())) {
                 sorted_dirs.prepend (gof);
             }
@@ -971,4 +1042,14 @@
 
         timeout_thumbsq = Timeout.add (40, queue_thumbs_timeout_cb);
     }
+
+    private bool cancel_timeout (ref uint id) {
+        if (id > 0) {
+            Source.remove (id);
+            id = 0;
+            return true;
+        } else {
+            return false;
+        }
+    }
 }

=== modified file 'libcore/gof-file.c'
--- libcore/gof-file.c	2015-12-26 19:42:49 +0000
+++ libcore/gof-file.c	2016-01-27 19:54:54 +0000
@@ -141,12 +141,14 @@
     GOFDirectoryAsync *dir = NULL;
 
     /* get the DirectoryAsync associated to the file */
-    dir = gof_directory_async_cache_lookup (file->directory);
-    if (dir != NULL) {
-        if (!file->is_hidden || gof_preferences_get_default ()->pref_show_hidden_files)
-            g_signal_emit_by_name (dir, "icon_changed", file);
+    if (file->directory != NULL) {
+        dir = gof_directory_async_cache_lookup (file->directory);
+        if (dir != NULL) {
+            if (!file->is_hidden || gof_preferences_get_default ()->pref_show_hidden_files)
+                g_signal_emit_by_name (dir, "icon_changed", file);
 
-        g_object_unref (dir);
+            g_object_unref (dir);
+        }
     }
     g_signal_emit_by_name (file, "icon_changed");
 }
@@ -2099,7 +2101,10 @@
 static void
 gof_file_update_existing (GOFFile *file, GFile *new_location)
 {
-    GOFDirectoryAsync *dir = gof_directory_async_cache_lookup (file->directory);
+    GOFDirectoryAsync *dir = NULL;
+    if (file->directory != NULL) {
+        dir = gof_directory_async_cache_lookup (file->directory);
+    }
 
     gof_file_remove_from_caches (file);
     file->is_gone = FALSE;
@@ -2597,10 +2602,12 @@
 gboolean
 gof_file_thumb_can_frame (GOFFile *file)
 {
-    GOFDirectoryAsync *dir;
+    GOFDirectoryAsync *dir = NULL;
 
     /* get the DirectoryAsync associated to the file */
-    dir = gof_directory_async_cache_lookup (file->directory);
+    if (file->directory != NULL) {
+        dir = gof_directory_async_cache_lookup (file->directory);
+    }
     if (dir != NULL) {
         gboolean can_frame = !dir->uri_contain_keypath_icons;
         g_object_unref (dir);

=== modified file 'libwidgets/FileUtils.vala'
--- libwidgets/FileUtils.vala	2015-11-22 17:56:28 +0000
+++ libwidgets/FileUtils.vala	2016-01-27 19:54:54 +0000
@@ -16,8 +16,6 @@
     Authors : Jeremy Wootten <[e-mail]>
 ***/
 namespace PF.FileUtils {
-    const string reserved_chars = (GLib.Uri.RESERVED_CHARS_GENERIC_DELIMITERS + GLib.Uri.RESERVED_CHARS_SUBCOMPONENT_DELIMITERS + " ");
-
     /**
      * Gets a properly escaped GLib.File for the given path
      **/
@@ -73,11 +71,6 @@
         return file.get_parent () != null;
     }
 
-    public string? escape_uri (string uri, bool allow_utf8 = true) {
-        reserved_chars.replace("#", "");
-        return Uri.escape_string ((Uri.unescape_string (uri) ?? uri), reserved_chars, allow_utf8);
-    }
-
     /** Produce a valid unescaped path **/
     public string sanitize_path (string? p, string? cp = null) {
         string path = "";

=== modified file 'libwidgets/View/BreadcrumbsEntry.vala'
--- libwidgets/View/BreadcrumbsEntry.vala	2015-12-26 19:42:49 +0000
+++ libwidgets/View/BreadcrumbsEntry.vala	2016-01-27 19:54:54 +0000
@@ -383,13 +383,13 @@
             menu.deactivate.connect (() => {reset_elements_states ();});
 
             build_base_menu (menu, loc);
+            GOF.Directory.Async? files_menu_dir = null;
             if (root != null) {
-                var files_menu_dir = GOF.Directory.Async.from_gfile (root);
+                files_menu_dir = GOF.Directory.Async.from_gfile (root);
                 files_menu_dir_handler_id = files_menu_dir.done_loading.connect (() => {
                     append_subdirectories (menu, files_menu_dir);
                     files_menu_dir.disconnect (files_menu_dir_handler_id);
                 });
-                files_menu_dir.init ();
             } else {
                 warning ("Root directory null for %s", path);
             }
@@ -400,6 +400,10 @@
                         right_click_menu_position_func,
                         0,
                         event.time);
+
+            if (files_menu_dir != null) {
+                files_menu_dir.init ();
+            }
         }
 
         private void build_base_menu (Gtk.Menu menu, GLib.File loc) {
@@ -461,17 +465,18 @@
 
         private void append_subdirectories (Gtk.Menu menu, GOF.Directory.Async dir) {
             /* Append list of directories at the same level */
-            unowned List<GOF.File>? sorted_dirs = dir.get_sorted_dirs ();
-            if (sorted_dirs.length () > 0) {
-                menu.append (new Gtk.SeparatorMenuItem ());
-                foreach (var gof in sorted_dirs) {
-                    var menuitem = new Gtk.MenuItem.with_label(gof.get_display_name ());
-                    menuitem.set_data ("location", gof.uri);
-                    menu.append (menuitem);
-                    menuitem.activate.connect (() => {
-                        text = menu.get_active ().get_data ("location");
-                        activate ();
-                    });
+            if (dir.can_load) {
+                unowned List<GOF.File>? sorted_dirs = dir.get_sorted_dirs ();
+                if (sorted_dirs.length () > 0) {
+                    menu.append (new Gtk.SeparatorMenuItem ());
+                    foreach (var gof in sorted_dirs) {
+                        var menuitem = new Gtk.MenuItem.with_label(gof.get_display_name ());
+                        menuitem.set_data ("location", gof.uri);
+                        menu.append (menuitem);
+                        menuitem.activate.connect ((mi) => {
+                            activate_path (mi.get_data ("location"));
+                        });
+                    }
                 }
             }
             menu.show_all ();

=== modified file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	2016-01-19 23:29:09 +0000
+++ src/View/AbstractDirectoryView.vala	2016-01-27 19:54:54 +0000
@@ -576,21 +576,31 @@
         /* Signal could be from subdirectory as well as slot directory */
         protected void connect_directory_handlers (GOF.Directory.Async dir) {
             assert (dir != null);
-            dir.file_loaded.connect (on_directory_file_loaded);
             dir.file_added.connect (on_directory_file_added);
             dir.file_changed.connect (on_directory_file_changed);
             dir.file_deleted.connect (on_directory_file_deleted);
             dir.icon_changed.connect (on_directory_file_icon_changed);
+            dir.thumbs_loaded.connect (on_directory_thumbs_loaded);
+            connect_directory_loading_handlers (dir);
+        }
+
+        protected void connect_directory_loading_handlers (GOF.Directory.Async dir) {
+            dir.file_loaded.connect (on_directory_file_loaded);
             dir.done_loading.connect (on_directory_done_loading);
-            dir.thumbs_loaded.connect (on_directory_thumbs_loaded);
+        }
+
+        protected void disconnect_directory_loading_handlers (GOF.Directory.Async dir) {
+            dir.file_loaded.disconnect (on_directory_file_loaded);
+            dir.done_loading.disconnect (on_directory_done_loading);
         }
 
         protected void disconnect_directory_handlers (GOF.Directory.Async dir) {
             /* If the directory is still loading the file_loaded signal handler
             /* will not have been disconnected */
 
-            if (dir.is_loading ())
-                dir.file_loaded.disconnect (on_directory_file_loaded);
+            if (dir.is_loading ()) {
+                disconnect_directory_loading_handlers (dir);
+            }
 
             dir.file_added.disconnect (on_directory_file_added);
             dir.file_changed.disconnect (on_directory_file_changed);
@@ -606,17 +616,20 @@
                 style_context.remove_class (MESSAGE_CLASS);
 
             cancel ();
+            clear ();
+            disconnect_directory_handlers (old_dir);
+            connect_directory_handlers (new_dir);
+        }
+
+        public void clear () {
+            /* after calling this (prior to reloading), the directory must be re-initialised so
+             * we reconnect the file_loaded and done_loading signals */
             freeze_tree ();
-            disconnect_directory_handlers (old_dir);
             block_model ();
             model.clear ();
             unblock_model ();
-            /* As we connect the signal file_loaded signal handler, we initialise. */
-            connect_directory_handlers (new_dir);
-        }
-
-        public void reload () {
-            change_directory (slot.directory, slot.directory);
+            connect_directory_loading_handlers (slot.directory);
+            /* tree will be thawed after done loading */
         }
 
         protected void connect_drag_drop_signals (Gtk.Widget widget) {
@@ -804,8 +817,7 @@
 
             /* If in recent "folder" we need to refresh the view. */
             if (in_recent) {
-                slot.directory.clear_directory_info ();
-                slot.directory.need_reload ();
+                slot.reload ();
             }
         }
 
@@ -898,8 +910,6 @@
             }
 
             var file_to_rename = GOF.File.@get (new_file);
-            view.slot.reload (true); /* non-local only */
-
             view.rename_file (file_to_rename); /* will wait for file to appear in model */
         }
 
@@ -912,7 +922,6 @@
 
             view.slot.directory.unblock_monitor ();
             view.can_trash_or_delete = true;
-            view.slot.reload (true); /* non-local only */
         }
 
         private void trash_or_delete_selected_files (bool delete_immediately = false) {
@@ -926,7 +935,6 @@
             unowned GLib.List<GOF.File> selection = get_selected_files_for_transfer ();
             if (selection != null) {
                 can_trash_or_delete = false;
-
                 trash_or_delete_files (selection, true, delete_immediately);
             }
         }
@@ -1197,7 +1205,6 @@
                         pasted_files_list.prepend (k as File);
                 });
 
-                view.slot.reload (true); /* non-local only */
                 view.select_glib_files (pasted_files_list, pasted_files_list.first ().data);
                 return false;
             });
@@ -1278,8 +1285,7 @@
 
         private void  on_directory_done_loading (GOF.Directory.Async dir) {
             /* Should only be called on directory creation or reload */
-            dir.file_loaded.disconnect (on_directory_file_loaded);
-            dir.done_loading.disconnect (on_directory_done_loading);
+            disconnect_directory_loading_handlers (dir);
             in_trash = slot.directory.is_trash;
             in_recent = slot.directory.is_recent;
             in_network_root = slot.directory.file.is_root_network_folder ();
@@ -1555,8 +1561,6 @@
             if (drop_occurred) {
                 drop_occurred = false;
                 if (current_actions != Gdk.DragAction.DEFAULT) {
-                    slot.reload (true); /* non-local only */
-
                     switch (info) {
                         case Marlin.TargetType.XDND_DIRECT_SAVE0:
                             success = dnd_handler.handle_xdnddirectsave  (context,
@@ -2715,12 +2719,10 @@
                 (path != null && hover_path != null && path.compare (hover_path) != 0)) {
 
                 /* cannot get file info while network disconnected */
-                if (slot.directory.is_local || slot.directory.check_network ()) {
-                    /* cannot get file info while network disconnected */
+                if (slot.directory.is_local || NetworkMonitor.get_default ().get_network_available ()) {
+                    /* cannot get file info while network disconnected. */
                     item_hovered (file);
                     hover_path = path;
-                } else {
-                    slot.reload (true); /* non-local only */
                 }
             }
 
@@ -2809,9 +2811,6 @@
             }
 
             on_name_editing_canceled ();
-
-            if (new_name != original_name)
-                slot.reload (true); /* non-local only */
         }
 
 
@@ -2839,7 +2838,6 @@
                                                                   view.original_name);
 
                 view.select_gof_file (file);  /* Select and scroll to show renamed file */
-                view.slot.reload (true);
             }
 
             if (pw != null) {
@@ -2854,20 +2852,22 @@
             /* If folder is empty, draw the empty message in the middle of the view
              * otherwise pass on event */
             var style_context = get_style_context ();
-            if (slot.directory.is_empty () || slot.directory.permission_denied) {
+            if (slot.directory.is_empty ()) {
                 Pango.Layout layout = create_pango_layout (null);
 
                 if (!style_context.has_class (MESSAGE_CLASS))
                     style_context.add_class (MESSAGE_CLASS);
 
-                if (slot.directory.permission_denied)
+
+                if (slot.directory.permission_denied) {
                     layout.set_markup (slot.denied_message, -1);
-                else if (slot.directory.is_trash) /* must be empty */
+                } else if (slot.directory.is_trash) {
                     layout.set_markup (slot.empty_trash_message, -1);
-                else if (slot.directory.location.get_uri_scheme () == "recent")
+                } else if (slot.directory.is_recent) {
                     layout.set_markup (slot.empty_recents_message, -1);
-                else
+                } else {
                     layout.set_markup (slot.empty_message, -1);
+                }
 
                 Pango.Rectangle? extents = null;
                 layout.get_extents (null, out extents);
@@ -2880,8 +2880,9 @@
                 get_style_context ().render_layout (cr, x, y, layout);
 
                 return true;
-            } else if (style_context.has_class (MESSAGE_CLASS))
+            } else if (style_context.has_class (MESSAGE_CLASS)) {
                 style_context.remove_class (MESSAGE_CLASS);
+            }
 
             return false;
         }

=== modified file 'src/View/Miller.vala'
--- src/View/Miller.vala	2015-12-29 12:48:51 +0000
+++ src/View/Miller.vala	2016-01-27 19:54:54 +0000
@@ -439,5 +439,9 @@
         public override void set_frozen_state (bool freeze) {
             current_slot.set_frozen_state (freeze);
         }
+
+        public override FileInfo? lookup_file_info (GLib.File loc) {
+            return current_slot.lookup_file_info (loc);
+        }
     }
 }

=== modified file 'src/View/Slot.vala'
--- src/View/Slot.vala	2015-12-29 12:48:51 +0000
+++ src/View/Slot.vala	2016-01-27 19:54:54 +0000
@@ -25,7 +25,7 @@
         private FM.AbstractDirectoryView? dir_view = null;
 
         protected bool updates_frozen = false;
-
+        protected bool original_reload_request = false;
         public bool has_autosized = false;
         public bool is_active {get; protected set;}
 
@@ -133,10 +133,24 @@
                 autosize_slot ();
 
             set_view_updates_frozen (false);
+            updates_frozen = false;
         }
 
         private void on_directory_need_reload (GOF.Directory.Async dir) {
-            user_path_change_request (directory.location, false);
+            if (!updates_frozen) {
+                updates_frozen = true;
+                path_changed (false);
+                /* ViewContainer listens to this signal takes care of updating appearance
+                 * If allow_mode_change is false View Container will not automagically
+                 * switch to icon view for icon folders (needed for Miller View) */
+                dir_view.clear (); /* clear model but do not change directory */
+                /* Only need to initialise directory once - the slot that originally received the
+                 * reload request does this */ 
+                if (original_reload_request) {
+                    directory.reload ();
+                    original_reload_request = false;
+                }
+            }
         }
 
         private void set_up_directory (GLib.File loc) {
@@ -178,18 +192,19 @@
 
             Pango.Layout layout = dir_view.create_pango_layout (null);
 
-            if (directory.is_empty ()) {
-                if (directory.is_trash)
+            if (directory.is_empty ()) { /* No files in the file cache */
+                if (directory.permission_denied) {
+                    layout.set_markup (denied_message, -1);
+                } else if (directory.is_trash) {
                     layout.set_markup (empty_trash_message, -1);
-                else if (directory.is_recent)
+                } else if (directory.is_recent) {
                     layout.set_markup (empty_recents_message, -1);
-                else
+                } else {
                     layout.set_markup (empty_message, -1);
-            } else if (directory.permission_denied)
-                layout.set_markup (denied_message, -1);
-            else
+                }
+            } else {
                 layout.set_markup (GLib.Markup.escape_text (directory.longest_file_name), -1);
-
+            }
             Pango.Rectangle extents;
             layout.get_extents (null, out extents);
 
@@ -227,8 +242,8 @@
         }
 
         public override void reload (bool non_local_only = false) {
-            if (!(non_local_only && directory.is_local)) {
-                directory.clear_directory_info ();
+            if (!non_local_only || !directory.is_local) {
+                original_reload_request = true;
                 directory.need_reload (); /* Signal will propagate to any other slot showing this directory */
             }
         }
@@ -357,5 +372,14 @@
             set_view_updates_frozen (freeze);
             frozen_changed (freeze);
         }
+
+        public override FileInfo? lookup_file_info (GLib.File loc) {
+            GOF.File? gof = directory.file_hash_lookup_location (loc);
+            if (gof != null) {
+                return gof.info;
+            } else {
+                return null;
+            }
+        }
     }
 }

=== modified file 'src/View/ViewContainer.vala'
--- src/View/ViewContainer.vala	2015-12-29 12:48:51 +0000
+++ src/View/ViewContainer.vala	2016-01-27 19:54:54 +0000
@@ -167,8 +167,10 @@
                 user_path_change_request (File.new_for_commandline_arg (loc));
         }
 
-        public void add_view (Marlin.ViewMode mode, GLib.File? loc = null) {
+        public void add_view (Marlin.ViewMode mode, GLib.File loc) {
             assert (view == null);
+            assert (loc != null);
+
             overlay_statusbar.cancel ();
             view_mode = mode;
             overlay_statusbar.showbar = view_mode != Marlin.ViewMode.LIST;
@@ -181,6 +183,7 @@
             connect_slot_signals (this.view);
             directory_is_loading (loc);
             view.directory.init ();
+            show_all ();
             /* NOTE: slot is created inactive to avoid bug during restoring multiple tabs
              * The slot becomes active when the tab becomes current */
         }
@@ -204,7 +207,6 @@
             disconnect_slot_signals (view);
             content = null; /* Make sure old slot and directory view are destroyed */
             view = null; /* Pre-requisite for add view */
-            loading (false);
         }
         private void after_mode_change () {
             /* Slot is created inactive so we activate now since we must be the current tab
@@ -251,7 +253,6 @@
 
         public void on_slot_path_changed (GOF.AbstractSlot slot, bool change_mode_to_icons) {
             assert (slot != null);
-            overlay_statusbar.cancel ();
             /* automagicly enable icon view for icons keypath */
             if (change_mode_to_icons && view_mode != Marlin.ViewMode.ICON) {
                 change_view_mode (Marlin.ViewMode.ICON);
@@ -260,11 +261,11 @@
             }
         }
 
-        public void directory_is_loading (GLib.File loc) {
-            assert (slot != null);
+        private void directory_is_loading (GLib.File loc) {
+            loading (true);
+            overlay_statusbar.cancel ();
             overlay_statusbar.halign = Gtk.Align.END;
             refresh_slot_info (loc);
-            loading (true);
         }
 
         public void plugin_directory_loaded () {
@@ -283,8 +284,6 @@
 
         public void refresh_slot_info (GLib.File loc) {
             update_tab_name (loc);
-            browser.record_uri (loc.get_parse_name ()); /* will ignore null changes */
-
             window.loading_uri (loc.get_uri ());
             window.update_top_menu ();
             window.update_labels (loc.get_parse_name (), tab_name);
@@ -316,15 +315,7 @@
             else if (slot_path == "/")
                 tab_name = _("File System");
             else {
-                try {
-                    var info = loc.query_info (FileAttribute.STANDARD_DISPLAY_NAME, FileQueryInfoFlags.NONE);
-                    tab_name = info.get_attribute_string (FileAttribute.STANDARD_DISPLAY_NAME);
-                }
-                catch (GLib.Error e) {
-                    warning ("Could not get location display name. %s", e.message);
-                    tab_name = loc.get_basename ();
-                    can_show_folder = false;
-                }
+                tab_name = Uri.unescape_string (Path.get_basename (loc.get_uri ()));
             }
 
             if (tab_name == "-----")
@@ -339,24 +330,29 @@
             loading (false);
             can_show_folder = true;
 
-            if (!slot.directory.file.exists) {
-                if (slot.can_create)
-                    content = new DirectoryNotFound (slot.directory, this);
-                else
-                    content = new Marlin.View.Welcome (_("This Folder Does Not Exist"),
-                                                       _("You cannot create a folder here."));
-                can_show_folder = false;
-            } else if (slot.directory.permission_denied) {
-                content = new Marlin.View.Welcome (_("This Folder Does Not Belong to You"),
-                                                   _("You don't have permission to view this folder."));
-                can_show_folder = false;
-            } else if (!slot.directory.can_load) {
-                content = new Marlin.View.Welcome (_("Unable to Mount Folder"),
-                                                   _("The server for this folder could not be located."));
-                can_show_folder = false;
+            /* First deal with all cases where directory could not be loaded */
+            if (!slot.directory.can_load) {
+                can_show_folder = false;
+                if (!slot.directory.file.exists) {
+                    if (slot.can_create)
+                        content = new DirectoryNotFound (slot.directory, this);
+                    else
+                        content = new Marlin.View.Welcome (_("This Folder Does Not Exist"),
+                                                           _("You cannot create a folder here."));
+                } else if (slot.directory.permission_denied) {
+                    content = new Marlin.View.Welcome (_("This Folder Does Not Belong to You"),
+                                                       _("You don't have permission to view this folder."));
+                } else if (!slot.directory.file.is_connected) {
+                    content = new Marlin.View.Welcome (_("Unable to Mount Folder"),
+                                                       _("Could not connect to the server for this folder."));
+                } else {
+                    content = new Marlin.View.Welcome (_("Unable show Folder"),
+                                                       _("The server for this folder could not be located."));
+                }
+            /* Now deal with cases where file (s) within the loaded folder has to be selected */
             } else if (selected_locations != null) {
-                    view.select_glib_files (selected_locations, selected_locations.first ().data);
-                    selected_locations = null;
+                view.select_glib_files (selected_locations, selected_locations.first ().data);
+                selected_locations = null;
             } else if (slot.directory.selected_file != null) {
                 if (slot.directory.selected_file.query_exists ()) {
                     focus_location_if_in_current_directory (slot.directory.selected_file);
@@ -371,6 +367,8 @@
             if (can_show_folder) {
                 assert (view != null);
                 content = view.get_content_box ();
+                /* Only record valid folders (will also log Zeitgeist event) */
+                browser.record_uri (slot.location.get_parse_name ()); /* will ignore null changes */
                 plugin_directory_loaded ();
             }
 
@@ -395,7 +393,7 @@
 
         public void set_active_state (bool is_active) {
             var aslot = get_current_slot ();
-            if (aslot != null)
+            if (aslot != null && aslot.directory.can_load)
                 aslot.set_active_state (is_active);
         }
         
@@ -405,55 +403,45 @@
                 aslot.set_frozen_state (is_frozen);
         }
         
-        public void focus_location (GLib.File? file,
-                                    bool select_in_current_only = false,
+        public void focus_location (GLib.File loc,
+                                    bool no_path_change = false,
                                     bool unselect_others = false) {
+
             /* This function navigates to another folder if necessary if 
              * select_in_current_only is not set to true.
-             */ 
-            if (unselect_others || file == null) {
-                get_current_slot ().set_all_selected (false);
-                selected_locations = null;
-            }
+             */
+            assert (loc != null);
 
-            if (file == null || location.equal (file)) {
+            if (location.equal (loc)) {
                 return;
             }
-            GLib.File? loc = null;
-            var filetype = file.query_file_type (GLib.FileQueryInfoFlags.NONE);
-            if (filetype == FileType.UNKNOWN) {
-                /* May be request for non-existing file - in which case 
-                 * an opportunity will be given to create it when we try to 
-                 * load it
-                 */
-                loc = file;
-            } else {
-                File? parent = file.get_parent ();
-                if (parent != null && location.equal (parent)) {
-                    if (select_in_current_only || filetype != FileType.DIRECTORY) {
-                        var list = new List<File> ();
-                        list.prepend (file);
-                        get_current_slot ().select_glib_files (list, file);
-                    } else
-                        loc = file;
-                } else if (!select_in_current_only) {
-                    if (filetype == FileType.DIRECTORY)
-                        loc = file;
-                    else if (parent != null) {
-                        loc = parent;
-                        selected_locations.prepend (file);
+
+            FileInfo? info = get_current_slot ().lookup_file_info (loc);
+            FileType filetype = FileType.UNKNOWN;
+            if (info != null) { /* location is in the current folder */
+                filetype = info.get_file_type ();
+                if (filetype != FileType.DIRECTORY || no_path_change) {
+                    if (unselect_others) {
+                        get_current_slot ().set_all_selected (false);
+                        selected_locations = null;
                     }
+                    var list = new List<File> ();
+                    list.prepend (loc);
+                    get_current_slot ().select_glib_files (list, loc);
+                    return;
                 }
+            } else if (no_path_change) { /* not in current, do not navigate to it*/
+                return;
             }
-
-            if (loc != null)
+            /* Attempt to navigate to the location */
+            if (loc != null) {
                 user_path_change_request (loc);
+            }
         }
 
-        public void focus_location_if_in_current_directory (GLib.File? file,
+        public void focus_location_if_in_current_directory (GLib.File? loc,
                                                             bool unselect_others = false) {
-
-            focus_location (file, true, unselect_others);
+            focus_location (loc, true, unselect_others);
         }
 
         public string get_root_uri () {

=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2015-12-26 19:42:49 +0000
+++ src/View/Window.vala	2016-01-27 19:54:54 +0000
@@ -524,7 +524,7 @@
                     break;
             }
             current_tab.change_view_mode (mode);
-            update_view_mode (mode);
+            /* ViewContainer takes care of changing appearance */
         }
 
         private void action_go_to (GLib.SimpleAction action, GLib.Variant? param) {
@@ -747,7 +747,7 @@
             }
         }
 
-        public void update_view_mode (Marlin.ViewMode mode) {
+        private void update_view_mode (Marlin.ViewMode mode) { /* Called via update topmenu */
             GLib.SimpleAction action = get_action ("view_mode");
             action.set_state (mode_strings [(int)mode]);
             view_switcher.mode = mode;
@@ -844,8 +844,10 @@
 
                 GLib.File root_location = GLib.File.new_for_commandline_arg (unescaped_root_uri);
 
-                if (!valid_location (root_location))
-                    continue;
+                /* We do not check valid location here because it may cause the interface to hang
+                 * before the window appears (e.g. if trying to connect to a server that has become unavailable)
+                 * Leave it to GOF.Directory.Async to deal with invalid locations asynchronously. 
+                 */
 
                 add_tab (root_location, mode);
 
@@ -890,32 +892,6 @@
             return tabs_added;
         }
 
-        private bool valid_location (GLib.File location) {
-            GLib.FileInfo? info = null;
-
-            string scheme = location.get_uri_scheme ();
-            if (scheme == "smb" ||
-                scheme == "ftp" ||
-                scheme == "network")
-                /* Do not restore remote and network locations */
-                return true;
-
-            try {
-                info = location.query_info ("standard::*", GLib.FileQueryInfoFlags.NONE);
-            }
-            catch (GLib.Error e) {
-                warning ("Invalid location on restoring tabs - %s", location.get_uri ());
-                return false;
-            }
-
-            if (info.get_file_type () == GLib.FileType.DIRECTORY)
-                return true;
-            else {
-                warning ("Attempt to restore a location that is not a directory");
-                return false;
-            }
-        }
-
         private void expand_miller_view (string tip_uri, GLib.File root_location) {
             /* It might be more elegant for Miller.vala to handle this */
             var tab = tabs.current;
@@ -940,9 +916,6 @@
                     uri += (GLib.Path.DIR_SEPARATOR_S + dir);
                     gfile = GLib.File.new_for_uri (uri);
 
-                    if (!valid_location (gfile))
-                        break;
-
                     mwcols.add_location (gfile, mwcols.current_slot);
                 }
             } else {
@@ -970,6 +943,7 @@
         }
 
         public void mount_removed (Mount mount) {
+            debug ("Mount %s removed", mount.get_name ());
             GLib.File root = mount.get_root ();
 
             foreach (var page in tabs.get_children ()) {