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

Extend date formats for filters

Browse Source 
Allow for specifying both date and time in all dates and date ranges
used in filters.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2014-08-09 12:56:13 +02:00
parent e1af76eb8d
commit 519107dc47
1 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/args.c
View File

@ -329,6 +329,40 @@ static int parse_datearg(const char *str)
return -1; return -1;
} }
static int parse_datetimearg(const char *str)
{
char *date = mem_strdup(str);
char *time;
unsigned hour, min;
long ret;
time = strchr(date, ' ');
if (time) {
/* Date and time. */
*time = '\0';
time++;
if (!parse_time(time, &hour, &min))
return -1;
ret = parse_datearg(date);
if (!ret)
return -1;
ret += hour * HOURINSEC + min * MININSEC;
return ret;
}
ret = parse_datearg(date);
if (!ret) {
/* No date specified, use time only. */
if (!parse_time(time, &hour, &min))
return -1;
return get_today() + hour * HOURINSEC + min * MININSEC;
}
return ret;
}
static int parse_daterange(const char *str, long *date_from, long *date_to) static int parse_daterange(const char *str, long *date_from, long *date_to)
{ {
int ret = 0; int ret = 0;
@ -342,7 +376,7 @@ static int parse_daterange(const char *str, long *date_from, long *date_to)
p++; p++;
if (*s != '\0') { if (*s != '\0') {
*date_from = parse_datearg(s); *date_from = parse_datetimearg(s);
if (*date_from == -1) if (*date_from == -1)
goto cleanup; goto cleanup;
} else { } else {
@ -350,7 +384,7 @@ static int parse_daterange(const char *str, long *date_from, long *date_to)
} }
if (*p != '\0') { if (*p != '\0') {
*date_to = parse_datearg(p); *date_to = parse_datetimearg(p);
if (*date_to == -1) if (*date_to == -1)
goto cleanup; goto cleanup;
} else { } else {
@ -486,7 +520,7 @@ int parse_args(int argc, char **argv)
if (is_all_digit(optarg)) { if (is_all_digit(optarg)) {
range = atoi(optarg); range = atoi(optarg);
} else { } else {
from = parse_datearg(optarg); from = parse_datetimearg(optarg);
EXIT_IF(from == -1, _("invalid date: %s"), EXIT_IF(from == -1, _("invalid date: %s"),
optarg); optarg);
} }
@ -526,7 +560,7 @@ int parse_args(int argc, char **argv)
query = 1; query = 1;
break; break;
case 's': case 's':
from = parse_datearg(optarg); from = parse_datetimearg(optarg);
EXIT_IF(from == -1, _("invalid date: %s"), optarg); EXIT_IF(from == -1, _("invalid date: %s"), optarg);
filter.type_mask |= TYPE_MASK_CAL; filter.type_mask |= TYPE_MASK_CAL;
query = 1; query = 1;
@ -578,22 +612,22 @@ int parse_args(int argc, char **argv)
filter.regex = &reg; filter.regex = &reg;
break; break;
case OPT_FILTER_START_FROM: case OPT_FILTER_START_FROM:
filter.start_from = parse_datearg(optarg); filter.start_from = parse_datetimearg(optarg);
EXIT_IF(filter.start_from == -1, EXIT_IF(filter.start_from == -1,
_("invalid date: %s"), optarg); _("invalid date: %s"), optarg);
break; break;
case OPT_FILTER_START_TO: case OPT_FILTER_START_TO:
filter.start_to = parse_datearg(optarg); filter.start_to = parse_datetimearg(optarg);
EXIT_IF(filter.start_to == -1, EXIT_IF(filter.start_to == -1,
_("invalid date: %s"), optarg); _("invalid date: %s"), optarg);
break; break;
case OPT_FILTER_START_AFTER: case OPT_FILTER_START_AFTER:
filter.start_from = parse_datearg(optarg) + 1; filter.start_from = parse_datetimearg(optarg) + 1;
EXIT_IF(filter.start_from == -1, EXIT_IF(filter.start_from == -1,
_("invalid date: %s"), optarg); _("invalid date: %s"), optarg);
break; break;
case OPT_FILTER_START_BEFORE: case OPT_FILTER_START_BEFORE:
filter.start_to = parse_datearg(optarg) - 1; filter.start_to = parse_datetimearg(optarg) - 1;
EXIT_IF(filter.start_to == -1, EXIT_IF(filter.start_to == -1,
_("invalid date: %s"), optarg); _("invalid date: %s"), optarg);
break; break;
@ -603,22 +637,22 @@ int parse_args(int argc, char **argv)
_("invalid date range: %s"), optarg); _("invalid date range: %s"), optarg);
break; break;
case OPT_FILTER_END_FROM: case OPT_FILTER_END_FROM:
filter.end_from = parse_datearg(optarg); filter.end_from = parse_datetimearg(optarg);
EXIT_IF(filter.end_from == -1, EXIT_IF(filter.end_from == -1,
_("invalid date: %s"), optarg); _("invalid date: %s"), optarg);
break; break;
case OPT_FILTER_END_TO: case OPT_FILTER_END_TO:
filter.end_to = parse_datearg(optarg); filter.end_to = parse_datetimearg(optarg);
EXIT_IF(filter.end_to == -1, EXIT_IF(filter.end_to == -1,
_("invalid date: %s"), optarg); _("invalid date: %s"), optarg);
break; break;
case OPT_FILTER_END_AFTER: case OPT_FILTER_END_AFTER:
filter.end_from = parse_datearg(optarg) + 1; filter.end_from = parse_datetimearg(optarg) + 1;
EXIT_IF(filter.end_from == -1, EXIT_IF(filter.end_from == -1,
_("invalid date: %s"), optarg); _("invalid date: %s"), optarg);
break; break;
case OPT_FILTER_END_BEFORE: case OPT_FILTER_END_BEFORE:
filter.end_to = parse_datearg(optarg) - 1; filter.end_to = parse_datetimearg(optarg) - 1;
EXIT_IF(filter.end_to == -1, EXIT_IF(filter.end_to == -1,
_("invalid date: %s"), optarg); _("invalid date: %s"), optarg);
break; break;
@ -639,11 +673,11 @@ int parse_args(int argc, char **argv)
filter.uncompleted = 1; filter.uncompleted = 1;
break; break;
case OPT_FROM: case OPT_FROM:
from = parse_datearg(optarg); from = parse_datetimearg(optarg);
EXIT_IF(from == -1, _("invalid date: %s"), optarg); EXIT_IF(from == -1, _("invalid date: %s"), optarg);
break; break;
case OPT_TO: case OPT_TO:
to = parse_datearg(optarg); to = parse_datetimearg(optarg);
EXIT_IF(to == -1, _("invalid date: %s"), optarg); EXIT_IF(to == -1, _("invalid date: %s"), optarg);
break; break;
case OPT_DAYS: case OPT_DAYS: