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

Add an option to filter by object hash

Browse Source 
Implement a new --filter-hash option to filter by object identifiers.
Each object having an identifier that has the specified pattern as a
prefix is matched. Patterns starting with an exclamation mark (!) are
interpreted as negative patterns.

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lukas Fleischer
2016-01-11 22:26:46 +01:00
parent dd85a73746
commit 7f8c62bf57
7 changed files with 91 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/recur.c
View File

@@ -336,6 +336,7 @@ struct recur_apoint *recur_apoint_scan(FILE * f, struct tm start,
{
char buf[BUFSIZ], *nl;
time_t tstart, tend, tuntil;
struct recur_apoint *rapt;
EXIT_IF(!check_date(start.tm_year, start.tm_mon, start.tm_mday) ||
!check_date(end.tm_year, end.tm_mon, end.tm_mday) ||
@@ -393,8 +394,20 @@ struct recur_apoint *recur_apoint_scan(FILE * f, struct tm start,
return NULL;
}
return recur_apoint_new(buf, note, tstart, tend - tstart, state,
rapt = recur_apoint_new(buf, note, tstart, tend - tstart, state,
recur_char2def(type), freq, tuntil, exc);
/* Filter by hash. */
if (filter && filter->hash) {
char *hash = recur_apoint_hash(rapt);
if (!hash_matches(filter->hash, hash)) {
recur_apoint_erase(rapt);
rapt = NULL;
}
mem_free(hash);
}
return rapt;
}
/* Load the recursive events from file */
@@ -405,6 +418,7 @@ struct recur_event *recur_event_scan(FILE * f, struct tm start, int id,
{
char buf[BUFSIZ], *nl;
time_t tstart, tend, tuntil;
struct recur_event *rev;
EXIT_IF(!check_date(start.tm_year, start.tm_mon, start.tm_mday) ||
!check_time(start.tm_hour, start.tm_min) ||
@@ -453,8 +467,20 @@ struct recur_event *recur_event_scan(FILE * f, struct tm start, int id,
return NULL;
}
return recur_event_new(buf, note, tstart, id, recur_char2def(type),
freq, tuntil, exc);
rev = recur_event_new(buf, note, tstart, id, recur_char2def(type),
freq, tuntil, exc);
/* Filter by hash. */
if (filter && filter->hash) {
char *hash = recur_event_hash(rev);
if (!hash_matches(filter->hash, hash)) {
recur_event_erase(rev);
rev = NULL;
}
mem_free(hash);
}
return rev;
}
char *recur_apoint_tostr(struct recur_apoint *o)