[nautilus/wip/muktupavels/delete: 4/4] dbus-manager: implement deleting files



commit bdefd9bc781a5c32390c06336534e346567ebc51
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu Dec 19 00:15:10 2019 +0200

    dbus-manager: implement deleting files
    
    https://gitlab.gnome.org/GNOME/nautilus/merge_requests/504

 data/dbus-interfaces2.xml   |  4 ++++
 src/nautilus-dbus-manager.c | 56 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
---
diff --git a/data/dbus-interfaces2.xml b/data/dbus-interfaces2.xml
index 2b09c4ece..ebc95768a 100644
--- a/data/dbus-interfaces2.xml
+++ b/data/dbus-interfaces2.xml
@@ -40,6 +40,10 @@
       <arg type='as' name='URIs' direction='in'/>
       <arg type='a{sv}' name='Parameters' direction='in'/>
     </method>
+    <method name='DeleteFiles'>
+      <arg type='as' name='URIs' direction='in'/>
+      <arg type='a{sv}' name='Parameters' direction='in'/>
+    </method>
     <method name='CreateFolder'>
       <arg type='s' name='URI' direction='in'/>
       <arg type='a{sv}' name='Parameters' direction='in'/>
diff --git a/src/nautilus-dbus-manager.c b/src/nautilus-dbus-manager.c
index eb43c1b8a..66be77244 100644
--- a/src/nautilus-dbus-manager.c
+++ b/src/nautilus-dbus-manager.c
@@ -467,6 +467,58 @@ handle_trash_files2 (NautilusDBusFileOperations2  *object,
     return TRUE; /* invocation was handled */
 }
 
+static void
+delete_on_finished (GHashTable *debutting_uris,
+                    gboolean    user_cancel,
+                    gpointer    callback_data)
+{
+    g_application_release (g_application_get_default ());
+}
+
+static void
+delete_files (const char **sources,
+              const char  *parent_handle,
+              guint32      timestamp)
+{
+    g_autolist (GFile) source_files = NULL;
+    gint idx;
+
+    for (idx = 0; sources[idx] != NULL; idx++)
+    {
+        source_files = g_list_prepend (source_files,
+                                       g_file_new_for_uri (sources[idx]));
+    }
+
+    g_application_hold (g_application_get_default ());
+    nautilus_file_operations_delete_async (source_files, NULL,
+                                           parent_handle, timestamp,
+                                           delete_on_finished, NULL);
+}
+
+static gboolean
+handle_delete_files2 (NautilusDBusFileOperations2  *object,
+                      GDBusMethodInvocation        *invocation,
+                      const gchar                 **sources,
+                      GVariant                     *parameters)
+{
+    GVariantDict dict;
+    const char *parent_handle;
+    guint32 timestamp;
+
+    g_variant_dict_init (&dict, parameters);
+
+    if (!g_variant_dict_lookup (&dict, "parent-handle", "&s", &parent_handle))
+        parent_handle = NULL;
+
+    if (!g_variant_dict_lookup (&dict, "timestamp", "u", &timestamp))
+        timestamp = 0;
+
+    delete_files (sources, parent_handle, timestamp);
+
+    nautilus_dbus_file_operations2_complete_delete_files (object, invocation);
+    return TRUE; /* invocation was handled */
+}
+
 static void
 rename_file_on_finished (NautilusFile *file,
                          GFile        *result_location,
@@ -580,6 +632,10 @@ nautilus_dbus_manager_init (NautilusDBusManager *self)
                       "handle-trash-files",
                       G_CALLBACK (handle_trash_files2),
                       self);
+    g_signal_connect (self->file_operations2,
+                      "handle-delete-files",
+                      G_CALLBACK (handle_delete_files2),
+                      self);
     g_signal_connect (self->file_operations,
                       "handle-create-folder",
                       G_CALLBACK (handle_create_folder),


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]