From: Mark Walters Date: Sun, 12 Feb 2012 10:36:03 +0000 (+0000) Subject: [RFC PATCH 1/3] cli: notmuch-show changes to support pick X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c9435b123559cd32e6ef95b72b7378df813e6f75;p=notmuch-archives.git [RFC PATCH 1/3] cli: notmuch-show changes to support pick --- diff --git a/be/7de20ad3b28fa11e0347c37c440ed623a8aa93 b/be/7de20ad3b28fa11e0347c37c440ed623a8aa93 new file mode 100644 index 000000000..d3743b794 --- /dev/null +++ b/be/7de20ad3b28fa11e0347c37c440ed623a8aa93 @@ -0,0 +1,250 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 8ABA3429E31 + for ; Sun, 12 Feb 2012 02:35:03 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +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 U+n9vvoWfMga for ; + Sun, 12 Feb 2012 02:35:02 -0800 (PST) +Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com + [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + 90832431FAE for ; Sun, 12 Feb 2012 02:35:02 -0800 + (PST) +Received: by wgbdt12 with SMTP id dt12so3593006wgb.2 + for ; Sun, 12 Feb 2012 02:35:01 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=F/EJAJwYr0fS3pkdQLdV87jd3pTYK2ch/AFp8FSwbqU=; + b=GHePJu1emkWzkseQGVQbvvmBwA7jUvAih59iQ82IrI70Db2KCAxJ7PYigAP/y0jEUN + hGyj5JsYokpsNAbrnjh0/U5a9Vk8gUad/UXxuNla3u0w8Wt3ZTbY+zAYOtR8IMkFAI3u + nMWui64KlMFEKpSUH2w8cUWYzWK/r2uAWw/Zs= +Received: by 10.180.107.2 with SMTP id gy2mr2540831wib.12.1329042901219; + Sun, 12 Feb 2012 02:35:01 -0800 (PST) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + er8sm33487998wib.9.2012.02.12.02.34.59 (version=TLSv1/SSLv3 cipher=OTHER); + Sun, 12 Feb 2012 02:35:00 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [RFC PATCH 1/3] cli: notmuch-show changes to support pick +Date: Sun, 12 Feb 2012 10:36:03 +0000 +Message-Id: <1329042965-3871-1-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.2.3 +In-Reply-To: <87d39k1gvi.fsf@qmul.ac.uk> +References: <87d39k1gvi.fsf@qmul.ac.uk> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +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: Sun, 12 Feb 2012 10:35:03 -0000 + +--- + notmuch-client.h | 9 +++++- + notmuch-show.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++------ + 2 files changed, 88 insertions(+), 11 deletions(-) + +diff --git a/notmuch-client.h b/notmuch-client.h +index 60828aa..b4dc7bf 100644 +--- a/notmuch-client.h ++++ b/notmuch-client.h +@@ -97,10 +97,17 @@ typedef struct notmuch_show_format { + const char *message_set_end; + } notmuch_show_format_t; + ++enum { ++ NOTMUCH_SHOW_THREAD_MATCH, ++ NOTMUCH_SHOW_THREAD_ENTIRE, ++ NOTMUCH_SHOW_THREAD_NONE ++}; ++ + typedef struct notmuch_show_params { +- notmuch_bool_t entire_thread; ++ int entire_thread; + notmuch_bool_t raw; + int part; ++ int headers_only; + #ifdef GMIME_ATLEAST_26 + GMimeCryptoContext* cryptoctx; + #else +diff --git a/notmuch-show.c b/notmuch-show.c +index c8fbd79..725d47d 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -876,7 +876,7 @@ show_message (void *ctx, + fputs (format->body_start, stdout); + } + +- if (format->part_content) ++ if (format->part_content && !params->headers_only) + show_message_body (message, format, params); + + if (params->part <= 0) { +@@ -923,11 +923,16 @@ show_messages (void *ctx, + fputs (format->message_set_sep, stdout); + } + +- show_messages (ctx, +- format, +- notmuch_message_get_replies (message), +- next_indent, +- params); ++ if (params->entire_thread != NOTMUCH_SHOW_THREAD_NONE) ++ show_messages (ctx, ++ format, ++ notmuch_message_get_replies (message), ++ next_indent, ++ params); ++ else { ++ fputs (format->message_set_start, stdout); ++ fputs (format->message_set_end, stdout); ++ } + + notmuch_message_destroy (message); + +@@ -937,6 +942,50 @@ show_messages (void *ctx, + fputs (format->message_set_end, stdout); + } + ++static int ++do_show_messages (void *ctx, ++ notmuch_query_t *query, ++ const notmuch_show_format_t *format, ++ notmuch_show_params_t *params) ++{ ++ notmuch_messages_t *messages; ++ notmuch_message_t *message; ++ int first_set = 1; ++ ++ fputs (format->message_set_start, stdout); ++ messages = notmuch_query_search_messages (query); ++ ++ for (; ++ notmuch_messages_valid (messages); ++ notmuch_messages_move_to_next (messages)) ++ { ++ if (!first_set) ++ fputs (format->message_set_sep, stdout); ++ first_set = 0; ++ ++ fputs (format->message_set_start, stdout); ++ fputs (format->message_set_start, stdout); ++ ++ message = notmuch_messages_get (messages); ++ notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH, 1); ++ show_message (ctx, format, message, 0, params); ++ ++ fputs (format->message_set_sep, stdout); ++ ++ fputs (format->message_set_start, stdout); ++ fputs (format->message_set_end, stdout); ++ ++ ++ notmuch_message_destroy (message); ++ ++ fputs (format->message_set_end, stdout); ++ fputs (format->message_set_end, stdout); ++ } ++ ++ fputs (format->message_set_end, stdout); ++ return 0; ++} ++ + /* Formatted output of single message */ + static int + do_show_single (void *ctx, +@@ -1064,11 +1113,13 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + notmuch_database_t *notmuch; + notmuch_query_t *query; + char *query_string; +- int opt_index, ret; ++ int opt_index, ret, entire_thread; ++ notmuch_sort_t sort = NOTMUCH_SORT_NEWEST_FIRST; + const notmuch_show_format_t *format = &format_text; + notmuch_show_params_t params = { .part = -1 }; + int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED; + notmuch_bool_t verify = FALSE; ++ notmuch_bool_t headers_only = FALSE; + + notmuch_opt_desc_t options[] = { + { NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f', +@@ -1077,10 +1128,19 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + { "mbox", NOTMUCH_FORMAT_MBOX }, + { "raw", NOTMUCH_FORMAT_RAW }, + { 0, 0 } } }, ++ { NOTMUCH_OPT_KEYWORD, &sort, "sort", 's', ++ (notmuch_keyword_t []){ { "oldest-first", NOTMUCH_SORT_OLDEST_FIRST }, ++ { "newest-first", NOTMUCH_SORT_NEWEST_FIRST }, ++ { 0, 0 } } }, + { NOTMUCH_OPT_INT, ¶ms.part, "part", 'p', 0 }, +- { NOTMUCH_OPT_BOOLEAN, ¶ms.entire_thread, "entire-thread", 't', 0 }, ++ { NOTMUCH_OPT_KEYWORD, &entire_thread, "thread", 't', ++ (notmuch_keyword_t []){ { "match", NOTMUCH_SHOW_THREAD_MATCH, }, ++ { "entire", NOTMUCH_SHOW_THREAD_ENTIRE }, ++ { "none", NOTMUCH_SHOW_THREAD_NONE }, ++ { 0, 0 } } }, + { NOTMUCH_OPT_BOOLEAN, ¶ms.decrypt, "decrypt", 'd', 0 }, + { NOTMUCH_OPT_BOOLEAN, &verify, "verify", 'v', 0 }, ++ { NOTMUCH_OPT_BOOLEAN, &headers_only, "headers-only", 'h', 0 }, + { 0, 0, 0, 0, 0 } + }; + +@@ -1090,6 +1150,9 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + return 1; + } + ++ params.entire_thread = entire_thread; ++ params.headers_only = headers_only; ++ + if (format_sel == NOTMUCH_FORMAT_NOT_SPECIFIED) { + /* if part was requested and format was not specified, use format=raw */ + if (params.part >= 0) +@@ -1101,7 +1164,9 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + switch (format_sel) { + case NOTMUCH_FORMAT_JSON: + format = &format_json; +- params.entire_thread = TRUE; ++ if (!params.entire_thread) params.entire_thread = NOTMUCH_SHOW_THREAD_ENTIRE; ++ // params.entire_thread = 1; ++ + break; + case NOTMUCH_FORMAT_TEXT: + format = &format_text; +@@ -1168,10 +1233,15 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + return 1; + } + ++ notmuch_query_set_sort (query, sort); ++ + if (params.part >= 0) + ret = do_show_single (ctx, query, format, ¶ms); + else +- ret = do_show (ctx, query, format, ¶ms); ++ if (params.entire_thread == NOTMUCH_SHOW_THREAD_NONE) ++ ret = do_show_messages (ctx, query, format, ¶ms); ++ else ++ ret = do_show (ctx, query, format, ¶ms); + + notmuch_query_destroy (query); + notmuch_database_close (notmuch); +-- +1.7.2.3 +