]> git.deb.at Git - pkg/abook.git/blobdiff - filter.c
ldif: support parsing from stdin
[pkg/abook.git] / filter.c
index a58868c5f8835352204a167cc4393dad7b2cc849..e928492e596ffeddc69d0c8c380a73d8978e97b9 100644 (file)
--- a/filter.c
+++ b/filter.c
 #include "xmalloc.h"
 #include <assert.h>
 
+#ifdef HAVE_VFORMAT
+#include "vcard.h"
+#endif
+
 extern abook_field_list *fields_list;
 extern int fields_count;
 
@@ -68,6 +72,14 @@ static int   wl_export_database(FILE *out, struct db_enumerator e);
 static int     bsdcal_export_database(FILE *out, struct db_enumerator e);
 static int     custom_export_database(FILE *out, struct db_enumerator e);
 
+/*
+ * export filter item prototypes
+ */
+
+void vcard_export_item(FILE *out, int item);
+void muttq_print_item(FILE *file, int item);
+void custom_print_item(FILE *out, int item);
+
 /*
  * end of function declarations
  */
@@ -100,11 +112,14 @@ struct abook_output_filter e_filters[] = {
        { "wl", N_("Wanderlust address book"), wl_export_database },
        { "spruce", N_("Spruce address book"), spruce_export_database },
        { "bsdcal", N_("BSD calendar"), bsdcal_export_database },
+       { "custom", N_("Custom format"), custom_export_database },
        { "\0", NULL, NULL }
 };
 
 struct abook_output_item_filter u_filters[] = {
+       { "vcard", N_("vCard 2 file"), vcard_export_item },
        { "muttq", N_("mutt alias"), muttq_print_item },
+       { "custom", N_("Custom format"), custom_print_item },
        { "\0", NULL }
 };
 
@@ -117,21 +132,21 @@ print_filters()
 {
        int i;
 
-       puts(_("input:"));
+       puts(_("input formats:"));
        for(i=0; *i_filters[i].filtname ; i++)
                printf("\t%s\t%s\n", i_filters[i].filtname,
                        gettext(i_filters[i].desc));
 
        putchar('\n');
 
-       puts(_("output:"));
+       puts(_("output formats:"));
        for(i=0; *e_filters[i].filtname ; i++)
                printf("\t%s\t%s\n", e_filters[i].filtname,
                        gettext(e_filters[i].desc));
 
        putchar('\n');
 
-       puts(_("output (with query):"));
+       puts(_("query-compatible output formats:"));
        for(i=0; *u_filters[i].filtname ; i++)
                printf("\t%s\t%s\n", u_filters[i].filtname,
                        gettext(u_filters[i].desc));
@@ -282,6 +297,18 @@ import_file(char filtname[FILTNAME_LEN], char *filename)
        if(i < 0)
                return -1;
 
+#ifdef HAVE_VFORMAT
+       // this is a special case for
+       // libvformat whose API expects a filename
+       if(!strcmp(filtname, "vcard")) {
+         if(!strcmp(filename, "-"))
+           ret = vcard_parse_file_libvformat("/dev/stdin");
+         else
+           ret = vcard_parse_file_libvformat(filename);
+       }
+       else
+#endif
+
        if(!strcmp(filename, "-")) {
                struct stat s;
                if((fstat(fileno(stdin), &s)) == -1 || S_ISDIR(s.st_mode))
@@ -520,35 +547,42 @@ static int ldif_conv_table[LDIF_ITEM_FIELDS] = {
        -1,             /* "objectclass" */ /* this must be the last entry */
 };
 
-
+/*
+  Handles multi-line strings.
+  If a string starts with a space, it's the continuation
+  of the previous line. Thus we need to always read ahead.
+  But for this to work with stdin, we need to stores the next
+  line for later use in case it's not a continuation of the
+  first line.
+ */
 static char *
-ldif_read_line(FILE *in)
+ldif_read_line(FILE *in, char **next_line)
 {
        char *buf = NULL;
        char *ptr, *tmp;
-       long pos;
-       int i;
+       char *line;
 
-       for(i = 1;;i++) {
-               char *line;
+       // buf filled with the first line
+       if(!*next_line)
+               buf = getaline(in);
+       else {
+               buf = xstrdup(*next_line);
+               xfree(*next_line);
+       }
 
-               pos = ftell(in);
+       while(!feof(in)) {
+               // if no line already read-ahead.
                line = getaline(in);
+               if(!line) break;
 
-               if(feof(in) || !line)
-                       break;
-
-               if(i == 1) {
-                       buf = line;
-                       continue;
-               }
-
+               // this is not a continuation of what is already in buf
+               // store it for the next round
                if(*line != ' ') {
-                       fseek(in, pos, SEEK_SET); /* fixme ! */
-                       free(line);
+                       *next_line = line;
                        break;
                }
 
+               // starts with ' ': this is the continuation of buf
                ptr = line;
                while( *ptr == ' ')
                        ptr++;
@@ -603,16 +637,10 @@ ldif_convert(ldif_item item, char *type, char *value)
                return;
        }
 
-       for(i=0; i < LDIF_ITEM_FIELDS; i++) {
-               if(!safe_strcmp(ldif_field_names[i], type) && *value) {
-                       if(i == LDIF_ITEM_FIELDS - 1) /* this is a dirty hack */
-                               if(safe_strcmp("person", value))
-                                       break;
-
-                       if(item_fget(item, i))
-                               free(item_fget(item, i));
-
+       for(i=0; i < LDIF_ITEM_FIELDS - 1; i++) {
+                if(!strcasecmp(ldif_field_names[i], type) && *value) {
                        item_fput(item, i, xstrdup(value));
+                       break;
                }
        }
 }
@@ -621,6 +649,7 @@ static int
 ldif_parse_file(FILE *handle)
 {
        char *line = NULL;
+       char *next_line = NULL;
        char *type, *value;
        int vlen;
        ldif_item item;
@@ -628,8 +657,10 @@ ldif_parse_file(FILE *handle)
        memset(item, 0, sizeof(item));
 
        do {
-               if( !(line = ldif_read_line(handle)) )
-                       continue;
+               line = ldif_read_line(handle, &next_line);
+
+               // EOF or empty lines: continue;
+               if(!line || *line == '\0') continue;
 
                if(-1 == (str_parse_line(line, &type, &value, &vlen))) {
                        xfree(line);
@@ -1850,74 +1881,77 @@ palm_export_database(FILE *out, struct db_enumerator e)
 
 static int
 vcard_export_database(FILE *out, struct db_enumerator e)
+{
+  db_enumerate_items(e)
+    vcard_export_item(out, e.item);
+  return 0;
+}
+
+void
+vcard_export_item(FILE *out, int item)
 {
        int j;
        char *name, *tmp;
        abook_list *emails, *em;
+       fprintf(out, "BEGIN:VCARD\r\nFN:%s\r\n",
+               safe_str(db_name_get(item)));
 
-       db_enumerate_items(e) {
-               fprintf(out, "BEGIN:VCARD\r\nFN:%s\r\n",
-                               safe_str(db_name_get(e.item)));
-
-               name = get_surname(db_name_get(e.item));
-               for( j = strlen(db_name_get(e.item)) - 1; j >= 0; j-- ) {
-                       if((db_name_get(e.item))[j] == ' ')
-                               break;
-               }
-               fprintf(out, "N:%s;%.*s\r\n",
-                       safe_str(name),
-                       j,
-                       safe_str(db_name_get(e.item))
-                       );
-
-               free(name);
-
-               if(db_fget(e.item, ADDRESS))
-                       fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\r\n",
-                               safe_str(db_fget(e.item, ADDRESS)),
-                               safe_str(db_fget(e.item, ADDRESS2)),
-                               safe_str(db_fget(e.item, CITY)),
-                               safe_str(db_fget(e.item, STATE)),
-                               safe_str(db_fget(e.item, ZIP)),
-                               safe_str(db_fget(e.item, COUNTRY))
-                               );
-
-               if(db_fget(e.item, PHONE))
-                       fprintf(out, "TEL;HOME:%s\r\n",
-                                       db_fget(e.item, PHONE));
-               if(db_fget(e.item, WORKPHONE))
-                       fprintf(out, "TEL;WORK:%s\r\n",
-                                       db_fget(e.item, WORKPHONE));
-               if(db_fget(e.item, FAX))
-                       fprintf(out, "TEL;FAX:%s\r\n",
-                                       db_fget(e.item, FAX));
-               if(db_fget(e.item, MOBILEPHONE))
-                       fprintf(out, "TEL;CELL:%s\r\n",
-                                       db_fget(e.item, MOBILEPHONE));
-
-               tmp = db_email_get(e.item);
-               if(*tmp) {
-                       emails = csv_to_abook_list(tmp);
-
-                       for(em = emails; em; em = em->next)
-                               fprintf(out, "EMAIL;INTERNET:%s\r\n", em->data);
-
-                       abook_list_free(&emails);
-               }
-               free(tmp);
-
-               if(db_fget(e.item, NOTES))
-                       fprintf(out, "NOTE:%s\r\n",
-                                       db_fget(e.item, NOTES));
-               if(db_fget(e.item, URL))
-                       fprintf(out, "URL:%s\r\n",
-                                       db_fget(e.item, URL));
+       name = get_surname(db_name_get(item));
+       for( j = strlen(db_name_get(item)) - 1; j >= 0; j-- ) {
+         if((db_name_get(item))[j] == ' ')
+           break;
+       }
+       fprintf(out, "N:%s;%.*s\r\n",
+               safe_str(name),
+               j,
+               safe_str(db_name_get(item))
+               );
+
+       free(name);
+
+       if(db_fget(item, ADDRESS))
+         fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\r\n",
+                 safe_str(db_fget(item, ADDRESS)),
+                 safe_str(db_fget(item, ADDRESS2)),
+                 safe_str(db_fget(item, CITY)),
+                 safe_str(db_fget(item, STATE)),
+                 safe_str(db_fget(item, ZIP)),
+                 safe_str(db_fget(item, COUNTRY))
+                 );
+
+       if(db_fget(item, PHONE))
+         fprintf(out, "TEL;HOME:%s\r\n",
+                 db_fget(item, PHONE));
+       if(db_fget(item, WORKPHONE))
+         fprintf(out, "TEL;WORK:%s\r\n",
+                 db_fget(item, WORKPHONE));
+       if(db_fget(item, FAX))
+         fprintf(out, "TEL;FAX:%s\r\n",
+                 db_fget(item, FAX));
+       if(db_fget(item, MOBILEPHONE))
+         fprintf(out, "TEL;CELL:%s\r\n",
+                 db_fget(item, MOBILEPHONE));
+
+       tmp = db_email_get(item);
+       if(*tmp) {
+         emails = csv_to_abook_list(tmp);
+
+         for(em = emails; em; em = em->next)
+           fprintf(out, "EMAIL;INTERNET:%s\r\n", em->data);
+
+         abook_list_free(&emails);
+       }
+       free(tmp);
 
-               fprintf(out, "END:VCARD\r\n\r\n");
+       if(db_fget(item, NOTES))
+         fprintf(out, "NOTE:%s\r\n",
+                 db_fget(item, NOTES));
+       if(db_fget(item, URL))
+         fprintf(out, "URL:%s\r\n",
+                 db_fget(item, URL));
 
-       }
+       fprintf(out, "END:VCARD\r\n\r\n");
 
-       return 0;
 }
 
 /*