X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=learn_from_spam;h=63cb9f8789b1fa4f32934bb2942ce6d97c490a76;hb=f14d68e0b26433ab1000f229bf942f7e7be64264;hp=aca7f219858159fa65646e90d6b8a074b5aa73a3;hpb=846faea524b838ce15a132b3dd2a93f5edf2565f;p=bin.git

diff --git a/learn_from_spam b/learn_from_spam
index aca7f21..63cb9f8 100755
--- a/learn_from_spam
+++ b/learn_from_spam
@@ -6,31 +6,34 @@ HAM_REPORT="spamassassin --revoke"
 SPAM_CHECK="spamassassin -e"
 
 # these are for spamc
-SPAM_REPORT="spamc --learntype=spam"
-HAM_REPORT="spamc --learntype=ham"
-SPAM_CHECK="spamc -c"
+SPAM_REPORT="spamc --learntype=spam -s $((100 * 1024 * 1024))"
+HAM_REPORT="spamc --learntype=ham -s $((100 * 1024 * 1024))"
+SPAM_CHECK="spamc -s $((100 * 1024 * 1024)) -c"
 
 # needs rules directories
-NEEDS_SPAM_RULES=~/Maildir/spam/needs_rules/cur/
-NEEDS_HAM_RULES=~/Maildir/spam/needs_ham_rules/cur/
+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
         if ! formail -c < "$file"|grep -q '^List-Id'; then
             $SPAM_REPORT < "$file" >/dev/null 2>&1;
-        fi;
+        else
+            spamasssin --local --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 spam
-        if ! $SPAM_CHECK < "$file" >/dev/null 2>&1; then
+        # 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" > "$TMP/file" 2>/dev/null;
-            mv "$TMP/file" "${NEEDS_SPAM_RULES}$(basename "$file")";
+            spamc -s $((100 * 1024 * 1024)) < "$file" > "$TMP/file" 2>/dev/null;
+            mv "$TMP/file" "${NEEDS_SPAM_RULES}/cur/$(basename "$file")";
             trap - EXIT;
             rmdir "$TMP";
-        elif [ "$file" = "${NEEDS_SPAM_RULES}$(basename "$file")" ]; then
+        elif [ "$(pwd)" = "${NEEDS_SPAM_RULES}" ]; then
             rm -f "$file";
         fi;
     done;
@@ -38,15 +41,15 @@ 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 --add-to-whitelist >/dev/null 2>&1;
-        if $SPAM_CHECK < "$file" >/dev/null 2>&1; then
-            mkdir -p ~/Maildir/spam/needs_ham_rules/cur;
+        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}$(basename "$file")";
+            spamc -s $((100 * 1024 * 1024)) < "$file" > "$TMP/file" 2>/dev/null;
+            mv "$TMP/file" "${NEEDS_HAM_RULES}/cur/$(basename "$file")";
             trap - EXIT;
             rmdir "$TMP";
-        elif [ "$file" = "${NEEDS_HAM_RULES}$(basename "$file")" ]; then
+        elif [ "$(pwd)" = "${NEEDS_HAM_RULES}" ]; then
             rm -f "$file";
         fi;
     done;