X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch;h=56f961b47d581f68172d2e9114b9190d6ff7a10d;hp=e30fccd6c9460b7cc20890436f6089933f2b28df;hb=3b2d73c684501e2eb906542f5081125d4e9c485d;hpb=5cb8dbeab5d168d9a1abef93a46158b62ae07462

diff --git a/notmuch b/notmuch
index e30fccd6..56f961b4 100755
--- a/notmuch
+++ b/notmuch
@@ -1,7 +1,9 @@
 #!/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
-from cnotmuch import notmuch
+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.
@@ -82,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
@@ -100,6 +114,30 @@ if __name__ == '__main__':
    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()]))
+
    else:
        # unknown command
        print "Error: Unknown command '%s' (see \"notmuch help\")" % sys.argv[1]