From: Jani Nikula Date: Mon, 10 Jun 2013 15:57:03 +0000 (+0300) Subject: [PATCH v3] cli: add --duplicate=N option to notmuch search X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=68fd8bdd8bf0a58c61f88e2a3b4f928867d57b12;p=notmuch-archives.git [PATCH v3] cli: add --duplicate=N option to notmuch search --- diff --git a/0b/4aabc1dadb6ae46bb72205676119eaaa8dcc3d b/0b/4aabc1dadb6ae46bb72205676119eaaa8dcc3d new file mode 100644 index 000000000..c1f2d2cd2 --- /dev/null +++ b/0b/4aabc1dadb6ae46bb72205676119eaaa8dcc3d @@ -0,0 +1,143 @@ +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 178E6431FD0 + for ; Mon, 10 Jun 2013 08:57:19 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[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 sQvTKbbIixMZ for ; + Mon, 10 Jun 2013 08:57:11 -0700 (PDT) +Received: from mail-la0-f49.google.com (mail-la0-f49.google.com + [209.85.215.49]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id D60D8431FAE + for ; Mon, 10 Jun 2013 08:57:10 -0700 (PDT) +Received: by mail-la0-f49.google.com with SMTP id ea20so2309231lab.8 + for ; Mon, 10 Jun 2013 08:57:09 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references + :x-gm-message-state; + bh=r283qVMMoWo046dZx7UjA22Xxwuxf6aVkLrhevbmCS4=; + b=NtgsGVuiPdPbA2bmQjf912TC1aXoRBkdCDIW4F1iUvU2XgQHT7/eo7M520ImzJP8j3 + 0IDpq0bw75GmVCT6X8D/HK72UTS39sDM2jp7JOGl/WRPuCwWyHY14EkL/kQ5EPnrB6xh + dFyQZtuP7b2hBjoZfbe/MDAftpVTF5Gue4GwUCRX1/Xw5s6CH21CZCSdAhFiCb4fiwoM + DSwoIuMqmPmtjr3kyJznWDdIWeoZ0SdDT70L22p7fO5wmsgzfmtCnBORqF7x7YpGZnme + 6h4ly2zMPpmt0m9DniVP338PJqFDd8KsPYHTm6K0L7FGIHvIZGrIw1iQr5sIEC2vmwa4 + OZZQ== +X-Received: by 10.152.28.129 with SMTP id b1mr2614338lah.51.1370879829364; + Mon, 10 Jun 2013 08:57:09 -0700 (PDT) +Received: from localhost (dsl-hkibrasgw2-58c376-211.dhcp.inet.fi. + [88.195.118.211]) + by mx.google.com with ESMTPSA id p16sm5897172lbi.13.2013.06.10.08.57.07 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Mon, 10 Jun 2013 08:57:08 -0700 (PDT) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH v3] cli: add --duplicate=N option to notmuch search +Date: Mon, 10 Jun 2013 18:57:03 +0300 +Message-Id: <1370879823-1388-1-git-send-email-jani@nikula.org> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: + <61ed86f221d65b4dba438cbc2b4c5b77a484a534.1370775663.git.jani@nikula.org> +References: + <61ed86f221d65b4dba438cbc2b4c5b77a484a534.1370775663.git.jani@nikula.org> +X-Gm-Message-State: + ALoCoQlR8VjniLD8k1L5152Uk3Y8G903sHP4rd6edZ8iidQGq3Gj8pN28sNTxcqT2dYwbys/7eyc +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: Mon, 10 Jun 2013 15:57:19 -0000 + +Effective with --output=files, output the Nth filename associated with +each message matching the query (N is 1-based). If N is greater than +the number of files associated with the message, don't print anything. + +--- + +v3: fix commit message, no other changes +--- + notmuch-search.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +diff --git a/notmuch-search.c b/notmuch-search.c +index 4323201..196934b 100644 +--- a/notmuch-search.c ++++ b/notmuch-search.c +@@ -177,7 +177,8 @@ do_search_messages (sprinter_t *format, + notmuch_query_t *query, + output_t output, + int offset, +- int limit) ++ int limit, ++ int dupe) + { + notmuch_message_t *message; + notmuch_messages_t *messages; +@@ -206,14 +207,17 @@ do_search_messages (sprinter_t *format, + message = notmuch_messages_get (messages); + + if (output == OUTPUT_FILES) { ++ int j; + filenames = notmuch_message_get_filenames (message); + +- for (; ++ for (j = 1; + notmuch_filenames_valid (filenames); +- notmuch_filenames_move_to_next (filenames)) ++ notmuch_filenames_move_to_next (filenames), j++) + { +- format->string (format, notmuch_filenames_get (filenames)); +- format->separator (format); ++ if (dupe < 0 || dupe == j) { ++ format->string (format, notmuch_filenames_get (filenames)); ++ format->separator (format); ++ } + } + + notmuch_filenames_destroy( filenames ); +@@ -303,6 +307,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + int offset = 0; + int limit = -1; /* unlimited */ + int exclude = EXCLUDE_TRUE; ++ int dupe = -1; + unsigned int i; + + enum { +@@ -339,6 +344,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + { 0, 0 } } }, + { NOTMUCH_OPT_INT, &offset, "offset", 'O', 0 }, + { NOTMUCH_OPT_INT, &limit, "limit", 'L', 0 }, ++ { NOTMUCH_OPT_INT, &dupe, "duplicate", 'D', 0 }, + { 0, 0, 0, 0, 0 } + }; + +@@ -424,7 +430,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[]) + break; + case OUTPUT_MESSAGES: + case OUTPUT_FILES: +- ret = do_search_messages (format, query, output, offset, limit); ++ ret = do_search_messages (format, query, output, offset, limit, dupe); + break; + case OUTPUT_TAGS: + ret = do_search_tags (notmuch, format, query); +-- +1.7.10.4 +