X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fdirectory.cc;h=6a3ffed73bb6031d36cf579a700d4b67b6ba5ec6;hp=5d673e2134d058b8010d96d9783d187e765b96a0;hb=a7bf045fb178b5ed48e71269427cec42c21f8cd6;hpb=98845fdbb2a4acaa0036f8e2e998e726b18e6b13 diff --git a/lib/directory.cc b/lib/directory.cc index 5d673e21..6a3ffed7 100644 --- a/lib/directory.cc +++ b/lib/directory.cc @@ -21,111 +21,25 @@ #include "notmuch-private.h" #include "database-private.h" -#include - -struct _notmuch_filenames { - Xapian::TermIterator iterator; - Xapian::TermIterator end; - int prefix_len; - char *filename; -}; - -/* We end up having to call the destructors explicitly because we had - * to use "placement new" in order to initialize C++ objects within a - * block that we allocated with talloc. So C++ is making talloc - * slightly less simple to use, (we wouldn't need - * talloc_set_destructor at all otherwise). - */ -static int -_notmuch_filenames_destructor (notmuch_filenames_t *filenames) -{ - filenames->iterator.~TermIterator (); - filenames->end.~TermIterator (); - - return 0; -} - /* Create an iterator to iterate over the basenames of files (or * directories) that all share a common parent directory. - * - * The code here is general enough to be reused for any case of - * iterating over the non-prefixed portion of terms sharing a common - * prefix. */ -notmuch_filenames_t * -_notmuch_filenames_create (void *ctx, - notmuch_database_t *notmuch, - const char *prefix) -{ - notmuch_filenames_t *filenames; - - filenames = talloc (ctx, notmuch_filenames_t); - if (unlikely (filenames == NULL)) - return NULL; - - new (&filenames->iterator) Xapian::TermIterator (); - new (&filenames->end) Xapian::TermIterator (); - - talloc_set_destructor (filenames, _notmuch_filenames_destructor); - - filenames->iterator = notmuch->xapian_db->allterms_begin (prefix); - filenames->end = notmuch->xapian_db->allterms_end (prefix); - - filenames->prefix_len = strlen (prefix); - - filenames->filename = NULL; - - return filenames; -} - -notmuch_bool_t -notmuch_filenames_valid (notmuch_filenames_t *filenames) -{ - if (filenames == NULL) - return NULL; - - return (filenames->iterator != filenames->end); -} - -const char * -notmuch_filenames_get (notmuch_filenames_t *filenames) +static notmuch_filenames_t * +_create_filenames_for_terms_with_prefix (void *ctx, + notmuch_database_t *notmuch, + const char *prefix) { - if (filenames == NULL || filenames->iterator == filenames->end) + notmuch_string_list_t *filename_list; + Xapian::TermIterator i, end; + + i = notmuch->xapian_db->allterms_begin(); + end = notmuch->xapian_db->allterms_end(); + filename_list = _notmuch_database_get_terms_with_prefix (ctx, i, end, + prefix); + if (unlikely (filename_list == NULL)) return NULL; - if (filenames->filename == NULL) { - std::string term = *filenames->iterator; - - filenames->filename = talloc_strdup (filenames, - term.c_str () + - filenames->prefix_len); - } - - return filenames->filename; -} - -void -notmuch_filenames_move_to_next (notmuch_filenames_t *filenames) -{ - if (filenames == NULL) - return; - - if (filenames->filename) { - talloc_free (filenames->filename); - filenames->filename = NULL; - } - - if (filenames->iterator != filenames->end) - filenames->iterator++; -} - -void -notmuch_filenames_destroy (notmuch_filenames_t *filenames) -{ - if (filenames == NULL) - return; - - talloc_free (filenames); + return _notmuch_filenames_create (ctx, filename_list); } struct _notmuch_directory { @@ -168,28 +82,41 @@ find_directory_document (notmuch_database_t *notmuch, return NOTMUCH_PRIVATE_STATUS_SUCCESS; } +/* Find or create a directory document. + * + * 'path' should be a path relative to the path of 'database', or else + * should be an absolute path with initial components that match the + * path of 'database'. + * + * If (flags & NOTMUCH_FIND_CREATE), then the directory document will + * be created if it does not exist. Otherwise, if the directory + * document does not exist, *status_ret is set to + * NOTMUCH_STATUS_SUCCESS and this returns NULL. + */ notmuch_directory_t * _notmuch_directory_create (notmuch_database_t *notmuch, const char *path, + notmuch_find_flags_t flags, notmuch_status_t *status_ret) { Xapian::WritableDatabase *db; notmuch_directory_t *directory; notmuch_private_status_t private_status; const char *db_path; + notmuch_bool_t create = (flags & NOTMUCH_FIND_CREATE); *status_ret = NOTMUCH_STATUS_SUCCESS; path = _notmuch_database_relative_path (notmuch, path); - if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY) + if (create && notmuch->mode == NOTMUCH_DATABASE_MODE_READ_ONLY) INTERNAL_ERROR ("Failure to ensure database is writable"); - db = static_cast (notmuch->xapian_db); - directory = talloc (notmuch, notmuch_directory_t); - if (unlikely (directory == NULL)) + if (unlikely (directory == NULL)) { + *status_ret = NOTMUCH_STATUS_OUT_OF_MEMORY; return NULL; + } directory->notmuch = notmuch; @@ -208,6 +135,13 @@ _notmuch_directory_create (notmuch_database_t *notmuch, directory->document_id = directory->doc.get_docid (); if (private_status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) { + if (!create) { + notmuch_directory_destroy (directory); + directory = NULL; + *status_ret = NOTMUCH_STATUS_SUCCESS; + goto DONE; + } + void *local = talloc_new (directory); const char *parent, *basename; Xapian::docid parent_id; @@ -219,7 +153,13 @@ _notmuch_directory_create (notmuch_database_t *notmuch, _notmuch_database_split_path (local, path, &parent, &basename); - _notmuch_database_find_directory_id (notmuch, parent, &parent_id); + *status_ret = _notmuch_database_find_directory_id ( + notmuch, parent, NOTMUCH_FIND_CREATE, &parent_id); + if (*status_ret) { + notmuch_directory_destroy (directory); + directory = NULL; + goto DONE; + } if (basename) { term = talloc_asprintf (local, "%s%u:%s", @@ -231,6 +171,8 @@ _notmuch_directory_create (notmuch_database_t *notmuch, directory->doc.add_value (NOTMUCH_VALUE_TIMESTAMP, Xapian::sortable_serialise (0)); + db = static_cast (notmuch->xapian_db); + directory->document_id = _notmuch_database_generate_doc_id (notmuch); db->replace_document (directory->document_id, directory->doc); talloc_free (local); @@ -244,10 +186,11 @@ _notmuch_directory_create (notmuch_database_t *notmuch, error.get_msg().c_str()); notmuch->exception_reported = TRUE; notmuch_directory_destroy (directory); + directory = NULL; *status_ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION; - return NULL; } + DONE: if (db_path != path) free ((char *) db_path); @@ -306,8 +249,9 @@ notmuch_directory_get_child_files (notmuch_directory_t *directory) _find_prefix ("file-direntry"), directory->document_id); - child_files = _notmuch_filenames_create (directory, - directory->notmuch, term); + child_files = _create_filenames_for_terms_with_prefix (directory, + directory->notmuch, + term); talloc_free (term); @@ -324,8 +268,8 @@ notmuch_directory_get_child_directories (notmuch_directory_t *directory) _find_prefix ("directory-direntry"), directory->document_id); - child_directories = _notmuch_filenames_create (directory, - directory->notmuch, term); + child_directories = _create_filenames_for_terms_with_prefix (directory, + directory->notmuch, term); talloc_free (term);