Changeset 3510

Timestamp:

03/19/08 15:19:36

Author:

pvanhoof

Message:

2008-03-19 Philip Van Hoof <pvanhoof@gnome.org>

• • • • Fast message moves when source and dest folder are both Maildir
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-maildir-folder.c (modified) (2 diffs)
• trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2008-03-19  Philip Van Hoof <pvanhoof@gnome.org>
+
+        * Fast message moves when source and dest folder are both Maildir
+
-2008-03-19  Philip Van Hoof <pvanhoof@gnome.org>
-

trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-maildir-folder.c

@@ -59 +59 @@
-static void maildir_rewrite_cache (CamelFolder *folder, const char *uid, CamelMimeMessage *msg);
-
+static void maildir_transfer_messages_to (CamelFolder *source, GPtrArray *uids, CamelFolder *dest, GPtrArray **transferred_uids, gboolean delete_originals, CamelException *ex);
+
+
-static void maildir_finalize(CamelObject * object);
-
@@ -106 +109 @@
-        camel_folder_class->rewrite_cache = maildir_rewrite_cache;
-
+        camel_folder_class->transfer_messages_to = maildir_transfer_messages_to;
+
-        lclass->create_summary = maildir_create_summary;
+}
+
+
+static void 
+maildir_transfer_messages_to (CamelFolder *source, GPtrArray *uids, CamelFolder *dest, GPtrArray **transferred_uids, gboolean delete_originals, CamelException *ex)
+{
+        if (delete_originals && CAMEL_IS_MAILDIR_FOLDER (source) && CAMEL_IS_MAILDIR_FOLDER (dest)) {
+                gint i;
+                CamelLocalFolder *lf = (CamelLocalFolder *) source;
+                CamelLocalFolder *df = (CamelLocalFolder *) dest;
+
+                camel_operation_start(NULL, _("Moving messages"));
+
+                camel_folder_freeze(dest);
+                camel_folder_freeze(source);
+
+                for (i = 0; i < uids->len; i++) {
+                        char *uid = (char *) uids->pdata[i];
+                        char *s_filename, *d_filename, *tmp; 
+                        CamelMaildirMessageInfo *mdi;
+                        CamelMessageInfo *mi, *info;
+
+                        if ((info = camel_folder_summary_uid (source->summary, uid)) == NULL) {
+                                camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,
+                                                     _("Cannot get message: %s from folder %s\n  %s"),
+                                                     uid, lf->folder_path, _("No such message"));
+                                return;
+                        }
+
+                        mdi = (CamelMaildirMessageInfo *) info;
+                        tmp = camel_maildir_summary_info_to_name (mdi);
+
+                        d_filename = g_strdup_printf("%s/cur/%s", df->folder_path, tmp);
+                        g_free (tmp);
+                        s_filename = camel_maildir_get_filename (lf->folder_path, mdi, uid);
+                        camel_message_info_free (info);
+
+                        if (rename (s_filename, d_filename) != 0)
+                                camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM_IO_WRITE,
+                                                     _("Cannot transfer message to destination folder"));
+                        else {
+                                camel_folder_set_message_flags (source, uid, 
+                                        CAMEL_MESSAGE_EXPUNGED|CAMEL_MESSAGE_DELETED|CAMEL_MESSAGE_SEEN, ~0);
+                                ((CamelMessageInfoBase *)info)->flags |= CAMEL_MESSAGE_EXPUNGED;
+                                camel_folder_summary_remove (source->summary, info);
+                        }
+
+                        g_free (s_filename);
+                        g_free (d_filename);
+                }
+
+                camel_folder_thaw(dest);
+                camel_folder_thaw(source);
+
+                camel_operation_end(NULL);
+
+        } else
+                ((CamelFolderClass *)parent_class)->transfer_messages_to (source, uids, dest, transferred_uids, delete_originals, ex);
+
+        return;
-}
-

trunk/tests/c-demo/tny-demoui-summary-view.c

@@ -1635 +1635 @@
-                tny_list_prepend (headers, (GObject *) info->header);
-                tny_folder_transfer_msgs_async (folder, headers, info->to_folder, 
-FALS
+TRU
-                g_object_unref (headers);
-        }