Merge lp:~jeremywootten/pantheon-files/fix-refresh-after-paste into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Fix refresh after pasting for local files and folders.

1) When refreshing a view, the directory cached information is cleared first to ensure the information is reloaded from source.

2) The code for selecting files after pasting is re-written avoiding fixed timeouts and reverting some changes that were blocking apparently duplicate signals (but which were sometimes needed)

NOTE. Copy/cut/paste and drag-drop of files between local folders should work as expected. There are still some problems with samba shared folders, where it is not 100% reliable. Networking issues will be dealt with in another branch.

[Fabio Zaramella (fabiozaramella)]

I've tried copying some folders and files, whether hidden or not, and they were always immediately shown, so the branch seems to solve these bugs.

review: Approve

=== modified file 'libcore/gof-directory-async.vala'
--- libcore/gof-directory-async.vala	2015-02-07 13:09:34 +0000
+++ libcore/gof-directory-async.vala	2015-02-15 18:37:53 +0000
@@ -113,6 +113,10 @@
         uri_contain_keypath_icons = "/icons" in file.uri || "/.icons" in file.uri;
     }
 
+    ~Async () {
+        debug ("Async destruct");
+    }
+
     /* This is also called when reloading the directory so that another attempt to connect to
      * the network is made */
     private bool prepare_directory () {

=== modified file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	2015-02-07 17:29:07 +0000
+++ src/View/AbstractDirectoryView.vala	2015-02-15 18:37:53 +0000
@@ -201,10 +201,10 @@
         private bool can_trash_or_delete = true;
 
         /* Rapid keyboard paste support */
-        protected bool pasting_files = false;
-        GLib.Timer? paste_timer = null;
-        protected uint paste_timeout_id = 0; 
+        protected bool pasting_files = false; 
         protected bool select_added_files = false;
+        private HashTable? pasted_files = null;
+
 
         public bool renaming {get; protected set; default = false;}
 
@@ -214,7 +214,6 @@
         private bool in_network_root = false;
         protected bool is_loading;
         protected bool helpers_shown;
-        private uint select_timeout_id = 0;
 
         private Gtk.Widget view;
         private unowned Marlin.ClipboardManager clipboard;
@@ -360,39 +359,35 @@
             unselect_all ();
             GLib.List<GOF.File>? file_list = null;
 
-            if (focus_location == null)
-                focus_location = location_list.first ().data;
-
             location_list.@foreach ((loc) => {
                 file_list.prepend (GOF.File.@get (loc));
             });
 
             /* Because the Icon View disconnects the model while loading, we need to wait until
              * the tree is thawed and the model reconnected before selecting the files */
-            select_timeout_id = GLib.Timeout.add (100, () => {
-                if (tree_frozen)
-                    return true;
-
-                file_list.@foreach ((file) => {
-                    var iter = Gtk.TreeIter ();
-
-                    if (model.get_first_iter_for_file (file, out iter)) {
-                        Gtk.TreePath path = model.get_path (iter);
-                        if (path != null) {
-                            if (focus_location.equal (file.location))
-                                set_cursor (path, false, true, false); /* set cursor and select */
-                            else
-                                select_path (path);
-                        } 
-                    }
-                });
-                select_timeout_id = 0;
-                return false;
+            Idle.add (() => {
+                bool try_again = true;
+                if (!tree_frozen) {
+                    try_again = false;
+                    file_list.@foreach ((file) => {
+                        var iter = Gtk.TreeIter ();
+                        if (model.get_first_iter_for_file (file, out iter)) {
+                            Gtk.TreePath path = model.get_path (iter);
+                            if (path != null) {
+                                if (focus_location != null && focus_location.equal (file.location))
+                                    set_cursor (path, false, true, false); /* set cursor and select */
+                                else
+                                    select_path (path);
+                            }
+                        } else {
+                            /* model has not caught up yet - wait a bit */ 
+                            try_again = true;
+                        }
+                    });
+                }
+                return try_again;
             });
-
             updates_frozen = false;
-            update_selected_files ();
-            notify_selection_changed ();
         }
 
         public unowned GLib.List<GLib.AppInfo> get_open_with_apps () {
@@ -1070,29 +1065,23 @@
             assert (pointer != null);
 
             var view = pointer as FM.AbstractDirectoryView; 
-            if (view.paste_timer == null)
-                view.paste_timer = new GLib.Timer ();
-
-            view.paste_timer.start (); /* restarts timer if already running */
-
-            /* Limit paste action rate to 10 per second, do not unblock the directory monitor
-             * until at least one second after the last paste event in order to avoid duplicate
-             * "add-file" events and messed up selection. */ 
-            if (view.paste_timeout_id == 0) {
-                view.paste_timeout_id = Timeout.add (100, () => {
-                    view.pasting_files = false; /* allows another paste action to occur */
-
-                    if (view.paste_timer.elapsed () < 1.0)
-                        return true;
-
-                    view.slot.directory.unblock_monitor ();
-                    view.select_added_files = false;
-                    view.paste_timeout_id = 0;
-                    view.paste_timer.stop ();
-                    view.paste_timer = null;
-                    return false;
+            view.pasted_files = uris;
+
+            Idle.add (() => {
+                /* Select the most recently pasted files */
+                GLib.List<GLib.File> pasted_files_list = null;
+                view.pasted_files.foreach ((k, v) => {
+                    File f = k as File;
+                    pasted_files_list.prepend (f);
                 });
-            }
+
+                if (!view.slot.directory.is_local)
+                    view.slot.directory.need_reload ();
+
+                view.select_glib_files (pasted_files_list, null);
+                view.pasting_files = false;
+                return false;
+            });
         }
 
         private void on_common_action_paste_into (GLib.SimpleAction action, GLib.Variant? param) {
@@ -1116,9 +1105,7 @@
                     call_back = (GLib.Callback)after_trash_or_delete;
                 } else {
                     pasting_files = true;
-                    prepare_to_select_added_files ();
-                    /* Block the async directory file monitor to avoid generating unwanted "add-file" events */
-                    slot.directory.block_monitor ();
+                    /* callback takes care of selecting pasted files */
                     call_back = (GLib.Callback)after_pasting_files;
                 }
 
@@ -1465,8 +1452,10 @@
 
                         case TargetType.TEXT_URI_LIST:
                             if ((current_actions & file_drag_actions) != 0) {
-                                prepare_to_select_added_files ();
-
+                                if (selected_files != null)
+                                    unselect_all ();
+ 
+                                select_added_files = true;
                                 success = dnd_handler.handle_file_drag_actions  (get_real_view (),
                                                                                  window,
                                                                                  context,
@@ -2254,13 +2243,6 @@
                 }
         }
 
-        private void prepare_to_select_added_files () {
-            if (selected_files != null)
-                unselect_all ();
-
-            select_added_files = true;
-        }
-
         private void remove_marlin_icon_info_cache (GOF.File file) {
             string? path = file.get_thumbnail_path ();
 
@@ -2282,9 +2264,10 @@
          */  
         private unowned GLib.List<unowned GOF.File> get_files_for_action () {
             unowned GLib.List<unowned GOF.File> action_files = null;
-            if (selected_files == null) {
+            
+            if (selected_files == null)
                 action_files.prepend (slot.directory.file);
-            } else
+            else
                 action_files = selected_files;
 
             return action_files;
@@ -2296,12 +2279,10 @@
 
         protected virtual void on_view_selection_changed () {
             update_selected_files ();
-
             if (updates_frozen)
                 return;
 
             notify_selection_changed ();
-            update_menu_actions ();
         }
 
         protected virtual bool on_view_key_press_event (Gdk.EventKey event) {
@@ -2950,7 +2931,6 @@
             cancel_thumbnailing ();
             slot.directory.cancel ();
             cancel_drag_timer ();
-            cancel_timeout (ref select_timeout_id);
             cancel_timeout (ref drag_scroll_timer_id);
             
             loaded_subdirectories.@foreach ((dir) => {

=== modified file 'src/View/AbstractTreeView.vala'
--- src/View/AbstractTreeView.vala	2015-01-24 12:31:20 +0000
+++ src/View/AbstractTreeView.vala	2015-02-15 18:37:53 +0000
@@ -28,6 +28,10 @@
             base (_slot);
         }
 
+        ~AbstractTreeView () {
+            debug ("ATV destruct");
+        }
+
         protected virtual void create_and_set_up_name_column () {
             name_column = new Gtk.TreeViewColumn ();
             name_column.set_sort_column_id (FM.ListModel.ColumnID.FILENAME);

=== modified file 'src/View/IconView.vala'
--- src/View/IconView.vala	2015-01-24 12:31:20 +0000
+++ src/View/IconView.vala	2015-02-15 18:37:53 +0000
@@ -31,6 +31,10 @@
                 zoom_level = minimum_zoom;
         }
 
+        ~IconView () {
+            debug ("Icon View destruct");
+        }
+
         private void set_up_view () {
             tree.set_model (model);
             tree.set_selection_mode (Gtk.SelectionMode.MULTIPLE);

=== modified file 'src/View/PropertiesWindow.vala'
--- src/View/PropertiesWindow.vala	2015-02-07 16:40:33 +0000
+++ src/View/PropertiesWindow.vala	2015-02-15 18:37:53 +0000
@@ -1375,7 +1375,7 @@
                 if (allocated_size < file_size && !gof.is_directory)
                     file_size = allocated_size;
             } catch (Error err) {
-                warning ("%s", err.message);
+                debug ("%s", err.message);
                 gof.is_connected = false;
             }
         }

=== modified file 'src/View/Slot.vala'
--- src/View/Slot.vala	2015-02-01 17:09:35 +0000
+++ src/View/Slot.vala	2015-02-15 18:37:53 +0000
@@ -37,9 +37,9 @@
         public string denied_message = "<span size='x-large'>" + _("Access denied") + "</span>";
 
         public signal bool horizontal_scroll_event (double delta_x);
-        public signal void frozen_changed (bool freeze); 
+        public signal void frozen_changed (bool freeze);
         public signal void folder_deleted (GOF.File file, GOF.Directory.Async parent);
-        public signal void active (bool scroll = true); 
+        public signal void active (bool scroll = true);
         public signal void inactive ();
 
         /* Support for multi-slot view (Miller)*/
@@ -275,6 +275,7 @@
         }
 
         public override void reload () {
+            directory.clear_directory_info ();
             user_path_change_request (location, false);
         }
 

=== modified file 'src/View/ViewContainer.vala'
--- src/View/ViewContainer.vala	2015-02-06 22:57:55 +0000
+++ src/View/ViewContainer.vala	2015-02-15 18:37:53 +0000
@@ -155,12 +155,6 @@
                     view.cancel ();
                 }
 
-                /* the following 2 lines delays destruction of the old view until this function returns
-                 * and allows the processor to display or update the window more quickly
-                 */    
-                GOF.AbstractSlot temp;
-                temp = view;
-
                 if (mode == Marlin.ViewMode.MILLER_COLUMNS)
                     view = new Miller (loc, this, mode);
                 else