2009-11-10 21:03:05 +01:00
|
|
|
/* notmuch - Not much of an email program, (just index and search)
|
|
|
|
*
|
|
|
|
* Copyright © 2009 Carl Worth
|
|
|
|
*
|
|
|
|
* This program is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program. If not, see http://www.gnu.org/licenses/ .
|
|
|
|
*
|
|
|
|
* Author: Carl Worth <cworth@cworth.org>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "notmuch-client.h"
|
|
|
|
|
2009-11-12 04:50:15 +01:00
|
|
|
static volatile sig_atomic_t do_add_files_print_progress = 0;
|
|
|
|
|
|
|
|
static void
|
|
|
|
handle_sigalrm (unused (int signal))
|
|
|
|
{
|
|
|
|
do_add_files_print_progress = 1;
|
|
|
|
}
|
|
|
|
|
2009-11-13 18:05:13 +01:00
|
|
|
static volatile sig_atomic_t interrupted;
|
|
|
|
|
|
|
|
static void
|
|
|
|
handle_sigint (unused (int sig))
|
|
|
|
{
|
|
|
|
static char msg[] = "Stopping... \n";
|
|
|
|
write(2, msg, sizeof(msg)-1);
|
|
|
|
interrupted = 1;
|
|
|
|
}
|
|
|
|
|
2009-11-10 21:03:05 +01:00
|
|
|
static void
|
|
|
|
tag_inbox_and_unread (notmuch_message_t *message)
|
|
|
|
{
|
|
|
|
notmuch_message_add_tag (message, "inbox");
|
|
|
|
notmuch_message_add_tag (message, "unread");
|
|
|
|
}
|
|
|
|
|
2009-11-12 04:50:15 +01:00
|
|
|
static void
|
|
|
|
add_files_print_progress (add_files_state_t *state)
|
|
|
|
{
|
|
|
|
struct timeval tv_now;
|
|
|
|
double elapsed_overall, rate_overall;
|
|
|
|
|
|
|
|
gettimeofday (&tv_now, NULL);
|
|
|
|
|
|
|
|
elapsed_overall = notmuch_time_elapsed (state->tv_start, tv_now);
|
|
|
|
rate_overall = (state->processed_files) / elapsed_overall;
|
|
|
|
|
|
|
|
printf ("Processed %d", state->processed_files);
|
|
|
|
|
|
|
|
if (state->total_files) {
|
|
|
|
double time_remaining;
|
|
|
|
|
|
|
|
time_remaining = ((state->total_files - state->processed_files) /
|
|
|
|
rate_overall);
|
|
|
|
printf (" of %d files (", state->total_files);
|
|
|
|
notmuch_time_print_formatted_seconds (time_remaining);
|
|
|
|
printf (" remaining). \r");
|
|
|
|
} else {
|
|
|
|
printf (" files (%d files/sec.) \r", (int) rate_overall);
|
|
|
|
}
|
|
|
|
|
|
|
|
fflush (stdout);
|
|
|
|
}
|
|
|
|
|
Read mail directory in inode number order
This gives a rather decent reduction in number of seeks required when
reading a Maildir that isn't in pagecache.
Most filesystems give some locality on disk based on inode numbers.
In ext[234] this is the inode tables, in XFS groups of sequential inode
numbers are together on disk and the most significant bits indicate
allocation group (i.e inode 1,000,000 is always after inode 1,000).
With this patch, we read in the whole directory, sort by inode number
before stat()ing the contents.
Ideally, directory is sequential and then we make one scan through the
file system stat()ing.
Since the universe is not ideal, we'll probably seek during reading the
directory and a fair bit while reading the inodes themselves.
However... with readahead, and stat()ing in inode order, we should be
in the best place possible to hit the cache.
In a (not very good) benchmark of "how long does it take to find the first
15,000 messages in my Maildir after 'echo 3 > /proc/sys/vm/drop_caches'",
this patch consistently cut at least 8 seconds off the scan time.
Without patch: 50 seconds
With patch: 38-42 seconds.
(I did this in a previous maildir reading project and saw large improvements too)
2009-11-18 02:56:40 +01:00
|
|
|
static int ino_cmp(const struct dirent **a, const struct dirent **b)
|
|
|
|
{
|
|
|
|
return ((*a)->d_ino < (*b)->d_ino)? -1: 1;
|
|
|
|
}
|
|
|
|
|
2009-11-12 04:50:15 +01:00
|
|
|
/* Examine 'path' recursively as follows:
|
|
|
|
*
|
|
|
|
* o Ask the filesystem for the mtime of 'path' (path_mtime)
|
|
|
|
*
|
|
|
|
* o Ask the database for its timestamp of 'path' (path_dbtime)
|
|
|
|
*
|
|
|
|
* o If 'path_mtime' > 'path_dbtime'
|
|
|
|
*
|
|
|
|
* o For each regular file in 'path' with mtime newer than the
|
|
|
|
* 'path_dbtime' call add_message to add the file to the
|
|
|
|
* database.
|
|
|
|
*
|
|
|
|
* o For each sub-directory of path, recursively call into this
|
|
|
|
* same function.
|
|
|
|
*
|
|
|
|
* o Tell the database to update its time of 'path' to 'path_mtime'
|
|
|
|
*
|
|
|
|
* The 'struct stat *st' must point to a structure that has already
|
|
|
|
* been initialized for 'path' by calling stat().
|
|
|
|
*/
|
|
|
|
static notmuch_status_t
|
|
|
|
add_files_recursive (notmuch_database_t *notmuch,
|
|
|
|
const char *path,
|
|
|
|
struct stat *st,
|
|
|
|
add_files_state_t *state)
|
|
|
|
{
|
|
|
|
DIR *dir = NULL;
|
Read mail directory in inode number order
This gives a rather decent reduction in number of seeks required when
reading a Maildir that isn't in pagecache.
Most filesystems give some locality on disk based on inode numbers.
In ext[234] this is the inode tables, in XFS groups of sequential inode
numbers are together on disk and the most significant bits indicate
allocation group (i.e inode 1,000,000 is always after inode 1,000).
With this patch, we read in the whole directory, sort by inode number
before stat()ing the contents.
Ideally, directory is sequential and then we make one scan through the
file system stat()ing.
Since the universe is not ideal, we'll probably seek during reading the
directory and a fair bit while reading the inodes themselves.
However... with readahead, and stat()ing in inode order, we should be
in the best place possible to hit the cache.
In a (not very good) benchmark of "how long does it take to find the first
15,000 messages in my Maildir after 'echo 3 > /proc/sys/vm/drop_caches'",
this patch consistently cut at least 8 seconds off the scan time.
Without patch: 50 seconds
With patch: 38-42 seconds.
(I did this in a previous maildir reading project and saw large improvements too)
2009-11-18 02:56:40 +01:00
|
|
|
struct dirent *entry = NULL;
|
2009-11-12 04:50:15 +01:00
|
|
|
char *next = NULL;
|
|
|
|
time_t path_mtime, path_dbtime;
|
|
|
|
notmuch_status_t status, ret = NOTMUCH_STATUS_SUCCESS;
|
|
|
|
notmuch_message_t *message = NULL;
|
Read mail directory in inode number order
This gives a rather decent reduction in number of seeks required when
reading a Maildir that isn't in pagecache.
Most filesystems give some locality on disk based on inode numbers.
In ext[234] this is the inode tables, in XFS groups of sequential inode
numbers are together on disk and the most significant bits indicate
allocation group (i.e inode 1,000,000 is always after inode 1,000).
With this patch, we read in the whole directory, sort by inode number
before stat()ing the contents.
Ideally, directory is sequential and then we make one scan through the
file system stat()ing.
Since the universe is not ideal, we'll probably seek during reading the
directory and a fair bit while reading the inodes themselves.
However... with readahead, and stat()ing in inode order, we should be
in the best place possible to hit the cache.
In a (not very good) benchmark of "how long does it take to find the first
15,000 messages in my Maildir after 'echo 3 > /proc/sys/vm/drop_caches'",
this patch consistently cut at least 8 seconds off the scan time.
Without patch: 50 seconds
With patch: 38-42 seconds.
(I did this in a previous maildir reading project and saw large improvements too)
2009-11-18 02:56:40 +01:00
|
|
|
struct dirent **namelist = NULL;
|
2009-11-12 04:50:15 +01:00
|
|
|
|
|
|
|
/* If we're told to, we bail out on encountering a read-only
|
|
|
|
* directory, (with this being a clear clue from the user to
|
|
|
|
* Notmuch that new mail won't be arriving there and we need not
|
|
|
|
* look. */
|
|
|
|
if (state->ignore_read_only_directories &&
|
|
|
|
(st->st_mode & S_IWUSR) == 0)
|
|
|
|
{
|
|
|
|
state->saw_read_only_directory = TRUE;
|
|
|
|
goto DONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
path_mtime = st->st_mtime;
|
|
|
|
|
|
|
|
path_dbtime = notmuch_database_get_timestamp (notmuch, path);
|
Read mail directory in inode number order
This gives a rather decent reduction in number of seeks required when
reading a Maildir that isn't in pagecache.
Most filesystems give some locality on disk based on inode numbers.
In ext[234] this is the inode tables, in XFS groups of sequential inode
numbers are together on disk and the most significant bits indicate
allocation group (i.e inode 1,000,000 is always after inode 1,000).
With this patch, we read in the whole directory, sort by inode number
before stat()ing the contents.
Ideally, directory is sequential and then we make one scan through the
file system stat()ing.
Since the universe is not ideal, we'll probably seek during reading the
directory and a fair bit while reading the inodes themselves.
However... with readahead, and stat()ing in inode order, we should be
in the best place possible to hit the cache.
In a (not very good) benchmark of "how long does it take to find the first
15,000 messages in my Maildir after 'echo 3 > /proc/sys/vm/drop_caches'",
this patch consistently cut at least 8 seconds off the scan time.
Without patch: 50 seconds
With patch: 38-42 seconds.
(I did this in a previous maildir reading project and saw large improvements too)
2009-11-18 02:56:40 +01:00
|
|
|
int n_entries= scandir(path, &namelist, 0, ino_cmp);
|
2009-11-12 04:50:15 +01:00
|
|
|
|
Read mail directory in inode number order
This gives a rather decent reduction in number of seeks required when
reading a Maildir that isn't in pagecache.
Most filesystems give some locality on disk based on inode numbers.
In ext[234] this is the inode tables, in XFS groups of sequential inode
numbers are together on disk and the most significant bits indicate
allocation group (i.e inode 1,000,000 is always after inode 1,000).
With this patch, we read in the whole directory, sort by inode number
before stat()ing the contents.
Ideally, directory is sequential and then we make one scan through the
file system stat()ing.
Since the universe is not ideal, we'll probably seek during reading the
directory and a fair bit while reading the inodes themselves.
However... with readahead, and stat()ing in inode order, we should be
in the best place possible to hit the cache.
In a (not very good) benchmark of "how long does it take to find the first
15,000 messages in my Maildir after 'echo 3 > /proc/sys/vm/drop_caches'",
this patch consistently cut at least 8 seconds off the scan time.
Without patch: 50 seconds
With patch: 38-42 seconds.
(I did this in a previous maildir reading project and saw large improvements too)
2009-11-18 02:56:40 +01:00
|
|
|
if (n_entries == -1) {
|
2009-11-12 04:50:15 +01:00
|
|
|
fprintf (stderr, "Error opening directory %s: %s\n",
|
|
|
|
path, strerror (errno));
|
|
|
|
ret = NOTMUCH_STATUS_FILE_ERROR;
|
|
|
|
goto DONE;
|
|
|
|
}
|
|
|
|
|
Read mail directory in inode number order
This gives a rather decent reduction in number of seeks required when
reading a Maildir that isn't in pagecache.
Most filesystems give some locality on disk based on inode numbers.
In ext[234] this is the inode tables, in XFS groups of sequential inode
numbers are together on disk and the most significant bits indicate
allocation group (i.e inode 1,000,000 is always after inode 1,000).
With this patch, we read in the whole directory, sort by inode number
before stat()ing the contents.
Ideally, directory is sequential and then we make one scan through the
file system stat()ing.
Since the universe is not ideal, we'll probably seek during reading the
directory and a fair bit while reading the inodes themselves.
However... with readahead, and stat()ing in inode order, we should be
in the best place possible to hit the cache.
In a (not very good) benchmark of "how long does it take to find the first
15,000 messages in my Maildir after 'echo 3 > /proc/sys/vm/drop_caches'",
this patch consistently cut at least 8 seconds off the scan time.
Without patch: 50 seconds
With patch: 38-42 seconds.
(I did this in a previous maildir reading project and saw large improvements too)
2009-11-18 02:56:40 +01:00
|
|
|
int i=0;
|
2009-11-12 04:50:15 +01:00
|
|
|
|
2009-11-13 18:05:13 +01:00
|
|
|
while (!interrupted) {
|
Read mail directory in inode number order
This gives a rather decent reduction in number of seeks required when
reading a Maildir that isn't in pagecache.
Most filesystems give some locality on disk based on inode numbers.
In ext[234] this is the inode tables, in XFS groups of sequential inode
numbers are together on disk and the most significant bits indicate
allocation group (i.e inode 1,000,000 is always after inode 1,000).
With this patch, we read in the whole directory, sort by inode number
before stat()ing the contents.
Ideally, directory is sequential and then we make one scan through the
file system stat()ing.
Since the universe is not ideal, we'll probably seek during reading the
directory and a fair bit while reading the inodes themselves.
However... with readahead, and stat()ing in inode order, we should be
in the best place possible to hit the cache.
In a (not very good) benchmark of "how long does it take to find the first
15,000 messages in my Maildir after 'echo 3 > /proc/sys/vm/drop_caches'",
this patch consistently cut at least 8 seconds off the scan time.
Without patch: 50 seconds
With patch: 38-42 seconds.
(I did this in a previous maildir reading project and saw large improvements too)
2009-11-18 02:56:40 +01:00
|
|
|
if (i == n_entries)
|
2009-11-12 04:50:15 +01:00
|
|
|
break;
|
|
|
|
|
Read mail directory in inode number order
This gives a rather decent reduction in number of seeks required when
reading a Maildir that isn't in pagecache.
Most filesystems give some locality on disk based on inode numbers.
In ext[234] this is the inode tables, in XFS groups of sequential inode
numbers are together on disk and the most significant bits indicate
allocation group (i.e inode 1,000,000 is always after inode 1,000).
With this patch, we read in the whole directory, sort by inode number
before stat()ing the contents.
Ideally, directory is sequential and then we make one scan through the
file system stat()ing.
Since the universe is not ideal, we'll probably seek during reading the
directory and a fair bit while reading the inodes themselves.
However... with readahead, and stat()ing in inode order, we should be
in the best place possible to hit the cache.
In a (not very good) benchmark of "how long does it take to find the first
15,000 messages in my Maildir after 'echo 3 > /proc/sys/vm/drop_caches'",
this patch consistently cut at least 8 seconds off the scan time.
Without patch: 50 seconds
With patch: 38-42 seconds.
(I did this in a previous maildir reading project and saw large improvements too)
2009-11-18 02:56:40 +01:00
|
|
|
entry= namelist[i++];
|
|
|
|
|
2009-11-12 04:50:15 +01:00
|
|
|
/* If this directory hasn't been modified since the last
|
|
|
|
* add_files, then we only need to look further for
|
|
|
|
* sub-directories. */
|
|
|
|
if (path_mtime <= path_dbtime && entry->d_type != DT_DIR)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Ignore special directories to avoid infinite recursion.
|
|
|
|
* Also ignore the .notmuch directory.
|
|
|
|
*/
|
|
|
|
/* XXX: Eventually we'll want more sophistication to let the
|
|
|
|
* user specify files to be ignored. */
|
|
|
|
if (strcmp (entry->d_name, ".") == 0 ||
|
|
|
|
strcmp (entry->d_name, "..") == 0 ||
|
|
|
|
strcmp (entry->d_name, ".notmuch") ==0)
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name);
|
|
|
|
|
|
|
|
if (stat (next, st)) {
|
|
|
|
fprintf (stderr, "Error reading %s: %s\n",
|
|
|
|
next, strerror (errno));
|
|
|
|
ret = NOTMUCH_STATUS_FILE_ERROR;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (S_ISREG (st->st_mode)) {
|
|
|
|
/* If the file hasn't been modified since the last
|
|
|
|
* add_files, then we need not look at it. */
|
2009-11-12 16:02:13 +01:00
|
|
|
if (path_dbtime == 0 || st->st_mtime > path_dbtime) {
|
2009-11-12 04:50:15 +01:00
|
|
|
state->processed_files++;
|
|
|
|
|
|
|
|
status = notmuch_database_add_message (notmuch, next, &message);
|
|
|
|
switch (status) {
|
|
|
|
/* success */
|
|
|
|
case NOTMUCH_STATUS_SUCCESS:
|
|
|
|
state->added_messages++;
|
|
|
|
tag_inbox_and_unread (message);
|
|
|
|
break;
|
|
|
|
/* Non-fatal issues (go on to next file) */
|
|
|
|
case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID:
|
|
|
|
/* Stay silent on this one. */
|
|
|
|
break;
|
|
|
|
case NOTMUCH_STATUS_FILE_NOT_EMAIL:
|
|
|
|
fprintf (stderr, "Note: Ignoring non-mail file: %s\n",
|
|
|
|
next);
|
|
|
|
break;
|
|
|
|
/* Fatal issues. Don't process anymore. */
|
|
|
|
case NOTMUCH_STATUS_XAPIAN_EXCEPTION:
|
|
|
|
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_UNBALANCED_FREEZE_THAW:
|
|
|
|
case NOTMUCH_STATUS_LAST_STATUS:
|
|
|
|
INTERNAL_ERROR ("add_message returned unexpected value: %d", status);
|
|
|
|
goto DONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (message) {
|
|
|
|
notmuch_message_destroy (message);
|
|
|
|
message = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (do_add_files_print_progress) {
|
|
|
|
do_add_files_print_progress = 0;
|
|
|
|
add_files_print_progress (state);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if (S_ISDIR (st->st_mode)) {
|
|
|
|
status = add_files_recursive (notmuch, next, st, state);
|
|
|
|
if (status && ret == NOTMUCH_STATUS_SUCCESS)
|
|
|
|
ret = status;
|
|
|
|
}
|
|
|
|
|
|
|
|
talloc_free (next);
|
|
|
|
next = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
status = notmuch_database_set_timestamp (notmuch, path, path_mtime);
|
|
|
|
if (status && ret == NOTMUCH_STATUS_SUCCESS)
|
|
|
|
ret = status;
|
|
|
|
|
|
|
|
DONE:
|
|
|
|
if (next)
|
|
|
|
talloc_free (next);
|
|
|
|
if (entry)
|
|
|
|
free (entry);
|
|
|
|
if (dir)
|
|
|
|
closedir (dir);
|
Read mail directory in inode number order
This gives a rather decent reduction in number of seeks required when
reading a Maildir that isn't in pagecache.
Most filesystems give some locality on disk based on inode numbers.
In ext[234] this is the inode tables, in XFS groups of sequential inode
numbers are together on disk and the most significant bits indicate
allocation group (i.e inode 1,000,000 is always after inode 1,000).
With this patch, we read in the whole directory, sort by inode number
before stat()ing the contents.
Ideally, directory is sequential and then we make one scan through the
file system stat()ing.
Since the universe is not ideal, we'll probably seek during reading the
directory and a fair bit while reading the inodes themselves.
However... with readahead, and stat()ing in inode order, we should be
in the best place possible to hit the cache.
In a (not very good) benchmark of "how long does it take to find the first
15,000 messages in my Maildir after 'echo 3 > /proc/sys/vm/drop_caches'",
this patch consistently cut at least 8 seconds off the scan time.
Without patch: 50 seconds
With patch: 38-42 seconds.
(I did this in a previous maildir reading project and saw large improvements too)
2009-11-18 02:56:40 +01:00
|
|
|
if (namelist)
|
|
|
|
free (namelist);
|
2009-11-12 04:50:15 +01:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This is the top-level entry point for add_files. It does a couple
|
|
|
|
* of error checks, sets up the progress-printing timer and then calls
|
|
|
|
* into the recursive function. */
|
|
|
|
notmuch_status_t
|
|
|
|
add_files (notmuch_database_t *notmuch,
|
|
|
|
const char *path,
|
|
|
|
add_files_state_t *state)
|
|
|
|
{
|
|
|
|
struct stat st;
|
|
|
|
notmuch_status_t status;
|
|
|
|
struct sigaction action;
|
|
|
|
struct itimerval timerval;
|
|
|
|
|
|
|
|
if (stat (path, &st)) {
|
|
|
|
fprintf (stderr, "Error reading directory %s: %s\n",
|
|
|
|
path, strerror (errno));
|
|
|
|
return NOTMUCH_STATUS_FILE_ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (! S_ISDIR (st.st_mode)) {
|
|
|
|
fprintf (stderr, "Error: %s is not a directory.\n", path);
|
|
|
|
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);
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* XXX: This should be merged with the add_files function since it
|
|
|
|
* shares a lot of logic with it. */
|
2009-11-18 00:23:42 +01:00
|
|
|
/* Recursively count all regular files in path and all sub-directories
|
2009-11-12 04:50:15 +01:00
|
|
|
* of path. The result is added to *count (which should be
|
|
|
|
* initialized to zero by the top-level caller before calling
|
|
|
|
* count_files). */
|
|
|
|
static void
|
|
|
|
count_files (const char *path, int *count)
|
|
|
|
{
|
|
|
|
DIR *dir;
|
|
|
|
struct dirent *e, *entry = NULL;
|
|
|
|
int entry_length;
|
|
|
|
int err;
|
|
|
|
char *next;
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
dir = opendir (path);
|
|
|
|
|
|
|
|
if (dir == NULL) {
|
|
|
|
fprintf (stderr, "Warning: failed to open directory %s: %s\n",
|
|
|
|
path, strerror (errno));
|
|
|
|
goto DONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
entry_length = offsetof (struct dirent, d_name) +
|
|
|
|
pathconf (path, _PC_NAME_MAX) + 1;
|
|
|
|
entry = malloc (entry_length);
|
|
|
|
|
2009-11-13 18:05:13 +01:00
|
|
|
while (!interrupted) {
|
2009-11-12 04:50:15 +01:00
|
|
|
err = readdir_r (dir, entry, &e);
|
|
|
|
if (err) {
|
|
|
|
fprintf (stderr, "Error reading directory: %s\n",
|
|
|
|
strerror (errno));
|
|
|
|
free (entry);
|
|
|
|
goto DONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (e == NULL)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Ignore special directories to avoid infinite recursion.
|
|
|
|
* Also ignore the .notmuch directory.
|
|
|
|
*/
|
|
|
|
/* XXX: Eventually we'll want more sophistication to let the
|
|
|
|
* user specify files to be ignored. */
|
|
|
|
if (strcmp (entry->d_name, ".") == 0 ||
|
|
|
|
strcmp (entry->d_name, "..") == 0 ||
|
|
|
|
strcmp (entry->d_name, ".notmuch") == 0)
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
|
|
|
if (S_ISREG (st.st_mode)) {
|
|
|
|
*count = *count + 1;
|
|
|
|
if (*count % 1000 == 0) {
|
|
|
|
printf ("Found %d files so far.\r", *count);
|
|
|
|
fflush (stdout);
|
|
|
|
}
|
|
|
|
} else if (S_ISDIR (st.st_mode)) {
|
|
|
|
count_files (next, count);
|
|
|
|
}
|
|
|
|
|
|
|
|
free (next);
|
|
|
|
}
|
|
|
|
|
|
|
|
DONE:
|
|
|
|
if (entry)
|
|
|
|
free (entry);
|
|
|
|
|
|
|
|
closedir (dir);
|
|
|
|
}
|
|
|
|
|
2009-11-10 21:03:05 +01:00
|
|
|
int
|
2009-11-12 04:50:15 +01:00
|
|
|
notmuch_new_command (void *ctx,
|
2009-11-10 21:03:05 +01:00
|
|
|
unused (int argc), unused (char *argv[]))
|
|
|
|
{
|
2009-11-12 04:50:15 +01:00
|
|
|
notmuch_config_t *config;
|
2009-11-10 21:03:05 +01:00
|
|
|
notmuch_database_t *notmuch;
|
|
|
|
add_files_state_t add_files_state;
|
|
|
|
double elapsed;
|
|
|
|
struct timeval tv_now;
|
|
|
|
int ret = 0;
|
2009-11-12 04:50:15 +01:00
|
|
|
struct stat st;
|
|
|
|
const char *db_path;
|
|
|
|
char *dot_notmuch_path;
|
2009-11-13 18:05:13 +01:00
|
|
|
struct sigaction action;
|
|
|
|
|
|
|
|
/* Setup our handler for SIGINT */
|
|
|
|
memset (&action, 0, sizeof (struct sigaction));
|
|
|
|
action.sa_handler = handle_sigint;
|
|
|
|
sigemptyset (&action.sa_mask);
|
|
|
|
action.sa_flags = SA_RESTART;
|
|
|
|
sigaction (SIGINT, &action, NULL);
|
2009-11-10 21:03:05 +01:00
|
|
|
|
2009-11-12 04:50:15 +01:00
|
|
|
config = notmuch_config_open (ctx, NULL, NULL);
|
|
|
|
if (config == NULL)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
db_path = notmuch_config_get_database_path (config);
|
|
|
|
|
|
|
|
dot_notmuch_path = talloc_asprintf (ctx, "%s/%s", db_path, ".notmuch");
|
|
|
|
|
|
|
|
if (stat (dot_notmuch_path, &st)) {
|
2009-11-13 18:05:13 +01:00
|
|
|
int count;
|
|
|
|
|
|
|
|
count = 0;
|
|
|
|
count_files (db_path, &count);
|
|
|
|
if (interrupted)
|
|
|
|
return 1;
|
|
|
|
|
2009-11-12 04:50:15 +01:00
|
|
|
notmuch = notmuch_database_create (db_path);
|
2009-11-13 18:05:13 +01:00
|
|
|
add_files_state.ignore_read_only_directories = FALSE;
|
|
|
|
add_files_state.total_files = count;
|
2009-11-12 04:50:15 +01:00
|
|
|
} else {
|
|
|
|
notmuch = notmuch_database_open (db_path);
|
2009-11-13 18:05:13 +01:00
|
|
|
add_files_state.ignore_read_only_directories = TRUE;
|
|
|
|
add_files_state.total_files = 0;
|
2009-11-10 21:03:05 +01:00
|
|
|
}
|
|
|
|
|
2009-11-12 04:50:15 +01:00
|
|
|
if (notmuch == NULL)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
talloc_free (dot_notmuch_path);
|
|
|
|
dot_notmuch_path = NULL;
|
|
|
|
|
2009-11-10 21:03:05 +01:00
|
|
|
add_files_state.saw_read_only_directory = FALSE;
|
|
|
|
add_files_state.total_files = 0;
|
|
|
|
add_files_state.processed_files = 0;
|
|
|
|
add_files_state.added_messages = 0;
|
|
|
|
gettimeofday (&add_files_state.tv_start, NULL);
|
|
|
|
|
2009-11-12 04:50:15 +01:00
|
|
|
ret = add_files (notmuch, db_path, &add_files_state);
|
2009-11-10 21:03:05 +01:00
|
|
|
|
|
|
|
gettimeofday (&tv_now, NULL);
|
|
|
|
elapsed = notmuch_time_elapsed (add_files_state.tv_start,
|
|
|
|
tv_now);
|
|
|
|
if (add_files_state.processed_files) {
|
|
|
|
printf ("Processed %d %s in ", add_files_state.processed_files,
|
|
|
|
add_files_state.processed_files == 1 ?
|
|
|
|
"file" : "total files");
|
|
|
|
notmuch_time_print_formatted_seconds (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 %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");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (elapsed > 1 && ! add_files_state.saw_read_only_directory) {
|
|
|
|
printf ("\nTip: If you have any sub-directories that are archives (that is,\n"
|
2009-11-18 00:23:42 +01:00
|
|
|
"they will never receive new mail), marking these directories as\n"
|
2009-11-10 21:03:05 +01:00
|
|
|
"read-only (chmod u-w /path/to/dir) will make \"notmuch new\"\n"
|
|
|
|
"much more efficient (it won't even look in those directories).\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ret) {
|
|
|
|
printf ("\nNote: At least one error was encountered: %s\n",
|
|
|
|
notmuch_status_to_string (ret));
|
|
|
|
}
|
|
|
|
|
2009-11-12 04:50:15 +01:00
|
|
|
notmuch_database_close (notmuch);
|
2009-11-10 21:03:05 +01:00
|
|
|
|
2009-11-13 18:05:13 +01:00
|
|
|
return ret || interrupted;
|
2009-11-10 21:03:05 +01:00
|
|
|
}
|