From: Sebastian Spaeth Date: Wed, 17 Mar 2010 16:32:37 +0000 (+0100) Subject: notmuch: implement tag command X-Git-Tag: 0.3~121^2~74 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=23b32a7dfdeec9acc2ad800e1d307b31cf82052d;p=notmuch.git notmuch: implement tag command --- diff --git a/cnotmuch/database.py b/cnotmuch/database.py index 79f57ea2..9c78b461 100644 --- a/cnotmuch/database.py +++ b/cnotmuch/database.py @@ -714,8 +714,12 @@ class Message(object): def remove_tag(self, tag): """Removes a tag from the given message + If the message has no such tag, this is a non-operation and + will report success anyway. + :param tag: String with a 'tag' to be removed. - :returns: STATUS.SUCCESS if the tag was successfully removed. + :returns: STATUS.SUCCESS if the tag was successfully removed or if + the message had no such tag. Raises an exception otherwise. :exception: :exc:`NotmuchError`. They have the following meaning: diff --git a/notmuch b/notmuch index 2ddd9ffc..5862b9ac 100755 --- a/notmuch +++ b/notmuch @@ -100,17 +100,18 @@ if __name__ == '__main__': # Handle command line options # No option + #------------------------------------- if len(sys.argv) == 1: print USAGE - + #------------------------------------- elif sys.argv[1] == 'setup': """ Interactively setup notmuch for first use. """ print "Not implemented." - + #------------------------------------- elif sys.argv[1] == 'help': if len(sys.argv) == 2: print HELPTEXT else: print "Not implemented" - + #------------------------------------- elif sys.argv[1] == 'show': db = Database() if len(sys.argv) == 2: @@ -123,11 +124,11 @@ if __name__ == '__main__': 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: @@ -138,7 +139,30 @@ if __name__ == '__main__': querystr = quote_query_line(sys.argv[2:]) logging.debug("count "+querystr) print(len(Query(db,querystr).search_messages())) - + #------------------------------------- + elif sys.argv[1] == 'tag': + #build lists of tags to be added and removed + add, remove = [], [] + while not sys.argv[2]=='--' and \ + (sys.argv[2].startswith('+') or sys.argv[2].startswith('-')): + if sys.argv[2].startswith('+'): + #append to add list without initial + + add.append(sys.argv.pop(2)[1:]) + else: + #append to remove list without initial - + remove.append(sys.argv.pop(2)[1:]) + #skip eventual '--' + if sys.argv[2]=='--': sys.argv.pop(2) + #the rest is search terms + querystr = quote_query_line(sys.argv[2:]) + logging.warning("tag search-term "+querystr) + db = Database(mode=Database.MODE.READ_WRITE) + m = Query(db,querystr).search_messages() + for msg in m: + #actually add and remove all tags + map(msg.add_tag, add) + map(msg.remove_tag, remove) + #------------------------------------- elif sys.argv[1] == 'search-tags': if len(sys.argv) == 2: #no further search term @@ -150,7 +174,7 @@ if __name__ == '__main__': 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 " db = Database() @@ -159,7 +183,7 @@ if __name__ == '__main__': 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] @@ -167,9 +191,10 @@ if __name__ == '__main__': #TODO: implement """ +setup +new search [options...] [...] show [...] reply [options...] [...] -tag +|- [...] [--] [...] restore """