Merge lp:~jeremywootten/pantheon-files/fix-1464978-crash-after-reloading-duplicate-tab into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Fix reloading when view open in multiple tabs and windows (lp:1464978)

This branch fixes the reloading of views that are displayed in multiple tabs and windows, ensuring the models of all views linked to the reloaded directory are refreshed.

It is essential that the branch lp:~jeremywootten/pantheon-files/fix-potential-infinite-loop-in-select-glib-files is merged first otherwise an infinite loop can be created in an Idle when going back in history.

[Cody Garver (codygarver)]

Conflicts with trunk

[lp:~jeremywootten/pantheon-files/fix-1464978-crash-after-reloading-duplicate-tab]

1856. By Jeremy Wootten on 2015-06-30

Merge trunk to rev 1871 and resolve conflict

[Jeremy Wootten (jeremywootten)]

Conflict with trunk now resolved.

=== modified file 'libcore/AbstractSlot.vala'
--- libcore/AbstractSlot.vala	2015-05-03 06:44:42 +0000
+++ libcore/AbstractSlot.vala	2015-06-30 14:19:06 +0000
@@ -57,7 +57,7 @@
         public abstract unowned GLib.List<unowned GOF.File>? get_selected_files ();
         public abstract void set_active_state (bool set_active);
         public abstract unowned AbstractSlot? get_current_slot ();
-        public abstract void reload ();
+        public abstract void reload (bool non_local_only = false);
         public abstract void grab_focus ();
         public abstract void user_path_change_request (GLib.File loc, bool allow_mode_change = true);
         public abstract void select_first_for_empty_selection ();

=== modified file 'libcore/gof-directory-async.vala'
--- libcore/gof-directory-async.vala	2015-05-25 09:06:09 +0000
+++ libcore/gof-directory-async.vala	2015-06-30 14:19:06 +0000
@@ -284,6 +284,8 @@
     }
 
     public void clear_directory_info () {
+        cancel ();
+
         if (idle_consume_changes_id != 0) {
             Source.remove ((uint) idle_consume_changes_id);
             idle_consume_changes_id = 0;

=== modified file 'src/Application.vala'
--- src/Application.vala	2015-05-03 06:44:42 +0000
+++ src/Application.vala	2015-06-30 14:19:06 +0000
@@ -235,19 +235,6 @@
         });
     }
 
-    public void tab_reloaded (Marlin.View.Window source, GLib.File file) {
-        unowned List<Gtk.Window> window_list = this.get_windows ();
-        window_list.@foreach ((window) => {
-            var win = (Marlin.View.Window)window;
-
-            if ((source.window_number != win.window_number) &&
-                 file.equal (win.current_tab.get_current_slot ().location))
-
-                win.current_tab.reload (false);
-
-        });
-    }
-
     private void mount_removed_callback (VolumeMonitor monitor, Mount mount) {
         /* Notify each window */
         foreach (var window in this.get_windows ()) {

=== modified file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	2015-06-24 07:49:55 +0000
+++ src/View/AbstractDirectoryView.vala	2015-06-30 14:19:06 +0000
@@ -587,17 +587,10 @@
         }
 
         public void change_directory (GOF.Directory.Async old_dir, GOF.Directory.Async new_dir) {
-            cancel_thumbnailing ();
+            cancel ();
             freeze_tree ();
-            old_dir.cancel ();
             disconnect_directory_handlers (old_dir);
             block_model ();
-
-            loaded_subdirectories.@foreach ((dir) => {
-                remove_subdirectory (dir);
-            });
-
-            loaded_subdirectories = null;
             model.clear ();
             unblock_model ();
             if (new_dir.can_load)
@@ -605,7 +598,6 @@
         }
 
         public void reload () {
-            slot.directory.clear_directory_info ();
             change_directory (slot.directory, slot.directory);
         }
 
@@ -833,15 +825,12 @@
 
             var file_to_rename = GOF.File.@get (new_file);
             bool local = view.slot.directory.is_local;
-            if (!local)
-                view.slot.directory.need_reload ();
+            view.slot.reload (true); /* non-local only */
 
             /* Allow time for the file to appear in the tree model before renaming
              * Wait longer for remote locations to allow for reload.
              */
-
             /**TODO** Remove need for hard coded delay*/
-
             int delay = local ? 250 : 500;
             GLib.Timeout.add (delay, () => {
                 view.rename_file (file_to_rename);
@@ -858,9 +847,7 @@
                 return;
 
             view.can_trash_or_delete = true;
-
-            if (!view.slot.directory.is_local)
-                view.slot.directory.need_reload ();
+            view.slot.reload (true); /* non-local only */
         }
 
         private void trash_or_delete_selected_files (bool delete_immediately = false) {
@@ -1117,9 +1104,7 @@
                         pasted_files_list.prepend (k as File);
                 });
 
-                if (!view.slot.directory.is_local)
-                    view.slot.directory.need_reload ();
-
+                view.slot.reload (true); /* non-local only */
                 view.select_glib_files (pasted_files_list, pasted_files_list.first ().data);
                 return false;
             });
@@ -1472,12 +1457,8 @@
             if (drop_occurred) {
                 drop_occurred = false;
                 if (current_actions != Gdk.DragAction.DEFAULT) {
-                    if (!slot.directory.is_local) {
-                        /* Cannot be sure that view will automatically refresh properly
-                         * so we force a refresh after a short delay */
-                        slot.directory.clear_directory_info ();
-                        slot.directory.need_reload ();
-                    }
+                    slot.reload (true); /* non-local only */
+
                     switch (info) {
                         case TargetType.XDND_DIRECT_SAVE0:
                             success = dnd_handler.handle_xdnddirectsave  (context,
@@ -2557,8 +2538,7 @@
                     window.item_hovered (file);
                     hover_path = path;
                 } else {
-                    slot.reload ();
-                    slot.directory.need_reload ();
+                    slot.reload (true); /* non-local only */
                 }
             }
 
@@ -2648,6 +2628,9 @@
             }
 
             on_name_editing_canceled ();
+
+            if (new_name != original_name)
+                slot.reload (true); /* non-local only */
         }
 
 
@@ -3032,7 +3015,6 @@
 
         public virtual void cancel () {
             cancel_thumbnailing ();
-            slot.directory.cancel ();
             cancel_drag_timer ();
             cancel_timeout (ref drag_scroll_timer_id);
 

=== modified file 'src/View/Miller.vala'
--- src/View/Miller.vala	2015-05-26 13:29:17 +0000
+++ src/View/Miller.vala	2015-06-30 14:19:06 +0000
@@ -398,8 +398,8 @@
             ((Marlin.View.Slot)(current_slot)).grab_focus ();
         }
 
-        public override void reload () {
-            ((Marlin.View.Slot)(current_slot)).reload ();
+        public override void reload (bool non_local_only = false) {
+            ((Marlin.View.Slot)(current_slot)).reload (non_local_only);
         }
 
         public override void cancel () {

=== modified file 'src/View/Slot.vala'
--- src/View/Slot.vala	2015-05-26 13:29:17 +0000
+++ src/View/Slot.vala	2015-06-30 14:19:06 +0000
@@ -120,7 +120,8 @@
         }
 
         private void on_directory_need_reload (GOF.Directory.Async dir) {
-            ctab.reload ();
+            dir_view.change_directory (directory, directory);
+            ctab.load_slot_directory (this);
         }
 
         private void set_up_directory (GLib.File loc) {
@@ -189,6 +190,7 @@
         public override void user_path_change_request (GLib.File loc, bool allow_mode_change = true) {
             assert (loc != null);
             var old_dir = directory;
+            old_dir.cancel ();
             set_up_directory (loc);
             dir_view.change_directory (old_dir, directory);
             /* ViewContainer takes care of updating appearance
@@ -197,6 +199,13 @@
             ctab.slot_path_changed (directory.location, allow_mode_change);
         }
 
+        public override void reload (bool non_local_only = false) {
+            if (!(non_local_only && directory.is_local)) {
+                directory.clear_directory_info ();
+                directory.need_reload (); /* Signal will propagate to any other slot showing this directory */
+            }
+        }
+
         protected override void make_view () {
             assert (dir_view == null);
 
@@ -291,11 +300,6 @@
                 dir_view.zoom_normal ();
         }
 
-        public override void reload () {
-            directory.clear_directory_info ();
-            user_path_change_request (location, false);
-        }
-
         public override void cancel () {
             if (directory != null)
                 directory.cancel ();

=== modified file 'src/View/ViewContainer.vala'
--- src/View/ViewContainer.vala	2015-06-01 15:35:22 +0000
+++ src/View/ViewContainer.vala	2015-06-30 14:19:06 +0000
@@ -56,7 +56,7 @@
         private Browser browser;
         private GLib.List<GLib.File>? selected_locations = null;
 
-        private bool ready = false;
+        public bool ready {get; private set;}
 
         public signal void tab_name_changed (string tab_name);
         public signal void loading (bool is_loading);
@@ -64,7 +64,7 @@
         public signal void path_changed (File file);
 
         /* Initial location now set by Window.make_tab after connecting signals */
-        public ViewContainer (Marlin.View.Window win, Marlin.ViewMode mode, GLib.File loc) {
+        public ViewContainer (Marlin.View.Window win) {
             window = win;
             overlay_statusbar = new OverlayBar (win, this);
             browser = new Browser ();
@@ -77,7 +77,6 @@
 
             set_events (Gdk.EventMask.ENTER_NOTIFY_MASK | Gdk.EventMask.LEAVE_NOTIFY_MASK);
             connect_signals ();
-            change_view_mode (mode, loc);
         }
 
         ~ViewContainer () {
@@ -177,7 +176,6 @@
         }
 
         public void user_path_change_request (GLib.File loc) {
-            loading (true);
             view.user_path_change_request (loc);
         }
 
@@ -217,7 +215,7 @@
                 return;
 
             refresh_slot_info (slot);
-
+            loading (true);
             /* Allow time for the window to update before trying to load directory so that
              * the window is displayed more quickly when starting the application in,
              * or switching view to, a folder that contains a large number of files.
@@ -229,7 +227,7 @@
 
              * Do not try and load directory that is not flagged 'can load'.
              */
-            Idle.add (() => {
+            Idle.add_full (GLib.Priority.LOW, () => {
                 if (!slot.directory.is_ready)
                     return true;
 
@@ -426,23 +424,10 @@
         }
 
         public void reload (bool propagate = true) {
-            /* Allow time for the signal to propagate and the tab label to redraw */
-            Idle.add (() => {
-                var slot = get_current_slot ();
-                if (slot == null)
-                    return false;
-
+            loading (true);
+            var slot = get_current_slot ();
+            if (slot != null)
                 slot.reload ();
-                load_slot_directory (slot);
-                /* For remote folders, make sure any other windows showing the same folder are
-                 * also refreshed. Prevent infinite loop with propagate - when called from application,
-                 * propagate will be false.
-                 */
-                if (propagate)
-                    ((Marlin.Application)(window.application)).tab_reloaded (window, slot.location);
-
-                return false;
-            });
         }
 
         public Gee.List<string> get_go_back_path_list () {

=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2015-06-24 07:49:55 +0000
+++ src/View/Window.vala	2015-06-30 14:19:06 +0000
@@ -74,7 +74,6 @@
         public signal void selection_changed (GLib.List<GOF.File> gof_file);
         public signal void loading_uri (string location);
         public signal void folder_deleted (GLib.File location);
-        public signal void tab_reloaded (GLib.File location);
 
         [Signal (action=true)]
         public virtual signal void go_up () {
@@ -379,7 +378,8 @@
                              Marlin.ViewMode mode = Marlin.ViewMode.PREFERRED) {
             mode = real_mode (mode);
             update_view_mode (mode);
-            var content = new View.ViewContainer (this, mode, location);
+
+            var content = new View.ViewContainer (this);
             var tab = new Granite.Widgets.Tab ("", null, content);
 
             content.tab_name_changed.connect ((tab_name) => {
@@ -391,9 +391,12 @@
                 top_menu.location_bar.bread.show_refresh_icon (!is_loading);
             });
 
+            content.update_tab_name (location);
+            content.change_view_mode (mode, location);
+
             change_tab ((int)tabs.insert_tab (tab, -1));
-            content.update_tab_name (location);
             tabs.current = tab;
+
             /* The following fixes a bug where upon first opening
                a tab, the overlay status bar is shown empty. */
             item_hovered (null);
@@ -460,15 +463,12 @@
             (application as Marlin.Application).quit ();
         }
 
-        private uint reload_timeout_id = 0;
         private void action_reload (GLib.SimpleAction action, GLib.Variant? param) {
             /* avoid spawning reload when key kept pressed */
-            if (reload_timeout_id == 0)
-                reload_timeout_id = Timeout.add (90, () => {
-                    current_tab.reload ();
-                    reload_timeout_id = 0;
-                    return false;
-                });
+            if (tabs.current.working || !current_tab.ready)
+                return;
+
+            current_tab.reload ();
         }
 
         private void action_view_mode (GLib.SimpleAction action, GLib.Variant? param) {