mutt-query (3/3): register the --mutt-query-format per-item filter and use it

[pkg/abook.git] / abook.c

diff --git a/abook.c b/abook.c
index f4675b2887b521d982f6a79de1d3e0b0ded683ff..e9f8841dccee9c3eb23be9a2e882e3be2fdcb99f 100644 (file)
--- a/abook.c
+++ b/abook.c
@@ -8,6 +8,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <ctype.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -32,6 +33,7 @@
 #include "options.h"
 #include "getname.h"
 #include "getopt.h"
+#include "views.h"
 #include "xmalloc.h"
 
 static void             init_abook();
@@ -48,9 +50,12 @@ static void          add_email(int);
 char *datafile = NULL;
 static char *rcfile = NULL;
 
+struct abook_output_item_filter selected_item_filter;
+
 bool alternative_datafile = FALSE;
 bool alternative_rcfile = FALSE;
 
+
 static int
 datafile_writeable()
 {
@@ -125,16 +130,19 @@ init_abook()
                printf(_("Press enter to continue...\n"));
                fgetc(stdin);
        }
+       init_default_views();
 
        signal(SIGTERM, quit_abook_sig);
 
+       init_index();
+
        if(init_ui())
                exit(EXIT_FAILURE);
 
        umask(DEFAULT_UMASK);
 
        if(!datafile_writeable()) {
-               char *s = mkstr(_("File %s is not writeable"), datafile);
+               char *s = strdup_printf(_("File %s is not writeable"), datafile);
                refresh_screen();
                statusline_msg(s);
                free(s);
@@ -181,14 +189,18 @@ int
 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);
 
        xmalloc_set_error_handler(xmalloc_error_handler);
 
+       prepare_database_internals();
+
        parse_command_line(argc, argv);
 
        init_abook();
@@ -293,6 +305,7 @@ parse_command_line(int argc, char **argv)
                *infile = "-",
                *outfile = "-";
        int c;
+       selected_item_filter = select_output_item_filter("muttq");
 
        for(;;) {
                int option_index = 0;
@@ -358,7 +371,8 @@ parse_command_line(int argc, char **argv)
                                set_convert_var(informat);
                                break;
                        case OPT_OUTFORMAT:
-                               set_convert_var(outformat);
+                               outformat = optarg;
+                               selected_item_filter = select_output_item_filter(outformat);
                                break;
                        case OPT_INFILE:
                                set_convert_var(infile);
@@ -374,7 +388,9 @@ parse_command_line(int argc, char **argv)
                }
        }
 
-       if (optind < argc) {
+       if(! selected_item_filter.func)
+               selected_item_filter = select_output_item_filter("muttq");
+       if(optind < argc) {
                fprintf(stderr, _("%s: unrecognized arguments on command line\n"),
                                argv[0]);
                exit(EXIT_FAILURE);
@@ -407,7 +423,7 @@ show_usage()
                "add the sender to the addressbook"));
        puts    (_("    --add-email-quiet               "
                "same as --add-email but doesn't\n"
-               "                                       confirm adding"));
+               "                                       require to confirm adding"));
        putchar('\n');
        puts    (_("    --convert                       convert address book files"));
        puts    (_("    options to use with --convert:"));
@@ -426,7 +442,6 @@ show_usage()
  * end of CLI
  */
 
-extern list_item *database;
 
 static void
 quit_mutt_query(int status)
@@ -437,34 +452,13 @@ quit_mutt_query(int status)
        exit(status);
 }
 
-static void
-muttq_print_item(FILE *file, int item)
-{
-       char emails[MAX_EMAILS][MAX_EMAIL_LEN];
-       int i;
-
-       split_emailstr(item, emails);
-
-       for(i = 0; i < (opt_get_bool(BOOL_MUTT_RETURN_ALL_EMAILS) ?
-                       MAX_EMAILS : 1) ; i++)
-               if( *emails[i] )
-                       fprintf(file, "%s\t%s\t%s\n", emails[i],
-                               database[item][NAME],
-                               database[item][NOTES] == NULL ? " " :
-                                       database[item][NOTES]
-                               );
-}
-
 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;
@@ -474,7 +468,7 @@ mutt_query(char *str)
                }
                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);
                }
        }
@@ -502,12 +496,12 @@ make_mailstr(int item)
 {
        char email[MAX_EMAIL_LEN];
        char *ret;
-       char *name = mkstr("\"%s\"", database[item][NAME]);
+       char *name = strdup_printf("\"%s\"", db_name_get(item));
 
        get_first_email(email, item);
 
-       ret = *database[item][EMAIL] ?
-               mkstr("%s <%s>", name, email) :
+       ret = *email ?
+               strdup_printf("%s <%s>", name, email) :
                xstrdup(name);
 
        free(name);
@@ -576,10 +570,10 @@ launch_wwwbrowser(int item)
        if( !is_valid_item(item) )
                return;
 
-       if( database[item][URL] )
-               cmd = mkstr("%s '%s'",
+       if(db_fget(item, URL))
+               cmd = strdup_printf("%s '%s'",
                                opt_get_str(STR_WWW_COMMAND),
-                               safe_str(database[item][URL]));
+                               safe_str(db_fget(item, URL)));
        else
                return;
 
@@ -616,7 +610,7 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
        int ret=0;
 
        if( !srcformat || !srcfile || !dstformat || !dstfile ) {
-               fprintf(stderr, _("too few argumets to make conversion\n"));
+               fprintf(stderr, _("too few arguments to make conversion\n"));
                fprintf(stderr, _("try --help\n"));
        }
 
@@ -631,6 +625,7 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
        set_filenames();
        init_opts();
        load_opts(rcfile);
+       init_standard_fields();
 
        switch(import_file(srcformat, srcfile)) {
                case -1:
@@ -699,6 +694,7 @@ init_add_email()
        check_abook_directory();
        init_opts();
        load_opts(rcfile);
+       init_standard_fields();
        atexit(free_opts);
 
        /*
@@ -736,24 +732,26 @@ add_email_add_item(int quiet, char *name, char *email)
                }
 
                do {
-                       /* TODO gettext: handle translated keypresses? */
-                       printf(_("Add ``%s <%s>'' to %s ? (y/n)\n"),
+                       printf(_("Add \"%s <%s>\" to %s? (%c/%c)\n"),
                                        name,
                                        email,
-                                       datafile);
-                       c = getc(in);
-                       if(c == 'n' || c == 'N') {
+                                       datafile,
+                                       *S_("keybinding for yes|y"),
+                                       *S_("keybinding for no|n"));
+                       c = tolower(getc(in));
+                       if(c == *S_("keybinding for no|n")) {
                                fclose(in);
                                return 0;
                        }
-               } while(c != 'y' && c != 'Y');
+               } while(c != *S_("keybinding for yes|y"));
                fclose(in);
        }
 
-       memset(item, 0, sizeof(item));
-       item[NAME] = xstrdup(name);
-       item[EMAIL] = xstrdup(email);
+       item = item_create();
+       item_fput(item, NAME, xstrdup(name));
+       item_fput(item, EMAIL, xstrdup(email));
        add_item2database(item);
+       item_free(&item);
 
        return 1;
 }