debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 19:08:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

new: Remove workaround for detecting newly created directory objects

Browse source 
Previously, notmuch_database_get_directory did not indicate whether or
not the returned directory object was newly created, which required a
workaround to distinguish newly created directory objects with no
child messages from directory objects that had no mtime set but did
have child messages.  Now that notmuch_database_get_directory
distinguishes whether or not the directory object exists in the
database, this workaround is no longer necessary.
This commit is contained in:
Austin Clements 2012-05-18 00:13:38 -04:00 committed by David Bremner
parent fe1ca14104
commit 3f3c446c40
1 changed files with 7 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
notmuch-new.c
View file

@ -256,7 +256,7 @@ add_files_recursive (notmuch_database_t *notmuch,
notmuch_filenames_t *db_subdirs = NULL; notmuch_filenames_t *db_subdirs = NULL;
time_t stat_time; time_t stat_time;
struct stat st; struct stat st;
notmuch_bool_t is_maildir, new_directory; notmuch_bool_t is_maildir;
const char **tag; const char **tag;
if (stat (path, &st)) { if (stat (path, &st)) {
@ -281,33 +281,12 @@ add_files_recursive (notmuch_database_t *notmuch,
} }
db_mtime = directory ? notmuch_directory_get_mtime (directory) : 0; db_mtime = directory ? notmuch_directory_get_mtime (directory) : 0;
new_directory = db_mtime ? FALSE : TRUE;
/* XXX This is a temporary workaround. If we don't update the
* database mtime until after processing messages in this
* directory, then a 0 mtime is *not* sufficient to indicate that
* this directory has no messages or subdirs in the database (for
* example, if an earlier run skipped the mtime update because
* fs_mtime == stat_time, or was interrupted before updating the
* mtime at the end). To address this, we record a (bogus)
* non-zero value before processing any child messages so that a
* later run won't mistake this for a new directory (and, for
* example, fail to detect removed files and subdirs).
*
* A better solution would be for notmuch_database_get_directory
* to indicate if it really created a new directory or not, either
* by a new out-argument, or by recording this information and
* providing an accessor.
*/
if (new_directory && directory)
notmuch_directory_set_mtime (directory, -1);
/* If the database knows about this directory, then we sort based /* If the database knows about this directory, then we sort based
* on strcmp to match the database sorting. Otherwise, we can do * on strcmp to match the database sorting. Otherwise, we can do
* inode-based sorting for faster filesystem operation. */ * inode-based sorting for faster filesystem operation. */
num_fs_entries = scandir (path, &fs_entries, 0, num_fs_entries = scandir (path, &fs_entries, 0,
new_directory ? directory ?
dirent_sort_inode : dirent_sort_strcmp_name); dirent_sort_strcmp_name : dirent_sort_inode);
if (num_fs_entries == -1) { if (num_fs_entries == -1) {
fprintf (stderr, "Error opening directory %s: %s\n", fprintf (stderr, "Error opening directory %s: %s\n",
@ -376,13 +355,12 @@ add_files_recursive (notmuch_database_t *notmuch,
* being discovered until the clock catches up and the directory * being discovered until the clock catches up and the directory
* is modified again). * is modified again).
*/ */
if (fs_mtime == db_mtime) if (directory && fs_mtime == db_mtime)
goto DONE; goto DONE;
/* new_directory means a directory that the database has never /* If the database has never seen this directory before, we can
* seen before. In that case, we can simply leave db_files and * simply leave db_files and db_subdirs NULL. */
* db_subdirs NULL. */ if (directory) {
if (!new_directory) {
db_files = notmuch_directory_get_child_files (directory); db_files = notmuch_directory_get_child_files (directory);
db_subdirs = notmuch_directory_get_child_directories (directory); db_subdirs = notmuch_directory_get_child_directories (directory);
} }