]> git.madduck.net Git - etc/mailfilter.git/blobdiff - bin/process-delayed-queue

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:

fix subject decoding
[etc/mailfilter.git] / bin / process-delayed-queue
index 82818ebfe2eb8a1019489fa06ce71eb9c51373dd..826a346ec6a9c68b662d9deb240eada8af74825b 100755 (executable)
@@ -6,17 +6,44 @@ MAILDIR=$HOME/.maildir
 SQLITE=/usr/bin/sqlite3
 RESUBMIT=$HOME/.etc/mailfilter/bin/resubmit
 
-DELAYED_QUEUE_DB=$VAR/procmail/delayed-queue.sqlite
-
-QUERY='select * from messages where release_ts < strftime("%s", "now")'
-
-$SQLITE -column $DELAYED_QUEUE_DB "$QUERY" | while read msgid file ts; do
-  file="$MAILDIR/$file"
-  if [ ! -f "$file" ]; then
-    echo "E: message $msgid not found in $file" >&2
-  else
-    $RESUBMIT "$file"
-    echo "I: resubmitted $msgid" >&2
-  fi
-  $SQLITE $DELAYED_QUEUE_DB "delete from messages where msgid = '$msgid'"
+DELAYED_QUEUE_DB=$HOME/.var/procmail/delayed-queue.sqlite
+
+QUERY='select * from messages where release_ts <= strftime("%s", "now")'
+
+$SQLITE -list -separator ' ' $DELAYED_QUEUE_DB "$QUERY" \
+  | while read msgid basefile ts; do
+
+    file="$MAILDIR/$basefile"
+    files="$file ${file}:2,"
+
+    basename="${file##*/}"
+    dirname="${file%/*}"
+    case "${dirname##*/}" in
+      cur)
+        files="$files ${file}:2,S ${file}:2,R ${file}:2,RS"
+        file="${dirname%/cur}/new/$basename"
+        files="$files $file ${file}:2, ${file}:2,R ${file}:2,RS"
+        ;;
+      new)
+        file="${dirname%/new}/cur/$basename"
+        files="$files ${file}:2, ${file}:2,S"
+        ;;
+    esac
+
+    found=0
+    for file in $files; do
+      if [ -f "$file" ]; then
+        $RESUBMIT "$file"
+        echo "I: resubmitted $msgid"
+        found=1
+        break
+      fi
+    done
+
+    $SQLITE $DELAYED_QUEUE_DB "delete from messages where msgid = '$msgid'"
+
+    if [ $found -eq 0 ]; then
+      echo "E: message $msgid not found in $basefile" >&2
+    fi
+
 done