X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=learn_from_spam;h=8d3b2c88b9553eef05ca0a05c3c4e63d691a0f81;hb=59404941343ff9bb75baf172c153f572bd1e4f4c;hp=35a25f6f5fb5214cd99796b90a8ecd68b6034d9b;hpb=2b3024cfe6b4d7bd035fb28835c22529ef74b9e9;p=bin.git

diff --git a/learn_from_spam b/learn_from_spam
index 35a25f6..8d3b2c8 100755
--- a/learn_from_spam
+++ b/learn_from_spam
@@ -6,31 +6,43 @@ 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="$(echo ~/Maildir/spam/needs_rules)"
 NEEDS_HAM_RULES="$(echo ~/Maildir/spam/needs_ham_rules)"
 
+run_through_spamc () {
+    # destdir
+    DESTDIR="$1"
+    FILENAME="$2"
+    mkdir -p "$1"
+    TMP="$(mktemp -d)"
+    DESTFILE="$DESTDIR/$(basename "$FILENAME")"
+    DESTFILE_NO_SIZE="$DESTDIR/$(basename "$FILENAME"|sed 's/,S=.*//g')"
+    spamc -s $((100 * 1024 * 1024)) < "$FILENAME" > "$TMP/file" 2>/dev/null;
+    mv "$TMP/file" "$DESTFILE"
+    if [ "$DESTFILE" -ne "$DESTFILE_NO_SIZE" ]; then
+        mv "$DESTFILE" "$DESTFILE_NO_SIZE"
+    fi;
+    trap - EXIT;
+    rmdir "$TMP";
+}
+
 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 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}/cur/$(basename "$file")";
-            trap - EXIT;
-            rmdir "$TMP";
+            run_through_spamc "${NEEDS_SPAM_RULES}/cur" "$file";
         elif [ "$(pwd)" = "${NEEDS_SPAM_RULES}" ]; then
             rm -f "$file";
         fi;
@@ -40,13 +52,7 @@ elif [ "$(basename $0)" = "learn_from_ham" ]; then
         $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 "${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";
+            run_through_spamc "${NEEDS_HAM_RULES}/cur" "$file";
         elif [ "$(pwd)" = "${NEEDS_HAM_RULES}" ]; then
             rm -f "$file";
         fi;