X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=bindings%2Fruby%2Fdatabase.c;h=e84f726d1bf5576814a019062e883e604f0ba467;hp=44ee6817df4a6ea6d0774c1a06c17131433fee85;hb=bc4000a95289da7f4928ea448382c69781f2653c;hpb=06bf04500ba282052d38adf428219968ae62bb54

diff --git a/bindings/ruby/database.c b/bindings/ruby/database.c
index 44ee6817..e84f726d 100644
--- a/bindings/ruby/database.c
+++ b/bindings/ruby/database.c
@@ -1,6 +1,6 @@
 /* The Ruby interface to the notmuch mail library
  *
- * Copyright © 2010 Ali Polatel
+ * Copyright © 2010, 2011 Ali Polatel
  *
  * 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
@@ -20,62 +20,89 @@
 
 #include "defs.h"
 
+VALUE
+notmuch_rb_database_alloc (VALUE klass)
+{
+    return Data_Wrap_Struct (klass, NULL, NULL, NULL);
+}
+
 /*
- * call-seq: Notmuch::Database.new(path, [{:create => false, :mode => notmuch::MODE_READ_ONLY}]) => DB
+ * call-seq: Notmuch::Database.new(path [, {:create => false, :mode => Notmuch::MODE_READ_ONLY}]) => DB
  *
  * Create or open a notmuch database using the given path.
+ *
  * If :create is +true+, create the database instead of opening.
+ *
  * The argument :mode specifies the open mode of the database.
  */
 VALUE
-notmuch_rb_database_new(int argc, VALUE *argv, VALUE klass)
+notmuch_rb_database_initialize (int argc, VALUE *argv, VALUE self)
 {
     const char *path;
     int create, mode;
-    notmuch_rb_database_t *db;
-    VALUE modev, dbv;
-
-#if !defined(RSTRING_PTR)
-#define RSTRING_PTR(v) (RSTRING((v))->ptr)
-#endif /* !defined(RSTRING_PTR) */
+    VALUE pathv, hashv;
+    VALUE modev;
+    notmuch_database_t *database;
+    notmuch_status_t ret;
 
     /* Check arguments */
-    if (argc < 1 || argc > 2)
-        rb_raise(rb_eTypeError, "Wrong number of arguments");
-
-    SafeStringValue(argv[0]);
-    path = RSTRING_PTR(argv[0]);
-
-    if (argc == 2) {
-        Check_Type(argv[1], T_HASH);
-        create = RTEST(rb_hash_aref(argv[1], ID2SYM(ID_db_create)));
-        modev = rb_hash_aref(argv[1], ID2SYM(ID_db_mode));
-        if (NIL_P(modev))
-            mode = NOTMUCH_DATABASE_MODE_READ_ONLY;
-        else if (!FIXNUM_P(modev))
-            rb_raise(rb_eTypeError, ":mode isn't a Fixnum");
-        else {
-            mode = FIX2INT(modev);
-            switch (mode) {
-            case NOTMUCH_DATABASE_MODE_READ_ONLY:
-            case NOTMUCH_DATABASE_MODE_READ_WRITE:
-                break;
-            default:
-                rb_raise(rb_eTypeError, "Invalid mode");
-            }
-        }
-    }
-    else {
-        create = 0;
-        mode = NOTMUCH_DATABASE_MODE_READ_ONLY;
+    rb_scan_args (argc, argv, "11", &pathv, &hashv);
+
+    SafeStringValue (pathv);
+    path = RSTRING_PTR (pathv);
+
+    if (!NIL_P (hashv)) {
+	Check_Type (hashv, T_HASH);
+	create = RTEST (rb_hash_aref (hashv, ID2SYM (ID_db_create)));
+	modev = rb_hash_aref (hashv, ID2SYM (ID_db_mode));
+	if (NIL_P (modev))
+	    mode = NOTMUCH_DATABASE_MODE_READ_ONLY;
+	else if (!FIXNUM_P (modev))
+	    rb_raise (rb_eTypeError, ":mode isn't a Fixnum");
+	else {
+	    mode = FIX2INT (modev);
+	    switch (mode) {
+	    case NOTMUCH_DATABASE_MODE_READ_ONLY:
+	    case NOTMUCH_DATABASE_MODE_READ_WRITE:
+		break;
+	    default:
+		rb_raise ( rb_eTypeError, "Invalid mode");
+	    }
+	}
+    } else {
+	create = 0;
+	mode = NOTMUCH_DATABASE_MODE_READ_ONLY;
     }
 
-    dbv = Data_Make_Struct(klass, notmuch_rb_database_t, NULL, notmuch_rb_database_free, db);
-    db->nm_db = create ? notmuch_database_create(path) : notmuch_database_open(path, mode);
-    if (!db->nm_db)
-        rb_raise(notmuch_rb_eDatabaseError, "failed to open database");
+    Check_Type (self, T_DATA);
+    if (create)
+	ret = notmuch_database_create (path, &database);
+    else
+	ret = notmuch_database_open (path, mode, &database);
+    notmuch_rb_status_raise (ret);
+
+    DATA_PTR (self) = database;
 
-    return dbv;
+    return self;
+}
+
+/*
+ * call-seq: Notmuch::Database.open(path [, ahash]) {|db| ...}
+ *
+ * Identical to new, except that when it is called with a block, it yields with
+ * the new instance and closes it, and returns the result which is returned from
+ * the block.
+ */
+VALUE
+notmuch_rb_database_open (int argc, VALUE *argv, VALUE klass)
+{
+    VALUE obj;
+
+    obj = rb_class_new_instance (argc, argv, klass);
+    if (!rb_block_given_p ())
+	return obj;
+
+    return rb_ensure (rb_yield, obj, notmuch_rb_database_close, obj);
 }
 
 /*
@@ -84,15 +111,13 @@ notmuch_rb_database_new(int argc, VALUE *argv, VALUE klass)
  * Close the notmuch database.
  */
 VALUE
-notmuch_rb_database_close(VALUE self)
+notmuch_rb_database_close (VALUE self)
 {
-    notmuch_rb_database_t *db;
+    notmuch_database_t *db;
 
-    Data_Get_Struct(self, notmuch_rb_database_t, db);
-    if (db->nm_db) {
-        notmuch_database_close(db->nm_db);
-        db->nm_db = NULL;
-    }
+    Data_Get_Notmuch_Database (self, db);
+    notmuch_database_destroy (db);
+    DATA_PTR (self) = NULL;
 
     return Qnil;
 }
@@ -103,15 +128,13 @@ notmuch_rb_database_close(VALUE self)
  * Return the path of the database
  */
 VALUE
-notmuch_rb_database_path(VALUE self)
+notmuch_rb_database_path (VALUE self)
 {
-    notmuch_rb_database_t *db;
+    notmuch_database_t *db;
 
-    Data_Get_Struct(self, notmuch_rb_database_t, db);
-    if (!db->nm_db)
-        rb_raise(rb_eRuntimeError, "Database closed");
+    Data_Get_Notmuch_Database (self, db);
 
-    return rb_str_new2(notmuch_database_get_path(db->nm_db));
+    return rb_str_new2 (notmuch_database_get_path (db));
 }
 
 /*
@@ -120,15 +143,13 @@ notmuch_rb_database_path(VALUE self)
  * Return the version of the database
  */
 VALUE
-notmuch_rb_database_version(VALUE self)
+notmuch_rb_database_version (VALUE self)
 {
-    notmuch_rb_database_t *db;
+    notmuch_database_t *db;
 
-    Data_Get_Struct(self, notmuch_rb_database_t, db);
-    if (!db->nm_db)
-        rb_raise(rb_eRuntimeError, "Database closed");
+    Data_Get_Notmuch_Database (self, db);
 
-    return INT2FIX(notmuch_database_get_version(db->nm_db));
+    return INT2FIX (notmuch_database_get_version (db));
 }
 
 /*
@@ -137,26 +158,24 @@ notmuch_rb_database_version(VALUE self)
  * Return the +true+ if the database needs upgrading, +false+ otherwise
  */
 VALUE
-notmuch_rb_database_needs_upgrade(VALUE self)
+notmuch_rb_database_needs_upgrade (VALUE self)
 {
-    notmuch_rb_database_t *db;
+    notmuch_database_t *db;
 
-    Data_Get_Struct(self, notmuch_rb_database_t, db);
-    if (!db->nm_db)
-        rb_raise(rb_eRuntimeError, "Database closed");
+    Data_Get_Notmuch_Database (self, db);
 
-    return notmuch_database_needs_upgrade(db->nm_db) ? Qtrue : Qfalse;
+    return notmuch_database_needs_upgrade (db) ? Qtrue : Qfalse;
 }
 
 static void
-notmuch_rb_upgrade_notify(void *closure, double progress)
+notmuch_rb_upgrade_notify (void *closure, double progress)
 {
-    VALUE *block = (VALUE *)closure;
-    rb_funcall(*block, ID_call, 1, rb_float_new(progress));
+    VALUE *block = (VALUE *) closure;
+    rb_funcall (*block, ID_call, 1, rb_float_new (progress));
 }
 
 /*
- * call-seq: DB.upgrade [{|progress| block }] => nil
+ * call-seq: DB.upgrade! [{|progress| block }] => nil
  *
  * Upgrade the database.
  *
@@ -164,26 +183,63 @@ notmuch_rb_upgrade_notify(void *closure, double progress)
  * floating point value in the range of [0.0..1.0].
  */
 VALUE
-notmuch_rb_database_upgrade(VALUE self)
+notmuch_rb_database_upgrade (VALUE self)
 {
     notmuch_status_t ret;
     void (*pnotify) (void *closure, double progress);
-    notmuch_rb_database_t *db;
+    notmuch_database_t *db;
     VALUE block;
 
-    Data_Get_Struct(self, notmuch_rb_database_t, db);
-    if (!db->nm_db)
-        rb_raise(rb_eRuntimeError, "Database closed");
+    Data_Get_Notmuch_Database (self, db);
 
-    if (rb_block_given_p()) {
-        pnotify = notmuch_rb_upgrade_notify;
-        block = rb_block_proc();
+    if (rb_block_given_p ()) {
+	pnotify = notmuch_rb_upgrade_notify;
+	block = rb_block_proc ();
     }
     else
-        pnotify = NULL;
+	pnotify = NULL;
+
+    ret = notmuch_database_upgrade (db, pnotify, pnotify ? &block : NULL);
+    notmuch_rb_status_raise (ret);
+
+    return Qtrue;
+}
+
+/*
+ * call-seq: DB.begin_atomic => nil
+ *
+ * Begin an atomic database operation.
+ */
+VALUE
+notmuch_rb_database_begin_atomic (VALUE self)
+{
+    notmuch_status_t ret;
+    notmuch_database_t *db;
+
+    Data_Get_Notmuch_Database (self, db);
+
+    ret = notmuch_database_begin_atomic (db);
+    notmuch_rb_status_raise (ret);
+
+    return Qtrue;
+}
+
+/*
+ * call-seq: DB.end_atomic => nil
+ *
+ * Indicate the end of an atomic database operation.
+ */
+VALUE
+notmuch_rb_database_end_atomic (VALUE self)
+{
+    notmuch_status_t ret;
+    notmuch_database_t *db;
+
+    Data_Get_Notmuch_Database (self, db);
+
+    ret = notmuch_database_end_atomic (db);
+    notmuch_rb_status_raise (ret);
 
-    ret = notmuch_database_upgrade(db->nm_db, pnotify, pnotify ? &block : NULL);
-    notmuch_rb_status_raise(ret);
     return Qtrue;
 }
 
@@ -193,129 +249,149 @@ notmuch_rb_database_upgrade(VALUE self)
  * Retrieve a directory object from the database for 'path'
  */
 VALUE
-notmuch_rb_database_get_directory(VALUE self, VALUE pathv)
+notmuch_rb_database_get_directory (VALUE self, VALUE pathv)
 {
     const char *path;
-    notmuch_rb_directory_t *dir;
-    notmuch_rb_database_t *db;
-    VALUE dirv;
-
-    Data_Get_Struct(self, notmuch_rb_database_t, db);
-    if (!db->nm_db)
-        rb_raise(rb_eRuntimeError, "Database closed");
-
-#if !defined(RSTRING_PTR)
-#define RSTRING_PTR(v) (RSTRING((v))->ptr)
-#endif /* !defined(RSTRING_PTR) */
+    notmuch_status_t ret;
+    notmuch_directory_t *dir;
+    notmuch_database_t *db;
 
-    SafeStringValue(pathv);
-    path = RSTRING_PTR(pathv);
+    Data_Get_Notmuch_Database (self, db);
 
-    dirv = Data_Make_Struct(notmuch_rb_cDirectory, notmuch_rb_directory_t,
-            notmuch_rb_directory_mark, notmuch_rb_directory_free, dir);
-    dir->nm_dir = notmuch_database_get_directory(db->nm_db, path);
-    dir->db = self;
-    if (!dir->nm_dir)
-        rb_raise(notmuch_rb_eXapianError, "Xapian exception");
+    SafeStringValue (pathv);
+    path = RSTRING_PTR (pathv);
 
-    return dirv;
+    ret = notmuch_database_get_directory (db, path, &dir);
+    notmuch_rb_status_raise (ret);
+    if (dir)
+	return Data_Wrap_Struct (notmuch_rb_cDirectory, NULL, NULL, dir);
+    return Qnil;
 }
 
 /*
  * call-seq: DB.add_message(path) => MESSAGE, isdup
  *
- * Add a message to the database and return it
+ * Add a message to the database and return it.
+ *
  * +isdup+ is a boolean that specifies whether the added message was a
  * duplicate.
  */
 VALUE
-notmuch_rb_database_add_message(VALUE self, VALUE pathv)
+notmuch_rb_database_add_message (VALUE self, VALUE pathv)
 {
     const char *path;
     notmuch_status_t ret;
-    notmuch_rb_message_t *message;
-    notmuch_rb_database_t *db;
-    VALUE messagev;
-
-    Data_Get_Struct(self, notmuch_rb_database_t, db);
-    if (!db->nm_db)
-        rb_raise(rb_eRuntimeError, "Database closed");
-
-#if !defined(RSTRING_PTR)
-#define RSTRING_PTR(v) (RSTRING((v))->ptr)
-#endif /* !defined(RSTRING_PTR) */
-
-    SafeStringValue(pathv);
-    path = RSTRING_PTR(pathv);
-
-    messagev = Data_Make_Struct(notmuch_rb_cMessage, notmuch_rb_message_t,
-            notmuch_rb_message_mark, notmuch_rb_message_free, message);
-    ret = notmuch_database_add_message(db->nm_db, path, &message->nm_message);
-    message->parent = self;
-    notmuch_rb_status_raise(ret);
-    return rb_assoc_new(messagev, (ret == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) ? Qtrue : Qfalse);
+    notmuch_message_t *message;
+    notmuch_database_t *db;
+
+    Data_Get_Notmuch_Database (self, db);
+
+    SafeStringValue (pathv);
+    path = RSTRING_PTR (pathv);
+
+    ret = notmuch_database_add_message (db, path, &message);
+    notmuch_rb_status_raise (ret);
+    return rb_assoc_new (Data_Wrap_Struct (notmuch_rb_cMessage, NULL, NULL, message),
+        (ret == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) ? Qtrue : Qfalse);
 }
 
 /*
- * call-seq: DB.remove_message(path) => isdup
+ * call-seq: DB.remove_message (path) => isdup
  *
  * Remove a message from the database.
+ *
  * +isdup+ is a boolean that specifies whether the removed message was a
  * duplicate.
  */
 VALUE
-notmuch_rb_database_remove_message(VALUE self, VALUE pathv)
+notmuch_rb_database_remove_message (VALUE self, VALUE pathv)
 {
     const char *path;
     notmuch_status_t ret;
-    notmuch_rb_database_t *db;
-
-    Data_Get_Struct(self, notmuch_rb_database_t, db);
-    if (!db->nm_db)
-        rb_raise(rb_eRuntimeError, "Database closed");
+    notmuch_database_t *db;
 
-#if !defined(RSTRING_PTR)
-#define RSTRING_PTR(v) (RSTRING((v))->ptr)
-#endif /* !defined(RSTRING_PTR) */
+    Data_Get_Notmuch_Database (self, db);
 
-    SafeStringValue(pathv);
-    path = RSTRING_PTR(pathv);
+    SafeStringValue (pathv);
+    path = RSTRING_PTR (pathv);
 
-    ret = notmuch_database_remove_message(db->nm_db, path);
-    notmuch_rb_status_raise(ret);
+    ret = notmuch_database_remove_message (db, path);
+    notmuch_rb_status_raise (ret);
     return (ret == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) ? Qtrue : Qfalse;
 }
 
+/*
+ * call-seq: DB.find_message(id) => MESSAGE or nil
+ *
+ * Find a message by message id.
+ */
+VALUE
+notmuch_rb_database_find_message (VALUE self, VALUE idv)
+{
+    const char *id;
+    notmuch_status_t ret;
+    notmuch_database_t *db;
+    notmuch_message_t *message;
+
+    Data_Get_Notmuch_Database (self, db);
+
+    SafeStringValue (idv);
+    id = RSTRING_PTR (idv);
+
+    ret = notmuch_database_find_message (db, id, &message);
+    notmuch_rb_status_raise (ret);
+
+    if (message)
+        return Data_Wrap_Struct (notmuch_rb_cMessage, NULL, NULL, message);
+    return Qnil;
+}
+
+/*
+ * call-seq: DB.find_message_by_filename(path) => MESSAGE or nil
+ *
+ * Find a message by filename.
+ */
+VALUE
+notmuch_rb_database_find_message_by_filename (VALUE self, VALUE pathv)
+{
+    const char *path;
+    notmuch_status_t ret;
+    notmuch_database_t *db;
+    notmuch_message_t *message;
+
+    Data_Get_Notmuch_Database (self, db);
+
+    SafeStringValue (pathv);
+    path = RSTRING_PTR (pathv);
+
+    ret = notmuch_database_find_message_by_filename (db, path, &message);
+    notmuch_rb_status_raise (ret);
+
+    if (message)
+        return Data_Wrap_Struct (notmuch_rb_cMessage, NULL, NULL, message);
+    return Qnil;
+}
+
 /*
  * call-seq: DB.query(query) => QUERY
  *
  * Retrieve a query object for the query string 'query'
  */
 VALUE
-notmuch_rb_database_query_create(VALUE self, VALUE qstrv)
+notmuch_rb_database_query_create (VALUE self, VALUE qstrv)
 {
     const char *qstr;
-    notmuch_rb_query_t *query;
-    notmuch_rb_database_t *db;
-    VALUE queryv;
-
-    Data_Get_Struct(self, notmuch_rb_database_t, db);
-    if (!db->nm_db)
-        rb_raise(rb_eRuntimeError, "Database closed");
+    notmuch_query_t *query;
+    notmuch_database_t *db;
 
-#if !defined(RSTRING_PTR)
-#define RSTRING_PTR(v) (RSTRING((v))->ptr)
-#endif /* !defined(RSTRING_PTR) */
+    Data_Get_Notmuch_Database (self, db);
 
-    SafeStringValue(qstrv);
-    qstr = RSTRING_PTR(qstrv);
+    SafeStringValue (qstrv);
+    qstr = RSTRING_PTR (qstrv);
 
-    queryv = Data_Make_Struct(notmuch_rb_cQuery, notmuch_rb_query_t,
-            notmuch_rb_query_mark, notmuch_rb_query_free, query);
-    query->nm_query = notmuch_query_create(db->nm_db, qstr);
-    query->db = self;
-    if (!query->nm_query)
-        rb_raise(notmuch_rb_eMemoryError, "out of memory");
+    query = notmuch_query_create (db, qstr);
+    if (!query)
+        rb_raise (notmuch_rb_eMemoryError, "Out of memory");
 
-    return queryv;
+    return Data_Wrap_Struct (notmuch_rb_cQuery, NULL, NULL, query);
 }