diff options
| -rw-r--r-- | src/args.c | 15 | ||||
| -rw-r--r-- | src/calcurse.c | 6 | ||||
| -rw-r--r-- | src/calcurse.h | 1 | ||||
| -rw-r--r-- | src/io.c | 7 |
4 files changed, 15 insertions, 14 deletions
@@ -747,8 +747,7 @@ int parse_args(int argc, char **argv) io_check_file(path_conf); vars_init(); config_load(); /* To get output date format. */ - io_load_app(&filter); - io_load_todo(&filter); + io_load_data(&filter); io_save_todo(NULL); io_save_apts(NULL); } else if (query) { @@ -757,8 +756,7 @@ int parse_args(int argc, char **argv) io_check_file(path_conf); vars_init(); config_load(); /* To get output date format. */ - io_load_app(&filter); - io_load_todo(&filter); + io_load_data(&filter); int add_line = todo_arg(fmt_todo, &limit, &filter); date_arg_from_to(from, to, add_line, fmt_apt, fmt_rapt, fmt_ev, fmt_rev, &limit); @@ -769,24 +767,21 @@ int parse_args(int argc, char **argv) } else if (gc) { io_check_file(path_apts); io_check_file(path_todo); - io_load_app(NULL); - io_load_todo(NULL); + io_load_data(NULL); note_gc(); } else if (import) { io_check_file(path_apts); io_check_file(path_todo); /* Get default pager in case we need to show a log file. */ vars_init(); - io_load_app(NULL); - io_load_todo(NULL); + io_load_data(NULL); io_import_data(IO_IMPORT_ICAL, ifile); io_save_apts(path_apts); io_save_todo(path_todo); } else if (export) { io_check_file(path_apts); io_check_file(path_todo); - io_load_app(&filter); - io_load_todo(&filter); + io_load_data(&filter); io_export_data(xfmt); } else { /* interactive mode */ diff --git a/src/calcurse.c b/src/calcurse.c index 0d78000..364d0fa 100644 --- a/src/calcurse.c +++ b/src/calcurse.c @@ -332,8 +332,7 @@ static inline void key_generic_reload(void) recur_event_llist_init(); todo_init_list(); - io_load_todo(NULL); - io_load_app(NULL); + io_load_data(NULL); io_unset_modified(); ui_todo_load_items(); ui_todo_sel_reset(); @@ -683,8 +682,7 @@ int main(int argc, char **argv) config_load(); wins_erase_status_bar(); io_load_keys(conf.pager); - io_load_todo(NULL); - io_load_app(NULL); + io_load_data(NULL); io_unset_modified(); wins_slctd_set(conf.default_panel); wins_resize(); diff --git a/src/calcurse.h b/src/calcurse.h index 2c6dd00..dc5b13e 100644 --- a/src/calcurse.h +++ b/src/calcurse.h @@ -796,6 +796,7 @@ unsigned io_save_keys(void); void io_save_cal(enum save_display); void io_load_app(struct item_filter *); void io_load_todo(struct item_filter *); +void io_load_data(struct item_filter *); void io_load_keys(const char *); int io_check_dir(const char *); unsigned io_dir_exists(const char *); @@ -686,6 +686,13 @@ void io_load_todo(struct item_filter *filter) file_close(data_file, __FILE_POS__); } +/* Load appointments and todo items */ +void io_load_data(struct item_filter *filter) +{ + io_load_app(filter); + io_load_todo(filter); +} + static void load_keys_ht_getkey(struct ht_keybindings_s *data, const char **key, int *len) |