From 241a88ce2f3c8d76b5a63a202d8455757c0e751e Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 2 Oct 2013 16:30:47 -0400 Subject: [PATCH] notmuch-compact: Initial commit of CLI Introduce the user command exposing the new compaction facility. Signed-off-by: Ben Gamari --- Makefile.local | 1 + notmuch-client.h | 3 +++ notmuch-compact.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ notmuch.c | 2 ++ 4 files changed, 62 insertions(+) create mode 100644 notmuch-compact.c diff --git a/Makefile.local b/Makefile.local index b7cd266d..0464a50f 100644 --- a/Makefile.local +++ b/Makefile.local @@ -257,6 +257,7 @@ notmuch_client_srcs = \ gmime-filter-reply.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 afb0ddf9..0bfa4da9 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -204,6 +204,9 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[]); int notmuch_config_command (notmuch_config_t *config, int argc, char *argv[]); +int +notmuch_compact_command (notmuch_config_t *config, int argc, char *argv[]); + const char * notmuch_time_relative_date (const void *ctx, time_t then); diff --git a/notmuch-compact.c b/notmuch-compact.c new file mode 100644 index 00000000..bfda40e3 --- /dev/null +++ b/notmuch-compact.c @@ -0,0 +1,56 @@ +/* notmuch - Not much of an email program, (just index and search) + * + * Copyright © 2013 Ben Gamari + * + * 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: Ben Gamari + */ + +#include "notmuch-client.h" + +void status_update_cb (const char *msg); + +void +status_update_cb (const char *msg) +{ + printf("%s\n", msg); +} + +int +notmuch_compact_command (notmuch_config_t *config, + unused (int argc), + unused (char *argv[])) +{ + const char *path = notmuch_config_get_database_path (config); + const char *backup_path = path; + notmuch_status_t ret; + + printf ("Compacting database...\n"); + ret = notmuch_database_compact (path, backup_path, status_update_cb); + if (ret) { + fprintf (stderr, "Compaction failed: %s\n", notmuch_status_to_string(ret)); + } else { + printf ("\n"); + printf ("\n"); + printf ("The old database has been moved to %s/xapian.old", backup_path); + printf ("\n"); + printf ("To delete run,\n"); + printf ("\n"); + printf (" rm -R %s/xapian.old\n", backup_path); + printf ("\n"); + } + + return 0; +} diff --git a/notmuch.c b/notmuch.c index 7300c214..8d303a14 100644 --- a/notmuch.c +++ b/notmuch.c @@ -60,6 +60,8 @@ static command_t commands[] = { "Create a plain-text dump of the tags for each message." }, { "restore", notmuch_restore_command, FALSE, "Restore the tags from the given dump file (see 'dump')." }, + { "compact", notmuch_compact_command, FALSE, + "Compact the notmuch database." }, { "config", notmuch_config_command, FALSE, "Get or set settings in the notmuch configuration file." }, { "help", notmuch_help_command, TRUE, /* create but don't save config */ -- 2.26.2