From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 00D42429E40 for ; Wed, 14 Sep 2011 15:24:02 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.699 X-Spam-Level: X-Spam-Status: No, score=-0.699 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UP-F2pIhojlC for ; Wed, 14 Sep 2011 15:24:00 -0700 (PDT) Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 1545D429E37 for ; Wed, 14 Sep 2011 15:23:58 -0700 (PDT) Received: by mail-ww0-f45.google.com with SMTP id 36so2235195wwi.2 for ; Wed, 14 Sep 2011 15:23:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=/7rqlCR7GlAKZ05SCid7HEDTnvMR1CKWjpXnfH5ROHY=; b=J5G8AgDzkXV7SajD5aT1BMwDu6Bu2WrqKyTXHmfT/ZCMpC22IX+oAxX9e27lKz9e+U C9rgQHdUTNrOCcS/HN6ObNgDIDjRI22JQtg25yM3i0GlLA1ubSppTtQcMTPUh6+57rq0 lnV0oRXu9zHMzxCbG8yc/z54FGQuDqLpFj8gA= Received: by 10.216.133.5 with SMTP id p5mr2922817wei.87.1316039038689; Wed, 14 Sep 2011 15:23:58 -0700 (PDT) Received: from osdor.le-roi-du-couscous.fr ([78.222.14.116]) by mx.google.com with ESMTPS id h20sm50709wbo.22.2011.09.14.15.23.57 (version=SSLv3 cipher=OTHER); Wed, 14 Sep 2011 15:23:58 -0700 (PDT) Sender: Louis Rilling From: Louis Rilling To: notmuch@notmuchmail.org Subject: [PATCH 4/4] tags_to_maildir_flags: Don't rename if no flags change Date: Thu, 15 Sep 2011 00:23:21 +0200 Message-Id: <1316039001-32602-5-git-send-email-l.rilling@av7.net> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1316039001-32602-1-git-send-email-l.rilling@av7.net> References: <1316039001-32602-1-git-send-email-l.rilling@av7.net> Cc: Michal Sojka , Austin Clements X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Sep 2011 22:24:04 -0000 notmuch_message_tags_to_maildir_flags() unconditionally moves messages from maildir directory "new/" to maildir directory "cur/", which makes messages lose their "new" status in the MUA. However some users want to keep this "new" status after, for instance, an auto-tagging of new messages. However, as Austin mentioned and according to the maildir specification, messages living in "new/" are not allowed to have flags, even if mutt allows it to happen. For this reason, this patch prevents moving messages from "new/" to "cur/", only if no flags have to be changed. It's hopefully enough to satisfy mutt (and maybe other MUAs showing the "new" status) users checking the "new" status. Changelog: * v2: Fix bool type as well as NULL returned despite having no errors (Austin Clements) * v4: Tag the related test (contributed by Michal Sojka) as working Signed-off-by: Louis Rilling --- lib/message.cc | 12 +++++++++++- test/maildir-sync | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/message.cc b/lib/message.cc index b1b2942..c003729 100644 --- a/lib/message.cc +++ b/lib/message.cc @@ -1139,7 +1139,7 @@ _get_maildir_flag_actions (notmuch_message_t *message, * compute the new maildir filename. * * If the existing filename is in the directory "new", the new - * filename will be in the directory "cur". + * filename will be in the directory "cur", unless no flags are changed. * * After a sequence of ":2," in the filename, any subsequent * single-character flags will be added or removed according to the @@ -1162,6 +1162,7 @@ _new_maildir_filename (void *ctx, char *filename_new, *dir; char flag_map[128]; int flags_in_map = 0; + notmuch_bool_t flags_changed = FALSE; unsigned int i; char *s; @@ -1202,6 +1203,7 @@ _new_maildir_filename (void *ctx, if (flag_map[flag] == 0) { flag_map[flag] = 1; flags_in_map++; + flags_changed = TRUE; } } @@ -1210,9 +1212,17 @@ _new_maildir_filename (void *ctx, if (flag_map[flag]) { flag_map[flag] = 0; flags_in_map--; + flags_changed = TRUE; } } + /* No need to rename. Messages in new/ can be kept in new/. + * Note: We don't even try to fix buggy messages having flags and living in + * new/. It's not our business. + */ + if (!flags_changed) + return talloc_strdup (ctx, filename); + filename_new = (char *) talloc_size (ctx, info - filename + strlen (":2,") + flags_in_map + 1); diff --git a/test/maildir-sync b/test/maildir-sync index b3e90ae..e1ad81c 100755 --- a/test/maildir-sync +++ b/test/maildir-sync @@ -92,7 +92,7 @@ test_begin_subtest "Adding non-maildir tags does not move message from new to cu add_message [subject]='"Message to stay in new"' [date]='"Sat, 01 Jan 2000 12:00:00 -0000"' [filename]='message-to-stay-in-new' [dir]=new notmuch tag +donotmove subject:"Message to stay in new" output=$(cd "$MAIL_DIR"; ls */message-to-stay-in-new*) -test_expect_equal_failure "$output" "new/message-to-stay-in-new" +test_expect_equal "$output" "new/message-to-stay-in-new" test_begin_subtest "Removing 'S' flag from existing filename adds 'unread' tag" add_message [subject]='"Removing S flag"' [filename]='removing-s-flag:2,S' [dir]=cur -- 1.7.2.5