Stay out of tmp to respect the Maildir spec.

[notmuch] / notmuch-new.c

diff --git a/notmuch-new.c b/notmuch-new.c
index bc35b4e8cf32480e1a7d1cf87cb95d7b6e4e3e71..e32b92a51de1b8c0c9bd7797edc84229e8424ff5 100644 (file)
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -20,6 +20,8 @@
 
 #include "notmuch-client.h"
 
+#include <unistd.h>
+
 static volatile sig_atomic_t do_add_files_print_progress = 0;
 
 static void
@@ -157,6 +159,7 @@ add_files_recursive (notmuch_database_t *notmuch,
         * user specify files to be ignored. */
        if (strcmp (entry->d_name, ".") == 0 ||
            strcmp (entry->d_name, "..") == 0 ||
+           strcmp (entry->d_name, "tmp") == 0 ||
            strcmp (entry->d_name, ".notmuch") ==0)
        {
            continue;
@@ -177,6 +180,19 @@ add_files_recursive (notmuch_database_t *notmuch,
            if (path_dbtime == 0 || st->st_mtime > path_dbtime) {
                state->processed_files++;
 
+               if (state->verbose) {
+                   if (state->output_is_a_tty)
+                       printf("\r\033[K");
+
+                   printf ("%i/%i: %s",
+                           state->processed_files,
+                           state->total_files,
+                           next);
+
+                   putchar((state->output_is_a_tty) ? '\r' : '\n');
+                   fflush (stdout);
+               }
+
                status = notmuch_database_add_message (notmuch, next, &message);
                switch (status) {
                    /* success */
@@ -259,6 +275,7 @@ add_files (notmuch_database_t *notmuch,
     notmuch_status_t status;
     struct sigaction action;
     struct itimerval timerval;
+    notmuch_bool_t timer_is_active = FALSE;
 
     if (stat (path, &st)) {
        fprintf (stderr, "Error reading directory %s: %s\n",
@@ -271,32 +288,38 @@ add_files (notmuch_database_t *notmuch,
        return NOTMUCH_STATUS_FILE_ERROR;
     }
 
-    /* Setup our handler for SIGALRM */
-    memset (&action, 0, sizeof (struct sigaction));
-    action.sa_handler = handle_sigalrm;
-    sigemptyset (&action.sa_mask);
-    action.sa_flags = SA_RESTART;
-    sigaction (SIGALRM, &action, NULL);
-
-    /* Then start a timer to send SIGALRM once per second. */
-    timerval.it_interval.tv_sec = 1;
-    timerval.it_interval.tv_usec = 0;
-    timerval.it_value.tv_sec = 1;
-    timerval.it_value.tv_usec = 0;
-    setitimer (ITIMER_REAL, &timerval, NULL);
+    if (state->output_is_a_tty && ! debugger_is_active () && ! state->verbose) {
+       /* Setup our handler for SIGALRM */
+       memset (&action, 0, sizeof (struct sigaction));
+       action.sa_handler = handle_sigalrm;
+       sigemptyset (&action.sa_mask);
+       action.sa_flags = SA_RESTART;
+       sigaction (SIGALRM, &action, NULL);
+
+       /* Then start a timer to send SIGALRM once per second. */
+       timerval.it_interval.tv_sec = 1;
+       timerval.it_interval.tv_usec = 0;
+       timerval.it_value.tv_sec = 1;
+       timerval.it_value.tv_usec = 0;
+       setitimer (ITIMER_REAL, &timerval, NULL);
+
+       timer_is_active = TRUE;
+    }
 
     status = add_files_recursive (notmuch, path, &st, state);
 
-    /* Now stop the timer. */
-    timerval.it_interval.tv_sec = 0;
-    timerval.it_interval.tv_usec = 0;
-    timerval.it_value.tv_sec = 0;
-    timerval.it_value.tv_usec = 0;
-    setitimer (ITIMER_REAL, &timerval, NULL);
-
-    /* And disable the signal handler. */
-    action.sa_handler = SIG_IGN;
-    sigaction (SIGALRM, &action, NULL);
+    if (timer_is_active) {
+       /* Now stop the timer. */
+       timerval.it_interval.tv_sec = 0;
+       timerval.it_interval.tv_usec = 0;
+       timerval.it_value.tv_sec = 0;
+       timerval.it_value.tv_usec = 0;
+       setitimer (ITIMER_REAL, &timerval, NULL);
+
+       /* And disable the signal handler. */
+       action.sa_handler = SIG_IGN;
+       sigaction (SIGALRM, &action, NULL);
+    }
 
     return status;
 }
@@ -371,8 +394,7 @@ count_files (const char *path, int *count)
 }
 
 int
-notmuch_new_command (void *ctx,
-                    unused (int argc), unused (char *argv[]))
+notmuch_new_command (void *ctx, int argc, char *argv[])
 {
     notmuch_config_t *config;
     notmuch_database_t *notmuch;
@@ -384,6 +406,19 @@ notmuch_new_command (void *ctx,
     const char *db_path;
     char *dot_notmuch_path;
     struct sigaction action;
+    int i;
+
+    add_files_state.verbose = 0;
+    add_files_state.output_is_a_tty = isatty (fileno (stdout));
+
+    for (i = 0; i < argc && argv[i][0] == '-'; i++) {
+       if (STRNCMP_LITERAL (argv[i], "--verbose") == 0) {
+           add_files_state.verbose = 1;
+       } else {
+           fprintf (stderr, "Unrecognized option: %s\n", argv[i]);
+           return 1;
+       }
+    }
 
     /* Setup our handler for SIGINT */
     memset (&action, 0, sizeof (struct sigaction));
@@ -414,7 +449,7 @@ notmuch_new_command (void *ctx,
        add_files_state.total_files = count;
     } else {
        notmuch = notmuch_database_open (db_path,
-                                        NOTMUCH_DATABASE_MODE_READ_ONLY);
+                                        NOTMUCH_DATABASE_MODE_READ_WRITE);
        add_files_state.ignore_read_only_directories = TRUE;
        add_files_state.total_files = 0;
     }