X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch;h=2ddd9ffc52911da15490fe5a741c20e86bcfa72a;hp=c89777e33c8b39b4fce28ddc9d89238650845fc3;hb=99880b7dbe0169fe303ef2e77984b46a55a74560;hpb=bb5870b9af7d023d7d61233dc19d73772d84fdc5

diff --git a/notmuch b/notmuch
index c89777e3..2ddd9ffc 100755
--- a/notmuch
+++ b/notmuch
@@ -1,7 +1,8 @@
 #!/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, os
+import sys, os, re, logging
 from cnotmuch.notmuch import Database, Query
+PREFIX=re.compile('(\w+):(.*$)')
 #TODO Handle variable: NOTMUCH-CONFIG
 
 #-------------------------------------------------------------------------
@@ -83,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
@@ -98,15 +111,54 @@ if __name__ == '__main__':
        if len(sys.argv) == 2: print HELPTEXT
        else: print "Not implemented"
 
+   elif sys.argv[1] == 'show':
+      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("show "+querystr)
+      m = Query(db,querystr).search_messages()
+      for msg in m:
+         print(msg.format_as_text())
+
    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: print "Not implemented"
+      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
@@ -116,31 +168,8 @@ if __name__ == '__main__':
    #TODO: implement
    """
 search	[options...] <search-terms> [...]
-
-	Search for messages matching the given search terms.
-
 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.
-
 tag	+<tag>|-<tag> [...] [--] <search-terms> [...]
-
-	Add/remove tags for all messages matching the search terms.
-
-dump	[<filename>]
-
-	Create a plain-text dump of the tags for each message.
-
 restore	<filename>
-	search-tags	[<search-terms> [...] ]
-
-		List all tags found in the database or matching messages.
    """