lib-storage: Add support for replacing mail using mailbox_save_begin_replace()

The indicated expunged mail is expunged once saving the new mail finishes
successfully. The expunged mail is available in the mailbox save context for
plugins (like quota) that need to be able to obtain information about the mail
being replaced. The source mail for mailbox_move() is also recorded in the
context as such. This way, quota handling can be implemented identically for
moving and replacing a message.

diff --git a/src/lib-storage/mail-storage-private.h b/src/lib-storage/mail-storage-private.h
index 6732bd80e4d09dd427ddb5ca4750f39a14f92d90..f93f9204c8c638a89466a33530e70f5a47f7bd24 100644 (file)
--- a/src/lib-storage/mail-storage-private.h
+++ b/src/lib-storage/mail-storage-private.h
@@ -742,6 +742,11 @@ struct mail_save_context {
           implemented via save, and the save_*() methods want to access the
           source mail. */
        struct mail *copy_src_mail;
+       /* Set during mailbox_move() and mailbox_save_begin_replace(). This
+          is made available for the quota plugin to allow accounting for the
+          size of the mail that is being expunged as part of the MOVE and
+          REPLACE commands, respectively. */
+       struct mail *expunged_mail;
 
        /* data that changes for each saved mail */
        struct mail_save_data data;

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index e126b33663ebf3b491f3b34148c49608c59ff059..fdae32c0e3b3b68616d81e2e358d245842b728ff 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -3005,6 +3005,14 @@ int mailbox_save_begin(struct mail_save_context **ctx, struct istream *input)
        return 0;
 }
 
+int mailbox_save_begin_replace(struct mail_save_context **ctx,
+                              struct istream *input,
+                              struct mail *replaced)
+{
+       (*ctx)->expunged_mail = replaced;
+       return mailbox_save_begin(ctx, input);
+}
+
 int mailbox_save_continue(struct mail_save_context *ctx)
 {
        int ret;
@@ -3079,6 +3087,8 @@ int mailbox_save_finish(struct mail_save_context **_ctx)
                if (pvt_flags != 0)
                        mailbox_save_add_pvt_flags(t, pvt_flags);
                t->save_count++;
+               if (ctx->expunged_mail != NULL)
+                       mail_expunge(ctx->expunged_mail);
        }
 
        mailbox_save_context_reset(ctx, TRUE);
@@ -3178,6 +3188,7 @@ int mailbox_move(struct mail_save_context **_ctx, struct mail *mail)
        i_assert(!ctx->moving);
 
        ctx->moving = TRUE;
+       ctx->expunged_mail = mail;
        T_BEGIN {
                if ((ret = mailbox_copy_int(_ctx, mail)) == 0)
                        mail_expunge(mail);

diff --git a/src/lib-storage/mail-storage.h b/src/lib-storage/mail-storage.h
index ed5d80e6b9c6f8cdd2a186a489e72dcdffe9cfb2..b821ef55020a3879e5c100db0be06a0c9e09b821 100644 (file)
--- a/src/lib-storage/mail-storage.h
+++ b/src/lib-storage/mail-storage.h
@@ -875,6 +875,13 @@ struct mail *mailbox_save_get_dest_mail(struct mail_save_context *ctx);
    i_stream_read() and calling mailbox_save_continue() as long as there's
    more input. */
 int mailbox_save_begin(struct mail_save_context **ctx, struct istream *input);
+/* Begin saving the message that replaces the provided mail (which may reside
+   in another mailbox altogether). The replaced mail is expunged implicitly
+   when saving the message succeeds at mailbox_save_finish(). In all other
+   respects this function behaves the same as mailbox_save_begin(). */
+int mailbox_save_begin_replace(struct mail_save_context **ctx,
+                              struct istream *input,
+                              struct mail *replaced);
 int mailbox_save_continue(struct mail_save_context *ctx);
 int mailbox_save_finish(struct mail_save_context **ctx);
 void mailbox_save_cancel(struct mail_save_context **ctx);