only delay if not already delayed

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

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index e04f7d7a7fceb01d750a4c23bbcb711194c1e2e5..6a4717c3227479caba0b5f8922bfbfad885504ff 100644 (file)
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -1,34 +1,44 @@
+#TODO: create config/delay-(disabled|tonight|weekend)
+
 :0
-* ^X-Mailer: swaks
-{ DELAY="30 seconds" }
+* POSTPONED ?? .
+{
+  LOG="delay:       not delaying already-postponed message$NL"
+  :0 fw
+  |$FORMAIL -R X-Postponed X-Was-Postponed
+}
 
-# create table messages (msgid text unique not null, filename text
-# primary key not null unique, release_ts integer not null);
+:0 E
+* DISABLE_DELAYS ?? .
+{
+  LOG="delay:       delays disabled, thus not delaying$NL"
+}
 
-:0
+:0 E
 * DELAY ?? .
 {
   #TODO: for tickling, use header date
-  RELEASE="`date -d \"now + $DELAY\" +'%s %c'`"
+  RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s %c'`"
+
   :0
   *$ RELEASE ?? ^\/${RE_NOT_SPACE}+
   { RELEASE_TS=$MATCH }
-  :0
-  *$ RELEASE ?? ^[0-9]+${RE_SPACE}+\/.+
-  { RELEASE_TIME="$MATCH" }
-
-  LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
 
-  DELAYED_QUEUE_DB=$PMVAR/delayed-queue.sqlite
-  DO_QUERY="$SQLITE $DELAYED_QUEUE_DB"
+  :0
+  *$  $RELEASE_TS ^0
+  *$ -$OURDATE_TS ^0
+  {
+    :0
+    *$ RELEASE ?? ^[0-9]+${RE_SPACE}+\/.+
+    { RELEASE_TIME="$MATCH" }
 
-  DATA="$MSGID"
-  INCLUDERC=$PMDIR/sql-escape
+    LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
+    POSTPONED="$RELEASE_TS ($RELEASE_TIME)"
 
-  Q="insert into messages values
-     ($DATA, '\\'\$DESTFILE\\'', $RELEASE_TS)"
-  TRAP="$TRAP; $DO_QUERY '$Q'"
+    INCLUDERC=$PMDIR/record-delayed-mail
+    INCLUDERC=$PMDIR/addheaders
 
-  :0
-  $DELAYED_QUEUE
+    :0
+    $DELAYED_QUEUE
+  }
 }