From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 3C5B16DE1117 for ; Sat, 19 Aug 2017 18:07:48 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[AWL=0.011, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Xt1Xup9Pvjt8 for ; Sat, 19 Aug 2017 18:07:47 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id CB0606DE10F9 for ; Sat, 19 Aug 2017 18:07:46 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.89) (envelope-from ) id 1djEez-0004LW-1b; Sat, 19 Aug 2017 21:04:13 -0400 Received: (nullmailer pid 30248 invoked by uid 1000); Sun, 20 Aug 2017 01:07:40 -0000 From: David Bremner To: notmuch@notmuchmail.org, notmuch@freelists.org Subject: [PATCH 3/3] CLI/new: support maildir synced tags in new.tags Date: Sat, 19 Aug 2017 22:07:27 -0300 Message-Id: <20170820010727.30117-4-david@tethera.net> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170820010727.30117-1-david@tethera.net> References: <20170820010727.30117-1-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.23 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: Sun, 20 Aug 2017 01:07:48 -0000 We reorder reading maildir flags to avoid overwriting 'new.tags'. The inverted status of 'unread' means the maildir flag needs to be checked a second time. I backpedalled here on the idea of supporting 'new.tags' without 'unread' in the presence of maildir syncing. For files in 'new/', it seems quite natural to tag them as 'unread'. --- notmuch-new.c | 10 ++++++++-- test/T340-maildir-sync.sh | 16 ++-------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/notmuch-new.c b/notmuch-new.c index 16b4d022..2a68af0e 100644 --- a/notmuch-new.c +++ b/notmuch-new.c @@ -267,10 +267,16 @@ add_file (notmuch_database_t *notmuch, const char *filename, case NOTMUCH_STATUS_SUCCESS: state->added_messages++; notmuch_message_freeze (message); - for (tag = state->new_tags; *tag != NULL; tag++) - notmuch_message_add_tag (message, *tag); if (state->synchronize_flags) notmuch_message_maildir_flags_to_tags (message); + + for (tag = state->new_tags; *tag != NULL; tag++) { + if (strcmp ("unread", *tag) !=0 || + !notmuch_message_has_maildir_flag (message, 'S')) { + notmuch_message_add_tag (message, *tag); + } + } + notmuch_message_thaw (message); break; /* Non-fatal issues (go on to next file). */ diff --git a/test/T340-maildir-sync.sh b/test/T340-maildir-sync.sh index 433effef..b473ae4e 100755 --- a/test/T340-maildir-sync.sh +++ b/test/T340-maildir-sync.sh @@ -196,26 +196,14 @@ notmuch search 'subject:"File in new"' | notmuch_search_sanitize > output test_expect_equal "$(< output)" \ "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; File in new/ (test unread)" -test_begin_subtest "unread is not mandatory in new/" -test_subtest_known_broken -OLDCONFIG=$(notmuch config get new.tags) -notmuch config set new.tags test -add_message [subject]='"File in new/"' [dir]=new [filename]='file-in-new' -notmuch config set new.tags $OLDCONFIG -notmuch search 'subject:"File in new"' | notmuch_search_sanitize > output -test_expect_equal "$(< output)" \ -"thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; File in new/ (test)" - for tag in draft flagged passed replied; do - test_begin_subtest "$tag is valid in new.tags" - test_subtest_known_broken OLDCONFIG=$(notmuch config get new.tags) - notmuch config set new.tags "$tag" + notmuch config set new.tags "$tag;unread" add_message [subject]="\"$tag sync in new\"" [dir]=new notmuch config set new.tags $OLDCONFIG notmuch search "subject:\"$tag sync in new\"" | notmuch_search_sanitize > output test_expect_equal "$(< output)" \ - "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; $tag sync in new ($tag)" + "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; $tag sync in new ($tag unread)" done test_done -- 2.13.2