#include <talloc.h>
-#include <glib.h> /* g_strdup_printf */
+#define unused(x) x __attribute__ ((unused))
/* There's no point in continuing when we've detected that we've done
* something wrong internally (as opposed to the user passing in a
const char *usage;
} command_t;
+typedef void (*add_files_callback_t) (notmuch_message_t *message);
+
typedef struct {
int ignore_read_only_directories;
int saw_read_only_directory;
int processed_files;
int added_messages;
struct timeval tv_start;
+
+ add_files_callback_t callback;
} add_files_state_t;
static void
}
/* Compute the number of seconds elapsed from start to end. */
-double
+static double
tv_elapsed (struct timeval start, struct timeval end)
{
return ((end.tv_sec - start.tv_sec) +
(end.tv_usec - start.tv_usec) / 1e6);
}
-void
+static void
print_formatted_seconds (double seconds)
{
int hours;
printf ("%ds", (int) seconds);
}
-void
+static void
add_files_print_progress (add_files_state_t *state)
{
struct timeval tv_now;
* The 'struct stat *st' must point to a structure that has already
* been initialized for 'path' by calling stat().
*/
-notmuch_status_t
+static notmuch_status_t
add_files_recursive (notmuch_database_t *notmuch,
const char *path,
struct stat *st,
char *next = NULL;
time_t path_mtime, path_dbtime;
notmuch_status_t status, ret = NOTMUCH_STATUS_SUCCESS;
+ notmuch_message_t *message, **closure;
/* If we're told to, we bail out on encountering a read-only
* directory, (with this being a clear clue from the user to
continue;
}
- next = g_strdup_printf ("%s/%s", path, entry->d_name);
+ next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name);
if (stat (next, st)) {
fprintf (stderr, "Error reading %s: %s\n",
if (st->st_mtime > path_dbtime) {
state->processed_files++;
- status = notmuch_database_add_message (notmuch, next);
+ if (state->callback)
+ closure = &message;
+ else
+ closure = NULL;
+
+ status = notmuch_database_add_message (notmuch, next, closure);
switch (status) {
/* success */
case NOTMUCH_STATUS_SUCCESS:
state->added_messages++;
+ if (state->callback)
+ (state->callback) (message);
+ notmuch_message_destroy (message);
break;
/* Non-fatal issues (go on to next file) */
case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID:
break;
/* Fatal issues. Don't process anymore. */
case NOTMUCH_STATUS_XAPIAN_EXCEPTION:
- fprintf (stderr, "A Xapian error was encountered. Halting processing.\n");
+ case NOTMUCH_STATUS_OUT_OF_MEMORY:
+ fprintf (stderr, "Error: %s. Halting processing.\n",
+ notmuch_status_to_string (status));
ret = status;
goto DONE;
default:
+ case NOTMUCH_STATUS_FILE_ERROR:
+ case NOTMUCH_STATUS_NULL_POINTER:
+ case NOTMUCH_STATUS_TAG_TOO_LONG:
+ case NOTMUCH_STATUS_LAST_STATUS:
INTERNAL_ERROR ("add_message returned unexpected value: %d", status);
goto DONE;
}
ret = status;
}
- free (next);
+ talloc_free (next);
next = NULL;
}
DONE:
if (next)
- free (next);
+ talloc_free (next);
if (entry)
free (entry);
if (dir)
* of path. The result is added to *count (which should be
* initialized to zero by the top-level caller before calling
* count_files). */
-void
+static void
count_files (const char *path, int *count)
{
DIR *dir;
- struct dirent *entry, *e;
+ struct dirent *e, *entry = NULL;
int entry_length;
int err;
char *next;
if (dir == NULL) {
fprintf (stderr, "Warning: failed to open directory %s: %s\n",
path, strerror (errno));
- return;
+ goto DONE;
}
entry_length = offsetof (struct dirent, d_name) +
fprintf (stderr, "Error reading directory: %s\n",
strerror (errno));
free (entry);
- return;
+ goto DONE;
}
if (e == NULL)
continue;
}
- next = g_strdup_printf ("%s/%s", path, entry->d_name);
+ if (asprintf (&next, "%s/%s", path, entry->d_name) == -1) {
+ next = NULL;
+ fprintf (stderr, "Error descending from %s to %s: Out of memory\n",
+ path, entry->d_name);
+ continue;
+ }
stat (next, &st);
free (next);
}
- free (entry);
+ DONE:
+ if (entry)
+ free (entry);
closedir (dir);
}
-int
-setup_command (int argc, char *argv[])
+static int
+setup_command (unused (int argc), unused (char *argv[]))
{
notmuch_database_t *notmuch = NULL;
char *default_path, *mail_directory = NULL;
add_files_state.total_files = count;
add_files_state.processed_files = 0;
add_files_state.added_messages = 0;
+ add_files_state.callback = NULL;
gettimeofday (&add_files_state.tv_start, NULL);
ret = add_files (notmuch, mail_directory, &add_files_state);
return ret;
}
-int
-new_command (int argc, char *argv[])
+static void
+tag_inbox_and_unread (notmuch_message_t *message)
+{
+ notmuch_message_add_tag (message, "inbox");
+ notmuch_message_add_tag (message, "unread");
+}
+
+static int
+new_command (unused (int argc), unused (char *argv[]))
{
notmuch_database_t *notmuch;
const char *mail_directory;
add_files_state.total_files = 0;
add_files_state.processed_files = 0;
add_files_state.added_messages = 0;
+ add_files_state.callback = tag_inbox_and_unread;
gettimeofday (&add_files_state.tv_start, NULL);
ret = add_files (notmuch, mail_directory, &add_files_state);
return ret;
}
-int
+static int
search_command (int argc, char *argv[])
{
void *local = talloc_new (NULL);
notmuch_database_t *notmuch = NULL;
notmuch_query_t *query;
- notmuch_results_t *results;
- notmuch_message_t *message;
+ notmuch_thread_results_t *results;
+ notmuch_thread_t *thread;
notmuch_tags_t *tags;
char *query_str;
int i;
goto DONE;
}
- for (results = notmuch_query_search (query);
- notmuch_results_has_more (results);
- notmuch_results_advance (results))
+ for (results = notmuch_query_search_threads (query);
+ notmuch_thread_results_has_more (results);
+ notmuch_thread_results_advance (results))
{
int first = 1;
- message = notmuch_results_get (results);
- printf ("%s (", notmuch_message_get_message_id (message));
+ thread = notmuch_thread_results_get (results);
- for (tags = notmuch_message_get_tags (message);
+ 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_message_destroy (message);
+ notmuch_thread_destroy (thread);
}
notmuch_query_destroy (query);
return ret;
}
-int
-show_command (int argc, char *argv[])
+static int
+show_command (unused (int argc), unused (char *argv[]))
{
fprintf (stderr, "Error: show is not implemented yet.\n");
return 1;
}
-int
+static int
dump_command (int argc, char *argv[])
{
- FILE *output;
+ FILE *output = NULL;
notmuch_database_t *notmuch = NULL;
notmuch_query_t *query;
- notmuch_results_t *results;
+ notmuch_message_results_t *results;
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 (query);
- notmuch_results_has_more (results);
- notmuch_results_advance (results))
+ for (results = notmuch_query_search_messages (query);
+ notmuch_message_results_has_more (results);
+ notmuch_message_results_advance (results))
{
int first = 1;
- message = notmuch_results_get (results);
+ message = notmuch_message_results_get (results);
fprintf (output,
"%s (", notmuch_message_get_message_id (message));
DONE:
if (notmuch)
notmuch_database_close (notmuch);
- if (output != stdout)
+ if (output && output != stdout)
fclose (output);
return ret;
}
-int
+static int
restore_command (int argc, char *argv[])
{
- FILE *input;
+ FILE *input = NULL;
notmuch_database_t *notmuch = NULL;
char *line = NULL;
size_t line_size;
free (line);
if (notmuch)
notmuch_database_close (notmuch);
+ if (input && input != stdin)
+ fclose (input);
return ret;
}
"\t\tthe setup command has not previously been completed." },
{ "new", new_command,
"Find and import any new messages.\n\n"
- "\t\tScans all sub-directories of the database, adding new files\n"
- "\t\tthat are found. Note: \"notmuch new\" will skip any\n"
- "\t\tread-only directories, so you can use that to mark\n"
- "\t\tdirectories that will not receive any new mail."},
+ "\t\tScans all sub-directories of the database, adding new messages\n"
+ "\t\tthat are found. Each new message will be tagges as both\n"
+ "\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\treceive any new mail (and make \"notmuch new\" faster)." },
{ "search", search_command,
"<search-term> [...]\n\n"
"\t\tSearch for threads matching the given search terms.\n"
"\t\tRestore the tags from the given dump file (see 'dump')." }
};
-void
+static void
usage (void)
{
command_t *command;
strcmp (argv[1], "--help") == 0)
{
fprintf (stderr, "The notmuch mail system.\n\n");
+ usage ();
+ return 0;
} else {
fprintf (stderr, "Error: Unknown command '%s'\n\n", argv[1]);
+ usage ();
+ return 1;
}
- usage ();
- exit (1);
-
- return 0;
}
projects / notmuch / blobdiff