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

Do not prompt when non-interactive import fails

Browse Source 
When running calcurse in non-interactive mode, we should not expect any
user input. This is even more important in the case of iCal imports
which are used by calcurse-caldav to import events from CalDAV servers.

Partly fixes GitHub issue #73.

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lukas Fleischer 2017-11-16 20:51:13 +01:00
parent 691d6b33ee
commit 16e7aecd29
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/io.c
View File

@ -1137,8 +1137,7 @@ void io_load_keys(const char *pager)
file_close(log->fd, __FILE_POS__); file_close(log->fd, __FILE_POS__);
if (skipped > 0) { if (skipped > 0) {
const char *view_log = const char *view_log =
_("There were some errors when loading keys file, see log file?"); _("There were some errors when loading keys file.");
io_log_display(log, view_log, pager); io_log_display(log, view_log, pager);
} }
io_log_free(log); io_log_free(log);
@ -1414,9 +1413,7 @@ void io_import_data(enum import_type type, const char *stream_name,
*/ */
file_close(log->fd, __FILE_POS__); file_close(log->fd, __FILE_POS__);
if (stats.skipped > 0) { if (stats.skipped > 0) {
const char *view_log = const char *view_log = _("Some items could not be imported.");
_("Some items could not be imported, see log file?");
io_log_display(log, view_log, conf.pager); io_log_display(log, view_log, conf.pager);
} }
@ -1465,25 +1462,22 @@ void io_log_print(struct io_file *log, int line, const char *msg)
fprintf(log->fd, "line %d: %s\n", line, msg); fprintf(log->fd, "line %d: %s\n", line, msg);
} }
void io_log_display(struct io_file *log, const char *msg, void io_log_display(struct io_file *log, const char *msg, const char *pager)
const char *pager)
{ {
char *msgq;
RETURN_IF(log == NULL, _("No log file to display!")); RETURN_IF(log == NULL, _("No log file to display!"));
if (ui_mode == UI_CMDLINE) { if (ui_mode == UI_CMDLINE) {
printf("\n%s [y/n] ", msg); fprintf(stderr, "\n%s\n", msg);
if (fgetc(stdin) != 'y') fprintf(stderr, _("See %s for details."), log->name);
return; fputc('\n', stderr);
const char *arg[] = { pager, log->name, NULL };
int pid;
if ((pid = fork_exec(NULL, NULL, pager, arg)))
child_wait(NULL, NULL, pid);
} else { } else {
if (status_ask_bool(msg) == 1) { asprintf(&msgq, "%s %s", msg, _("Display log file?"));
if (status_ask_bool(msgq) == 1) {
const char *arg[] = { pager, log->name, NULL }; const char *arg[] = { pager, log->name, NULL };
wins_launch_external(arg); wins_launch_external(arg);
} }
mem_free(msgq);
wins_erase_status_bar(); wins_erase_status_bar();
} }
} }