/*
- * $Id: abook.c,v 1.60 2006/09/04 18:29:24 cduval Exp $
+ * $Id$
*
* by JH <jheinonen@users.sourceforge.net>
*
char *datafile = NULL;
static char *rcfile = NULL;
+// custom formatting
+char custom_format[FORMAT_STRING_LEN] = "{nick} ({name}): {mobile}";
+struct abook_output_item_filter selected_item_filter;
+
bool alternative_datafile = FALSE;
bool alternative_rcfile = FALSE;
main(int argc, char **argv)
{
#if defined(HAVE_SETLOCALE) && defined(HAVE_LOCALE_H)
- setlocale(LC_ALL, "");
+ setlocale(LC_MESSAGES, "");
+ setlocale(LC_TIME, "");
+ setlocale(LC_CTYPE, "");
+ setlocale(LC_COLLATE, "");
#endif
-
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
*infile = "-",
*outfile = "-";
int c;
+ selected_item_filter = select_output_item_filter("muttq");
for(;;) {
int option_index = 0;
OPT_CONVERT,
OPT_INFORMAT,
OPT_OUTFORMAT,
+ OPT_OUTFORMAT_STR,
OPT_INFILE,
OPT_OUTFILE,
OPT_FORMATS
{ "convert", 0, 0, OPT_CONVERT },
{ "informat", 1, 0, OPT_INFORMAT },
{ "outformat", 1, 0, OPT_OUTFORMAT },
+ { "outformatstr", 1, 0, OPT_OUTFORMAT_STR },
{ "infile", 1, 0, OPT_INFILE },
{ "outfile", 1, 0, OPT_OUTFILE },
{ "formats", 0, 0, OPT_FORMATS },
{ 0, 0, 0, 0 }
};
- c = getopt_long(argc, argv, "hC:",
+ c = getopt_long(argc, argv, "hC:f:",
long_options, &option_index);
if(c == -1)
set_convert_var(informat);
break;
case OPT_OUTFORMAT:
- set_convert_var(outformat);
+ if(mode != MODE_CONVERT && mode != MODE_QUERY) {
+ fprintf(stderr,
+ _("please use option --outformat after --convert or --mutt-query option\n"));
+ exit(EXIT_FAILURE);
+ }
+ // ascii-name is stored, it's used to traverse
+ // e_filters[] in MODE_CONVERT (see export_file())
+ outformat = optarg;
+ // but in case a query-compatible filter is requested
+ // try to guess right now which one it is, from u_filters[]
+ selected_item_filter = select_output_item_filter(outformat);
+ break;
+ case OPT_OUTFORMAT_STR:
+ strncpy(custom_format, optarg, FORMAT_STRING_LEN);
+ custom_format[FORMAT_STRING_LEN - 1] = 0;
break;
case OPT_INFILE:
set_convert_var(infile);
}
}
+ // if the output format requested does not allow filtered querying
+ // (not in u_filter[]) and --convert has not been specified; bailout
+ if(! selected_item_filter.func && mode != MODE_CONVERT) {
+ printf("output format %s not supported or incompatible with --mutt-query\n", outformat);
+ exit(EXIT_FAILURE);
+ }
+ if(! selected_item_filter.func)
+ selected_item_filter = select_output_item_filter("muttq");
+ else if (! strcmp(outformat, "custom")) {
+ if(! *custom_format) {
+ fprintf(stderr, _("Invalid custom format string\n"));
+ exit(EXIT_FAILURE);
+ }
+ }
if(optind < argc) {
fprintf(stderr, _("%s: unrecognized arguments on command line\n"),
argv[0]);
static void
show_usage()
{
- puts (PACKAGE " v " VERSION "\n");
+ puts (PACKAGE " v" VERSION "\n");
puts (_(" -h --help show usage"));
puts (_(" -C --config <file> use an alternative configuration file"));
- puts (_(" --datafile <file> use an alternative addressbook file"));
+ puts (_(" -f --datafile <file> use an alternative addressbook file"));
puts (_(" --mutt-query <string> make a query for mutt"));
puts (_(" --add-email "
"read an e-mail message from stdin and\n"
puts (_(" (default: text)"));
puts (_(" --outfile <file> destination file"));
puts (_(" (default: stdout)"));
+ puts (_(" --outformatstr <str> format to use for \"custom\" --outformat"));
+ puts (_(" (default: \"{nick} ({name}): {mobile}\")"));
puts (_(" --formats list available formats"));
}
exit(status);
}
-static void
-muttq_print_item(FILE *file, int item)
-{
- abook_list *emails, *e;
- char *tmp = db_email_get(item);
-
- emails = csv_to_abook_list(tmp);
- free(tmp);
-
- for(e = emails; e; e = e->next) {
- fprintf(file, "%s\t%s\t%s\n", e->data, db_name_get(item),
- !db_fget(item, NOTES) ?" " :db_fget(item, NOTES)
- );
- if(!opt_get_bool(BOOL_MUTT_RETURN_ALL_EMAILS))
- break;
- }
- abook_list_free(&emails);
-}
-
static void
mutt_query(char *str)
{
init_mutt_query();
if( str == NULL || !strcasecmp(str, "all") ) {
- struct db_enumerator e = init_db_enumerator(ENUM_ALL);
- printf("All items\n");
- db_enumerate_items(e)
- muttq_print_item(stdout, e.item);
+ export_file("muttq", "-");
} else {
int search_fields[] = {NAME, EMAIL, NICK, -1};
int i;
printf("Not found\n");
quit_mutt_query(EXIT_FAILURE);
}
- putchar('\n');
+ // mutt expects a leading line containing
+ // a message about the query.
+ // Others output filter supporting query (vcard, custom)
+ // don't needs this.
+ if(!strcmp(selected_item_filter.filtname, "muttq"))
+ putchar('\n');
while(i >= 0) {
- muttq_print_item(stdout, i);
+ e_write_item(stdout, i, selected_item_filter.func);
i = find_item(str, i + 1, search_fields);
}
}
* --add-email handling
*/
-static int add_email_count = 0;
+static int add_email_count = 0, add_email_found = 0;
static void
quit_add_email()
exit(EXIT_FAILURE);
}
printf(_("%d item(s) added to %s\n"), add_email_count, datafile);
- } else {
+ } else if (add_email_found == 0) {
puts(_("Valid sender address not found"));
}
check_abook_directory();
init_opts();
load_opts(rcfile);
+ init_standard_fields();
atexit(free_opts);
/*
do {
line = getaline(stdin);
if(line && !strncasecmp("From:", line, 5) ) {
+ add_email_found++;
getname(line, &name, &email);
add_email_count += add_email_add_item(quiet,
name, email);
projects / pkg / abook.git / blobdiff