debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-02-17 23:53:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

CLI: generalize notmuch_config_mode_t

Browse source 
The renaming and extra values will make sense when we start to convert
subcommands to the new configuration framework. It will also avoid
collisions with a new enum for configuration keys to be introduced in
a future commit.
This commit is contained in:
David Bremner 2020-12-21 12:12:09 -04:00
parent 39580e2d7f
commit 867d7352a7
3 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
notmuch-client.h
View file

@ -253,14 +253,16 @@ json_quote_str (const void *ctx, const char *str);
/* notmuch-config.c */ /* notmuch-config.c */
typedef enum { typedef enum {
NOTMUCH_CONFIG_OPEN = 1 << 0, NOTMUCH_COMMAND_CONFIG_OPEN = 1 << 0,
NOTMUCH_CONFIG_CREATE = 1 << 1, NOTMUCH_COMMAND_CONFIG_CREATE = 1 << 1,
} notmuch_config_mode_t; NOTMUCH_COMMAND_DATABASE_EARLY = 1 << 2,
NOTMUCH_COMMAND_DATABASE_WRITE = 1 << 3,
} notmuch_command_mode_t;
notmuch_config_t * notmuch_config_t *
notmuch_config_open (void *ctx, notmuch_config_open (void *ctx,
const char *filename, const char *filename,
notmuch_config_mode_t config_mode); notmuch_command_mode_t config_mode);
void void
notmuch_config_close (notmuch_config_t *config); notmuch_config_close (notmuch_config_t *config);

6
notmuch-config.c
View file

@ -324,7 +324,7 @@ get_config_from_file (notmuch_config_t *config, bool create_new)
notmuch_config_t * notmuch_config_t *
notmuch_config_open (void *ctx, notmuch_config_open (void *ctx,
const char *filename, const char *filename,
notmuch_config_mode_t config_mode) notmuch_command_mode_t config_mode)
{ {
GError *error = NULL; GError *error = NULL;
size_t tmp; size_t tmp;
@ -359,8 +359,8 @@ notmuch_config_open (void *ctx,
config->key_file = g_key_file_new (); config->key_file = g_key_file_new ();
if (config_mode & NOTMUCH_CONFIG_OPEN) { if (config_mode & NOTMUCH_COMMAND_CONFIG_OPEN) {
bool create_new = (config_mode & NOTMUCH_CONFIG_CREATE) != 0; bool create_new = (config_mode & NOTMUCH_COMMAND_CONFIG_CREATE) != 0;
if (! get_config_from_file (config, create_new)) { if (! get_config_from_file (config, create_new)) {
talloc_free (config); talloc_free (config);

36
notmuch.c
View file

@ -33,7 +33,7 @@ typedef int (*command_function_t) (notmuch_config_t *config, int argc, char *arg
typedef struct command { typedef struct command {
const char *name; const char *name;
command_function_t function; command_function_t function;
notmuch_config_mode_t config_mode; notmuch_command_mode_t mode;
const char *summary; const char *summary;
} command_t; } command_t;
@ -136,41 +136,41 @@ notmuch_process_shared_indexing_options (notmuch_database_t *notmuch)
static command_t commands[] = { static command_t commands[] = {
{ NULL, notmuch_command, NOTMUCH_CONFIG_OPEN | NOTMUCH_CONFIG_CREATE, { NULL, notmuch_command, NOTMUCH_COMMAND_CONFIG_OPEN | NOTMUCH_COMMAND_CONFIG_CREATE,
"Notmuch main command." }, "Notmuch main command." },
{ "setup", notmuch_setup_command, NOTMUCH_CONFIG_OPEN | NOTMUCH_CONFIG_CREATE, { "setup", notmuch_setup_command, NOTMUCH_COMMAND_CONFIG_OPEN | NOTMUCH_COMMAND_CONFIG_CREATE,
"Interactively set up notmuch for first use." }, "Interactively set up notmuch for first use." },
{ "new", notmuch_new_command, NOTMUCH_CONFIG_OPEN, { "new", notmuch_new_command, NOTMUCH_COMMAND_CONFIG_OPEN,
"Find and import new messages to the notmuch database." }, "Find and import new messages to the notmuch database." },
{ "insert", notmuch_insert_command, NOTMUCH_CONFIG_OPEN, { "insert", notmuch_insert_command, NOTMUCH_COMMAND_CONFIG_OPEN,
"Add a new message into the maildir and notmuch database." }, "Add a new message into the maildir and notmuch database." },
{ "search", notmuch_search_command, NOTMUCH_CONFIG_OPEN, { "search", notmuch_search_command, NOTMUCH_COMMAND_CONFIG_OPEN,
"Search for messages matching the given search terms." }, "Search for messages matching the given search terms." },
{ "address", notmuch_address_command, NOTMUCH_CONFIG_OPEN, { "address", notmuch_address_command, NOTMUCH_COMMAND_CONFIG_OPEN,
"Get addresses from messages matching the given search terms." }, "Get addresses from messages matching the given search terms." },
{ "show", notmuch_show_command, NOTMUCH_CONFIG_OPEN, { "show", notmuch_show_command, NOTMUCH_COMMAND_CONFIG_OPEN,
"Show all messages matching the search terms." }, "Show all messages matching the search terms." },
{ "count", notmuch_count_command, NOTMUCH_CONFIG_OPEN, { "count", notmuch_count_command, NOTMUCH_COMMAND_CONFIG_OPEN,
"Count messages matching the search terms." }, "Count messages matching the search terms." },
{ "reply", notmuch_reply_command, NOTMUCH_CONFIG_OPEN, { "reply", notmuch_reply_command, NOTMUCH_COMMAND_CONFIG_OPEN,
"Construct a reply template for a set of messages." }, "Construct a reply template for a set of messages." },
{ "tag", notmuch_tag_command, NOTMUCH_CONFIG_OPEN, { "tag", notmuch_tag_command, NOTMUCH_COMMAND_CONFIG_OPEN,
"Add/remove tags for all messages matching the search terms." }, "Add/remove tags for all messages matching the search terms." },
{ "dump", notmuch_dump_command, NOTMUCH_CONFIG_OPEN, { "dump", notmuch_dump_command, NOTMUCH_COMMAND_CONFIG_OPEN,
"Create a plain-text dump of the tags for each message." }, "Create a plain-text dump of the tags for each message." },
{ "restore", notmuch_restore_command, NOTMUCH_CONFIG_OPEN, { "restore", notmuch_restore_command, NOTMUCH_COMMAND_CONFIG_OPEN,
"Restore the tags from the given dump file (see 'dump')." }, "Restore the tags from the given dump file (see 'dump')." },
{ "compact", notmuch_compact_command, NOTMUCH_CONFIG_OPEN, { "compact", notmuch_compact_command, NOTMUCH_COMMAND_CONFIG_OPEN,
"Compact the notmuch database." }, "Compact the notmuch database." },
{ "reindex", notmuch_reindex_command, NOTMUCH_CONFIG_OPEN, { "reindex", notmuch_reindex_command, NOTMUCH_COMMAND_CONFIG_OPEN,
"Re-index all messages matching the search terms." }, "Re-index all messages matching the search terms." },
{ "config", notmuch_config_command, NOTMUCH_CONFIG_OPEN, { "config", notmuch_config_command, NOTMUCH_COMMAND_CONFIG_OPEN,
"Get or set settings in the notmuch configuration file." }, "Get or set settings in the notmuch configuration file." },
#if WITH_EMACS #if WITH_EMACS
{ "emacs-mua", NULL, 0, { "emacs-mua", NULL, 0,
"send mail with notmuch and emacs." }, "send mail with notmuch and emacs." },
#endif #endif
{ "help", notmuch_help_command, NOTMUCH_CONFIG_CREATE, /* create but don't save config */ { "help", notmuch_help_command, NOTMUCH_COMMAND_CONFIG_CREATE, /* create but don't save config */
"This message, or more detailed help for the named command." } "This message, or more detailed help for the named command." }
}; };
@ -496,7 +496,7 @@ main (int argc, char *argv[])
goto DONE; goto DONE;
} }
config = notmuch_config_open (local, config_file_name, command->config_mode); config = notmuch_config_open (local, config_file_name, command->mode);
if (! config) { if (! config) {
ret = EXIT_FAILURE; ret = EXIT_FAILURE;
goto DONE; goto DONE;