Re: [PATCH] bug in notmuch-fcc-header-setup

[notmuch-archives.git] / 7b / ad574a6262e973f8cb9238bfc60484c3401247

Return-Path: <meskio@sindominio.net>\r
X-Original-To: notmuch@notmuchmail.org\r
Delivered-To: notmuch@notmuchmail.org\r
Received: from localhost (localhost [127.0.0.1])\r
        by olra.theworths.org (Postfix) with ESMTP id 882A5417340\r
        for <notmuch@notmuchmail.org>; Sat, 20 Mar 2010 03:21:42 -0700 (PDT)\r
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
X-Spam-Flag: NO\r
X-Spam-Score: -1.9\r
X-Spam-Level: \r
X-Spam-Status: No, score=-1.9 tagged_above=-999 required=5\r
        tests=[BAYES_00=-1.9] autolearn=ham\r
Received: from olra.theworths.org ([127.0.0.1])\r
        by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
        with ESMTP id zQ5iSnDOmwm7 for <notmuch@notmuchmail.org>;\r
        Sat, 20 Mar 2010 03:21:40 -0700 (PDT)\r
Received: from flatline.sindominio.net (flatline.sindominio.net [82.144.4.26])\r
        by olra.theworths.org (Postfix) with ESMTP id DEB23431FC1\r
        for <notmuch@notmuchmail.org>; Sat, 20 Mar 2010 03:21:39 -0700 (PDT)\r
Received: from localhost (localhost.localdomain [127.0.0.1])\r
        by flatline.sindominio.net (Postfix) with ESMTP id C66F2262E3E;\r
        Sat, 20 Mar 2010 11:21:38 +0100 (CET)\r
X-Virus-Scanned: Debian amavisd-new at sindominio.net\r
Received: from flatline.sindominio.net ([127.0.0.1])\r
        by localhost (flatline.sindominio.net [127.0.0.1]) (amavisd-new,\r
        port 10024)\r
        with ESMTP id Yiiim5dMf4NV; Sat, 20 Mar 2010 11:21:35 +0100 (CET)\r
Received: from blackspot (heal.cauterized.net [89.140.131.167])\r
        by flatline.sindominio.net (Postfix) with ESMTPA id 6EA72262E3B;\r
        Sat, 20 Mar 2010 11:21:28 +0100 (CET)\r
Received: by blackspot (Postfix, from userid 1000)\r
        id 0FF728BDFC; Sat, 20 Mar 2010 11:24:51 +0100 (CET)\r
From: Ruben Pollan <meskio@sindominio.net>\r
To: notmuch@notmuchmail.org\r
Date: Sat, 20 Mar 2010 11:23:22 +0100\r
Message-Id: <1269080605-5617-3-git-send-email-meskio@sindominio.net>\r
X-Mailer: git-send-email 1.7.0\r
In-Reply-To: <873a09jt2t.fsf@yoom.home.cworth.org>\r
References: <873a09jt2t.fsf@yoom.home.cworth.org>\r
Subject: [notmuch] [PATCH 2/5] Added backwards iterator to messages\r
X-BeenThere: notmuch@notmuchmail.org\r
X-Mailman-Version: 2.1.13\r
Precedence: list\r
List-Id: "Use and development of the notmuch mail system."\r
        <notmuch.notmuchmail.org>\r
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
        <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
List-Post: <mailto:notmuch@notmuchmail.org>\r
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
        <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
X-List-Received-Date: Sat, 20 Mar 2010 10:21:42 -0000\r
\r
Added the functions notmuch_messages_move_to_prevoius,\r
notmuch_messages_move_to_last and  notmuch_messages_move_to_first to\r
notmuch library. With them is possible to iterate backwards on messages.\r
\r
* notmuch_messages_move_to_prevoius do the opposite than\r
  notmuch_messages_move_to_next, getting the messages iterator one\r
  position backwards.\r
\r
* notmuch_messages_move_to_last move the iterator to the first last\r
  message.\r
\r
* notmuch_messages_move_to_first move the iterator to the first valid\r
  message.\r
---\r
 lib/messages.c        |   31 +++++++++++++++++++++++++++++\r
 lib/notmuch-private.h |   10 +++++++++\r
 lib/notmuch.h         |   28 ++++++++++++++++++++++++++\r
 lib/query.cc          |   52 +++++++++++++++++++++++++++++++++++++++++++++++++\r
 4 files changed, 121 insertions(+), 0 deletions(-)\r
\r
diff --git a/lib/messages.c b/lib/messages.c\r
index 2a85774..975e4b1 100644\r
--- a/lib/messages.c\r
+++ b/lib/messages.c\r
@@ -90,6 +90,7 @@ _notmuch_messages_create (notmuch_message_list_t *list)\r
 \r
     messages->is_of_list_type = TRUE;\r
     messages->iterator = list->head;\r
+    messages->list = list;\r
 \r
     return messages;\r
 }\r
@@ -134,6 +135,15 @@ notmuch_messages_get (notmuch_messages_t *messages)\r
 }\r
 \r
 void\r
+notmuch_messages_move_to_first (notmuch_messages_t *messages)\r
+{\r
+    if (! messages->is_of_list_type)\r
+       return _notmuch_mset_messages_move_to_first (messages);\r
+\r
+    messages->iterator = messages->list->head;\r
+}\r
+\r
+void\r
 notmuch_messages_move_to_next (notmuch_messages_t *messages)\r
 {\r
     if (! messages->is_of_list_type)\r
@@ -146,6 +156,27 @@ notmuch_messages_move_to_next (notmuch_messages_t *messages)\r
 }\r
 \r
 void\r
+notmuch_messages_move_to_last (notmuch_messages_t *messages)\r
+{\r
+    if (! messages->is_of_list_type)\r
+       return _notmuch_mset_messages_move_to_last (messages);\r
+\r
+    messages->iterator = messages->list->tail;\r
+}\r
+\r
+void\r
+notmuch_messages_move_to_previous (notmuch_messages_t *messages)\r
+{\r
+    if (! messages->is_of_list_type)\r
+       return _notmuch_mset_messages_move_to_previous (messages);\r
+\r
+    if (messages->iterator == NULL)\r
+       return;\r
+\r
+    messages->iterator = messages->iterator->prev;\r
+}\r
+\r
+void\r
 notmuch_messages_destroy (notmuch_messages_t *messages)\r
 {\r
     talloc_free (messages);\r
diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h\r
index 3b3f0eb..2269d2b 100644\r
--- a/lib/notmuch-private.h\r
+++ b/lib/notmuch-private.h\r
@@ -364,6 +364,7 @@ typedef struct _notmuch_message_list {\r
 struct _notmuch_messages {\r
     notmuch_bool_t is_of_list_type;\r
     notmuch_message_node_t *iterator;\r
+    notmuch_message_list_t *list;\r
 };\r
 \r
 notmuch_message_list_t *\r
@@ -389,8 +390,17 @@ notmuch_message_t *\r
 _notmuch_mset_messages_get (notmuch_messages_t *messages);\r
 \r
 void\r
+_notmuch_mset_messages_move_to_first (notmuch_messages_t *messages);\r
+\r
+void\r
 _notmuch_mset_messages_move_to_next (notmuch_messages_t *messages);\r
 \r
+void\r
+_notmuch_mset_messages_move_to_last (notmuch_messages_t *messages);\r
+\r
+void\r
+_notmuch_mset_messages_move_to_previous (notmuch_messages_t *messages);\r
+\r
 /* message.cc */\r
 \r
 void\r
diff --git a/lib/notmuch.h b/lib/notmuch.h\r
index 0d9cb0f..753f3bb 100644\r
--- a/lib/notmuch.h\r
+++ b/lib/notmuch.h\r
@@ -645,6 +645,15 @@ notmuch_messages_valid (notmuch_messages_t *messages);\r
 notmuch_message_t *\r
 notmuch_messages_get (notmuch_messages_t *messages);\r
 \r
+/* Move the 'messages' iterator to the first message.\r
+ *\r
+ * After that the 'messages' iterator will be set to the first valid \r
+ * message, so it can be use to iterate with \r
+ * notmuch_messages_move_to_next.\r
+ */\r
+void\r
+notmuch_messages_move_to_first (notmuch_messages_t *messages);\r
+\r
 /* Move the 'messages' iterator to the next message.\r
  *\r
  * If 'messages' is already pointing at the last message then the\r
@@ -658,6 +667,25 @@ notmuch_messages_get (notmuch_messages_t *messages);\r
 void\r
 notmuch_messages_move_to_next (notmuch_messages_t *messages);\r
 \r
+/* Move the 'messages' iterator to the last message.\r
+ *\r
+ * After that the 'messages' iterator will be set to the last valid \r
+ * message, so it can be use to iterate with \r
+ * notmuch_messages_move_to_previous.\r
+ */\r
+void\r
+notmuch_messages_move_to_last (notmuch_messages_t *messages);\r
+\r
+/* Move the 'messages' iterator to the previous message.\r
+ *\r
+ * If 'messages' is already pointing at the first message then the\r
+ * iterator will be moved to a point just beyond that first message,\r
+ * (where notmuch_messages_valid will return FALSE and\r
+ * notmuch_messages_get will return NULL).\r
+ */\r
+void\r
+notmuch_messages_move_to_previous (notmuch_messages_t *messages);\r
+\r
 /* Destroy a notmuch_messages_t object.\r
  *\r
  * It's not strictly necessary to call this function. All memory from\r
diff --git a/lib/query.cc b/lib/query.cc\r
index 9266d35..970c35a 100644\r
--- a/lib/query.cc\r
+++ b/lib/query.cc\r
@@ -35,6 +35,7 @@ typedef struct _notmuch_mset_messages {\r
     notmuch_messages_t base;\r
     notmuch_database_t *notmuch;\r
     Xapian::MSetIterator iterator;\r
+    Xapian::MSetIterator iterator_begin;\r
     Xapian::MSetIterator iterator_end;\r
 } notmuch_mset_messages_t;\r
 \r
@@ -86,6 +87,7 @@ static int\r
 _notmuch_messages_destructor (notmuch_mset_messages_t *messages)\r
 {\r
     messages->iterator.~MSetIterator ();\r
+    messages->iterator_begin.~MSetIterator ();\r
     messages->iterator_end.~MSetIterator ();\r
 \r
     return 0;\r
@@ -108,6 +110,7 @@ notmuch_query_search_messages (notmuch_query_t *query)\r
        messages->base.iterator = NULL;\r
        messages->notmuch = notmuch;\r
        new (&messages->iterator) Xapian::MSetIterator ();\r
+       new (&messages->iterator_begin) Xapian::MSetIterator ();\r
        new (&messages->iterator_end) Xapian::MSetIterator ();\r
 \r
        talloc_set_destructor (messages, _notmuch_messages_destructor);\r
@@ -157,6 +160,7 @@ notmuch_query_search_messages (notmuch_query_t *query)\r
        mset = enquire.get_mset (0, notmuch->xapian_db->get_doccount ());\r
 \r
        messages->iterator = mset.begin ();\r
+       messages->iterator_begin = mset.begin ();\r
        messages->iterator_end = mset.end ();\r
 \r
     } catch (const Xapian::Error &error) {\r
@@ -208,6 +212,16 @@ _notmuch_mset_messages_get (notmuch_messages_t *messages)\r
 }\r
 \r
 void\r
+_notmuch_mset_messages_move_to_first (notmuch_messages_t *messages)\r
+{\r
+    notmuch_mset_messages_t *mset_messages;\r
+\r
+    mset_messages = (notmuch_mset_messages_t *) messages;\r
+\r
+    mset_messages->iterator = mset_messages->iterator_begin;\r
+}\r
+\r
+void\r
 _notmuch_mset_messages_move_to_next (notmuch_messages_t *messages)\r
 {\r
     notmuch_mset_messages_t *mset_messages;\r
@@ -217,6 +231,44 @@ _notmuch_mset_messages_move_to_next (notmuch_messages_t *messages)\r
     mset_messages->iterator++;\r
 }\r
 \r
+void\r
+_notmuch_mset_messages_move_to_last (notmuch_messages_t *messages)\r
+{\r
+    notmuch_mset_messages_t *mset_messages;\r
+\r
+    mset_messages = (notmuch_mset_messages_t *) messages;\r
+\r
+    mset_messages->iterator = mset_messages->iterator_end;\r
+    mset_messages->iterator--;\r
+}\r
+\r
+void\r
+_notmuch_mset_messages_move_to_previous (notmuch_messages_t *messages)\r
+{\r
+    notmuch_mset_messages_t *mset_messages;\r
+\r
+    mset_messages = (notmuch_mset_messages_t *) messages;\r
+\r
+    if (mset_messages->iterator == mset_messages->iterator_begin)\r
+    {\r
+        /*\r
+         * Xapian iterators can not be beyond the first element, so we\r
+         * assign the iterator_end to mark the iterator as invalid in case\r
+         * of move_to_previous with the iterator at the beginning\r
+         */\r
+        mset_messages->iterator = mset_messages->iterator_end;\r
+    }\r
+    else if (_notmuch_mset_messages_valid (messages))\r
+    {\r
+        /*\r
+         * If is valid move the iterator. To emulate the same behavior \r
+         * than notmuch_messages_t the iterator won't be updated if is \r
+         * not valid\r
+         */\r
+        mset_messages->iterator--;\r
+    }\r
+}\r
+\r
 /* Glib objects force use to use a talloc destructor as well, (but not\r
  * nearly as ugly as the for messages due to C++ objects). At\r
  * this point, I'd really like to have some talloc-friendly\r
-- \r
1.7.0\r
\r