only delay if ts is actually in the future

[etc/mailfilter.git] / procmail / delay-delivery

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index e04f7d7a7fceb01d750a4c23bbcb711194c1e2e5..2c6fc4d4ce542bf519e5e0910abbbf42a7a71532 100644 (file)
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -1,34 +1,46 @@
-:0
-* ^X-Mailer: swaks
-{ DELAY="30 seconds" }
-

 # create table messages (msgid text unique not null, filename text
 # primary key not null unique, release_ts integer not null);
 
 :0
 * DELAY ?? .
 # create table messages (msgid text unique not null, filename text
 # primary key not null unique, release_ts integer not null);
 
 :0
 * DELAY ?? .

+* ! DELAYED ?? .

 {
 {

+  :0
+  * DELAY ?? ^[0-9]
+  { DELAY="now + $DELAY" }
+

   #TODO: for tickling, use header date
   #TODO: for tickling, use header date

-  RELEASE="`date -d \"now + $DELAY\" +'%s %c'`"
+  RELEASE="`date -d \"$DELAY\" +'%s %c'`"

   :0
   *$ RELEASE ?? ^\/${RE_NOT_SPACE}+
   { RELEASE_TS=$MATCH }
   :0
   *$ RELEASE ?? ^\/${RE_NOT_SPACE}+
   { RELEASE_TS=$MATCH }

+
+  VERBOSE=yes

   :0
   :0

-  *$ RELEASE ?? ^[0-9]+${RE_SPACE}+\/.+
-  { RELEASE_TIME="$MATCH" }
+  *$  $RELEASE_TS^0
+  *$ -$OURDATE_TS^0
+  {
+    :0
+    *$ RELEASE ?? ^[0-9]+${RE_SPACE}+\/.+
+    { RELEASE_TIME="$MATCH" }

 
 

-  LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
+    LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"

 
 

-  DELAYED_QUEUE_DB=$PMVAR/delayed-queue.sqlite
-  DO_QUERY="$SQLITE $DELAYED_QUEUE_DB"
+    DELAYED_QUEUE_DB=$PMVAR/delayed-queue.sqlite
+    DO_QUERY="$SQLITE $DELAYED_QUEUE_DB"

 
 

-  DATA="$MSGID"
-  INCLUDERC=$PMDIR/sql-escape
+    DATA="$MSGID"
+    INCLUDERC=$PMDIR/sql-escape

 
 

-  Q="insert into messages values
-     ($DATA, '\\'\$DESTFILE\\'', $RELEASE_TS)"
-  TRAP="$TRAP; $DO_QUERY '$Q'"
+    Q="insert into messages values
+      ($DATA, '\\'\$DESTFILE\\'', $RELEASE_TS)"
+    TRAP="$TRAP; $DO_QUERY '$Q'"

 
 

-  :0
-  $DELAYED_QUEUE
+    :0 fw
+    |$FORMAIL -I "X-Delayed: $RELEASE_TS ($RELEASE_TIME)"
+
+    :0
+    $DELAYED_QUEUE
+  }
+  VERBOSE=no

 }
 }