From: Mark Walters Date: Fri, 24 Jan 2014 08:58:02 +0000 (+0000) Subject: Re: [PATCH 6/7] cli: add --quiet option to notmuch new X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ceaa009c5de5f05920d4b5fa2c569961a44fbd03;p=notmuch-archives.git Re: [PATCH 6/7] cli: add --quiet option to notmuch new --- diff --git a/cf/f47312f1c9418655d34265c66cff6a563ead5c b/cf/f47312f1c9418655d34265c66cff6a563ead5c new file mode 100644 index 000000000..3348c764b --- /dev/null +++ b/cf/f47312f1c9418655d34265c66cff6a563ead5c @@ -0,0 +1,231 @@ +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 534EE431FB6 + for ; Fri, 24 Jan 2014 01:00:50 -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 6wF9L6Ad5Wq1 for ; + Fri, 24 Jan 2014 01:00:42 -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 51F3E431FAF + for ; Fri, 24 Jan 2014 01:00:42 -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 1W6cch-000615-Uv; Fri, 24 Jan 2014 09:00:38 +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.71) + (envelope-from ) + id 1W6cbo-000263-CM; Fri, 24 Jan 2014 08:59:28 +0000 +From: Mark Walters +To: Jani Nikula , notmuch@notmuchmail.org +Subject: Re: [PATCH 6/7] cli: add --quiet option to notmuch new +In-Reply-To: + <276371280dfbf8d98a9970b68910e1c030769641.1390163335.git.jani@nikula.org> +References: + <276371280dfbf8d98a9970b68910e1c030769641.1390163335.git.jani@nikula.org> +User-Agent: Notmuch/0.15.2+484~gfb59956 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Fri, 24 Jan 2014 08:58:02 +0000 +Message-ID: <87txctah9h.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-Geographic: According to ripencc, + this message was delivered by a machine in Britain (UK) (GB). +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: 7898fa3a61acdc79bf063ba117da7861 (of first 20000 bytes) +X-SpamAssassin-Score: 0.0 +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 0.0 points. Summary of the scoring: + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * 0.0 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: Fri, 24 Jan 2014 09:00:50 -0000 + + +Hi + +I am working my way through this series in a rather random order. + +I am not sure I like doing the database upgrade with no comment to the +user at all. In fact I am not sure I like doing the upgrade without +being specifically told to (e.g. it does not give the user a clear chance +to backup the database first) + +What would people think about having a --upgrade-database option to +notmuch new? + +Best wishes + +Mark + + + On Sun, 19 Jan 2014, Jani Nikula wrote: +> Tie it to --verbose (resulting in verbosity levels of quiet, normal, +> and verbose) but leave --debug orthogonal. Do some drive-by cleaning +> while at it. +> --- +> notmuch-new.c | 47 ++++++++++++++++++++++++++++++++--------------- +> 1 file changed, 32 insertions(+), 15 deletions(-) +> +> diff --git a/notmuch-new.c b/notmuch-new.c +> index c443181..cd74489 100644 +> --- a/notmuch-new.c +> +++ b/notmuch-new.c +> @@ -34,9 +34,15 @@ typedef struct _filename_list { +> _filename_node_t **tail; +> } _filename_list_t; +> +> +enum verbosity { +> + VERBOSITY_QUIET, +> + VERBOSITY_NORMAL, +> + VERBOSITY_VERBOSE, +> +}; +> + +> typedef struct { +> int output_is_a_tty; +> - notmuch_bool_t verbose; +> + enum verbosity verbosity; +> notmuch_bool_t debug; +> const char **new_tags; +> size_t new_tags_length; +> @@ -566,13 +572,11 @@ add_files (notmuch_database_t *notmuch, +> +> state->processed_files++; +> +> - if (state->verbose) { +> + if (state->verbosity >= VERBOSITY_VERBOSE) { +> if (state->output_is_a_tty) +> printf("\r\033[K"); +> +> - printf ("%i/%i: %s", +> - state->processed_files, +> - state->total_files, +> + printf ("%i/%i: %s", state->processed_files, state->total_files, +> next); +> +> putchar((state->output_is_a_tty) ? '\r' : '\n'); +> @@ -741,7 +745,7 @@ count_files (const char *path, int *count, add_files_state_t *state) +> entry_type = dirent_type (path, entry); +> if (entry_type == S_IFREG) { +> *count = *count + 1; +> - if (*count % 1000 == 0) { +> + if (*count % 1000 == 0 && state->verbosity >= VERBOSITY_NORMAL) { +> printf ("Found %d files so far.\r", *count); +> fflush (stdout); +> } +> @@ -917,13 +921,15 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) +> int i; +> notmuch_bool_t timer_is_active = FALSE; +> notmuch_bool_t no_hooks = FALSE; +> + notmuch_bool_t quiet = FALSE, verbose = FALSE; +> +> - add_files_state.verbose = FALSE; +> + add_files_state.verbosity = VERBOSITY_NORMAL; +> add_files_state.debug = FALSE; +> add_files_state.output_is_a_tty = isatty (fileno (stdout)); +> +> notmuch_opt_desc_t options[] = { +> - { NOTMUCH_OPT_BOOLEAN, &add_files_state.verbose, "verbose", 'v', 0 }, +> + { NOTMUCH_OPT_BOOLEAN, &quiet, "quiet", 'q', 0 }, +> + { NOTMUCH_OPT_BOOLEAN, &verbose, "verbose", 'v', 0 }, +> { NOTMUCH_OPT_BOOLEAN, &add_files_state.debug, "debug", 'd', 0 }, +> { NOTMUCH_OPT_BOOLEAN, &no_hooks, "no-hooks", 'n', 0 }, +> { 0, 0, 0, 0, 0 } +> @@ -933,6 +939,12 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) +> if (opt_index < 0) +> return EXIT_FAILURE; +> +> + /* quiet trumps verbose */ +> + if (quiet) +> + add_files_state.verbosity = VERBOSITY_QUIET; +> + else if (verbose) +> + add_files_state.verbosity = VERBOSITY_VERBOSE; +> + +> add_files_state.new_tags = notmuch_config_get_new_tags (config, &add_files_state.new_tags_length); +> add_files_state.new_ignore = notmuch_config_get_new_ignore (config, &add_files_state.new_ignore_length); +> add_files_state.synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config); +> @@ -954,7 +966,8 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) +> if (interrupted) +> return EXIT_FAILURE; +> +> - printf ("Found %d total files (that's not much mail).\n", count); +> + if (add_files_state.verbosity >= VERBOSITY_NORMAL) +> + printf ("Found %d total files (that's not much mail).\n", count); +> if (notmuch_database_create (db_path, ¬much)) +> return EXIT_FAILURE; +> add_files_state.total_files = count; +> @@ -964,11 +977,14 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) +> return EXIT_FAILURE; +> +> if (notmuch_database_needs_upgrade (notmuch)) { +> - printf ("Welcome to a new version of notmuch! Your database will now be upgraded.\n"); +> + if (add_files_state.verbosity >= VERBOSITY_NORMAL) +> + printf ("Welcome to a new version of notmuch! Your database will now be upgraded.\n"); +> gettimeofday (&add_files_state.tv_start, NULL); +> - notmuch_database_upgrade (notmuch, upgrade_print_progress, +> + notmuch_database_upgrade (notmuch, +> + add_files_state.verbosity >= VERBOSITY_NORMAL ? upgrade_print_progress : NULL, +> &add_files_state); +> - printf ("Your notmuch database has now been upgraded to database format version %u.\n", +> + if (add_files_state.verbosity >= VERBOSITY_NORMAL) +> + printf ("Your notmuch database has now been upgraded to database format version %u.\n", +> notmuch_database_get_version (notmuch)); +> } +> +> @@ -999,8 +1015,8 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) +> add_files_state.removed_directories = _filename_list_create (config); +> add_files_state.directory_mtimes = _filename_list_create (config); +> +> - if (! debugger_is_active () && add_files_state.output_is_a_tty +> - && ! add_files_state.verbose) { +> + if (add_files_state.verbosity == VERBOSITY_NORMAL && +> + add_files_state.output_is_a_tty && ! debugger_is_active ()) { +> setup_progress_printing_timer (); +> timer_is_active = TRUE; +> } +> @@ -1053,7 +1069,8 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) +> if (timer_is_active) +> stop_progress_printing_timer (); +> +> - print_results (&add_files_state); +> + if (add_files_state.verbosity >= VERBOSITY_NORMAL) +> + print_results (&add_files_state); +> +> if (ret) +> fprintf (stderr, "Note: A fatal error was encountered: %s\n", +> -- +> 1.8.5.2 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch