notmuch: use new function Database().create_query() for 'count'

[notmuch] / notmuch

diff --git a/notmuch b/notmuch
index d28c6ea42ca4ce7e2a9999b4964119da52f74b21..92f68150f321b9bcf517785d6d2596def07711c7 100755 (executable)
--- a/notmuch
+++ b/notmuch
@@ -142,15 +142,13 @@ if __name__ == '__main__':
        print "Not implemented."
    #-------------------------------------
    elif sys.argv[1] == 'count':
-      db = Database()
       if len(sys.argv) == 2:
-         #no further search term
+         #no further search term, count all
          querystr=''
       else:
          #mangle arguments wrapping terms with spaces in quotes
          querystr = quote_query_line(sys.argv[2:])
-      logging.debug("count "+querystr)
-      print(Query(db,querystr).count_messages())
+      print(Database().create_query(querystr).count_messages())
       
    #-------------------------------------
    elif sys.argv[1] == 'tag':
@@ -235,7 +233,8 @@ if __name__ == '__main__':
 
          #set the new tags
          msg.freeze()
-         msg.remove_all_tags()
+         #only remove tags if the new ones are not a superset anyway
+         if not (new_tags > old_tags): msg.remove_all_tags()
          for tag in new_tags: msg.add_tag(tag)
          msg.thaw()