handle delay disabling more verbosely

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

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index 634f70f84f5dbe6ea72fd3c075d9d01fa672776d..6a4717c3227479caba0b5f8922bfbfad885504ff 100644 (file)
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -1,42 +1,42 @@
-# create table messages (msgid text unique not null, filename text
-# primary key not null unique, release_ts integer not null);
+#TODO: create config/delay-(disabled|tonight|weekend)

 
 :0
 
 :0

-* DELAY ?? .
-* ! DELAYED ?? .
+* POSTPONED ?? .

 {
 {

-  :0
-  * DELAY ?? ^[0-9]
-  { DELAY="now + $DELAY" }
+  LOG="delay:       not delaying already-postponed message$NL"
+  :0 fw
+  |$FORMAIL -R X-Postponed X-Was-Postponed
+}
+
+:0 E
+* DISABLE_DELAYS ?? .
+{
+  LOG="delay:       delays disabled, thus not delaying$NL"
+}

 
 

+:0 E
+* DELAY ?? .
+{

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

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

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

-  *$  $RELEASE_TS^0
-  *$ -$OURDATE_TS^0
+  *$  $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"
   {
     :0
     *$ RELEASE ?? ^[0-9]+${RE_SPACE}+\/.+
     { RELEASE_TIME="$MATCH" }
 
     LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"

+    POSTPONED="$RELEASE_TS ($RELEASE_TIME)"

 
 

-    DELAYED_QUEUE_DB=$PMVAR/delayed-queue.sqlite
-    DO_QUERY="$SQLITE $DELAYED_QUEUE_DB"
-
-    DATA="$MSGID"
-    INCLUDERC=$PMDIR/sql-escape
-
-    Q="insert into messages values
-      ($DATA, '\\'\$DESTFILE\\'', $RELEASE_TS)"
-    TRAP="$TRAP; $DO_QUERY '$Q'"
-
-    :0 fw
-    |$FORMAIL -I "X-Delayed: $RELEASE_TS ($RELEASE_TIME)"
+    INCLUDERC=$PMDIR/record-delayed-mail
+    INCLUDERC=$PMDIR/addheaders

 
     :0
     $DELAYED_QUEUE
 
     :0
     $DELAYED_QUEUE