From 433102dabae248a3b03a1bb8701b8f8d84143886 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 3 Oct 2013 16:30:47 +2000 Subject: [PATCH] [PATCH 2/3] notmuch-compact: Initial commit of CLI --- 7b/c145ffb7e3a2e177d19313566a5bbe3d9efb3e | 181 ++++++++++++++++++++++ 1 file changed, 181 insertions(+) create mode 100644 7b/c145ffb7e3a2e177d19313566a5bbe3d9efb3e diff --git a/7b/c145ffb7e3a2e177d19313566a5bbe3d9efb3e b/7b/c145ffb7e3a2e177d19313566a5bbe3d9efb3e new file mode 100644 index 000000000..1aeebbfb1 --- /dev/null +++ b/7b/c145ffb7e3a2e177d19313566a5bbe3d9efb3e @@ -0,0 +1,181 @@ +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 4D1E2431FDA + for ; Wed, 2 Oct 2013 13:31:10 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.799 +X-Spam-Level: +X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 FlPKeZ+jBM+n for ; + Wed, 2 Oct 2013 13:31:05 -0700 (PDT) +Received: from mail-qc0-f174.google.com (mail-qc0-f174.google.com + [209.85.216.174]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 24E8A431FD6 + for ; Wed, 2 Oct 2013 13:31:03 -0700 (PDT) +Received: by mail-qc0-f174.google.com with SMTP id n9so944021qcw.19 + for ; Wed, 02 Oct 2013 13:31:02 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:in-reply-to:references + :mime-version:content-type:content-transfer-encoding; + bh=7jtcxk1tRBwBmX6VIMtPbgHsu86gjby8N+BEE5R14ys=; + b=yD6Vn4n0MJp1mvW5m1VKvTHqtlMJUPSLc1X9f7R7iSSudgLTNFxhuSEWyq2rCFKsp1 + h9nbTDE9Bu1ipHpS3hqHOULB0zVMcwLbO1ziR2mliGcCkc8D55UnHfilNrBFF/jFZcZT + JlBFrIDeZKjDw6nEXV9YJsZyIHnqDlZaTnyNgMxQIVCZAwe7aRIq2VczbiUPtR84v+ot + BsE5gOd7gTDQcswTWjW/vB7mKFnNDhjtB0NlVizENWZbhYezAjv/krdQajwzU/LP875l + gv4EVdxm91xtMiOE3vNQsUqKivv2kweFdbm9tLLqJnNOrh4oLCv/wXOivuM73BfzI3CR + 6RbQ== +X-Received: by 10.49.48.168 with SMTP id m8mr5373585qen.25.1380745862606; + Wed, 02 Oct 2013 13:31:02 -0700 (PDT) +Received: from ben-laptop.hasb.physics.cns (gamari.physics.umass.edu. + [128.119.56.223]) + by mx.google.com with ESMTPSA id fx6sm5946200qeb.1.1969.12.31.16.00.00 + (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); + Wed, 02 Oct 2013 13:31:02 -0700 (PDT) +From: Ben Gamari +To: notmuch@notmuchmail.org +Subject: [PATCH 2/3] notmuch-compact: Initial commit of CLI +Date: Wed, 2 Oct 2013 16:30:47 -0400 +Message-Id: <1380745848-4972-3-git-send-email-bgamari.foss@gmail.com> +X-Mailer: git-send-email 1.8.1.2 +In-Reply-To: <1380745848-4972-1-git-send-email-bgamari.foss@gmail.com> +References: <1380745848-4972-1-git-send-email-bgamari.foss@gmail.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +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: Wed, 02 Oct 2013 20:31:10 -0000 + +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 b7cd266..0464a50 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 afb0ddf..0bfa4da 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 0000000..bfda40e +--- /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 7300c21..8d303a1 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 */ +-- +1.8.1.2 + -- 2.26.2