allow learning from very large messages

[bin.git] / learn_from_spam

diff --git a/learn_from_spam b/learn_from_spam
index bb721e16900d1ef368801a454f5fb106d7e28466..2535f8c2a8aab57fa2e9f5a246ec20c36cb23607 100755 (executable)
--- a/learn_from_spam
+++ b/learn_from_spam
@@ -8,11 +8,11 @@ SPAM_CHECK="spamassassin -e"
 # these are for spamc
 SPAM_REPORT="spamc --learntype=spam"
 HAM_REPORT="spamc --learntype=ham"
-SPAM_CHECK="spamc -c"
+SPAM_CHECK="spamc -s $((100 * 1024 * 1024)) -c"
 
 # needs rules directories
-NEEDS_SPAM_RULES=~/Maildir/spam/needs_rules
-NEEDS_HAM_RULES=~/Maildir/spam/needs_ham_rules
+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
@@ -21,13 +21,13 @@ if [ "$(basename $0)" = "learn_from_spam" ]; then
         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;
+            spamc -s $((100 * 1024 * 1024)) < "$file" > "$TMP/file" 2>/dev/null;
             mv "$TMP/file" "${NEEDS_SPAM_RULES}/cur/$(basename "$file")";
             trap - EXIT;
             rmdir "$TMP";
@@ -39,11 +39,11 @@ 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
+        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;
+            spamc -s $((100 * 1024 * 1024)) < "$file" > "$TMP/file" 2>/dev/null;
             mv "$TMP/file" "${NEEDS_HAM_RULES}/cur/$(basename "$file")";
             trap - EXIT;
             rmdir "$TMP";