lib: replace deprecated n_q_count_threads with status returning version

[notmuch] / bindings / ruby / query.c

diff --git a/bindings/ruby/query.c b/bindings/ruby/query.c
index 02b7819eb6856e12aa25975dde9d506a15be8d01..8b46d700bdab01554c8944ec7903ea9ce8a3707e 100644 (file)
--- a/bindings/ruby/query.c
+++ b/bindings/ruby/query.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Ali Polatel <alip@exherbo.org>
  */
@@ -88,6 +88,42 @@ notmuch_rb_query_get_string (VALUE self)
     return rb_str_new2 (notmuch_query_get_query_string (query));
 }
 
+/*
+ * call-seq: QUERY.add_tag_exclude(tag) => nil
+ *
+ * Add a tag that will be excluded from the query results by default.
+ */
+VALUE
+notmuch_rb_query_add_tag_exclude (VALUE self, VALUE tagv)
+{
+    notmuch_query_t *query;
+    const char *tag;
+
+    Data_Get_Notmuch_Query (self, query);
+    tag = RSTRING_PTR(tagv);
+
+    notmuch_query_add_tag_exclude(query, tag);
+    return Qnil;
+}
+
+/*
+ * call-seq: QUERY.omit_excluded=(boolean) => nil
+ *
+ * Specify whether to omit excluded results or simply flag them.
+ * By default, this is set to +true+.
+ */
+VALUE
+notmuch_rb_query_set_omit_excluded (VALUE self, VALUE omitv)
+{
+    notmuch_query_t *query;
+
+    Data_Get_Notmuch_Query (self, query);
+
+    notmuch_query_set_omit_excluded (query, RTEST (omitv));
+
+    return Qnil;
+}
+
 /*
  * call-seq: QUERY.search_threads => THREADS
  *
@@ -98,12 +134,13 @@ notmuch_rb_query_search_threads (VALUE self)
 {
     notmuch_query_t *query;
     notmuch_threads_t *threads;
+    notmuch_status_t status;
 
     Data_Get_Notmuch_Query (self, query);
 
-    threads = notmuch_query_search_threads (query);
-    if (!threads)
-       rb_raise (notmuch_rb_eMemoryError, "Out of memory");
+    status = notmuch_query_search_threads (query, &threads);
+    if (status)
+       notmuch_rb_status_raise (status);
 
     return Data_Wrap_Struct (notmuch_rb_cThreads, NULL, NULL, threads);
 }
@@ -118,12 +155,13 @@ notmuch_rb_query_search_messages (VALUE self)
 {
     notmuch_query_t *query;
     notmuch_messages_t *messages;
+    notmuch_status_t status;
 
     Data_Get_Notmuch_Query (self, query);
 
-    messages = notmuch_query_search_messages (query);
-    if (!messages)
-       rb_raise (notmuch_rb_eMemoryError, "Out of memory");
+    status = notmuch_query_search_messages (query, &messages);
+    if (status)
+       notmuch_rb_status_raise (status);
 
     return Data_Wrap_Struct (notmuch_rb_cMessages, NULL, NULL, messages);
 }
@@ -137,12 +175,35 @@ VALUE
 notmuch_rb_query_count_messages (VALUE self)
 {
     notmuch_query_t *query;
+    notmuch_status_t status;
+    unsigned int count;
 
     Data_Get_Notmuch_Query (self, query);
 
-    /* Xapian exceptions are not handled properly.
-     * (function may return 0 after printing a message)
-     * Thus there is nothing we can do here...
-     */
-    return UINT2FIX(notmuch_query_count_messages(query));
+    status = notmuch_query_count_messages (query, &count);
+    if (status)
+       notmuch_rb_status_raise (status);
+
+    return UINT2NUM(count);
+}
+
+/*
+ * call-seq: QUERY.count_threads => Fixnum
+ *
+ * Return an estimate of the number of threads matching a search
+ */
+VALUE
+notmuch_rb_query_count_threads (VALUE self)
+{
+    notmuch_query_t *query;
+    notmuch_status_t status;
+    unsigned int count;
+
+    Data_Get_Notmuch_Query (self, query);
+
+    status = notmuch_query_count_threads (query, &count);
+    if (status)
+       notmuch_rb_status_raise (status);
+
+    return UINT2NUM(count);
 }