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

Support interactive test of recurrence rule extensions

Browse Source 
The generic command 'next' is introduced.

Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lars Henriksen 2020-02-10 16:14:26 +01:00 committed by Lukas Fleischer
parent f3779d5945
commit f2918b1700
3 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/calcurse.c
View File

@ -557,7 +557,7 @@ static inline void key_generic_cmd(void)
int valid = 0, force = 0, ret;
char *error_msg;
status_mesg(_("Command: [ h(elp) | w(rite)(!) | q(uit)(!) | wq(!) ]"), "");
status_mesg(_("Command: [ h(elp) | w(rite)(!) | q(uit)(!) | wq(!) | n(ext) ]"), "");
if (getstring(win[STA].p, cmd, BUFSIZ, 0, 1) != GETSTRING_VALID)
goto cleanup;
cmd_name = strtok(cmd, " ");
@ -609,6 +609,47 @@ static inline void key_generic_cmd(void)
valid = 1;
}
if (!strcmp(cmd_name, "next") || !strcmp(cmd_name, "n")) {
struct day_item *item;
time_t day, next;
struct recur_apoint *rapt;
struct recur_event *rev;
int more = 0;
if (wins_slctd() != APP) {
error_msg =
_("Select a repeating item in the appointments panel.");
warnbox(error_msg);
goto cleanup;
}
day = date2sec(*ui_calendar_get_slctd_day(), 0, 0);
item = ui_day_get_sel();
if (item->type == RECUR_EVNT) {
rev = item->item.rev;
more = recur_next_occurrence(rev->day, -1, rev->rpt, &rev->exc,
day, &next);
} else if (item->type == RECUR_APPT) {
rapt = item->item.rapt;
more = recur_next_occurrence(rapt->start, rapt->dur, rapt->rpt,
&rapt->exc, day, &next);
} else {
error_msg = _("Not a repeating item.");
warnbox(error_msg);
goto cleanup;
}
if (!more) {
error_msg = _("Last repetition.");
warnbox(error_msg);
goto cleanup;
}
item->start = next;
ui_calendar_set_slctd_day(sec2date(next));
day_set_sel_data(item);
do_storage(1);
valid = 1;
}
if (!valid) {
asprintf(&error_msg, _("No such command: %s"), cmd);
status_mesg(error_msg, "");

2
src/calcurse.h
View File

@ -1105,6 +1105,8 @@ void recur_apoint_check_next(struct notify_app *, time_t, time_t);
void recur_apoint_switch_notify(struct recur_apoint *);
void recur_event_paste_item(struct recur_event *, time_t);
void recur_apoint_paste_item(struct recur_apoint *, time_t);
int recur_next_occurrence(time_t, long, struct rpt *, llist_t *, time_t, time_t *);
/* sigs.c */
void sigs_init(void);

24
src/recur.c
View File

@ -1772,3 +1772,27 @@ void recur_apoint_paste_item(struct recur_apoint *rapt, time_t date)
if (notify_bar())
notify_check_repeated(rapt);
}
/*
* Finds the next occurrence of a recurrent item and returns it in the provided
* buffer. Useful for test of a repeated item.
*/
int recur_next_occurrence(time_t s, long d, struct rpt *r, llist_t *e,
time_t occur, time_t *next)
{
int ret = 0;
if (r->until && r->until <= occur)
return ret;
while (!r->until || occur < r->until) {
occur = NEXTDAY(occur);
if (!check_sec(&occur))
break;
if (recur_item_find_occurrence(s, d, r, e, occur, next)) {
ret = 1;
break;
}
}
return ret;
}