debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

CLI/config: switch "notmuch config list" to merged config

Browse source 
Use the database opened at the top level rather than opening another
notmuch_database_t.

Test output changes because keys are now listed in alphabetical order,
and because a missing database is no longer an error.
This commit is contained in:
David Bremner 2021-02-14 07:54:22 -04:00
parent 34f734e26b
commit 3787fe6c84
2 changed files with 24 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
notmuch-config.c
View file

@ -972,67 +972,20 @@ _notmuch_config_list_built_with ()
}
static int
_list_db_config (notmuch_config_t *config)
notmuch_config_command_list (notmuch_database_t *notmuch)
{
notmuch_database_t *notmuch;
notmuch_config_list_t *list;
if (notmuch_database_open (notmuch_config_get_database_path (config),
NOTMUCH_DATABASE_MODE_READ_ONLY, &notmuch))
return EXIT_FAILURE;
/* XXX Handle UUID mismatch? */
if (print_status_database ("notmuch config", notmuch,
notmuch_database_get_config_list (notmuch, "", &list)))
return EXIT_FAILURE;
for (; notmuch_config_list_valid (list); notmuch_config_list_move_to_next (list)) {
printf ("%s=%s\n", notmuch_config_list_key (list), notmuch_config_list_value (list));
}
notmuch_config_list_destroy (list);
return EXIT_SUCCESS;
}
static int
notmuch_config_command_list (notmuch_config_t *config)
{
char **groups;
size_t g, groups_length;
groups = g_key_file_get_groups (config->key_file, &groups_length);
if (groups == NULL)
return 1;
for (g = 0; g < groups_length; g++) {
char **keys;
size_t k, keys_length;
keys = g_key_file_get_keys (config->key_file,
groups[g], &keys_length, NULL);
if (keys == NULL)
continue;
for (k = 0; k < keys_length; k++) {
char *value;
value = g_key_file_get_string (config->key_file,
groups[g], keys[k], NULL);
if (value != NULL) {
printf ("%s.%s=%s\n", groups[g], keys[k], value);
free (value);
}
}
g_strfreev (keys);
}
g_strfreev (groups);
notmuch_config_pairs_t *list;
_notmuch_config_list_built_with ();
return _list_db_config (config);
for (list = notmuch_config_get_pairs (notmuch, "");
notmuch_config_pairs_valid (list);
notmuch_config_pairs_move_to_next (list)) {
const char *value = notmuch_config_pairs_value (list);
if (value)
printf ("%s=%s\n", notmuch_config_pairs_key (list), value);
}
notmuch_config_pairs_destroy (list);
return EXIT_SUCCESS;
}
int
@ -1074,7 +1027,7 @@ notmuch_config_command (notmuch_config_t *config, notmuch_database_t *notmuch,
}
ret = notmuch_config_command_set (config, argv[1], argc - 2, argv + 2);
} else if (strcmp (argv[0], "list") == 0) {
ret = notmuch_config_command_list (config);
ret = notmuch_config_command_list (notmuch);
} else {
fprintf (stderr, "Unrecognized argument for notmuch config: %s\n",
argv[0]);

27
test/T030-config.sh
View file

@ -46,25 +46,22 @@ notmuch config set foo.nonexistent
test_expect_equal "$(notmuch config get foo.nonexistent)" ""
test_begin_subtest "List all items"
notmuch config list > STDOUT 2> STDERR
printf "%s\n====\n%s\n" "$(< STDOUT)" "$(< STDERR)" | notmuch_config_sanitize > OUTPUT
notmuch config list 2>&1 | notmuch_config_sanitize > OUTPUT
cat <<EOF > EXPECTED
database.path=MAIL_DIR
user.name=Notmuch Test Suite
user.primary_email=test_suite@notmuchmail.org
user.other_email=test_suite_other@notmuchmail.org;test_suite@otherdomain.org
new.tags=unread;inbox;
new.ignore=
search.exclude_tags=
maildir.synchronize_flags=true
foo.string=this is another string value
foo.list=this;is another;list value;
built_with.compact=something
built_with.field_processor=something
built_with.retry_lock=something
====
Error: Cannot open database at MAIL_DIR/.notmuch: No such file or directory.
database.mail_root=MAIL_DIR
database.path=MAIL_DIR
foo.list=this;is another;list value;
foo.string=this is another string value
maildir.synchronize_flags=true
new.ignore=
new.tags=unread;inbox;
search.exclude_tags=
user.name=Notmuch Test Suite
user.other_email=test_suite_other@notmuchmail.org;test_suite@otherdomain.org
user.primary_email=test_suite@notmuchmail.org
EOF
test_expect_equal_file EXPECTED OUTPUT