Merge branch 'release'

[notmuch] / lib / directory.cc

diff --git a/lib/directory.cc b/lib/directory.cc
index bb6314ad7610b992726c8396251df1b64fa32606..70e1693ea54eaa4f3bfe5e5312610318d803621f 100644 (file)
--- a/lib/directory.cc
+++ b/lib/directory.cc
@@ -21,111 +21,25 @@
 #include "notmuch-private.h"
 #include "database-private.h"
 
-#include <xapian.h>
-
-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)
+static notmuch_filenames_t *
+_create_filenames_for_terms_with_prefix (void *ctx,
+                                        notmuch_database_t *notmuch,
+                                        const char *prefix)
 {
-    notmuch_filenames_t *filenames;
-
-    filenames = talloc (ctx, notmuch_filenames_t);
-    if (unlikely (filenames == NULL))
+    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;
 
-    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_has_more (notmuch_filenames_t *filenames)
-{
-    if (filenames == NULL)
-       return NULL;
-
-    return (filenames->iterator != filenames->end);
-}
-
-const char *
-notmuch_filenames_get (notmuch_filenames_t *filenames)
-{
-    if (filenames == NULL || filenames->iterator == filenames->end)
-       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_advance (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 {
@@ -231,7 +145,8 @@ _notmuch_directory_create (notmuch_database_t *notmuch,
            directory->doc.add_value (NOTMUCH_VALUE_TIMESTAMP,
                                      Xapian::sortable_serialise (0));
 
-           directory->document_id = db->add_document (directory->doc);
+           directory->document_id = _notmuch_database_generate_doc_id (notmuch);
+           db->replace_document (directory->document_id, directory->doc);
            talloc_free (local);
        }
 
@@ -305,8 +220,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);
 
@@ -323,8 +239,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);