Restore files from trash dialogs - present () not run () (#2546)

Author: jeremypw

libcore/FileUtils.vala

@@ -80,38 +80,43 @@ namespace Files.FileUtils {
         return parent_path;
     }
 
-    public void restore_files_from_trash (GLib.List<Files.File> files, Gtk.Widget? widget) {
-        GLib.List<Files.File>? unhandled_files = null;
-        var original_dirs_hash = get_trashed_files_original_directories (files, out unhandled_files);
-
+    public async void restore_files_from_trash (GLib.List<Files.File> files, Gtk.Widget? widget) {
+        GLib.List<Files.File>? unhandled_files;
+        var original_dirs_hash = yield get_trashed_files_original_directories (files, out unhandled_files);
         foreach (Files.File goffile in unhandled_files) {
             var message = _("Could not determine original location of \"%s\"").printf (goffile.get_display_name ());
-            PF.Dialogs.show_warning_dialog (message, _("The item cannot be restored from trash"),
-                                            (widget is Gtk.Window) ? widget as Gtk.Window : null );
+            PF.Dialogs.show_warning_dialog (
+                message,
+                _("The item cannot be restored from trash"),
+                (widget is Gtk.Window) ? widget as Gtk.Window : null
+            );
+        }
+
+        foreach (var original_dir in original_dirs_hash.get_keys ()) {
+            var dir_files = original_dirs_hash.take (original_dir);
+            Files.FileOperations.copy_move_link.begin (
+                (owned) dir_files,
+                original_dir,
+                Gdk.DragAction.MOVE,
+                widget,
+                null
+            );
         }
-
-        original_dirs_hash.foreach ((original_dir, dir_files) => {
-                Files.FileOperations.copy_move_link.begin (dir_files,
-                                                            original_dir,
-                                                            Gdk.DragAction.MOVE,
-                                                            widget,
-                                                            null);
-        });
     }
 
-    private GLib.HashTable<GLib.File, GLib.List<GLib.File>>
-    get_trashed_files_original_directories (GLib.List<Files.File> files, out GLib.List<Files.File> unhandled_files) {
+    private async GLib.HashTable<GLib.File, GLib.List<GLib.File>> get_trashed_files_original_directories (
+        GLib.List<Files.File> files,
+        out GLib.List<Files.File> unhandled_files) {
 
         var directories = new GLib.HashTable<GLib.File, GLib.List<GLib.File>> (GLib.File.hash, GLib.File.equal);
         unhandled_files = null;
 
         var exists_map = new Gee.HashMap<string, int> ();
-        foreach (unowned Files.File goffile in files) {
+        foreach (var goffile in files) {
             /* Check it is a valid file (e.g. not a dummy row from list view) */
             if (goffile == null || goffile.location == null) {
                 continue;
             }
-
             /* Check that file is in root of trash.  If not, do not try to restore
              * (it will be restored with its parent anyway) */
             if (Path.get_dirname (goffile.uri) == "trash:") {
@@ -122,11 +127,13 @@ namespace Files.FileUtils {
                     if (exists_map.has_key (original_dir.get_path ())) {
                         exists = exists_map.@get (original_dir.get_path ());
                     }
-                    if (exists == 1 || (exists < 0 && ensure_exists (original_dir))) {
-                        if (exists < 0) {
+
+                    if (exists == 1 || (exists < 0 && yield ensure_exists (original_dir))) {
+                        if (exists < 0) { // original existed or was created
                             exists_map.@set (original_dir.get_path (), 1); // Do not need to check this path again
                         }
-                        GLib.List<GLib.File>? dir_files = directories.take (original_dir);
+
+                        List<GLib.File>? dir_files = directories.take (original_dir);
                         dir_files.prepend (goffile.location);
                         directories.insert (original_dir, (owned)dir_files);
                     } else {
@@ -174,12 +181,12 @@ namespace Files.FileUtils {
         }
     }
 
-    private bool ensure_exists (GLib.File file) {
+    private async bool ensure_exists (GLib.File file) {
         if (file.query_exists ()) {
             return true;
         }
 
-        bool success = false;
+        bool created = false;
         var dialog = new Granite.MessageDialog.with_image_from_icon_name (
             _("The original folder %s no longer exists").printf (file.get_path ()),
             _("The folder can be recreated and selected files that were originally there will be restored to it. Otherwise, files that were in this folder will not be restored."),
@@ -189,20 +196,22 @@ namespace Files.FileUtils {
         dialog.add_button (_("Ignore"), Gtk.ResponseType.CANCEL);
         dialog.add_button (_("Recreate"), Gtk.ResponseType.ACCEPT);
         dialog.set_default_response (Gtk.ResponseType.ACCEPT);
-
+        dialog.set_modal (true);
         dialog.response.connect ((res) => {
             switch (res) {
                 case Gtk.ResponseType.ACCEPT:
                     try {
-                        success = file.make_directory_with_parents ();
+                        file.make_directory_with_parents ();
+                        created = true;
                     } catch (Error e) {
                         var error_dialog = new Granite.MessageDialog.with_image_from_icon_name (
                             _("Could not recreate folder %s. Will ignore all files in this folder").printf (file.get_path ()),
                             e.message,
                             "dialog-error",
                             Gtk.ButtonsType.CLOSE
                         );
-                        error_dialog.response.connect (() => error_dialog.close ());
+
+                        error_dialog.response.connect (error_dialog.destroy);
                         error_dialog.present ();
                     }
 
@@ -213,12 +222,12 @@ namespace Files.FileUtils {
             }
 
             dialog.destroy ();
+            ensure_exists.callback (); // Continue from after yield statement
         });
 
-        // Need to continue to use run () in Gtk3 in order to get modal dialog as
-        // we need to return a result
-        dialog.run ();
-        return success;
+        dialog.present ();
+        yield;
+        return created;
     }
 
     public string? get_path_for_symlink (GLib.File file) {

plugins/pantheon-files-trash/plugin.vala

@@ -83,7 +83,7 @@ public class Files.Plugins.Trash : Files.Plugins.Base {
                     }
 
                     unowned GLib.List<Files.File> selection = view.get_selected_files ();
-                    FileUtils.restore_files_from_trash (selection, window);
+                    FileUtils.restore_files_from_trash.begin (selection, window);
                 });
 
                 delete_button.clicked.connect (() => {

src/View/AbstractDirectoryView.vala

@@ -1119,8 +1119,7 @@ namespace Files {
 
         private void on_selection_action_restore (GLib.SimpleAction action, GLib.Variant? param) {
             GLib.List<Files.File> selection = get_selected_files_for_transfer ();
-            FileUtils.restore_files_from_trash (selection, window);
-
+            FileUtils.restore_files_from_trash.begin (selection, window);
         }
 
         private void on_selection_action_open_executable (GLib.SimpleAction action, GLib.Variant? param) {