implement Query.set_sort() and sort notmuch dump by message id

[notmuch] / notmuch

diff --git a/notmuch b/notmuch
index 2f65ae49e631d38b2e6eb069812788d44a762e25..478aed3ab0108fd79fac1d524fbcf03623b68e42 100755 (executable)
--- a/notmuch
+++ b/notmuch
@@ -1,6 +1,10 @@
 #!/usr/bin/env python
 """This is a notmuch implementation in python. It's goal is to allow running the test suite on the cnotmuch python bindings."""
-import sys
+import sys, os, re, logging
+from cnotmuch.notmuch import Database, Query
+PREFIX=re.compile('(\w+):(.*$)')
+#TODO Handle variable: NOTMUCH-CONFIG
+
 #-------------------------------------------------------------------------
 HELPTEXT="""The notmuch mail system.
 
@@ -53,7 +57,7 @@ Where <command> and [args...] are as follows:
 Use "notmuch help <command>" for more details on each command.
 And "notmuch help search-terms" for the common search-terms syntax.
 """
-
+#-------------------------------------------------------------------------
 #TODO: replace the dynamic pieces
 USAGE="""Notmuch is configured and appears to have a database. Excellent!
 
@@ -80,6 +84,18 @@ And don't forget to run "notmuch new" whenever new mail arrives.
 Have fun, and may your inbox never have much mail.
 """
 #-------------------------------------------------------------------------
+def quote_query_line(argv):
+   #mangle arguments wrapping terms with spaces in quotes
+   for i in xrange(0,len(argv)):
+      if argv[i].find(' ') >= 0:
+         #if we use prefix:termWithSpaces, put quotes around term
+         m = PREFIX.match(argv[i])
+         if m:
+            argv[i] = '%s:"%s"' % (m.group(1), m.group(2))
+         else:
+            argv[i] = '"'+argv[i]+'"'
+   return ' '.join(argv)
+
 if __name__ == '__main__':
 
    # Handle command line options
@@ -95,17 +111,49 @@ if __name__ == '__main__':
        if len(sys.argv) == 2: print HELPTEXT
        else: print "Not implemented"
 
+   elif sys.argv[1] == 'new':
+       #TODO: handle --verbose
+       print "Not implemented."
+
+   elif sys.argv[1] == 'count':
+      db = Database()
+      if len(sys.argv) == 2:
+         #no further search term
+         querystr=''
+      else:
+         #mangle arguments wrapping terms with spaces in quotes
+         querystr = quote_query_line(sys.argv[2:])
+      logging.debug("count "+querystr)
+      print(len(Query(db,querystr).search_messages()))
+
+   elif sys.argv[1] == 'search-tags':
+      if len(sys.argv) == 2:
+         #no further search term
+         print("\n".join(Database().get_all_tags()))
+      else:
+         #mangle arguments wrapping terms with spaces in quotes
+         querystr = quote_query_line(sys.argv[2:])
+         logging.debug("search-term "+querystr)
+         db = Database()
+         m  = Query(db,querystr).search_messages()
+         print("\n".join([t for t in m.collect_tags()]))
+
+   elif sys.argv[1] == 'dump':
+      #TODO: implement "dump <filename>"
+      db = Database()
+      q = Query(db,'')
+      q.set_sort(Query.SORT_MESSAGE_ID)
+      m = q.search_messages()
+      for msg in m:
+         print("%s (%s)" % (msg.get_message_id(), msg.get_tags()))
+
    else:
        # unknown command
        print "Error: Unknown command '%s' (see \"notmuch help\")" % sys.argv[1]
 
 
    #TODO: implement
-   """ 
-new    [--verbose]
-
-       Find and import new messages to the notmuch database.
-
+   """
 search [options...] <search-terms> [...]
 
        Search for messages matching the given search terms.
@@ -114,10 +162,6 @@ show       <search-terms> [...]
 
        Show all messages matching the search terms.
 
-count  <search-terms> [...]
-
-       Count messages matching the search terms.
-
 reply  [options...] <search-terms> [...]
 
        Construct a reply template for a set of messages.