X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=learn_from_spam;h=35a25f6f5fb5214cd99796b90a8ecd68b6034d9b;hb=1886c7247cb16ed68a78cd5550b152689a465999;hp=d061e45a72f64a768a92e8206a78b8aa270c0484;hpb=f60f3eab948b0d8c48df97d40fb5940132957468;p=bin.git

diff --git a/learn_from_spam b/learn_from_spam
index d061e45..35a25f6 100755
--- a/learn_from_spam
+++ b/learn_from_spam
@@ -10,23 +10,45 @@ SPAM_REPORT="spamc --learntype=spam"
 HAM_REPORT="spamc --learntype=ham"
 SPAM_CHECK="spamc -c"
 
+# needs rules directories
+NEEDS_SPAM_RULES="$(echo ~/Maildir/spam/needs_rules)"
+NEEDS_HAM_RULES="$(echo ~/Maildir/spam/needs_ham_rules)"
+
 if [ "$(basename $0)" = "learn_from_spam" ]; then
     for file in "$@"; do
-        $SPAM_REPORT < "$file" >/dev/null 2>&1;
-        formail -c < "$file" | grep -e '^From ' -e 'From: ' | spamassassin -R >/dev/null 2>&1;
-        # check to see if it's still spam
-        if ! $SPAM_CHECK < "$file" >/dev/null 2>&1; then
+        if ! formail -c < "$file"|grep -q '^List-Id'; then
+            $SPAM_REPORT < "$file" >/dev/null 2>&1;
+        fi;
+        formail -c < "$file" | grep -e '^From ' -e 'From: ' | spamassassin --add-to-blacklist >/dev/null 2>&1;
+        formail -c < "$file" | grep -e '^From ' -e 'From: ' | spamassassin --remove-from-whitelist >/dev/null 2>&1;
+        # check to see if it's still ham
+        if $SPAM_CHECK < "$file" >/dev/null 2>&1; then
+            mkdir -p "${NEEDS_SPAM_RULES}/cur";
+            TMP="$(mktemp -d)"
+            trap "rm -f '$TMP'/file; rmdir '$TMP'" EXIT
             # this message is still not spam; may need custom rules
-            spamc "$file" > ~/Maildir/spam/needs_rules/cur/"$(basename "$file")" 2>/dev/null;
+            spamc < "$file" > "$TMP/file" 2>/dev/null;
+            mv "$TMP/file" "${NEEDS_SPAM_RULES}/cur/$(basename "$file")";
+            trap - EXIT;
+            rmdir "$TMP";
+        elif [ "$(pwd)" = "${NEEDS_SPAM_RULES}" ]; then
+            rm -f "$file";
         fi;
     done;
 elif [ "$(basename $0)" = "learn_from_ham" ]; then
     for file in "$@"; do
         $HAM_REPORT < "$file" >/dev/null 2>&1;
-        formail -c < "$file" |grep -e '^From ' -e 'From: ' -e 'To: ' -e 'Cc: '|spamassassin -W >/dev/null 2>&1;
-        if $SPAM_CHECK < "$file" >/dev/null 2>&1; then
-            mkdir -p ~/Maildir/spam/needs_ham_rules/cur;
-            spamc "$file" > ~/Maildir/spam/needs_ham_rules/cur/"$(basename "$file")" 2>/dev/null;
+        formail -c < "$file" |grep -e '^From ' -e 'From: ' -e 'To: ' -e 'Cc: '|spamassassin --add-to-whitelist >/dev/null 2>&1;
+        if ! $SPAM_CHECK < "$file" >/dev/null 2>&1; then
+            mkdir -p "${NEEDS_HAM_RULES}/cur";
+            TMP="$(mktemp -d)"
+            trap "rm -f '$TMP'/file; rmdir '$TMP'" EXIT
+            spamc < "$file" > "$TMP/file" 2>/dev/null;
+            mv "$TMP/file" "${NEEDS_HAM_RULES}/cur/$(basename "$file")";
+            trap - EXIT;
+            rmdir "$TMP";
+        elif [ "$(pwd)" = "${NEEDS_HAM_RULES}" ]; then
+            rm -f "$file";
         fi;
     done;
 else