lib: Add "lastmod:" queries for filtering by last modification

The implementation is essentially the same as the date range search
prior to Jani's fancy date parser.
This commit is contained in:
Austin Clements 2014-10-13 02:20:03 -04:00 committed by David Bremner
parent f76d8f82dd
commit cb08a2ee01
4 changed files with 30 additions and 0 deletions

View file

@ -54,6 +54,8 @@ indicate user-supplied values):
- date:<since>..<until> - date:<since>..<until>
- lastmod:<since>..<until>
The **from:** prefix is used to match the name or address of the sender The **from:** prefix is used to match the name or address of the sender
of an email message. of an email message.
@ -124,6 +126,12 @@ The time range can also be specified using timestamps with a syntax of:
Each timestamp is a number representing the number of seconds since Each timestamp is a number representing the number of seconds since
1970-01-01 00:00:00 UTC. 1970-01-01 00:00:00 UTC.
The **lastmod:** prefix can be used to restrict the result by the
database revision number of when messages were last modified (tags
were added/removed or filenames changed). This is usually used in
conjunction with the **--uuid** argument to **notmuch search**
to find messages that have changed since an earlier query.
Operators Operators
--------- ---------

View file

@ -176,6 +176,7 @@ struct _notmuch_database {
Xapian::TermGenerator *term_gen; Xapian::TermGenerator *term_gen;
Xapian::ValueRangeProcessor *value_range_processor; Xapian::ValueRangeProcessor *value_range_processor;
Xapian::ValueRangeProcessor *date_range_processor; Xapian::ValueRangeProcessor *date_range_processor;
Xapian::ValueRangeProcessor *last_mod_range_processor;
}; };
/* Prior to database version 3, features were implied by the database /* Prior to database version 3, features were implied by the database

View file

@ -1000,6 +1000,7 @@ notmuch_database_open_verbose (const char *path,
notmuch->term_gen->set_stemmer (Xapian::Stem ("english")); notmuch->term_gen->set_stemmer (Xapian::Stem ("english"));
notmuch->value_range_processor = new Xapian::NumberValueRangeProcessor (NOTMUCH_VALUE_TIMESTAMP); notmuch->value_range_processor = new Xapian::NumberValueRangeProcessor (NOTMUCH_VALUE_TIMESTAMP);
notmuch->date_range_processor = new ParseTimeValueRangeProcessor (NOTMUCH_VALUE_TIMESTAMP); notmuch->date_range_processor = new ParseTimeValueRangeProcessor (NOTMUCH_VALUE_TIMESTAMP);
notmuch->last_mod_range_processor = new Xapian::NumberValueRangeProcessor (NOTMUCH_VALUE_LAST_MOD, "lastmod:");
notmuch->query_parser->set_default_op (Xapian::Query::OP_AND); notmuch->query_parser->set_default_op (Xapian::Query::OP_AND);
notmuch->query_parser->set_database (*notmuch->xapian_db); notmuch->query_parser->set_database (*notmuch->xapian_db);
@ -1007,6 +1008,7 @@ notmuch_database_open_verbose (const char *path,
notmuch->query_parser->set_stemming_strategy (Xapian::QueryParser::STEM_SOME); notmuch->query_parser->set_stemming_strategy (Xapian::QueryParser::STEM_SOME);
notmuch->query_parser->add_valuerangeprocessor (notmuch->value_range_processor); notmuch->query_parser->add_valuerangeprocessor (notmuch->value_range_processor);
notmuch->query_parser->add_valuerangeprocessor (notmuch->date_range_processor); notmuch->query_parser->add_valuerangeprocessor (notmuch->date_range_processor);
notmuch->query_parser->add_valuerangeprocessor (notmuch->last_mod_range_processor);
for (i = 0; i < ARRAY_SIZE (BOOLEAN_PREFIX_EXTERNAL); i++) { for (i = 0; i < ARRAY_SIZE (BOOLEAN_PREFIX_EXTERNAL); i++) {
prefix_t *prefix = &BOOLEAN_PREFIX_EXTERNAL[i]; prefix_t *prefix = &BOOLEAN_PREFIX_EXTERNAL[i];
@ -1085,6 +1087,8 @@ notmuch_database_close (notmuch_database_t *notmuch)
notmuch->value_range_processor = NULL; notmuch->value_range_processor = NULL;
delete notmuch->date_range_processor; delete notmuch->date_range_processor;
notmuch->date_range_processor = NULL; notmuch->date_range_processor = NULL;
delete notmuch->last_mod_range_processor;
notmuch->last_mod_range_processor = NULL;
return status; return status;
} }

View file

@ -73,4 +73,21 @@ test_expect_success 'tag succeeds with correct uuid' \
test_expect_code 1 'tag fails with incorrect uuid' \ test_expect_code 1 'tag fails with incorrect uuid' \
"notmuch tag --uuid=this-is-no-uuid '*' +test2" "notmuch tag --uuid=this-is-no-uuid '*' +test2"
test_begin_subtest 'lastmod:0.. matches everything'
total=$(notmuch count '*')
modtotal=$(notmuch count lastmod:0..)
test_expect_equal "$total" "$modtotal"
test_begin_subtest 'lastmod:1000000.. matches nothing'
modtotal=$(notmuch count lastmod:1000000..)
test_expect_equal 0 "$modtotal"
test_begin_subtest 'exclude one message using lastmod'
lastmod=$(notmuch count --lastmod '*' | cut -f3)
total=$(notmuch count '*')
notmuch tag +4EFC743A.3060609@april.org id:4EFC743A.3060609@april.org
subtotal=$(notmuch count lastmod:..$lastmod)
result=$(($subtotal == $total-1))
test_expect_equal 1 "$result"
test_done test_done