int err;
char *next;
struct stat st;
+ notmuch_status_t status;
dir = opendir (path);
stat (next, &st);
if (S_ISREG (st.st_mode)) {
- notmuch_database_add_message (notmuch, next);
- state->count++;
+ status = notmuch_database_add_message (notmuch, next);
+ if (status == NOTMUCH_STATUS_FILE_NOT_EMAIL) {
+ fprintf (stderr, "Note: Ignoring non-mail file: %s\n",
+ next);
+ } else {
+ state->count++;
+ }
if (state->count % 1000 == 0)
add_files_print_progress (state);
} else if (S_ISDIR (st.st_mode)) {
printf ("Notmuch needs to know the top-level directory of your email archive,\n"
"(where you already have mail stored and where messages will be delivered\n"
"in the future). This directory can contain any number of sub-directories\n"
- "but the only files it contains should be individual email messages.\n"
- "Either maildir or mh format directories are fine, but you will want to\n"
- "move away any auxiliary files maintained by other email programs.\n\n");
+ "and primarily just files with indvidual email messages (eg. maildir or mh\n"
+ "archives are perfect). If there are other, non-email files (such as\n"
+ "indexes maintained by other email programs) then notmuch will do its\n"
+ "best to detect those and ignore them.\n\n");
printf ("Mail storage that uses mbox format, (where one mbox file contains many\n"
"messages), will not work with notmuch. If that's how your mail is currently\n"
int
show_command (int argc, char *argv[])
{
- fprintf (stderr, "Error: show-thread is not implemented yet.\n");
+ fprintf (stderr, "Error: show is not implemented yet.\n");
+ return 1;
+}
+
+int
+dump_command (int argc, char *argv[])
+{
+ fprintf (stderr, "Error: dump is not implemented yet.\n");
+ return 1;
+}
+
+int
+restore_command (int argc, char *argv[])
+{
+ fprintf (stderr, "Error: restore is not implemented yet.\n");
return 1;
}
command_t commands[] = {
{ "setup", setup_command,
- "Interactively setup notmuch for first use (no arguments).\n"
+ "Interactively setup notmuch for first use.\n"
"\t\tInvoking notmuch with no command argument will run setup if\n"
- "\t\the setup command has not previously been completed." },
+ "\t\tthe setup command has not previously been completed." },
{ "search", search_command,
- "Search for threads matching the given search terms." },
+ "<search-term> [...]\n\n"
+ "\t\tSearch for threads matching the given search terms.\n"
+ "\t\tOnce we actually implement search we'll document the\n"
+ "\t\tsyntax here." },
{ "show", show_command,
- "Show the thread with the given thread ID (see 'search')." }
+ "<thread-id>\n\n"
+ "\t\tShow the thread with the given thread ID (see 'search')." },
+ { "dump", dump_command,
+ "[<filename>]\n\n"
+ "\t\tCreate a plain-text dump of the tags for each message\n"
+ "\t\twriting to the given filename, if any, or to stdout.\n"
+ "\t\tThese tags are the only data in the notmuch database\n"
+ "\t\tthat can't be recreated from the messages themselves.\n"
+ "\t\tThe output of notmuch dump is therefore the only\n"
+ "\t\tcritical thing to backup (and much more friendly to\n"
+ "\t\tincremental backup than the native database files." },
+ { "restore", restore_command,
+ "<filename>\n\n"
+ "\t\tRestore the tags from the given dump file (see 'dump')." }
};
void
fprintf (stderr, "Usage: notmuch <command> [args...]\n");
fprintf (stderr, "\n");
- fprintf (stderr, "Where <command> is one of the following:\n");
+ fprintf (stderr, "Where <command> and [args...] are as follows:\n");
fprintf (stderr, "\n");
for (i = 0; i < ARRAY_SIZE (commands); i++) {
return (command->function) (argc - 2, &argv[2]);
}
- fprintf (stderr, "Error: Unknown command '%s'\n\n", argv[1]);
+ /* Don't complain about "help" being an unknown command when we're
+ about to provide exactly what's wanted anyway. */
+ if (strcmp (argv[1], "help") == 0 ||
+ strcmp (argv[1], "--help") == 0)
+ {
+ fprintf (stderr, "The notmuch mail system.\n\n");
+ } else {
+ fprintf (stderr, "Error: Unknown command '%s'\n\n", argv[1]);
+ }
usage ();
exit (1);