Re: [Patch v8 2/6] cli: Let json output "null" messages for non --entire-thread

[Austin Clements <amdragon@MIT.EDU>]

The JSON format change LGTM.  This seems like the right way to do this.

On Sat, 16 Jun 2012, Mark Walters <markwalters1009@gmail.com> wrote:
> All formats except Json can output empty messages for non
> entire-thread, but in Json format we output "null" to keep the other
> elements (e.g. the replies to the omitted message) in the correct
> place.
> ---
>  notmuch-client.h |    1 +
>  notmuch-show.c   |   20 ++++++++++++++++----
>  2 files changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/notmuch-client.h b/notmuch-client.h
> index 9b63eae..0c17b79 100644
> --- a/notmuch-client.h
> +++ b/notmuch-client.h
> @@ -75,6 +75,7 @@ typedef struct notmuch_show_format {
>  			      const struct notmuch_show_params *params);
>      const char *message_set_sep;
>      const char *message_set_end;
> +    const char *null_message;
>  } notmuch_show_format_t;
>  
>  typedef struct notmuch_crypto {
> diff --git a/notmuch-show.c b/notmuch-show.c
> index 8247f1d..b004468 100644
> --- a/notmuch-show.c
> +++ b/notmuch-show.c
> @@ -37,7 +37,8 @@ static const notmuch_show_format_t format_json = {
>      .message_set_start = "[",
>      .part = format_part_json_entry,
>      .message_set_sep = ", ",
> -    .message_set_end = "]"
> +    .message_set_end = "]",
> +    .null_message = "null"
>  };
>  
>  static notmuch_status_t
> @@ -800,6 +801,15 @@ format_part_raw (unused (const void *ctx), mime_node_t *node,
>  }
>  
>  static notmuch_status_t
> +show_null_message (const notmuch_show_format_t *format)
> +{
> +    /* Output a null message. Currently empty for all formats except Json */
> +    if (format->null_message)
> +	printf ("%s", format->null_message);
> +    return NOTMUCH_STATUS_SUCCESS;
> +}
> +
> +static notmuch_status_t
>  show_message (void *ctx,
>  	      const notmuch_show_format_t *format,
>  	      notmuch_message_t *message,
> @@ -861,11 +871,13 @@ show_messages (void *ctx,
>  	    if (status && !res)
>  		res = status;
>  	    next_indent = indent + 1;
> -
> -	    if (!status && format->message_set_sep)
> -		fputs (format->message_set_sep, stdout);
> +	} else {
> +	    status = show_null_message (format);
>  	}
>  
> +	if (!status && format->message_set_sep)
> +	    fputs (format->message_set_sep, stdout);
> +
>  	status = show_messages (ctx,
>  				format,
>  				notmuch_message_get_replies (message),
> -- 
> 1.7.9.1
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch