From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 85D69429E29 for ; Fri, 21 Oct 2011 12:48:14 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -2.3 X-Spam-Level: X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_MED=-2.3] 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 fwwl510BJXho for ; Fri, 21 Oct 2011 12:48:13 -0700 (PDT) Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 81009429E2E for ; Fri, 21 Oct 2011 12:48:11 -0700 (PDT) Received: from convex-new.cs.unb.ca ([131.202.13.154]) by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p9LJm4NU002203; Fri, 21 Oct 2011 16:48:07 -0300 Received: from bremner by convex-new.cs.unb.ca with local (Exim 4.72) (envelope-from ) id 1RHL4W-00016W-Rd; Fri, 21 Oct 2011 16:48:04 -0300 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 4/6] notmuch-restore: implement --accumulate option Date: Fri, 21 Oct 2011 16:47:55 -0300 Message-Id: <1319226477-4181-5-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1319226477-4181-1-git-send-email-david@tethera.net> References: <1317317857-29636-1-git-send-email-thomas@schwinge.name> <1319226477-4181-1-git-send-email-david@tethera.net> Cc: David Bremner 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: Fri, 21 Oct 2011 19:48:15 -0000 From: David Bremner Modify command line argument handling to take a --accumulate flag. Test for extra arguments beyond the input file. The --accumulate switch causes the union of the existing and new tags to be applied, instead of replacing each message's tags as they are read in from the dump file. Based on a patch by Thomas Schwinge: id:"1317317857-29636-1-git-send-email-thomas@schwinge.name" --- notmuch-restore.c | 45 ++++++++++++++++++++++++++++++++++++--------- test/dump-restore | 3 --- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/notmuch-restore.c b/notmuch-restore.c index f530bb4..097ca4b 100644 --- a/notmuch-restore.c +++ b/notmuch-restore.c @@ -18,6 +18,8 @@ * Author: Carl Worth */ +#include + #include "notmuch-client.h" int @@ -26,7 +28,8 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[]) notmuch_config_t *config; notmuch_database_t *notmuch; notmuch_bool_t synchronize_flags; - FILE *input; + notmuch_bool_t accumulate = FALSE; + FILE *input = stdin; char *line = NULL; size_t line_size; ssize_t line_len; @@ -44,18 +47,33 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[]) synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config); - argc--; argv++; /* skip subcommand argument */ + struct option options[] = { + { "accumulate", no_argument, 0, 'a' }, + { 0, 0, 0, 0} + }; + + int opt; + do { + opt = getopt_long (argc, argv, "", options, NULL); + + switch (opt) { + case 'a': + accumulate = 1; + break; + case '?': + break; + } + + } while (opt != -1); - if (argc) { - input = fopen (argv[0], "r"); + if (optind < argc) { + input = fopen (argv[optind], "r"); if (input == NULL) { fprintf (stderr, "Error opening %s for reading: %s\n", - argv[0], strerror (errno)); + argv[optind], strerror (errno)); return 1; } - } else { - printf ("No filename given. Reading dump from stdin.\n"); - input = stdin; + optind++; } /* Dump output is one line per message. We match a sequence of @@ -99,6 +117,13 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[]) goto NEXT_LINE; } + /* In order to detect missing messages, this check/optimization is + * intentionally done *after* first finding the message. */ + if (accumulate && (file_tags == NULL || *file_tags == '\0')) + { + goto NEXT_LINE; + } + db_tags_str = NULL; for (db_tags = notmuch_message_get_tags (message); notmuch_tags_valid (db_tags); @@ -120,7 +145,9 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[]) } notmuch_message_freeze (message); - notmuch_message_remove_all_tags (message); + + if (!accumulate) + notmuch_message_remove_all_tags (message); next = file_tags; while (next) { diff --git a/test/dump-restore b/test/dump-restore index 276dd6f..2f8dcc7 100755 --- a/test/dump-restore +++ b/test/dump-restore @@ -23,7 +23,6 @@ test_expect_success 'Clearing all tags' \ notmuch dump > clear.actual && test_cmp clear.expected clear.actual' -test_subtest_known_broken # missing --accumuluate test_expect_success 'Accumulate original tags' \ 'notmuch tag +ABC +DEF -- from:cworth && notmuch restore --accumulate < dump.expected && @@ -40,13 +39,11 @@ test_expect_success 'Restore with nothing to do' \ notmuch dump > dump.actual && test_cmp dump.expected dump.actual' -test_subtest_known_broken # missing --accumuluate test_expect_success 'Restore with nothing to do, II' \ 'notmuch restore --accumulate dump.expected && notmuch dump > dump.actual && test_cmp dump.expected dump.actual' -test_subtest_known_broken # missing --accumuluate test_expect_success 'Restore with nothing to do, III' \ 'notmuch restore --accumulate < clear.expected && notmuch dump > dump.actual && -- 1.7.5.4