#define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
-typedef int (*command_function_t) (int argc, char *argv[]);
+typedef int (*command_function_t) (void *ctx, int argc, char *argv[]);
typedef struct command {
const char *name;
}
static int
-setup_command (unused (int argc), unused (char *argv[]))
+setup_command (unused (void *ctx), unused (int argc), unused (char *argv[]))
{
notmuch_database_t *notmuch = NULL;
char *default_path, *mail_directory = NULL;
}
static int
-new_command (unused (int argc), unused (char *argv[]))
+new_command (unused (void *ctx), unused (int argc), unused (char *argv[]))
{
notmuch_database_t *notmuch;
const char *mail_directory;
return query_string;
}
-static int
-search_command (int argc, char *argv[])
-{
- void *local = talloc_new (NULL);
- notmuch_database_t *notmuch = NULL;
- notmuch_query_t *query;
- notmuch_thread_results_t *results;
- notmuch_thread_t *thread;
- notmuch_tags_t *tags;
- char *query_str;
- notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
-
- notmuch = notmuch_database_open (NULL);
- if (notmuch == NULL) {
- ret = 1;
- goto DONE;
- }
-
- query_str = query_string_from_args (local, argc, argv);
-
- query = notmuch_query_create (notmuch, query_str);
- if (query == NULL) {
- fprintf (stderr, "Out of memory\n");
- ret = 1;
- goto DONE;
- }
-
- for (results = notmuch_query_search_threads (query);
- notmuch_thread_results_has_more (results);
- notmuch_thread_results_advance (results))
- {
- int first = 1;
-
- thread = notmuch_thread_results_get (results);
-
- printf ("%s %s",
- notmuch_thread_get_thread_id (thread),
- notmuch_thread_get_subject (thread));
-
- printf (" (");
- for (tags = notmuch_thread_get_tags (thread);
- notmuch_tags_has_more (tags);
- notmuch_tags_advance (tags))
- {
- if (! first)
- printf (" ");
- printf ("%s", notmuch_tags_get (tags));
- first = 0;
- }
- printf (")\n");
-
- notmuch_thread_destroy (thread);
- }
-
- notmuch_query_destroy (query);
-
- DONE:
- if (notmuch)
- notmuch_database_close (notmuch);
- talloc_free (local);
-
- return ret;
-}
-
/* Format a nice representation of 'time' relative to the current time.
*
* Examples include:
if (delta > 180 * DAY) {
strftime (result, RELATIVE_DATE_MAX,
- "%F", &tm_then);
+ "%F", &tm_then); /* 2008-06-30 */
return result;
}
return result;
}
- if (delta <= 6 * DAY) {
+ if (delta <= 7 * DAY) {
if (tm_then.tm_wday == tm_now.tm_wday &&
delta < DAY)
{
strftime (result, RELATIVE_DATE_MAX,
- "%R", &tm_then);
+ "%R", &tm_then); /* 12:30 */
return result;
} else if ((tm_now.tm_wday + 7 - tm_then.tm_wday) % 7 == 1) {
return "Yesterday";
} else {
- strftime (result, RELATIVE_DATE_MAX,
- "%A", &tm_then);
- return result;
+ if (tm_then.tm_wday != tm_now.tm_wday) {
+ strftime (result, RELATIVE_DATE_MAX,
+ "%A", &tm_then); /* Monday */
+ return result;
+ }
}
}
strftime (result, RELATIVE_DATE_MAX,
- "%b %d", &tm_then);
+ "%b %d", &tm_then); /* Oct. 12 */
return result;
}
#undef MINUTE
#undef HOUR
#undef DAY
+static int
+search_command (void *ctx, int argc, char *argv[])
+{
+ void *local = talloc_new (ctx);
+ notmuch_database_t *notmuch = NULL;
+ notmuch_query_t *query;
+ notmuch_threads_t *threads;
+ notmuch_thread_t *thread;
+ notmuch_tags_t *tags;
+ char *query_str;
+ const char *relative_date;
+ time_t date;
+ notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
+
+ notmuch = notmuch_database_open (NULL);
+ if (notmuch == NULL) {
+ ret = 1;
+ goto DONE;
+ }
+
+ query_str = query_string_from_args (local, argc, argv);
+
+ query = notmuch_query_create (notmuch, query_str);
+ if (query == NULL) {
+ fprintf (stderr, "Out of memory\n");
+ ret = 1;
+ goto DONE;
+ }
+
+ for (threads = notmuch_query_search_threads (query);
+ notmuch_threads_has_more (threads);
+ notmuch_threads_advance (threads))
+ {
+ int first = 1;
+
+ thread = notmuch_threads_get (threads);
+
+ date = notmuch_thread_get_oldest_date (thread);
+ relative_date = _format_relative_date (local, date);
+
+ printf ("%s (%s) %s",
+ notmuch_thread_get_thread_id (thread),
+ relative_date,
+ notmuch_thread_get_subject (thread));
+
+ printf (" (");
+ for (tags = notmuch_thread_get_tags (thread);
+ notmuch_tags_has_more (tags);
+ notmuch_tags_advance (tags))
+ {
+ if (! first)
+ printf (" ");
+ printf ("%s", notmuch_tags_get (tags));
+ first = 0;
+ }
+ printf (")\n");
+
+ notmuch_thread_destroy (thread);
+ }
+
+ notmuch_query_destroy (query);
+
+ DONE:
+ if (notmuch)
+ notmuch_database_close (notmuch);
+ talloc_free (local);
+
+ return ret;
+}
+
/* Get a nice, single-line summary of message. */
static const char *
_get_one_line_summary (void *ctx, notmuch_message_t *message)
}
static int
-show_command (unused (int argc), unused (char *argv[]))
+show_command (void *ctx, unused (int argc), unused (char *argv[]))
{
- void *local = talloc_new (NULL);
+ void *local = talloc_new (ctx);
char *query_string;
notmuch_database_t *notmuch = NULL;
notmuch_query_t *query = NULL;
- notmuch_message_results_t *messages;
+ notmuch_messages_t *messages;
notmuch_message_t *message;
const char *filename;
FILE *file;
}
for (messages = notmuch_query_search_messages (query);
- notmuch_message_results_has_more (messages);
- notmuch_message_results_advance (messages))
+ notmuch_messages_has_more (messages);
+ notmuch_messages_advance (messages))
{
- message = notmuch_message_results_get (messages);
+ message = notmuch_messages_get (messages);
printf ("%%message{\n");
}
static int
-tag_command (unused (int argc), unused (char *argv[]))
+tag_command (void *ctx, unused (int argc), unused (char *argv[]))
{
void *local;
int *add_tags, *remove_tags;
char *query_string;
notmuch_database_t *notmuch = NULL;
notmuch_query_t *query;
- notmuch_message_results_t *results;
+ notmuch_messages_t *messages;
notmuch_message_t *message;
int ret = 0;
int i;
- local = talloc_new (NULL);
+ local = talloc_new (ctx);
if (local == NULL) {
ret = 1;
goto DONE;
goto DONE;
}
- for (results = notmuch_query_search_messages (query);
- notmuch_message_results_has_more (results);
- notmuch_message_results_advance (results))
+ for (messages = notmuch_query_search_messages (query);
+ notmuch_messages_has_more (messages);
+ notmuch_messages_advance (messages))
{
- message = notmuch_message_results_get (results);
+ message = notmuch_messages_get (messages);
notmuch_message_freeze (message);
}
static int
-dump_command (int argc, char *argv[])
+dump_command (unused (void *ctx), int argc, char *argv[])
{
FILE *output = NULL;
notmuch_database_t *notmuch = NULL;
notmuch_query_t *query;
- notmuch_message_results_t *results;
+ notmuch_messages_t *messages;
notmuch_message_t *message;
notmuch_tags_t *tags;
int ret = 0;
notmuch_query_set_sort (query, NOTMUCH_SORT_MESSAGE_ID);
- for (results = notmuch_query_search_messages (query);
- notmuch_message_results_has_more (results);
- notmuch_message_results_advance (results))
+ for (messages = notmuch_query_search_messages (query);
+ notmuch_messages_has_more (messages);
+ notmuch_messages_advance (messages))
{
int first = 1;
- message = notmuch_message_results_get (results);
+ message = notmuch_messages_get (messages);
fprintf (output,
"%s (", notmuch_message_get_message_id (message));
}
static int
-restore_command (int argc, char *argv[])
+restore_command (unused (void *ctx), int argc, char *argv[])
{
FILE *input = NULL;
notmuch_database_t *notmuch = NULL;
}
static int
-help_command (int argc, char *argv[]);
+help_command (void *ctx, int argc, char *argv[]);
command_t commands[] = {
{ "setup", setup_command,
"\t\t\"inbox\" and \"unread\".\n"
"\n"
"\t\tNote: \"notmuch new\" will skip any read-only directories,\n"
- "\t\tso you can use that to mark tdirectories that will not\n"
+ "\t\tso you can use that to mark directories that will not\n"
"\t\treceive any new mail (and make \"notmuch new\" faster)." },
{ "search", search_command,
"<search-term> [...]\n\n"
}
static int
-help_command (int argc, char *argv[])
+help_command (unused (void *ctx), int argc, char *argv[])
{
command_t *command;
unsigned int i;
int
main (int argc, char *argv[])
{
+ void *local = talloc_new (NULL);
command_t *command;
unsigned int i;
if (argc == 1)
- return setup_command (0, NULL);
+ return setup_command (local, 0, NULL);
for (i = 0; i < ARRAY_SIZE (commands); i++) {
command = &commands[i];
if (strcmp (argv[1], command->name) == 0)
- return (command->function) (argc - 2, &argv[2]);
+ return (command->function) (local, argc - 2, &argv[2]);
}
/* Don't complain about "help" being an unknown command when we're
about to provide exactly what's wanted anyway. */
- fprintf (stderr, "Error: Unknown command '%s'\n\n", argv[1]);
- usage ();
+ fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n",
+ argv[1]);
+
+ talloc_free (local);
return 1;
}
projects / notmuch / blobdiff