From 4315ac015a1ba329880031805f4706731b3c1ef4 Mon Sep 17 00:00:00 2001 From: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Sat, 18 Feb 2012 01:13:06 +0100 Subject: python: refactor Query class Put each libnotmuch function reference right in front of the corresponding python wrapper. Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de> --- bindings/python/notmuch/query.py | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'bindings') diff --git a/bindings/python/notmuch/query.py b/bindings/python/notmuch/query.py index bab5c3ea..d4a93d5b 100644 --- a/bindings/python/notmuch/query.py +++ b/bindings/python/notmuch/query.py @@ -56,26 +56,6 @@ class Query(object): SORT = Enum(['OLDEST_FIRST', 'NEWEST_FIRST', 'MESSAGE_ID', 'UNSORTED']) """Constants: Sort order in which to return results""" - """notmuch_query_create""" - _create = nmlib.notmuch_query_create - _create.argtypes = [NotmuchDatabaseP, c_char_p] - _create.restype = NotmuchQueryP - - """notmuch_query_search_threads""" - _search_threads = nmlib.notmuch_query_search_threads - _search_threads.argtypes = [NotmuchQueryP] - _search_threads.restype = NotmuchThreadsP - - """notmuch_query_search_messages""" - _search_messages = nmlib.notmuch_query_search_messages - _search_messages.argtypes = [NotmuchQueryP] - _search_messages.restype = NotmuchMessagesP - - """notmuch_query_count_messages""" - _count_messages = nmlib.notmuch_query_count_messages - _count_messages.argtypes = [NotmuchQueryP] - _count_messages.restype = c_uint - def __init__(self, db, querystr): """ :param db: An open database which we derive the Query from. @@ -93,6 +73,11 @@ class Query(object): if self._query is None: raise NotInitializedError() + """notmuch_query_create""" + _create = nmlib.notmuch_query_create + _create.argtypes = [NotmuchDatabaseP, c_char_p] + _create.restype = NotmuchQueryP + def create(self, db, querystr): """Creates a new query derived from a Database @@ -132,6 +117,11 @@ class Query(object): self.sort = sort self._set_sort(self._query, sort) + """notmuch_query_search_threads""" + _search_threads = nmlib.notmuch_query_search_threads + _search_threads.argtypes = [NotmuchQueryP] + _search_threads.restype = NotmuchThreadsP + def search_threads(self): """Execute a query for threads @@ -153,6 +143,11 @@ class Query(object): raise NullPointerError return Threads(threads_p, self) + """notmuch_query_search_messages""" + _search_messages = nmlib.notmuch_query_search_messages + _search_messages.argtypes = [NotmuchQueryP] + _search_messages.restype = NotmuchMessagesP + def search_messages(self): """Filter messages according to the query and return :class:`Messages` in the defined sort order @@ -167,6 +162,11 @@ class Query(object): raise NullPointerError return Messages(msgs_p, self) + """notmuch_query_count_messages""" + _count_messages = nmlib.notmuch_query_count_messages + _count_messages.argtypes = [NotmuchQueryP] + _count_messages.restype = c_uint + def count_messages(self): """Estimate the number of messages matching the query -- cgit v1.2.3