debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-23 01:44:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: extract single message addition in notmuch new to clarify code

Browse source 
The add_files() function has grown huge, chop it up a bit. No
functional changes.
This commit is contained in:
Jani Nikula 2014-01-19 22:32:22 +02:00 committed by David Bremner
parent 3b74537f49
commit caf5514a36
1 changed files with 55 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
notmuch-new.c
View file

@ -240,6 +240,60 @@ _entry_in_ignore_list (const char *entry, add_files_state_t *state)
return FALSE; return FALSE;
} }
/* Add a single file to the database. */
static notmuch_status_t
add_file (notmuch_database_t *notmuch, const char *filename,
add_files_state_t *state)
{
notmuch_message_t *message = NULL;
const char **tag;
notmuch_status_t status;
status = notmuch_database_begin_atomic (notmuch);
if (status)
goto DONE;
status = notmuch_database_add_message (notmuch, filename, &message);
switch (status) {
/* Success. */
case NOTMUCH_STATUS_SUCCESS:
state->added_messages++;
notmuch_message_freeze (message);
for (tag = state->new_tags; *tag != NULL; tag++)
notmuch_message_add_tag (message, *tag);
if (state->synchronize_flags)
notmuch_message_maildir_flags_to_tags (message);
notmuch_message_thaw (message);
break;
/* Non-fatal issues (go on to next file). */
case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID:
if (state->synchronize_flags)
notmuch_message_maildir_flags_to_tags (message);
break;
case NOTMUCH_STATUS_FILE_NOT_EMAIL:
fprintf (stderr, "Note: Ignoring non-mail file: %s\n", filename);
break;
/* Fatal issues. Don't process anymore. */
case NOTMUCH_STATUS_READ_ONLY_DATABASE:
case NOTMUCH_STATUS_XAPIAN_EXCEPTION:
case NOTMUCH_STATUS_OUT_OF_MEMORY:
fprintf (stderr, "Error: %s. Halting processing.\n",
notmuch_status_to_string (status));
goto DONE;
default:
INTERNAL_ERROR ("add_message returned unexpected value: %d", status);
goto DONE;
}
status = notmuch_database_end_atomic (notmuch);
DONE:
if (message)
notmuch_message_destroy (message);
return status;
}
/* Examine 'path' recursively as follows: /* Examine 'path' recursively as follows:
* *
* o Ask the filesystem for the mtime of 'path' (fs_mtime) * o Ask the filesystem for the mtime of 'path' (fs_mtime)
@ -291,7 +345,6 @@ add_files (notmuch_database_t *notmuch,
char *next = NULL; char *next = NULL;
time_t fs_mtime, db_mtime; time_t fs_mtime, db_mtime;
notmuch_status_t status, ret = NOTMUCH_STATUS_SUCCESS; notmuch_status_t status, ret = NOTMUCH_STATUS_SUCCESS;
notmuch_message_t *message = NULL;
struct dirent **fs_entries = NULL; struct dirent **fs_entries = NULL;
int i, num_fs_entries = 0, entry_type; int i, num_fs_entries = 0, entry_type;
notmuch_directory_t *directory; notmuch_directory_t *directory;
@ -300,7 +353,6 @@ add_files (notmuch_database_t *notmuch,
time_t stat_time; time_t stat_time;
struct stat st; struct stat st;
notmuch_bool_t is_maildir; notmuch_bool_t is_maildir;
const char **tag;
if (stat (path, &st)) { if (stat (path, &st)) {
fprintf (stderr, "Error reading directory %s: %s\n", fprintf (stderr, "Error reading directory %s: %s\n",
@ -527,63 +579,12 @@ add_files (notmuch_database_t *notmuch,
fflush (stdout); fflush (stdout);
} }
status = notmuch_database_begin_atomic (notmuch); status = add_file (notmuch, next, state);
if (status) { if (status) {
ret = status; ret = status;
goto DONE; goto DONE;
} }
status = notmuch_database_add_message (notmuch, next, &message);
switch (status) {
/* success */
case NOTMUCH_STATUS_SUCCESS:
state->added_messages++;
notmuch_message_freeze (message);
for (tag=state->new_tags; *tag != NULL; tag++)
notmuch_message_add_tag (message, *tag);
if (state->synchronize_flags == TRUE)
notmuch_message_maildir_flags_to_tags (message);
notmuch_message_thaw (message);
break;
/* Non-fatal issues (go on to next file) */
case NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID:
if (state->synchronize_flags == TRUE)
notmuch_message_maildir_flags_to_tags (message);
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_READ_ONLY_DATABASE:
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_UNBALANCED_ATOMIC:
case NOTMUCH_STATUS_LAST_STATUS:
INTERNAL_ERROR ("add_message returned unexpected value: %d", status);
goto DONE;
}
status = notmuch_database_end_atomic (notmuch);
if (status) {
ret = status;
goto DONE;
}
if (message) {
notmuch_message_destroy (message);
message = NULL;
}
if (do_print_progress) { if (do_print_progress) {
do_print_progress = 0; do_print_progress = 0;
generic_print_progress ("Processed", "files", state->tv_start, generic_print_progress ("Processed", "files", state->tv_start,