From: Mark Walters Date: Sun, 18 Nov 2012 17:05:42 +0000 (+0000) Subject: Re: [PATCH 10/18] insert: parse command-line tag operations X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8f06a78db13815ae476e1b0c4f44512513e88c53;p=notmuch-archives.git Re: [PATCH 10/18] insert: parse command-line tag operations --- diff --git a/6b/0994fc957571f76cf0981a71e503eecc87345e b/6b/0994fc957571f76cf0981a71e503eecc87345e new file mode 100644 index 000000000..203e48962 --- /dev/null +++ b/6b/0994fc957571f76cf0981a71e503eecc87345e @@ -0,0 +1,177 @@ +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 547F6431FB6 + for ; Sun, 18 Nov 2012 09:05:47 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -1.098 +X-Spam-Level: +X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 KmuJJ-Ufk78F for ; + Sun, 18 Nov 2012 09:05:45 -0800 (PST) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 803E3431FAF + for ; Sun, 18 Nov 2012 09:05:45 -0800 (PST) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1Ta8JT-0006op-O3; Sun, 18 Nov 2012 17:05:44 +0000 +Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) + (envelope-from ) + id 1Ta8JT-0003UQ-Cm; Sun, 18 Nov 2012 17:05:43 +0000 +From: Mark Walters +To: Peter Wang , notmuch@notmuchmail.org +Subject: Re: [PATCH 10/18] insert: parse command-line tag operations +In-Reply-To: <1343223767-9812-10-git-send-email-novalazy@gmail.com> +References: <1343223767-9812-1-git-send-email-novalazy@gmail.com> + <1343223767-9812-10-git-send-email-novalazy@gmail.com> +User-Agent: Notmuch/0.14+81~g9730584 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Sun, 18 Nov 2012 17:05:42 +0000 +Message-ID: <87r4nqq1sp.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 93.97.24.31 +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: 097be4e91f00fec4afeec6e6003e71d1 (of first 20000 bytes) +X-SpamAssassin-Score: -1.8 +X-SpamAssassin-SpamBar: - +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored -1.8 points. + Summary of the scoring: + * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, + * medium trust + * [138.37.6.40 listed in list.dnswl.org] + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * 0.5 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +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, 18 Nov 2012 17:05:47 -0000 + + +Hi + +On Wed, 25 Jul 2012, Peter Wang wrote: +> Parse +tag and -tag on the 'insert' command-line. +> Issue a warning about ambiguous -tag arguments which don't follow +> +tag nor an explicit option list terminator. +> --- +> notmuch-insert.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ +> 1 files changed, 50 insertions(+), 0 deletions(-) +> +> diff --git a/notmuch-insert.c b/notmuch-insert.c +> index 4fb3ea3..6db03e3 100644 +> --- a/notmuch-insert.c +> +++ b/notmuch-insert.c +> @@ -24,6 +24,11 @@ +> #include +> #include +> +> +typedef struct { +> + const char *tag; +> + notmuch_bool_t remove; +> +} tag_operation_t; +> + +> static notmuch_bool_t +> check_folder_name (const char *folder) +> { +> @@ -236,8 +241,11 @@ notmuch_insert_command (void *ctx, int argc, char *argv[]) +> const char **new_tags; +> size_t new_tags_length; +> const char *folder = NULL; +> + tag_operation_t *tag_ops; +> + int tag_ops_count = 0; +> char *maildir; +> int opt_index; +> + notmuch_bool_t warn_tag_rem; +> notmuch_bool_t ret; +> +> notmuch_opt_desc_t options[] = { +> @@ -253,6 +261,48 @@ notmuch_insert_command (void *ctx, int argc, char *argv[]) +> return 1; +> } +> +> + if (opt_index > 0 && strcmp (argv[opt_index - 1], "--") == 0) { +> + warn_tag_rem = FALSE; +> + } else { +> + warn_tag_rem = TRUE; +> + } +> + +> + /* Array of tagging operations (add or remove), terminated with an +> + * empty element. */ +> + tag_ops = talloc_array (ctx, tag_operation_t, argc - opt_index + 1); +> + if (tag_ops == NULL) { +> + fprintf (stderr, "Out of memory.\n"); +> + return 1; +> + } +> + +> + for (; opt_index < argc; opt_index++) { +> + if (argv[opt_index][0] == '+') { +> + tag_ops[tag_ops_count].tag = argv[opt_index] + 1; +> + tag_ops[tag_ops_count].remove = FALSE; +> + tag_ops_count++; +> + warn_tag_rem = FALSE; +> + } else if (argv[opt_index][0] == '-') { +> + if (warn_tag_rem) { +> + fprintf (stderr, +> + "Warning: ambiguous argument treated as tag removal: %s\n", +> + argv[opt_index]); +> + } +> + tag_ops[tag_ops_count].tag = argv[opt_index] + 1; +> + tag_ops[tag_ops_count].remove = TRUE; +> + tag_ops_count++; +> + } else { +> + break; +> + } +> + } + +I don't like the code duplication between this and notmuch-tag.c. In +particular the two (now) differ on how they deal with malformed tags +etc. Would it be possible to unify them? + +Best wishes + +Mark + +> + +> + tag_ops[tag_ops_count].tag = NULL; +> + +> + if (opt_index != argc) { +> + fprintf (stderr, "Error: bad argument to notmuch insert: %s\n", +> + argv[opt_index]); +> + return 1; +> + } +> + +> config = notmuch_config_open (ctx, NULL, NULL); +> if (config == NULL) +> return 1; +> -- +> 1.7.4.4 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch