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

Support relative dates when adding recurrences

Browse Source 
In commit f5d8b5e (Support durations in recurrence ending dates,
2016-02-25), we added support for the `+xxwxxd` syntax when specifying
recurrence end dates. However, this only worked when *editing* the
recurrence, not when converting a regular item to a recurrent one. Fix
this and support the new syntax in both cases.

Also, mention the new syntax in the prompt.

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lukas Fleischer 2016-04-01 08:50:35 +02:00
parent 2c9ea341cf
commit 1531425005
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/ui-day.c
View File

@ -256,7 +256,8 @@ static void update_rept(struct rpt **rpt, const long start)
int newmonth, newday, newyear; int newmonth, newday, newyear;
unsigned days; unsigned days;
asprintf(&outstr, _("Enter the new ending date: [%s] or '0'"), asprintf(&outstr,
_("Enter end date ([%s]), duration ([+xxwxxd]) or '0':"),
DATEFMT_DESC(conf.input_datefmt)); DATEFMT_DESC(conf.input_datefmt));
status_mesg(outstr, ""); status_mesg(outstr, "");
mem_free(outstr); mem_free(outstr);
@ -694,10 +695,10 @@ void ui_day_item_repeat(void)
const char *mesg_wrong_freq = const char *mesg_wrong_freq =
_("The frequence you entered is not valid."); _("The frequence you entered is not valid.");
const char *mesg_until_1 = const char *mesg_until_1 =
_("Enter the ending date: [%s] or '0' for an endless repetition"); _("Enter end date ([%s]), duration ([+xxwxxd]) or '0' for endless repetition:");
const char *mesg_wrong_1 = _("The entered date is not valid."); const char *mesg_wrong_1 = _("The entered date is not valid.");
const char *mesg_wrong_2 = const char *mesg_wrong_2 =
_("Possible formats are [%s] or '0' for an endless repetition"); _("Possible formats are [%s], [+xxwxxd] or '0'.");
const char *wrong_type_1 = const char *wrong_type_1 =
_("This item is already a repeated one."); _("This item is already a repeated one.");
const char *wrong_type_2 = _("Press [ENTER] to continue."); const char *wrong_type_2 = _("Press [ENTER] to continue.");
@ -714,6 +715,7 @@ void ui_day_item_repeat(void)
struct day_item *p; struct day_item *p;
struct recur_apoint *ra; struct recur_apoint *ra;
time_t until, date; time_t until, date;
unsigned days;
if (day_item_count(0) <= 0) if (day_item_count(0) <= 0)
goto cleanup; goto cleanup;
@ -764,12 +766,26 @@ void ui_day_item_repeat(void)
if (getstring(win[STA].p, user_input, BUFSIZ, 0, 1) != if (getstring(win[STA].p, user_input, BUFSIZ, 0, 1) !=
GETSTRING_VALID) GETSTRING_VALID)
goto cleanup; goto cleanup;
if (strlen(user_input) == 1 if (strlen(user_input) == 1 && strcmp(user_input, "0") == 0) {
&& strcmp(user_input, "0") == 0) {
until = 0; until = 0;
break; break;
} }
if (parse_date(user_input, conf.input_datefmt, if (*user_input == '+') {
if (!parse_date_duration(user_input + 1, &days)) {
asprintf(&outstr, mesg_wrong_2,
DATEFMT_DESC(conf.input_datefmt));
status_mesg(mesg_wrong_1, outstr);
mem_free(outstr);
wgetch(win[KEY].p);
continue;
}
t = p->start;
localtime_r(&t, &lt);
date_change(&lt, 0, days);
until_date.dd = lt.tm_mday;
until_date.mm = lt.tm_mon + 1;
until_date.yyyy = lt.tm_year + 1900;
} else if (parse_date(user_input, conf.input_datefmt,
&year, &month, &day, &year, &month, &day,
ui_calendar_get_slctd_day())) { ui_calendar_get_slctd_day())) {
t = p->start; t = p->start;
@ -777,18 +793,20 @@ void ui_day_item_repeat(void)
until_date.dd = day; until_date.dd = day;
until_date.mm = month; until_date.mm = month;
until_date.yyyy = year; until_date.yyyy = year;
until = date2sec(until_date, lt.tm_hour, lt.tm_min);
if (until >= p->start)
break;
status_mesg(mesg_older, wrong_type_2);
wgetch(win[KEY].p);
} else { } else {
asprintf(&outstr, mesg_wrong_2, asprintf(&outstr, mesg_wrong_2,
DATEFMT_DESC(conf.input_datefmt)); DATEFMT_DESC(conf.input_datefmt));
status_mesg(mesg_wrong_1, outstr); status_mesg(mesg_wrong_1, outstr);
mem_free(outstr); mem_free(outstr);
wgetch(win[KEY].p); wgetch(win[KEY].p);
continue;
} }
until = date2sec(until_date, lt.tm_hour, lt.tm_min);
if (until >= p->start)
break;
status_mesg(mesg_older, wrong_type_2);
wgetch(win[KEY].p);
} }
date = ui_calendar_get_slctd_day_sec(); date = ui_calendar_get_slctd_day_sec();