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

Add a grep mode

Browse Source 
This allows for printing a subset of the items in the data files by
using filters.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2014-08-07 16:34:48 +02:00
parent 9f24adfded
commit c2a9292bf4
2 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/args.c
View File

@ -365,7 +365,8 @@ cleanup:
int parse_args(int argc, char **argv) int parse_args(int argc, char **argv)
{ {
/* Command-line flags */ /* Command-line flags */
int status = 0, query = 0, next = 0, gc = 0, import = 0, export = 0; int grep = 0, query = 0, next = 0;
int status = 0, gc = 0, import = 0, export = 0;
/* Query ranges */ /* Query ranges */
long from = -1, range = -1, to = -1; long from = -1, range = -1, to = -1;
int limit = INT_MAX; int limit = INT_MAX;
@ -386,7 +387,7 @@ int parse_args(int argc, char **argv)
int ch; int ch;
regex_t reg; regex_t reg;
static const char *optstr = "ghvnNax::t::d:c:r::s::S:D:i:l:Q"; static const char *optstr = "gGhvnNax::t::d:c:r::s::S:D:i:l:Q";
struct option longopts[] = { struct option longopts[] = {
{"appointment", no_argument, NULL, 'a'}, {"appointment", no_argument, NULL, 'a'},
@ -394,6 +395,7 @@ int parse_args(int argc, char **argv)
{"day", required_argument, NULL, 'd'}, {"day", required_argument, NULL, 'd'},
{"directory", required_argument, NULL, 'D'}, {"directory", required_argument, NULL, 'D'},
{"gc", no_argument, NULL, 'g'}, {"gc", no_argument, NULL, 'g'},
{"grep", no_argument, NULL, 'G'},
{"help", no_argument, NULL, 'h'}, {"help", no_argument, NULL, 'h'},
{"import", required_argument, NULL, 'i'}, {"import", required_argument, NULL, 'i'},
{"limit", required_argument, NULL, 'l'}, {"limit", required_argument, NULL, 'l'},
@ -463,6 +465,9 @@ int parse_args(int argc, char **argv)
case 'g': case 'g':
gc = 1; gc = 1;
break; break;
case 'G':
grep = 1;
break;
case 'i': case 'i':
import = 1; import = 1;
ifile = optarg; ifile = optarg;
@ -629,7 +634,7 @@ int parse_args(int argc, char **argv)
if (filter.type_mask == 0) if (filter.type_mask == 0)
filter.type_mask = TYPE_MASK_ALL; filter.type_mask = TYPE_MASK_ALL;
if (status + query + next + gc + import + export > 1) { if (status + grep + query + next + gc + import + export > 1) {
ERROR_MSG(_("invalid argument combination")); ERROR_MSG(_("invalid argument combination"));
usage(); usage();
usage_try(); usage_try();
@ -654,6 +659,16 @@ int parse_args(int argc, char **argv)
if (status) { if (status) {
status_arg(); status_arg();
} else if (grep) {
io_check_file(path_apts);
io_check_file(path_todo);
io_check_file(path_conf);
vars_init();
config_load(); /* To get output date format. */
io_load_app(&filter);
io_load_todo(&filter);
io_save_todo(NULL);
io_save_apts(NULL);
} else if (query) { } else if (query) {
io_check_file(path_apts); io_check_file(path_apts);
io_check_file(path_todo); io_check_file(path_todo);

32
src/io.c
View File

@ -303,11 +303,15 @@ unsigned io_save_apts(const char *aptsfile)
llist_item_t *i; llist_item_t *i;
FILE *fp; FILE *fp;
if (read_only) if (aptsfile) {
return 1; if (read_only)
return 1;
if ((fp = fopen(aptsfile, "w")) == NULL) if ((fp = fopen(aptsfile, "w")) == NULL)
return 0; return 0;
} else {
fp = stdout;
}
recur_save_data(fp); recur_save_data(fp);
@ -324,7 +328,9 @@ unsigned io_save_apts(const char *aptsfile)
struct event *ev = LLIST_TS_GET_DATA(i); struct event *ev = LLIST_TS_GET_DATA(i);
event_write(ev, fp); event_write(ev, fp);
} }
file_close(fp, __FILE_POS__);
if (aptsfile)
file_close(fp, __FILE_POS__);
return 1; return 1;
} }
@ -335,17 +341,23 @@ unsigned io_save_todo(const char *todofile)
llist_item_t *i; llist_item_t *i;
FILE *fp; FILE *fp;
if (read_only) if (todofile) {
return 1; if (read_only)
return 1;
if ((fp = fopen(todofile, "w")) == NULL) if ((fp = fopen(todofile, "w")) == NULL)
return 0; return 0;
} else {
fp = stdout;
}
LLIST_FOREACH(&todolist, i) { LLIST_FOREACH(&todolist, i) {
struct todo *todo = LLIST_TS_GET_DATA(i); struct todo *todo = LLIST_TS_GET_DATA(i);
todo_write(todo, fp); todo_write(todo, fp);
} }
file_close(fp, __FILE_POS__);
if (todofile)
file_close(fp, __FILE_POS__);
return 1; return 1;
} }