More care in final status reporting.

[notmuch] / notmuch.c

diff --git a/notmuch.c b/notmuch.c
index ed087a070150e5d1771968a8833587010bc8efcf..581cc4c0cbfe52b61d1cd860e950e3e474f7d138 100644 (file)
--- a/notmuch.c
+++ b/notmuch.c
@@ -81,6 +81,11 @@ print_formatted_seconds (double seconds)
     int hours;
     int minutes;
 
+    if (seconds < 1) {
+       printf ("almost no time");
+       return;
+    }
+
     if (seconds > 3600) {
        hours = (int) seconds / 3600;
        printf ("%dh ", hours);
@@ -436,10 +441,18 @@ setup_command (int argc, char *argv[])
                          tv_now);
     printf ("Processed %d total files in ", add_files_state.processed_files);
     print_formatted_seconds (elapsed);
-    printf (" (%d files/sec.).                 \n",
-           (int) (add_files_state.processed_files / elapsed));
-    printf ("Added %d unique messages to the database.\n\n",
-           add_files_state.added_messages);
+    if (elapsed > 1) {
+       printf (" (%d files/sec.).                 \n",
+               (int) (add_files_state.processed_files / elapsed));
+    } else {
+       printf (".                    \n");
+    }
+    if (add_files_state.added_messages) {
+       printf ("Added %d %s to the database.\n\n",
+               add_files_state.added_messages,
+               add_files_state.added_messages == 1 ?
+               "message" : "unique messages");
+    }
 
     printf ("When new mail is delivered to %s in the future,\n"
            "run \"notmuch new\" to add it to the database.\n",
@@ -490,14 +503,20 @@ new_command (int argc, char *argv[])
     if (add_files_state.processed_files) {
        printf ("Processed %d total files in ", add_files_state.processed_files);
        print_formatted_seconds (elapsed);
-       printf (" (%d files/sec.).                 \n",
-               (int) (add_files_state.processed_files / elapsed));
+       if (elapsed > 1) {
+           printf (" (%d files/sec.).                 \n",
+                   (int) (add_files_state.processed_files / elapsed));
+       } else {
+           printf (".                    \n");
+       }
     }
     if (add_files_state.added_messages) {
-       printf ("Added %d new messages to the database (not much, really).\n",
-               add_files_state.added_messages);
+       printf ("Added %d new %s to the database (not much, really).\n",
+               add_files_state.added_messages,
+               add_files_state.added_messages == 1 ?
+               "message" : "messages");
     } else {
-       printf ("No new mail---and that's not much!.\n");
+       printf ("No new mail---and that's not much!\n");
     }
 
     if (ret) {