debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 17:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

CLI/new: support maildir synced tags in new.tags

Browse source 
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'.
This commit is contained in:
David Bremner 2017-08-19 22:07:27 -03:00
parent 0a40ea4b48
commit 0082a55785
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
notmuch-new.c
View file

@ -267,10 +267,16 @@ add_file (notmuch_database_t *notmuch, const char *filename,
case NOTMUCH_STATUS_SUCCESS: case NOTMUCH_STATUS_SUCCESS:
state->added_messages++; state->added_messages++;
notmuch_message_freeze (message); notmuch_message_freeze (message);
for (tag = state->new_tags; *tag != NULL; tag++)
notmuch_message_add_tag (message, *tag);
if (state->synchronize_flags) if (state->synchronize_flags)
notmuch_message_maildir_flags_to_tags (message); 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); notmuch_message_thaw (message);
break; break;
/* Non-fatal issues (go on to next file). */ /* Non-fatal issues (go on to next file). */

16
test/T340-maildir-sync.sh
View file

@ -196,26 +196,14 @@ notmuch search 'subject:"File in new"' | notmuch_search_sanitize > output
test_expect_equal "$(< output)" \ test_expect_equal "$(< output)" \
"thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; File in new/ (test unread)" "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 for tag in draft flagged passed replied; do
test_begin_subtest "$tag is valid in new.tags" test_begin_subtest "$tag is valid in new.tags"
test_subtest_known_broken
OLDCONFIG=$(notmuch config get new.tags) 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 add_message [subject]="\"$tag sync in new\"" [dir]=new
notmuch config set new.tags $OLDCONFIG notmuch config set new.tags $OLDCONFIG
notmuch search "subject:\"$tag sync in new\"" | notmuch_search_sanitize > output notmuch search "subject:\"$tag sync in new\"" | notmuch_search_sanitize > output
test_expect_equal "$(< 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 done
test_done test_done