[PATCH 2/3] notmuch-compact: Initial commit

diff --git a/a4/0fa1949b3d9d632a9f7365d8c2136fb5ac2961 b/a4/0fa1949b3d9d632a9f7365d8c2136fb5ac2961
new file mode 100644 (file)
index 0000000..96dbb51
--- /dev/null
+++ b/a4/0fa1949b3d9d632a9f7365d8c2136fb5ac2961
@@ -0,0 +1,171 @@
+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 4DACC429E32\r
+       for <notmuch@notmuchmail.org>; Fri, 23 Aug 2013 19:55:40 -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 BuHsabDZzCiC for <notmuch@notmuchmail.org>;\r
+       Fri, 23 Aug 2013 19:55:35 -0700 (PDT)\r
+Received: from mail-qe0-f44.google.com (mail-qe0-f44.google.com\r
+       [209.85.128.44]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 55A9F431FD9\r
+       for <notmuch@notmuchmail.org>; Fri, 23 Aug 2013 19:55:31 -0700 (PDT)\r
+Received: by mail-qe0-f44.google.com with SMTP id 5so757329qeb.17\r
+       for <notmuch@notmuchmail.org>; Fri, 23 Aug 2013 19:55:30 -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:in-reply-to:references\r
+       :mime-version:content-type:content-transfer-encoding;\r
+       bh=hEsOS6pgxy9QkaJlT5pnQl4Jj+/XHDXiS1y16fxoz9A=;\r
+       b=v68OotxsIdVFgEZGbxJwE5lUZ22Dd6AkclVv7XcAY0iXd9V6lS1N4bQqxIQEf+tT6A\r
+       rdpHvL2HVFmFxXWCcbbB+aywo4VZB//WQbR5tPGRgGx+wDJQUY8Noob9jxReJWuoR4Qt\r
+       4Vb/fFMhvsuBxG2Wnk+ls05ZbXjq7PAojT2uu7mvCkUa9Vk7qpZDMeDwXqvWe3FKBvCY\r
+       5rTTV+DKJJvk2tX+x32Dq84mCqeOazcRkdvIQTvKabiujxeXCW21b1peTc0PKEEAjXX0\r
+       0QSZW7mvhDawhddFORhCYwj+VvHKQg9jMZ6Q++W4aclj3YTNknqZAC2l0l64xji4zU9o\r
+       9iBg==\r
+X-Received: by 10.224.160.194 with SMTP id o2mr2613108qax.3.1377312930804;\r
+       Fri, 23 Aug 2013 19:55:30 -0700 (PDT)\r
+Received: from localhost.localdomain\r
+       (pool-108-8-228-201.spfdma.east.verizon.net. [108.8.228.201])\r
+       by mx.google.com with ESMTPSA id a2sm4350757qek.7.1969.12.31.16.00.00\r
+       (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);\r
+       Fri, 23 Aug 2013 19:55:30 -0700 (PDT)\r
+From: Ben Gamari <bgamari.foss@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3] notmuch-compact: Initial commit\r
+Date: Fri, 23 Aug 2013 22:55:22 -0400\r
+Message-Id: <1377312923-32274-3-git-send-email-bgamari.foss@gmail.com>\r
+X-Mailer: git-send-email 1.8.1.2\r
+In-Reply-To: <1377312923-32274-1-git-send-email-bgamari.foss@gmail.com>\r
+References: <1377312923-32274-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: Sat, 24 Aug 2013 02:55:40 -0000\r
+\r
+Introduce the user command exposing the new compaction facility.\r
+\r
+Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>\r
+---\r
+ Makefile.local    |  1 +\r
+ notmuch-client.h  |  6 ++++++\r
+ notmuch-compact.c | 43 +++++++++++++++++++++++++++++++++++++++++++\r
+ notmuch.c         |  2 ++\r
+ 4 files changed, 52 insertions(+)\r
+ create mode 100644 notmuch-compact.c\r
+\r
+diff --git a/Makefile.local b/Makefile.local\r
+index b7cd266..0464a50 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -257,6 +257,7 @@ notmuch_client_srcs =              \\r
+       gmime-filter-reply.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 da332f3..5b8a076 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -203,6 +203,12 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[]);\r
+ int\r
+ notmuch_config_command (notmuch_config_t *config, int argc, char *argv[]);\r
+ \r
++int\r
++notmuch_compact_command (notmuch_config_t *config, int argc, char *argv[]);\r
++\r
++int\r
++notmuch_config_command (notmuch_config_t *config, int argc, char *argv[]);\r
++\r
+ const char *\r
+ notmuch_time_relative_date (const void *ctx, time_t then);\r
+ \r
+diff --git a/notmuch-compact.c b/notmuch-compact.c\r
+new file mode 100644\r
+index 0000000..72b5c1e\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 © 2013 Ben Gmaari\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: Ben Gamari <bgamari.foss@gmail.com>\r
++ */\r
++\r
++#include "notmuch-client.h"\r
++\r
++int\r
++notmuch_compact_command (notmuch_config_t *config, unused (int argc), unused (char *argv[]))\r
++{\r
++    notmuch_database_t *notmuch;\r
++    notmuch_status_t ret;\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...\n");\r
++    ret = notmuch_database_compact_close (notmuch);\r
++    if (ret) {\r
++      fprintf (stderr, "Compaction failed: %s\n", notmuch_status_to_string(ret));\r
++    } else {\r
++      printf ("Done.\n");\r
++    }\r
++    notmuch_database_destroy (notmuch);\r
++\r
++    return 0;\r
++}\r
+diff --git a/notmuch.c b/notmuch.c\r
+index 78d29a8..ab0b1cf 100644\r
+--- a/notmuch.c\r
++++ b/notmuch.c\r
+@@ -60,6 +60,8 @@ static command_t commands[] = {\r
+       "Create a plain-text dump of the tags for each message." },\r
+     { "restore", notmuch_restore_command, FALSE,\r
+       "Restore the tags from the given dump file (see 'dump')." },\r
++    { "compact", notmuch_compact_command, FALSE,\r
++      "Compact the notmuch database." },\r
+     { "config", notmuch_config_command, FALSE,\r
+       "Get or set settings in the notmuch configuration file." },\r
+     { "help", notmuch_help_command, TRUE, /* create but don't save config */\r
+-- \r
+1.8.1.2\r
+\r