]> git.madduck.net Git - etc/mailfilter.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

rewrite tickler for new system
authormartin f. krafft <madduck@madduck.net>
Sun, 26 Aug 2007 19:52:38 +0000 (21:52 +0200)
committermartin f. krafft <madduck@madduck.net>
Sun, 26 Aug 2007 19:52:38 +0000 (21:52 +0200)
procmail/tickle

index 71edef645c926afa8a98f83b1a631de41cd10a0a..dac3fb72a1e23ea5e196b27c1e330c1aab0d5353 100644 (file)
@@ -1,21 +1,48 @@
 :0
 :0
-* ORIGINAL_TO ?? ^[0-9]+@tickle\.madduck\.net$
-* ORIGINAL_TO ?? ^\/[0-9]+
+* ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
+* ORIGINAL_TO ?? ^\/[^@]+
 {
 {
-  TICKLEDIR=$BASE/.tickle.$MATCH
-
+  STAMP
   :0
   :0
-  * ? test ! -d $TICKLEDIR/cur
-  {
-    LOG="tickle:      received message outside tickle range: $MATCH$NL"
+  * MATCH ?? ^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$
+  { STAMP=$MATCH }
+
+  :0 E
+  * MATCH ?? ^[0-9]+m$
+  * MATCH ?? ^\/[^m]
+  { DATESTR="$DATE + $MATCH months 00:00" }
+
+  :0 E
+  * MATCH ?? ^[0-9]+w$
+  * MATCH ?? ^\/[^w]
+  { DATESTR="$DATE + $MATCH weeks 00:00" }
+
+  :0 E
+  * MATCH ?? ^[0-9]+d?$
+  * MATCH ?? ^\/[^d]
+  { DATESTR="$DATE + $MATCH days 00:00" }
 
 
-    :0
-    $DISCARD
+  :0 E
+  * MATCH ?? ^[0-9]+h$
+  * MATCH ?? ^\/[^h]
+  { DATESTR="$DATE + $MATCH hours" }
+
+  :0 E
+  {
+    LOG="tickle:      invalid date string: $MATCH$NL"
+    EXITCODE=69
+    HOST
   }
 
   }
 
-  LOG="tickle:      file message and tickle in $MATCH day(s)$NL"
+  :0
+  * ! STAMP ?? .
+  { STAMP=`/bin/date +%s -d "$DATESTR"` }
+
+  LOG="tickle:      stamping message $MSGID with $STAMP$NL"
+
+  :0 fw
+  |$FORMAIL -i "X-Tickle: $STAMP"
 
   :0
 
   :0
-  $TICKLEDIR/
-  TICKLEDIR
+  $BASE/.tickler/
 }
 }