From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 35505431FCB for ; Sat, 19 Dec 2009 06:56:04 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y6RtE5gCMQK0 for ; Sat, 19 Dec 2009 06:56:02 -0800 (PST) Received: from pivot.cs.unb.ca (pivot.cs.unb.ca [131.202.240.57]) by olra.theworths.org (Postfix) with ESMTP id 13AD4431FBF for ; Sat, 19 Dec 2009 06:56:02 -0800 (PST) Received: from fctnnbsc30w-142167182194.pppoe-dynamic.high-speed.nb.bellaliant.net ([142.167.182.194] helo=localhost) by pivot.cs.unb.ca with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1NM0iv-0003aS-H0; Sat, 19 Dec 2009 10:56:01 -0400 Received: from bremner by localhost with local (Exim 4.69) (envelope-from ) id 1NM0iq-0006ec-27; Sat, 19 Dec 2009 10:55:56 -0400 From: david@tethera.net To: notmuch@notmuchmail.org Date: Sat, 19 Dec 2009 10:55:24 -0400 Message-Id: <1261234524-25522-4-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.6.5.3 In-Reply-To: <1261234524-25522-3-git-send-email-david@tethera.net> References: <87iqc4yyo8.fsf@yoom.home.cworth.org> <1261234524-25522-1-git-send-email-david@tethera.net> <1261234524-25522-2-git-send-email-david@tethera.net> <1261234524-25522-3-git-send-email-david@tethera.net> X-Sender-Verified: bremner@pivot.cs.unb.ca Cc: David Bremner Subject: [PATCH 3/3] notmuch-show.c: prototype tabular output format, with output control X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Dec 2009 14:56:04 -0000 From: David Bremner Currently this only outputs the information from the "message header"; i.e. the part before the rfc2822 header or body. Adding this required adding an extra parameter, currently unused, to format_message_text and format_message_json. Also the struct definition is changed to match the new function prototypes. An int (enum) is used as a mask, each bit corresponds to some part to be shown or not shown. This enum will need to be extended as more things are controllable via --show. --- notmuch-show.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 77 insertions(+), 12 deletions(-) diff --git a/notmuch-show.c b/notmuch-show.c index 51aa87d..99a4d3c 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -20,10 +20,18 @@ #include "notmuch-client.h" +/* These should be powers of 2 */ +typedef enum {SHOW_MESSAGE_ID = 1, + SHOW_MATCH = 2, + SHOW_FILENAME = 4 +} show_mask_t; + +static const show_mask_t SHOW_ALL = ~0; + typedef struct show_format { const char *message_set_start; const char *message_start; - void (*message) (const void *ctx, + void (*message) (const void *ctx, show_mask_t show_mask, notmuch_message_t *message, int indent); const char *header_start; @@ -40,7 +48,7 @@ typedef struct show_format { } show_format_t; static void -format_message_text (unused (const void *ctx), +format_message_text (unused (const void *ctx), show_mask_t show_mask, notmuch_message_t *message, int indent); static void @@ -59,7 +67,21 @@ static const show_format_t format_text = { }; static void -format_message_json (const void *ctx, +format_message_tabular (unused (const void *ctx), show_mask_t show_mask, + notmuch_message_t *message, + int indent); + +static const show_format_t format_tabular = { + "", + "", format_message_tabular, + "", NULL, "", + "", NULL, "", + "\n", "", + "" +}; + +static void +format_message_json (const void *ctx, show_mask_t show_mask, notmuch_message_t *message, unused (int indent)); static void @@ -124,7 +146,30 @@ _get_one_line_summary (const void *ctx, notmuch_message_t *message) } static void -format_message_text (unused (const void *ctx), notmuch_message_t *message, int indent) +format_message_tabular (unused (const void *ctx), show_mask_t show_mask, + notmuch_message_t *message, + unused(int indent)) +{ + int count=0; + + if (show_mask & SHOW_MESSAGE_ID) { + fputs ( notmuch_message_get_message_id (message), stdout); + count++; + } + + if (show_mask & SHOW_MATCH) + printf ("%s%d", count++ ? "\t" : "", + notmuch_message_get_flag (message, + NOTMUCH_MESSAGE_FLAG_MATCH)); + + if (show_mask & SHOW_FILENAME) + printf("%s%s", count++ ? "\t" : "", + notmuch_message_get_filename (message)); +} + +static void +format_message_text (unused (const void *ctx), unused(show_mask_t show_mask), + notmuch_message_t *message, int indent) { printf ("id:%s depth:%d match:%d filename:%s\n", notmuch_message_get_message_id (message), @@ -134,7 +179,8 @@ format_message_text (unused (const void *ctx), notmuch_message_t *message, int i } static void -format_message_json (const void *ctx, notmuch_message_t *message, unused (int indent)) +format_message_json (const void *ctx, unused(show_mask_t show_mask), + notmuch_message_t *message, unused (int indent)) { void *ctx_quote = talloc_new (ctx); @@ -323,11 +369,12 @@ format_part_json (GMimeObject *part, int *part_count) } static void -show_message (void *ctx, const show_format_t *format, notmuch_message_t *message, int indent) +show_message (void *ctx, const show_format_t *format, show_mask_t show_mask, + notmuch_message_t *message, int indent) { fputs (format->message_start, stdout); if (format->message) - format->message(ctx, message, indent); + format->message(ctx, show_mask, message, indent); fputs (format->header_start, stdout); if (format->header) @@ -344,8 +391,8 @@ show_message (void *ctx, const show_format_t *format, notmuch_message_t *message static void -show_messages (void *ctx, const show_format_t *format, notmuch_messages_t *messages, int indent, - notmuch_bool_t entire_thread) +show_messages (void *ctx, const show_format_t *format, show_mask_t show_mask, + notmuch_messages_t *messages, int indent, notmuch_bool_t entire_thread) { notmuch_message_t *message; notmuch_bool_t match; @@ -371,13 +418,14 @@ show_messages (void *ctx, const show_format_t *format, notmuch_messages_t *messa next_indent = indent; if (match || entire_thread) { - show_message (ctx, format, message, indent); + show_message (ctx, format, show_mask, message, indent); next_indent = indent + 1; fputs (format->message_set_sep, stdout); } - show_messages (ctx, format, notmuch_message_get_replies (message), + show_messages (ctx, format, show_mask, + notmuch_message_get_replies (message), next_indent, entire_thread); notmuch_message_destroy (message); @@ -403,6 +451,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) int entire_thread = 0; int i; int first_toplevel = 1; + show_mask_t show_mask=SHOW_ALL; for (i = 0; i < argc && argv[i][0] == '-'; i++) { if (strcmp (argv[i], "--") == 0) { @@ -422,6 +471,22 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) fprintf (stderr, "Invalid value for --format: %s\n", opt); return 1; } + } else if (STRNCMP_LITERAL (argv[i], "--show=") == 0) { + char *keyword=NULL; + show_mask=0; + opt = argv[i] + sizeof ("--show=") - 1; + while ((keyword=strsep (&opt,", "))) { + if (strcmp (keyword, "message-id") == 0) { + show_mask |= SHOW_MESSAGE_ID; + } else if (strcmp (keyword, "match") == 0) { + show_mask |= SHOW_MATCH; + } else if (strcmp (keyword, "filename") == 0) { + show_mask |= SHOW_FILENAME; + } else { + fprintf (stderr, "Invalid value for --show: %s\n", opt); + return 1; + } + } } else if (STRNCMP_LITERAL (argv[i], "--entire-thread") == 0) { entire_thread = 1; } else { @@ -477,7 +542,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) fputs (format->message_set_sep, stdout); first_toplevel = 0; - show_messages (ctx, format, messages, 0, entire_thread); + show_messages (ctx, format, show_mask, messages, 0, entire_thread); notmuch_thread_destroy (thread); -- 1.6.5.3