X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch;h=e4e07bcffe16e208e72265822aadc0c2e7d3589b;hp=acebe38e56a2e8d2e870dfdaae9e9fe32e8d8f5c;hb=0b57cb8ed9850d1315a60ff23113e343b531170e;hpb=5c936f9135f4fc6874d8826c4ebd505aa1710c69

diff --git a/notmuch b/notmuch
index acebe38e..e4e07bcf 100755
--- a/notmuch
+++ b/notmuch
@@ -5,7 +5,9 @@ This "binary" honors the NOTMUCH_CONFIG environmen variable for reading a user's
 notmuch configuration (e.g. the database path)
 
 This code is licensed under the GNU GPL v3+."""
+from __future__ import with_statement # This isn't required in Python 2.6
 import sys, os, re, logging
+from subprocess import call
 from cnotmuch.notmuch import Database, Query
 PREFIX=re.compile('(\w+):(.*$)')
 #TODO Handle variable: NOTMUCH-CONFIG
@@ -113,6 +115,11 @@ if __name__ == '__main__':
        """ Interactively setup notmuch for first use. """
        print "Not implemented."
    #-------------------------------------
+   elif sys.argv[1] == 'new':
+       """ Interactively setup notmuch for first use. """
+       #print "Not implemented. We cheat by calling the proper notmuch"
+       call(['notmuch new'],shell=True)
+   #-------------------------------------
    elif sys.argv[1] == 'help':
        if len(sys.argv) == 2: print HELPTEXT
        else: print "Not implemented"
@@ -143,7 +150,8 @@ if __name__ == '__main__':
          #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()))
+      print(Query(db,querystr).count_messages())
+      
    #-------------------------------------
    elif sys.argv[1] == 'tag':
       #build lists of tags to be added and removed
@@ -160,7 +168,7 @@ if __name__ == '__main__':
       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)
+      logging.debug("tag search-term "+querystr)
       db = Database(mode=Database.MODE.READ_WRITE)
       m  = Query(db,querystr).search_messages()
       for msg in m:
@@ -182,12 +190,56 @@ if __name__ == '__main__':
    #-------------------------------------
    elif sys.argv[1] == 'dump':
       #TODO: implement "dump <filename>"
+      if len(sys.argv) == 2:
+         f = sys.stdout
+      else:
+         f = open(sys.argv[2],"w")
       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()))
+         f.write("%s (%s)\n" % (msg.get_message_id(), msg.get_tags()))
+   #-------------------------------------
+   elif sys.argv[1] == 'restore':
+      import re
+      if len(sys.argv) == 2:
+         print("No filename given. Reading dump from stdin.")
+         f = sys.stdin
+      else:
+         f = open(sys.argv[2],"r")
+      #split the msg id and the tags
+      MSGID_TAGS = re.compile("(\S+)\s\((.*)\)$")
+      db = Database(mode=Database.MODE.READ_WRITE)
+
+      #read each line of the dump file
+      for line in f:
+         m = MSGID_TAGS.match(line)
+         if not m:
+            sys.stderr.write("Warning: Ignoring invalid input line: %s" % 
+                             line)
+            continue
+         # split line in components and fetch message
+         msg_id = m.group(1)
+         new_tags= set(m.group(2).split())
+         msg    = db.find_message(msg_id)
+
+         if msg == None:
+            sys.stderr.write(
+               "Warning: Cannot apply tags to missing message: %s\n" % id)
+            continue
+
+         #do nothing if the old set of tags is the same as the new one
+         old_tags = set(msg.get_tags())
+         if old_tags == new_tags: continue
+
+         #set the new tags
+         msg.freeze()
+         #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()
+            
    #-------------------------------------
    else:
        # unknown command