From 42abbf53463cbbdcd319063fcbfb91cf6ed5bdc5 Mon Sep 17 00:00:00 2001 From: Lars Henriksen Date: Thu, 6 Dec 2018 09:56:45 +0100 Subject: Filter option: invert New filter option: --filter-invert. When present it inverts (negates) the other filter options combined. This is mostly useful with the -G option (with -Q the output is limited by the query range (day range)). The ouput from "calcurse -G " is the (set) complement of "calcurse -G --filter-invert". Here may be any combination of filter options. Signed-off-by: Lars Henriksen Signed-off-by: Lukas Fleischer --- src/event.c | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) (limited to 'src/event.c') diff --git a/src/event.c b/src/event.c index fe8f883..65af662 100644 --- a/src/event.c +++ b/src/event.c @@ -152,7 +152,8 @@ struct event *event_scan(FILE * f, struct tm start, int id, char *note, { char buf[BUFSIZ], *nl; time_t tstart, tend; - struct event *ev; + struct event *ev = NULL; + int cond; EXIT_IF(!check_date(start.tm_year, start.tm_mon, start.tm_mday) || !check_time(start.tm_hour, start.tm_min), @@ -179,31 +180,29 @@ struct event *event_scan(FILE * f, struct tm start, int id, char *note, /* Filter item. */ if (filter) { - if (!(filter->type_mask & TYPE_MASK_EVNT)) - return NULL; - if (filter->regex && regexec(filter->regex, buf, 0, 0, 0)) - return NULL; - if (filter->start_from != -1 && tstart < filter->start_from) - return NULL; - if (filter->start_to != -1 && tstart > filter->start_to) - return NULL; - if (filter->end_from != -1 && tend < filter->end_from) - return NULL; - if (filter->end_to != -1 && tend > filter->end_to) - return NULL; - } - - ev = event_new(buf, note, tstart, id); + cond = ( + !(filter->type_mask & TYPE_MASK_EVNT) || + (filter->regex && regexec(filter->regex, buf, 0, 0, 0)) || + (filter->start_from != -1 && tstart < filter->start_from) || + (filter->start_to != -1 && tstart > filter->start_to) || + (filter->end_from != -1 && tend < filter->end_from) || + (filter->end_to != -1 && tend > filter->end_to) + ); + if (filter->hash) { + ev = event_new(buf, note, tstart, id); + char *hash = event_hash(ev); + cond = cond || !hash_matches(filter->hash, hash); + mem_free(hash); + } - /* Filter by hash. */ - if (filter && filter->hash) { - char *hash = event_hash(ev); - if (!hash_matches(filter->hash, hash)) { - event_delete(ev); - ev = NULL; + if ((!filter->invert && cond) || (filter->invert && !cond)) { + if (filter->hash) + event_delete(ev); + return NULL; } - mem_free(hash); } + if (!ev) + ev = event_new(buf, note, tstart, id); return ev; } -- cgit v1.2.3-54-g00ecf