add spam pattern matching

[etc/mailfilter.git] / bin / process-tickler

diff --git a/bin/process-tickler b/bin/process-tickler
index 0c3839ff025d7d39bc26d072ce5d4e126a7c542d..28b6c5ea92eef84e2c9a5c8c172390be969ecbc2 100755 (executable)
--- a/bin/process-tickler
+++ b/bin/process-tickler
@@ -15,29 +15,32 @@ import time
 HOME = os.getenv('HOME')
 MAILDIR = os.path.join(HOME, '.maildir')
 TICKLER_DIR = os.path.join(MAILDIR, '.tickler')
 HOME = os.getenv('HOME')
 MAILDIR = os.path.join(HOME, '.maildir')
 TICKLER_DIR = os.path.join(MAILDIR, '.tickler')

-INBOX_DIR = MAILDIR
+DEST_DIR = os.path.join(MAILDIR, '.resubmit')

 
 tmd = mailbox.Maildir(TICKLER_DIR)
 
 tmd = mailbox.Maildir(TICKLER_DIR)

-imd = mailbox.Maildir(INBOX_DIR)
+dmd = mailbox.Maildir(DEST_DIR)

 msgids = dict()
 
 msgids = dict()
 

-def move_to_inbox(key):
+def resubmit(key):

     msg = tmd.get_message(key)
     msg = tmd.get_message(key)

-    print >>sys.stdout, 'I: move message %s to inbox' % key
-    msg.add_header('X-Tickle-Delivered', time.strftime('%c'))
-    imd.add(msg)
+    print >>sys.stdout, 'I: resubmit message %s' % key
+    if msg.has_key('X-Tickle-Delivered'):
+        msg.replace_header('X-Tickle-Delivered', time.strftime('%c'))
+    else:
+        msg.add_header('X-Tickle-Delivered', time.strftime('%c'))
+    dmd.add(msg)

     tmd.discard(key)
 
 for key, msg in tmd.iteritems():
     msgid = msg.get('Message-Id')
     if msgid is None:
         print >>sys.stderr, 'W: message without ID: ' + key
     tmd.discard(key)
 
 for key, msg in tmd.iteritems():
     msgid = msg.get('Message-Id')
     if msgid is None:
         print >>sys.stderr, 'W: message without ID: ' + key

-        move_to_inbox(key)
+        resubmit(key)

 
     tickle = msg.get('X-Tickle')
     if tickle is None:
 
     tickle = msg.get('X-Tickle')
     if tickle is None:

-        print >>sys.stderr, 'W: message without tickle information: ' + key
-        move_to_inbox(key)
+        print >>sys.stderr, 'W: message without tickle information: ' + msgid
+        resubmit(key)

 
     if msgids.get(msgid, None) is None:
         msgids[msgid] = list()
 
     if msgids.get(msgid, None) is None:
         msgids[msgid] = list()


@@ -55,7 +58,7 @@ for msgid, msgs in msgids.iteritems():
 
         t = time.time()
         if t >= tickle:
 
         t = time.time()
         if t >= tickle:

-            move_to_inbox(key)
+            resubmit(key)

         else:
             print >>sys.stdout, 'I: message %s still has %d seconds' % (key,
                     int(tickle - t))
         else:
             print >>sys.stdout, 'I: message %s still has %d seconds' % (key,
                     int(tickle - t))