Re: [PATCH 3/3] Add notmuch compact command

[Jani Nikula <jani@nikula.org>]

Nag nag nag: Commit message. ;)

The custom is to have a man page for each notmuch cli command.

Small nitpicks below.


BR,
Jani.


On Wed, 17 Oct 2012, Ben Gamari <bgamari.foss@gmail.com> wrote:
> ---
>  Makefile.local    |    1 +
>  notmuch-client.h  |    3 +++
>  notmuch-compact.c |   43 +++++++++++++++++++++++++++++++++++++++++++
>  notmuch.c         |    3 +++
>  4 files changed, 50 insertions(+)
>  create mode 100644 notmuch-compact.c
>
> diff --git a/Makefile.local b/Makefile.local
> index 7f2d4f1..e050ba6 100644
> --- a/Makefile.local
> +++ b/Makefile.local
> @@ -258,6 +258,7 @@ notmuch_client_srcs =		\
>  	gmime-filter-headers.c	\
>  	hooks.c			\
>  	notmuch.c		\
> +	notmuch-compact.c	\
>  	notmuch-config.c	\
>  	notmuch-count.c		\
>  	notmuch-dump.c		\
> diff --git a/notmuch-client.h b/notmuch-client.h
> index ae9344b..a6c624b 100644
> --- a/notmuch-client.h
> +++ b/notmuch-client.h
> @@ -157,6 +157,9 @@ int
>  notmuch_cat_command (void *ctx, int argc, char *argv[]);
>  
>  int
> +notmuch_compact_command (void *ctx, int argc, char *argv[]);
> +
> +int
>  notmuch_config_command (void *ctx, int argc, char *argv[]);
>  
>  const char *
> diff --git a/notmuch-compact.c b/notmuch-compact.c
> new file mode 100644
> index 0000000..6deb2ec
> --- /dev/null
> +++ b/notmuch-compact.c
> @@ -0,0 +1,43 @@
> +/* notmuch - Not much of an email program, (just index and search)
> + *
> + * Copyright © 2009 Carl Worth

It's your code, this year.

> + *
> + * This program is free software: you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation, either version 3 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program.  If not, see http://www.gnu.org/licenses/ .
> + *
> + * Author: Carl Worth <cworth@cworth.org>

It's your code.

> + */
> +
> +#include "notmuch-client.h"
> +
> +int
> +notmuch_compact_command (void *ctx, unused (int argc), unused (char *argv[]))
> +{
> +    notmuch_config_t *config;
> +    notmuch_database_t *notmuch;
> +
> +    config = notmuch_config_open (ctx, NULL, NULL);
> +    if (config == NULL)
> +	return 1;
> +
> +    if (notmuch_database_open (notmuch_config_get_database_path (config),
> +			       NOTMUCH_DATABASE_MODE_READ_WRITE, &notmuch))
> +	return 1;
> +
> +    printf ("Compacting database... ");
> +    notmuch_database_close_compact (notmuch);
> +    printf ("Done.\n");

Or maybe not. Please add and check the return status of the compact
call.

> +    notmuch_database_destroy (notmuch);
> +
> +    return 0;
> +}
> diff --git a/notmuch.c b/notmuch.c
> index 477a09c..7b6c5ae 100644
> --- a/notmuch.c
> +++ b/notmuch.c
> @@ -74,6 +74,9 @@ static command_t commands[] = {
>      { "restore", notmuch_restore_command,
>        "[--accumulate] [<filename>]",
>        "Restore the tags from the given dump file (see 'dump')." },
> +    { "compact", notmuch_compact_command,
> +      NULL,
> +      "Compacts the database." },
>      { "config", notmuch_config_command,
>        "[get|set] <section>.<item> [value ...]",
>        "Get or set settings in the notmuch configuration file." },
> -- 
> 1.7.10.4
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch