From ce01c73dbc58af7f829bbed24b3547e7ff7588e4 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sun, 23 Sep 2007 17:03:50 +0200 Subject: [PATCH] prepare tickler for resubmitting, instead of inbox writing --- bin/process-tickler | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/process-tickler b/bin/process-tickler index d7af9b6..71f750a 100755 --- a/bin/process-tickler +++ b/bin/process-tickler @@ -15,32 +15,32 @@ import time 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) -imd = mailbox.Maildir(INBOX_DIR) +dmd = mailbox.Maildir(DEST_DIR) msgids = dict() -def move_to_inbox(key): +def resubmit(key): msg = tmd.get_message(key) - print >>sys.stdout, 'I: move message %s to inbox' % key + 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')) - imd.add(msg) + 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 - move_to_inbox(key) + resubmit(key) tickle = msg.get('X-Tickle') if tickle is None: print >>sys.stderr, 'W: message without tickle information: ' + key - move_to_inbox(key) + resubmit(key) if msgids.get(msgid, None) is None: msgids[msgid] = list() @@ -58,7 +58,7 @@ for msgid, msgs in msgids.iteritems(): 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)) -- 2.39.2