yigid/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Filter option: invert

Browse Source 
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 <filter options>" is the (set) complement of
"calcurse -G <filter options> --filter-invert". Here <filter options>
may be any combination of filter options.

Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lars Henriksen
2018-12-06 09:56:45 +01:00
committed by Lukas Fleischer
parent 9300e9154c
commit 42abbf5346
6 changed files with 133 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/io.c
View File

@@ -707,8 +707,7 @@ void io_load_todo(struct item_filter *filter)
{
FILE *data_file;
char *newline;
int nb_tod = 0;
int c, id, completed;
int c, id, completed, cond;
char buf[BUFSIZ], e_todo[BUFSIZ], note[MAX_NOTESIZ + 1];
unsigned line = 0;
@@ -760,34 +759,31 @@ void io_load_todo(struct item_filter *filter)
io_extract_data(e_todo, buf, sizeof buf);
/* Filter item. */
struct todo *todo = NULL;
if (filter) {
if (!(filter->type_mask & TYPE_MASK_TODO))
continue;
if (filter->regex &&
regexec(filter->regex, e_todo, 0, 0, 0))
continue;
if (filter->priority && id != filter->priority)
continue;
if (filter->completed && !completed)
continue;
if (filter->uncompleted && completed)
continue;
}
struct todo *todo = todo_add(e_todo, id, completed, note);
/* Filter by hash. */
if (filter && filter->hash) {
char *hash = todo_hash(todo);
if (!hash_matches(filter->hash, hash)) {
todo_delete(todo);
todo = NULL;
cond = (
!(filter->type_mask & TYPE_MASK_TODO) ||
(filter->regex && regexec(filter->regex, e_todo, 0, 0, 0)) ||
(filter->priority && id != filter->priority) ||
(filter->completed && !completed) ||
(filter->uncompleted && completed)
);
if (filter->hash) {
todo = todo_add(e_todo, id, completed, note);
char *hash = todo_hash(todo);
cond = cond || !hash_matches(filter->hash, hash);
mem_free(hash);
}
if ((!filter->invert && cond) || (filter->invert && !cond)) {
if (filter->hash)
todo_delete(todo);
continue;
}
mem_free(hash);
}
if (todo)
++nb_tod;
if (!todo)
todo = todo_add(e_todo, id, completed, note);
}
file_close(data_file, __FILE_POS__);
}