implement message counting

[notmuch] / cnotmuch / database.py

diff --git a/cnotmuch/database.py b/cnotmuch/database.py
index 93c727c67bdc009c34596ef2af5757a7065016e4..19460b339e6d9942b093c3155fa6c3575a78e432 100644 (file)
--- a/cnotmuch/database.py
+++ b/cnotmuch/database.py
@@ -1,7 +1,7 @@
 import ctypes
 from ctypes import c_int, c_char_p, c_void_p
 from cnotmuch.globals import nmlib, STATUS, NotmuchError
-
+import logging
 
 class Database(object):
     """ Wrapper around a notmuch_database_t
@@ -121,7 +121,7 @@ class Database(object):
     def __del__(self):
         """Close and free the notmuch database if needed"""
         if self._db is not None:
-            print("Freeing the database now")
+            logging.debug("Freeing the database now")
             nmlib.notmuch_database_close(self._db)
 
     def _get_user_default_db(self):
@@ -204,7 +204,7 @@ class Query(object):
     def __del__(self):
         """Close and free the Query"""
         if self._query is not None:
-            print("Freeing the Query now")
+            logging.debug("Freeing the Query now")
             nmlib.notmuch_query_destroy (self._query)
 
 #------------------------------------------------------------------------------
@@ -235,26 +235,28 @@ class Tags(object):
 
         self._tags = tags_p
         self._db = db
-        print "Inited Tags derived from %s" %(str(db))
+        logging.debug("Inited Tags derived from %s" %(str(db)))
     
     def __iter__(self):
         """ Make Tags an iterator """
-        if self._tags is None:
-            raise NotmuchError(STATUS.NOT_INITIALIZED)
         return self
 
     def next(self):
-        nmlib.notmuch_tags_move_to_next(self._tags)
+        if self._tags is None:
+            raise NotmuchError(STATUS.NOT_INITIALIZED)
+
         if not nmlib.notmuch_tags_valid(self._tags):
-            print("Freeing the Tags now")
-            nmlib.notmuch_tags_destroy (self._tags)
+            self._tags = None
             raise StopIteration
-        return Tags._get (self._tags)
+
+        tag = Tags._get (self._tags)
+        nmlib.notmuch_tags_move_to_next(self._tags)
+        return tag
 
     def __del__(self):
         """Close and free the notmuch tags"""
         if self._tags is not None:
-            print("Freeing the Tags now")
+            logging.debug("Freeing the Tags now")
             nmlib.notmuch_tags_destroy (self._tags)
 
 
@@ -266,6 +268,9 @@ class Messages(object):
     _get = nmlib.notmuch_messages_get
     _get.restype = c_void_p
 
+    _collect_tags = nmlib.notmuch_messages_collect_tags
+    _collect_tags.restype = c_void_p
+
     def __init__(self, msgs_p, parent=None):
         """
         msg_p is a pointer to an notmuch_messages_t Structure. If it is None,
@@ -287,8 +292,27 @@ class Messages(object):
         self._msgs = msgs_p
         #store parent, so we keep them alive as long as self  is alive
         self._parent = parent
-        print "Inited Messages derived from %s" %(str(parent))
-    
+        logging.debug("Inited Messages derived from %s" %(str(parent)))
+
+    def collect_tags(self):
+        """ return the Tags() belonging to the messages
+        
+        Do note that collect_tags will iterate over the messages and
+        therefore will not allow further iterationsl
+        Raises NotmuchError(STATUS.NOT_INITIALIZED) if not inited
+        """
+        if self._msgs is None:
+            raise NotmuchError(STATUS.NOT_INITIALIZED)
+
+        # collect all tags (returns NULL on error)
+        tags_p = Messages._collect_tags (self._msgs)
+        #reset _msgs as we iterated over it and can do so only once
+        self._msgs = None
+
+        if tags_p == None:
+            raise NotmuchError(STATUS.NULL_POINTER)
+        return Tags(tags_p, self)
+
     def __iter__(self):
         """ Make Messages an iterator """
         return self
@@ -297,18 +321,36 @@ class Messages(object):
         if self._msgs is None:
             raise NotmuchError(STATUS.NOT_INITIALIZED)
 
-        nmlib.notmuch_messages_move_to_next(self._msgs)
         if not nmlib.notmuch_messages_valid(self._msgs):
-            print("Freeing the Messages now")
-            nmlib.notmuch_messages_destroy (self._msgs)
             self._msgs = None
             raise StopIteration
-        return Message(Messages._get (self._msgs), self)
+
+        msg = Message(Messages._get (self._msgs), self)
+        nmlib.notmuch_messages_move_to_next(self._msgs)
+        return msg
+
+    def __len__(self):
+        """ Returns the number of contained messages
+
+        :note: As this iterates over the messages, we will not be able to 
+               iterate over them again (as in retrieve them)!
+        """
+        if self._msgs is None:
+            raise NotmuchError(STATUS.NOT_INITIALIZED)
+
+        i=0
+        while nmlib.notmuch_messages_valid(self._msgs):
+            nmlib.notmuch_messages_move_to_next(self._msgs)
+            i += 1
+        self._msgs = None
+        return i
+
+
 
     def __del__(self):
         """Close and free the notmuch Messages"""
         if self._msgs is not None:
-            print("Freeing the Messages now")
+            logging.debug("Freeing the Messages now")
             nmlib.notmuch_messages_destroy (self._msgs)
 
 
@@ -339,8 +381,9 @@ class Message(object):
         if msg_p is None:
             NotmuchError(STATUS.NULL_POINTER)
         self._msg = msg_p
+        #keep reference to parent, so we keep it alive
         self._parent = parent
-        print "Inited Message derived from %s" %(str(parent))
+        logging.debug("Inited Message derived from %s" %(str(parent)))
 
 
     def get_message_id(self):
@@ -379,5 +422,5 @@ class Message(object):
     def __del__(self):
         """Close and free the notmuch Message"""
         if self._msg is not None:
-            print("Freeing the Message now")
+            logging.debug("Freeing the Message now")
             nmlib.notmuch_message_destroy (self._msg)