--- /dev/null
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id F22946DE01FF\r
+ for <notmuch@notmuchmail.org>; Tue, 12 Jan 2016 19:10:28 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.311\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.311 tagged_above=-999 required=5 tests=[AWL=0.240,\r
+ RP_MATCHES_RCVD=-0.55, SPF_PASS=-0.001] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id cFR9P_HEN4-j for <notmuch@notmuchmail.org>;\r
+ Tue, 12 Jan 2016 19:10:27 -0800 (PST)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id A316D6DE0B4F\r
+ for <notmuch@notmuchmail.org>; Tue, 12 Jan 2016 19:10:24 -0800 (PST)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1aJBp8-0000ye-8s; Tue, 12 Jan 2016 22:10:14 -0500\r
+Received: (nullmailer pid 23106 invoked by uid 1000);\r
+ Wed, 13 Jan 2016 03:10:18 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [WIP2 4/4] CLI: add optional metadata to dump output.\r
+Date: Tue, 12 Jan 2016 23:10:10 -0400\r
+Message-Id: <1452654610-22864-5-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.6.4\r
+In-Reply-To: <1452654610-22864-1-git-send-email-david@tethera.net>\r
+References: <1452654610-22864-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 13 Jan 2016 03:10:29 -0000\r
+\r
+This lacks at least documentation. Note that it changes the default dump\r
+output format, but doesn't break existing notmuch-restore. It might\r
+break user scripts though.\r
+---\r
+ notmuch-client.h | 6 ++++++\r
+ notmuch-dump.c | 41 ++++++++++++++++++++++++++++++++++++++---\r
+ notmuch-new.c | 2 +-\r
+ test/T590-libconfig.sh | 10 ++++++++++\r
+ 4 files changed, 55 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/notmuch-client.h b/notmuch-client.h\r
+index 7c9a1ea..2dca83c 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -443,11 +443,17 @@ typedef enum dump_formats {\r
+ DUMP_FORMAT_SUP\r
+ } dump_format_t;\r
+ \r
++typedef enum dump_includes {\r
++ DUMP_INCLUDE_TAGS=1,\r
++ DUMP_INCLUDE_CONFIG=2,\r
++} dump_include_t;\r
++\r
+ int\r
+ notmuch_database_dump (notmuch_database_t *notmuch,\r
+ const char *output_file_name,\r
+ const char *query_str,\r
+ dump_format_t output_format,\r
++ dump_include_t include,\r
+ notmuch_bool_t gzip_output);\r
+ \r
+ /* If status is non-zero (i.e. error) print appropriate\r
+diff --git a/notmuch-dump.c b/notmuch-dump.c\r
+index 829781f..4909493 100644\r
+--- a/notmuch-dump.c\r
++++ b/notmuch-dump.c\r
+@@ -23,16 +23,43 @@\r
+ #include "string-util.h"\r
+ #include <zlib.h>\r
+ \r
++static notmuch_status_t\r
++database_dump_config(notmuch_database_t *notmuch, gzFile output)\r
++{\r
++ notmuch_config_list_t *list;\r
++ notmuch_status_t status;\r
++ status = notmuch_database_get_config_list (notmuch, NULL, &list);\r
++ if (status)\r
++ return status;\r
++\r
++ for (; notmuch_config_list_valid (list); notmuch_config_list_move_to_next (list)) {\r
++ /* FIXME hexencode key and values */\r
++ gzprintf(output, "#@ %s %s\n",\r
++ notmuch_config_list_key (list), notmuch_config_list_value (list));\r
++ }\r
++ notmuch_config_list_destroy (list);\r
++\r
++ return NOTMUCH_STATUS_SUCCESS;\r
++}\r
+ \r
+ static int\r
+ database_dump_file (notmuch_database_t *notmuch, gzFile output,\r
+- const char *query_str, int output_format)\r
++ const char *query_str, int output_format, int include)\r
+ {\r
+ notmuch_query_t *query;\r
+ notmuch_messages_t *messages;\r
+ notmuch_message_t *message;\r
+ notmuch_tags_t *tags;\r
+ \r
++ if (include | DUMP_INCLUDE_CONFIG) {\r
++ if (print_status_database ("notmuch dump", notmuch,\r
++ database_dump_config(notmuch,output)))\r
++ return EXIT_FAILURE;\r
++ }\r
++\r
++ if (! (include & DUMP_INCLUDE_TAGS))\r
++ return EXIT_SUCCESS;\r
++\r
+ if (! query_str)\r
+ query_str = "";\r
+ \r
+@@ -130,6 +157,7 @@ notmuch_database_dump (notmuch_database_t *notmuch,\r
+ const char *output_file_name,\r
+ const char *query_str,\r
+ dump_format_t output_format,\r
++ dump_include_t include,\r
+ notmuch_bool_t gzip_output)\r
+ {\r
+ gzFile output = NULL;\r
+@@ -164,7 +192,7 @@ notmuch_database_dump (notmuch_database_t *notmuch,\r
+ goto DONE;\r
+ }\r
+ \r
+- ret = database_dump_file (notmuch, output, query_str, output_format);\r
++ ret = database_dump_file (notmuch, output, query_str, output_format, include);\r
+ if (ret) goto DONE;\r
+ \r
+ ret = gzflush (output, Z_FINISH);\r
+@@ -226,6 +254,7 @@ notmuch_dump_command (notmuch_config_t *config, int argc, char *argv[])\r
+ int opt_index;\r
+ \r
+ int output_format = DUMP_FORMAT_BATCH_TAG;\r
++ int include = 0;\r
+ notmuch_bool_t gzip_output = 0;\r
+ \r
+ notmuch_opt_desc_t options[] = {\r
+@@ -233,6 +262,9 @@ notmuch_dump_command (notmuch_config_t *config, int argc, char *argv[])\r
+ (notmuch_keyword_t []){ { "sup", DUMP_FORMAT_SUP },\r
+ { "batch-tag", DUMP_FORMAT_BATCH_TAG },\r
+ { 0, 0 } } },\r
++ { NOTMUCH_OPT_KEYWORD_FLAGS, &include, "include", 'i',\r
++ (notmuch_keyword_t []){ { "metadata", DUMP_INCLUDE_CONFIG },\r
++ { "tags", DUMP_INCLUDE_TAGS} } },\r
+ { NOTMUCH_OPT_STRING, &output_file_name, "output", 'o', 0 },\r
+ { NOTMUCH_OPT_BOOLEAN, &gzip_output, "gzip", 'z', 0 },\r
+ { NOTMUCH_OPT_INHERIT, (void *) ¬much_shared_options, NULL, 0, 0 },\r
+@@ -245,6 +277,9 @@ notmuch_dump_command (notmuch_config_t *config, int argc, char *argv[])\r
+ \r
+ notmuch_process_shared_options (argv[0]);\r
+ \r
++ if (include == 0)\r
++ include = DUMP_INCLUDE_CONFIG | DUMP_INCLUDE_TAGS;\r
++\r
+ if (opt_index < argc) {\r
+ query_str = query_string_from_args (notmuch, argc - opt_index, argv + opt_index);\r
+ if (query_str == NULL) {\r
+@@ -254,7 +289,7 @@ notmuch_dump_command (notmuch_config_t *config, int argc, char *argv[])\r
+ }\r
+ \r
+ ret = notmuch_database_dump (notmuch, output_file_name, query_str,\r
+- output_format, gzip_output);\r
++ output_format, include, gzip_output);\r
+ \r
+ notmuch_database_destroy (notmuch);\r
+ \r
+diff --git a/notmuch-new.c b/notmuch-new.c\r
+index e503776..fd2ff82 100644\r
+--- a/notmuch-new.c\r
++++ b/notmuch-new.c\r
+@@ -1041,7 +1041,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])\r
+ }\r
+ \r
+ if (notmuch_database_dump (notmuch, backup_name, "",\r
+- DUMP_FORMAT_BATCH_TAG, TRUE)) {\r
++ DUMP_FORMAT_BATCH_TAG, DUMP_INCLUDE_CONFIG | DUMP_INCLUDE_TAGS, TRUE)) {\r
+ fprintf (stderr, "Backup failed. Aborting upgrade.");\r
+ return EXIT_FAILURE;\r
+ }\r
+diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh\r
+index 8ca6883..4fe6bd1 100755\r
+--- a/test/T590-libconfig.sh\r
++++ b/test/T590-libconfig.sh\r
+@@ -115,4 +115,14 @@ testkey2 testvalue2\r
+ EOF\r
+ test_expect_equal_file EXPECTED OUTPUT\r
+ \r
++test_begin_subtest "dump config"\r
++notmuch dump --include=metadata >OUTPUT\r
++cat <<'EOF' >EXPECTED\r
++#@ aaabefore beforeval\r
++#@ testkey1 testvalue1\r
++#@ testkey2 testvalue2\r
++#@ zzzafter afterval\r
++EOF\r
++test_expect_equal_file EXPECTED OUTPUT\r
++\r
+ test_done\r
+-- \r
+2.6.4\r
+\r
projects / notmuch-archives.git / commitdiff