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

extract_data() renamed to io_extract_data() and save_cal() to io_save_cal()

Browse Source
This commit is contained in:
Frederic Culot 2007-03-24 23:20:49 +00:00
parent e71a6eff06
commit ac6dfd27b8
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/io.c
View File

@ -1,4 +1,4 @@
/* $calcurse: io.c,v 1.12 2007/03/17 16:55:27 culot Exp $ */ /* $calcurse: io.c,v 1.13 2007/03/24 23:20:49 culot Exp $ */
/* /*
* Calcurse - text-based organizer * Calcurse - text-based organizer
@ -44,7 +44,6 @@
#include "apoint.h" #include "apoint.h"
#include "recur.h" #include "recur.h"
#include "io.h" #include "io.h"
#include "vars.h"
typedef enum { typedef enum {
PROGRESS_BAR_SAVE, PROGRESS_BAR_SAVE,
@ -384,7 +383,8 @@ io_init(char *cfile)
} }
/* get data from file */ /* get data from file */
void extract_data(char *dst_data, const char *org, int len) void
io_extract_data(char *dst_data, const char *org, int len)
{ {
for (;;) { for (;;) {
if (*org == '\n' || *org == '\0') if (*org == '\n' || *org == '\0')
@ -396,9 +396,7 @@ void extract_data(char *dst_data, const char *org, int len)
/* Save the calendar data */ /* Save the calendar data */
void void
save_cal(bool auto_save, bool confirm_quit, bool confirm_delete, io_save_cal(conf_t *conf, int layout)
bool skip_system_dialogs, bool skip_progress_bar,
bool week_begins_on_monday, int layout)
{ {
FILE *data_file; FILE *data_file;
struct event_s *k; struct event_s *k;
@ -412,7 +410,7 @@ save_cal(bool auto_save, bool confirm_quit, bool confirm_delete,
char *enter = _("Press [ENTER] to continue"); char *enter = _("Press [ENTER] to continue");
bool show_bar = false; bool show_bar = false;
if (!skip_progress_bar) if (!conf->skip_progress_bar)
show_bar = true; show_bar = true;
/* Save the user configuration. */ /* Save the user configuration. */
@ -430,38 +428,36 @@ save_cal(bool auto_save, bool confirm_quit, bool confirm_delete,
fprintf(data_file, fprintf(data_file,
"# If this option is set to yes, automatic save is done when quitting\n"); "# If this option is set to yes, automatic save is done when quitting\n");
fprintf(data_file, "auto_save=\n"); fprintf(data_file, "auto_save=\n");
fprintf(data_file, "%s\n", fprintf(data_file, "%s\n", (conf->auto_save) ? "yes" : "no");
(auto_save) ? "yes" : "no");
fprintf(data_file, fprintf(data_file,
"\n# If this option is set to yes, confirmation is required before quitting\n"); "\n# If this option is set to yes, confirmation is required before quitting\n");
fprintf(data_file, "confirm_quit=\n"); fprintf(data_file, "confirm_quit=\n");
fprintf(data_file, "%s\n", fprintf(data_file, "%s\n", (conf->confirm_quit) ? "yes" : "no");
(confirm_quit) ? "yes" : "no");
fprintf(data_file, fprintf(data_file,
"\n# If this option is set to yes, confirmation is required before deleting an event\n"); "\n# If this option is set to yes, confirmation is required before deleting an event\n");
fprintf(data_file, "confirm_delete=\n"); fprintf(data_file, "confirm_delete=\n");
fprintf(data_file, "%s\n", fprintf(data_file, "%s\n",
(confirm_delete) ? "yes" : "no"); (conf->confirm_delete) ? "yes" : "no");
fprintf(data_file, fprintf(data_file,
"\n# If this option is set to yes, messages about loaded and saved data will not be displayed\n"); "\n# If this option is set to yes, messages about loaded and saved data will not be displayed\n");
fprintf(data_file, "skip_system_dialogs=\n"); fprintf(data_file, "skip_system_dialogs=\n");
fprintf(data_file, "%s\n", fprintf(data_file, "%s\n",
(skip_system_dialogs) ? "yes" : "no"); (conf->skip_system_dialogs) ? "yes" : "no");
fprintf(data_file, fprintf(data_file,
"\n# If this option is set to yes, progress bar appearing when saving data will not be displayed\n"); "\n# If this option is set to yes, progress bar appearing when saving data will not be displayed\n");
fprintf(data_file, "skip_progress_bar=\n"); fprintf(data_file, "skip_progress_bar=\n");
fprintf(data_file, "%s\n", fprintf(data_file, "%s\n",
(skip_progress_bar) ? "yes" : "no"); (conf->skip_progress_bar) ? "yes" : "no");
fprintf(data_file, fprintf(data_file,
"\n# If this option is set to yes, monday is the first day of the week, else it is sunday\n"); "\n# If this option is set to yes, monday is the first day of the week, else it is sunday\n");
fprintf(data_file, "week_begins_on_monday=\n"); fprintf(data_file, "week_begins_on_monday=\n");
fprintf(data_file, "%s\n", fprintf(data_file, "%s\n",
(week_begins_on_monday) ? "yes" : "no"); (conf->week_begins_on_monday) ? "yes" : "no");
fprintf(data_file, fprintf(data_file,
"\n# This is the color theme used for menus :\n"); "\n# This is the color theme used for menus :\n");
@ -539,7 +535,7 @@ save_cal(bool auto_save, bool confirm_quit, bool confirm_delete,
/* Print a message telling data were saved */ /* Print a message telling data were saved */
if (!skip_system_dialogs){ if (!conf->skip_system_dialogs) {
status_mesg(save_success, enter); status_mesg(save_success, enter);
wgetch(swin); wgetch(swin);
} }
@ -721,7 +717,7 @@ load_todo(void)
if (nl) { if (nl) {
*nl = '\0'; *nl = '\0';
} }
extract_data(e_todo, buf, strlen(buf)); io_extract_data(e_todo, buf, strlen(buf));
todo_add(e_todo, id); todo_add(e_todo, id);
++nb_tod; ++nb_tod;
} }
@ -795,7 +791,7 @@ startup_screen(bool skip_dialogs, int no_data_file)
/* Export calcurse data. */ /* Export calcurse data. */
void void
io_export_data(export_mode_t mode, bool skip_dialogs, bool skip_bar) io_export_data(export_mode_t mode, conf_t *conf)
{ {
FILE *stream; FILE *stream;
char *wrong_mode = char *wrong_mode =
@ -818,17 +814,17 @@ io_export_data(export_mode_t mode, bool skip_dialogs, bool skip_bar)
io_export_header(stream); io_export_header(stream);
if (!skip_bar) if (!conf->skip_progress_bar && mode == IO_EXPORT_INTERACTIVE)
progress_bar(PROGRESS_BAR_EXPORT, 0); progress_bar(PROGRESS_BAR_EXPORT, 0);
io_export_recur_events(stream); io_export_recur_events(stream);
io_export_events(stream); io_export_events(stream);
if (!skip_bar) if (!conf->skip_progress_bar && mode == IO_EXPORT_INTERACTIVE)
progress_bar(PROGRESS_BAR_EXPORT, 1); progress_bar(PROGRESS_BAR_EXPORT, 1);
io_export_recur_apoints(stream); io_export_recur_apoints(stream);
io_export_apoints(stream); io_export_apoints(stream);
if (!skip_bar) if (!conf->skip_progress_bar && mode == IO_EXPORT_INTERACTIVE)
progress_bar(PROGRESS_BAR_EXPORT, 2); progress_bar(PROGRESS_BAR_EXPORT, 2);
io_export_todo(stream); io_export_todo(stream);
@ -837,7 +833,7 @@ io_export_data(export_mode_t mode, bool skip_dialogs, bool skip_bar)
if (stream != stdout) if (stream != stdout)
fclose(stream); fclose(stream);
if (!skip_dialogs) { if (!conf->skip_system_dialogs && mode == IO_EXPORT_INTERACTIVE) {
status_mesg(success, enter); status_mesg(success, enter);
wgetch(swin); wgetch(swin);
} }