Add move support to daemon

Original git commit by Alexander Larsson <alexl@redhat.com> at 1183552446 +0200

svn path=/trunk/; revision=625

5 files changed, 254 insertions, 0 deletions

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index c5f84840..7743499f 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -75,6 +75,7 @@ libdaemon_la_SOURCES = \
 	gvfsjobtrash.c gvfsjobtrash.h \
 	gvfsjobdelete.c gvfsjobdelete.h \
 	gvfsjobcopy.c gvfsjobcopy.h \
+	gvfsjobmove.c gvfsjobmove.h \
 	gvfsjobmakedirectory.c gvfsjobmakedirectory.h \
 	gvfsdaemonprotocol.c \
 	dbus-gmain.h dbus-gmain.c \
diff --git a/daemon/gvfsbackend.c b/daemon/gvfsbackend.c
index 44e926a6..49131e5d 100644
--- a/daemon/gvfsbackend.c
+++ b/daemon/gvfsbackend.c
@@ -23,6 +23,7 @@
 #include <gvfsjobmountmountable.h>
 #include <gvfsjobmakedirectory.h>
 #include <gvfsjobcopy.h>
+#include <gvfsjobmove.h>
 #include <gdbusutils.h>
 
 enum {
@@ -306,6 +307,10 @@ backend_dbus_handler (DBusConnection  *connection,
 					G_VFS_DBUS_MOUNT_INTERFACE,
 					G_VFS_DBUS_MOUNT_OP_COPY))
     job = g_vfs_job_copy_new (connection, message, backend);
+  else if (dbus_message_is_method_call (message,
+					G_VFS_DBUS_MOUNT_INTERFACE,
+					G_VFS_DBUS_MOUNT_OP_MOVE))
+    job = g_vfs_job_move_new (connection, message, backend);
 
   if (job)
     {
diff --git a/daemon/gvfsbackend.h b/daemon/gvfsbackend.h
index f531a7b6..e4b99f68 100644
--- a/daemon/gvfsbackend.h
+++ b/daemon/gvfsbackend.h
@@ -41,6 +41,7 @@ typedef struct _GVfsJobTrash           GVfsJobTrash;
 typedef struct _GVfsJobDelete          GVfsJobDelete;
 typedef struct _GVfsJobMakeDirectory   GVfsJobMakeDirectory;
 typedef struct _GVfsJobCopy            GVfsJobCopy;
+typedef struct _GVfsJobMove            GVfsJobMove;
 
 typedef gpointer GVfsBackendHandle;
 
@@ -231,6 +232,20 @@ struct _GVfsBackendClass
 				 GFileCopyFlags flags,
 				 GFileProgressCallback progress_callback,
 				 gpointer progress_callback_data);
+  void     (*move)              (GVfsBackend *backend,
+				 GVfsJobCopy *job,
+				 const char *source,
+				 const char *destination,
+				 GFileCopyFlags flags,
+				 GFileProgressCallback progress_callback,
+				 gpointer progress_callback_data);
+  gboolean (*try_move)          (GVfsBackend *backend,
+				 GVfsJobCopy *job,
+				 const char *source,
+				 const char *destination,
+				 GFileCopyFlags flags,
+				 GFileProgressCallback progress_callback,
+				 gpointer progress_callback_data);
 };
 
 GType g_vfs_backend_get_type (void) G_GNUC_CONST;
diff --git a/daemon/gvfsjobmove.c b/daemon/gvfsjobmove.c
new file mode 100644
index 00000000..cf00dae1
--- /dev/null
+++ b/daemon/gvfsjobmove.c
@@ -0,0 +1,188 @@
+#include <config.h>
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#include <glib.h>
+#include <dbus/dbus.h>
+#include <glib/gi18n.h>
+#include "gvfsjobmove.h"
+#include "gdbusutils.h"
+#include "gvfsdaemonprotocol.h"
+
+G_DEFINE_TYPE (GVfsJobMove, g_vfs_job_move, G_VFS_TYPE_JOB_DBUS);
+
+static void         run          (GVfsJob        *job);
+static gboolean     try          (GVfsJob        *job);
+static DBusMessage *create_reply (GVfsJob        *job,
+				  DBusConnection *connection,
+				  DBusMessage    *message);
+
+static void
+g_vfs_job_move_finalize (GObject *object)
+{
+  GVfsJobMove *job;
+
+  job = G_VFS_JOB_MOVE (object);
+  
+  g_free (job->source);
+  g_free (job->destination);
+  g_free (job->callback_obj_path);
+  
+  if (G_OBJECT_CLASS (g_vfs_job_move_parent_class)->finalize)
+    (*G_OBJECT_CLASS (g_vfs_job_move_parent_class)->finalize) (object);
+}
+
+static void
+g_vfs_job_move_class_init (GVfsJobMoveClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GVfsJobClass *job_class = G_VFS_JOB_CLASS (klass);
+  GVfsJobDBusClass *job_dbus_class = G_VFS_JOB_DBUS_CLASS (klass);
+  
+  gobject_class->finalize = g_vfs_job_move_finalize;
+  job_class->run = run;
+  job_class->try = try;
+  job_dbus_class->create_reply = create_reply;
+}
+
+static void
+g_vfs_job_move_init (GVfsJobMove *job)
+{
+}
+
+GVfsJob *
+g_vfs_job_move_new (DBusConnection *connection,
+			DBusMessage *message,
+			GVfsBackend *backend)
+{
+  GVfsJobMove *job;
+  DBusMessage *reply;
+  DBusError derror;
+  int path1_len, path2_len;
+  const char *path1_data, *path2_data, *callback_obj_path;
+  dbus_uint32_t flags;
+  
+  dbus_error_init (&derror);
+  if (!dbus_message_get_args (message, &derror, 
+			      DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE,
+			      &path1_data, &path1_len,
+			      DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE,
+			      &path2_data, &path2_len,
+                              DBUS_TYPE_UINT32, &flags,
+			      DBUS_TYPE_OBJECT_PATH, &callback_obj_path,
+			      0))
+    {
+      reply = dbus_message_new_error (message,
+				      derror.name,
+                                      derror.message);
+      dbus_error_free (&derror);
+
+      dbus_connection_send (connection, reply, NULL);
+      return NULL;
+    }
+
+  job = g_object_new (G_VFS_TYPE_JOB_MOVE,
+		      "message", message,
+		      "connection", connection,
+		      NULL);
+
+  job->source = g_strndup (path1_data, path1_len);
+  job->destination = g_strndup (path2_data, path2_len);
+  job->backend = backend;
+  job->flags = flags;
+  if (strcmp (callback_obj_path, "/org/gtk/vfs/void") != 0)
+    job->callback_obj_path = g_strdup (callback_obj_path);
+  
+  return G_VFS_JOB (job);
+}
+
+static void
+progress_callback (goffset current_num_bytes,
+		   goffset total_num_bytes,
+		   gpointer user_data)
+{
+  GVfsJob *job = G_VFS_JOB (user_data);
+  GVfsJobDBus *dbus_job = G_VFS_JOB_DBUS (job);
+  GVfsJobMove *op_job = G_VFS_JOB_MOVE (job);
+  dbus_uint64_t current_dbus, total_dbus;
+  DBusMessage *message;
+
+  g_print ("progress_callback %d/%d\n", (int)current_num_bytes, (int)total_num_bytes);
+
+  if (op_job->callback_obj_path == NULL)
+    return;
+  
+  message =
+    dbus_message_new_method_call (dbus_message_get_sender (dbus_job->message),
+				  op_job->callback_obj_path,
+				  G_VFS_DBUS_PROGRESS_INTERFACE,
+				  G_VFS_DBUS_PROGRESS_OP_PROGRESS);
+  dbus_message_set_no_reply (message, TRUE);
+
+  current_dbus = current_num_bytes;
+  total_dbus = total_num_bytes;
+  dbus_message_append_args (message,
+			    DBUS_TYPE_UINT64, &current_dbus,
+			    DBUS_TYPE_UINT64, &total_dbus,
+			    0);
+
+  /* Queues reply (threadsafely), actually sends it in mainloop */
+  dbus_connection_send (dbus_job->connection, message, NULL);
+  dbus_message_unref (message);
+}
+
+static void
+run (GVfsJob *job)
+{
+  GVfsJobMove *op_job = G_VFS_JOB_MOVE (job);
+  GVfsBackendClass *class = G_VFS_BACKEND_GET_CLASS (op_job->backend);
+
+  if (class->move == NULL)
+    {
+      g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+			_("Operation not supported by backend"));
+      return;
+    }
+  
+  class->move (op_job->backend,
+	       op_job,
+	       op_job->source,
+	       op_job->destination,
+	       op_job->flags,
+	       progress_callback,
+	       job);
+}
+
+static gboolean
+try (GVfsJob *job)
+{
+  GVfsJobMove *op_job = G_VFS_JOB_MOVE (job);
+  GVfsBackendClass *class = G_VFS_BACKEND_GET_CLASS (op_job->backend);
+
+  if (class->try_move == NULL)
+    return FALSE;
+  
+  return class->try_move (op_job->backend,
+			  op_job,
+			  op_job->source,
+			  op_job->destination,
+			  op_job->flags,
+			  progress_callback,
+			  job);
+}
+
+/* Might be called on an i/o thread */
+static DBusMessage *
+create_reply (GVfsJob *job,
+	      DBusConnection *connection,
+	      DBusMessage *message)
+{
+  DBusMessage *reply;
+
+  reply = dbus_message_new_method_return (message);
+  
+  return reply;
+}
diff --git a/daemon/gvfsjobmove.h b/daemon/gvfsjobmove.h
new file mode 100644
index 00000000..e844100a
--- /dev/null
+++ b/daemon/gvfsjobmove.h
@@ -0,0 +1,45 @@
+#ifndef __G_VFS_JOB_MOVE_H__
+#define __G_VFS_JOB_MOVE_H__
+
+#include <gio/gfileinfo.h>
+#include <gvfsjob.h>
+#include <gvfsjobdbus.h>
+#include <gvfsbackend.h>
+
+G_BEGIN_DECLS
+
+#define G_VFS_TYPE_JOB_MOVE         (g_vfs_job_move_get_type ())
+#define G_VFS_JOB_MOVE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_VFS_TYPE_JOB_MOVE, GVfsJobMove))
+#define G_VFS_JOB_MOVE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_VFS_TYPE_JOB_MOVE, GVfsJobMoveClass))
+#define G_VFS_IS_JOB_MOVE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_VFS_TYPE_JOB_MOVE))
+#define G_VFS_IS_JOB_MOVE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_VFS_TYPE_JOB_MOVE))
+#define G_VFS_JOB_MOVE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_VFS_TYPE_JOB_MOVE, GVfsJobMoveClass))
+
+typedef struct _GVfsJobMoveClass   GVfsJobMoveClass;
+
+struct _GVfsJobMove
+{
+  GVfsJobDBus parent_instance;
+
+  GVfsBackend *backend;
+  char *source;
+  char *destination;
+  GFileCopyFlags flags;
+  char *callback_obj_path;
+  
+};
+
+struct _GVfsJobMoveClass
+{
+  GVfsJobDBusClass parent_class;
+};
+
+GType g_vfs_job_move_get_type (void) G_GNUC_CONST;
+
+GVfsJob *g_vfs_job_move_new (DBusConnection *connection,
+			     DBusMessage    *message,
+			     GVfsBackend    *backend);
+
+G_END_DECLS
+
+#endif /* __G_VFS_JOB_MOVE_H__ */