[PATCH 3/3] Add notmuch compact command

diff --git a/a2/3481b5bb55a7a55d4fee3beed478dfaf530afa b/a2/3481b5bb55a7a55d4fee3beed478dfaf530afa
new file mode 100644 (file)
index 0000000..4bd8e76
--- /dev/null
+++ b/a2/3481b5bb55a7a55d4fee3beed478dfaf530afa
@@ -0,0 +1,165 @@
+Return-Path: <bgamari.foss@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 9E8BF431FC2\r
+       for <notmuch@notmuchmail.org>; Mon, 20 Aug 2012 08:31:56 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id HuMc7I9uRH6a for <notmuch@notmuchmail.org>;\r
+       Mon, 20 Aug 2012 08:31:56 -0700 (PDT)\r
+Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com\r
+       [209.85.212.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id EA1BB431FBD\r
+       for <notmuch@notmuchmail.org>; Mon, 20 Aug 2012 08:31:55 -0700 (PDT)\r
+Received: by vbbfc26 with SMTP id fc26so5986842vbb.26\r
+       for <notmuch@notmuchmail.org>; Mon, 20 Aug 2012 08:31:55 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
+       :mime-version:content-type:content-transfer-encoding;\r
+       bh=W4VCSYkTSHtM0q7CnkAV8Hnjg8fIkYv34UXj92C2Dlw=;\r
+       b=0dcjPiOL6PFt5EiyktbPaHf8cysztAiUU3NWQF62wrP/EXF/PpZxIh1Z3zewTzFMln\r
+       /qzpZCc6cxkB2jDt7MIi24MCtTgwSOr4o3Sk5WLhS3rVlwO4/MppjoZGWbehfd9IswsS\r
+       KiIXti+sPbZnoef4fhbJ7X1ABjaWtJ5Shka6OFO94WHhbVjkEAvJkEhwVVQz7YAYRnZ7\r
+       6+nBU0YnljQb+TmI2Zd/Y1JPvJUBYqp+NDt5AoEhz6LqVxVD8cZHkAg3hkH/fWWoGxBt\r
+       iTZoZfHi76Bw6F5pz11LB4DDX5yrN3CqcXr7NH7aY58EJv040OvGh6PFHgyLI71LcwMo\r
+       jy7A==\r
+Received: by 10.52.72.44 with SMTP id a12mr3953564vdv.124.1345476715154;\r
+       Mon, 20 Aug 2012 08:31:55 -0700 (PDT)\r
+Received: from localhost.localdomain\r
+       (pool-108-8-230-85.spfdma.east.verizon.net. [108.8.230.85])\r
+       by mx.google.com with ESMTPS id g10sm5430786vdk.2.2012.08.20.08.31.54\r
+       (version=SSLv3 cipher=OTHER); Mon, 20 Aug 2012 08:31:54 -0700 (PDT)\r
+From: Ben Gamari <bgamari.foss@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: =?UTF-8?q?=5BPATCH=203/3=5D=20Add=20notmuch=20compact=20command?=\r
+Date: Mon, 20 Aug 2012 11:31:44 -0400\r
+Message-Id: <1345476704-17091-4-git-send-email-bgamari.foss@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.5\r
+In-Reply-To: <1345476704-17091-1-git-send-email-bgamari.foss@gmail.com>\r
+References: <1345476704-17091-1-git-send-email-bgamari.foss@gmail.com>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=UTF-8\r
+Content-Transfer-Encoding: 8bit\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 20 Aug 2012 15:31:56 -0000\r
+\r
+---\r
+ Makefile.local    |    1 +\r
+ notmuch-client.h  |    3 +++\r
+ notmuch-compact.c |   43 +++++++++++++++++++++++++++++++++++++++++++\r
+ notmuch.c         |    3 +++\r
+ 4 files changed, 50 insertions(+)\r
+ create mode 100644 notmuch-compact.c\r
+\r
+diff --git a/Makefile.local b/Makefile.local\r
+index de984ab..848605d 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -278,6 +278,7 @@ notmuch_client_srcs =              \\r
+       gmime-filter-headers.c  \\r
+       hooks.c                 \\r
+       notmuch.c               \\r
++      notmuch-compact.c       \\r
+       notmuch-config.c        \\r
+       notmuch-count.c         \\r
+       notmuch-dump.c          \\r
+diff --git a/notmuch-client.h b/notmuch-client.h\r
+index ae9344b..a6c624b 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -157,6 +157,9 @@ int\r
+ notmuch_cat_command (void *ctx, int argc, char *argv[]);\r
+ \r
+ int\r
++notmuch_compact_command (void *ctx, int argc, char *argv[]);\r
++\r
++int\r
+ notmuch_config_command (void *ctx, int argc, char *argv[]);\r
+ \r
+ const char *\r
+diff --git a/notmuch-compact.c b/notmuch-compact.c\r
+new file mode 100644\r
+index 0000000..6deb2ec\r
+--- /dev/null\r
++++ b/notmuch-compact.c\r
+@@ -0,0 +1,43 @@\r
++/* notmuch - Not much of an email program, (just index and search)\r
++ *\r
++ * Copyright © 2009 Carl Worth\r
++ *\r
++ * This program is free software: you can redistribute it and/or modify\r
++ * it under the terms of the GNU General Public License as published by\r
++ * the Free Software Foundation, either version 3 of the License, or\r
++ * (at your option) any later version.\r
++ *\r
++ * This program is distributed in the hope that it will be useful,\r
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
++ * GNU General Public License for more details.\r
++ *\r
++ * You should have received a copy of the GNU General Public License\r
++ * along with this program.  If not, see http://www.gnu.org/licenses/ .\r
++ *\r
++ * Author: Carl Worth <cworth@cworth.org>\r
++ */\r
++\r
++#include "notmuch-client.h"\r
++\r
++int\r
++notmuch_compact_command (void *ctx, unused (int argc), unused (char *argv[]))\r
++{\r
++    notmuch_config_t *config;\r
++    notmuch_database_t *notmuch;\r
++\r
++    config = notmuch_config_open (ctx, NULL, NULL);\r
++    if (config == NULL)\r
++      return 1;\r
++\r
++    if (notmuch_database_open (notmuch_config_get_database_path (config),\r
++                             NOTMUCH_DATABASE_MODE_READ_WRITE, &notmuch))\r
++      return 1;\r
++\r
++    printf ("Compacting database... ");\r
++    notmuch_database_close_compact (notmuch);\r
++    printf ("Done.\n");\r
++    notmuch_database_destroy (notmuch);\r
++\r
++    return 0;\r
++}\r
+diff --git a/notmuch.c b/notmuch.c\r
+index 477a09c..7b6c5ae 100644\r
+--- a/notmuch.c\r
++++ b/notmuch.c\r
+@@ -74,6 +74,9 @@ static command_t commands[] = {\r
+     { "restore", notmuch_restore_command,\r
+       "[--accumulate] [<filename>]",\r
+       "Restore the tags from the given dump file (see 'dump')." },\r
++    { "compact", notmuch_compact_command,\r
++      NULL,\r
++      "Compacts the database." },\r
+     { "config", notmuch_config_command,\r
+       "[get|set] <section>.<item> [value ...]",\r
+       "Get or set settings in the notmuch configuration file." },\r
+-- \r
+1.7.9.5\r
+\r