*** /home/harder/gnus/lisp/spam-stat.el	Mon Jan  5 20:12:20 2004
--- /home/harder/cvsgnus/lisp/spam-stat.el	Tue Jan 20 06:54:45 2004
***************
*** 122,127 ****
--- 122,128 ----
  
  
  ;;; Code:
+ (require 'spamwash)
  
  (defgroup spam-stat nil
    "Statistical spam detection for Emacs.
***************
*** 171,176 ****
--- 172,182 ----
    :type 'number
    :group 'spam-stat)
  
+ (defcustom spam-stat-washing-hook '(spamwash)
+   "Hook applied to each message before analysis."
+   :type 'hook
+   :group 'spam-stat)
+ 
  (defvar spam-stat-syntax-table
    (let ((table (copy-syntax-table text-mode-syntax-table)))
      (modify-syntax-entry ?- "w" table)
***************
*** 291,296 ****
--- 297,303 ----
  
  (defun spam-stat-buffer-words ()
    "Return a hash table of words and number of occurences in the buffer."
+   (run-hooks 'spam-stat-washing-hook)
    (with-spam-stat-max-buffer-size
     (with-syntax-table spam-stat-syntax-table
       (goto-char (point-min))
***************
*** 369,395 ****
    "Save the `spam-stat' hash table as lisp file."
    (interactive)
    (when (or force spam-stat-dirty)
!     (with-temp-buffer
!       (let ((standard-output (current-buffer))
! 	    (font-lock-maximum-size 0))
! 	(insert "(setq spam-stat-ngood "
! 		(number-to-string spam-stat-ngood)
! 		" spam-stat-nbad "
! 		(number-to-string spam-stat-nbad)
! 		" spam-stat (spam-stat-to-hash-table '(")
! 	(maphash (lambda (word entry)
! 		   (prin1 (list word
! 				(spam-stat-good entry)
! 				(spam-stat-bad entry))))
! 		 spam-stat)
! 	(insert ")))")
! 	(write-file spam-stat-file)))
      (setq spam-stat-dirty nil)))
  
  (defun spam-stat-load ()
    "Read the `spam-stat' hash table from disk."
    ;; TODO: maybe we should warn the user if spam-stat-dirty is t?
!   (load-file spam-stat-file)
    (setq spam-stat-dirty nil))
  
  (defun spam-stat-to-hash-table (entries)
--- 376,404 ----
    "Save the `spam-stat' hash table as lisp file."
    (interactive)
    (when (or force spam-stat-dirty)
!     (let ((coding-system-for-write 'emacs-mule))
!       (with-temp-file spam-stat-file
! 	  (let ((standard-output (current-buffer))
! 		(font-lock-maximum-size 0))
! 	    (insert ";-*- coding: emacs-mule; -*-\n")
! 	    (insert "(setq spam-stat-ngood "
! 		    (number-to-string spam-stat-ngood)
! 		    " spam-stat-nbad "
! 		    (number-to-string spam-stat-nbad)
! 		    " spam-stat (spam-stat-to-hash-table '(")
! 	    (maphash (lambda (word entry)
! 		       (prin1 (list word
! 				    (spam-stat-good entry)
! 				    (spam-stat-bad entry))))
! 		     spam-stat)
! 	    (insert ")))"))))
      (setq spam-stat-dirty nil)))
  
  (defun spam-stat-load ()
    "Read the `spam-stat' hash table from disk."
    ;; TODO: maybe we should warn the user if spam-stat-dirty is t?
!   (let ((coding-system-for-read 'emacs-mule))
!     (load-file spam-stat-file))
    (setq spam-stat-dirty nil))
  
  (defun spam-stat-to-hash-table (entries)
***************
*** 399,405 ****
  NBAD is the number of bad mails it has appeared in, GOOD is the number
  of times it appeared in good mails, and BAD is the number of times it
  has appeared in bad mails."
!   (let ((table (make-hash-table :test 'equal)))
      (mapc (lambda (l)
  	    (puthash (car l)
  		     (spam-stat-make-entry (nth 1 l) (nth 2 l))
--- 408,414 ----
  NBAD is the number of bad mails it has appeared in, GOOD is the number
  of times it appeared in good mails, and BAD is the number of times it
  has appeared in bad mails."
!   (let ((table (make-hash-table :size (length entries) :test 'equal)))
      (mapc (lambda (l)
  	    (puthash (car l)
  		     (spam-stat-make-entry (nth 1 l) (nth 2 l))
***************
*** 484,490 ****
                     (> (nth 7 (file-attributes f)) 0))
  	  (setq count (1+ count))
  	  (message "Reading %s: %.2f%%" dir (/ count max))
! 	  (insert-file-contents f)
  	  (funcall func)
  	  (erase-buffer))))))
  
--- 493,499 ----
                     (> (nth 7 (file-attributes f)) 0))
  	  (setq count (1+ count))
  	  (message "Reading %s: %.2f%%" dir (/ count max))
! 	  (insert-file-contents-literally f)
  	  (funcall func)
  	  (erase-buffer))))))
  
***************
*** 522,528 ****
  	  (setq count (1+ count))
  	  (message "Reading %.2f%%, score %.2f%%"
  		   (/ count max) (/ score count))
! 	  (insert-file-contents f)
  	  (when (> (spam-stat-score-buffer) 0.9)
  	    (setq score (1+ score)))
  	  (erase-buffer))))
--- 531,537 ----
  	  (setq count (1+ count))
  	  (message "Reading %.2f%%, score %.2f%%"
  		   (/ count max) (/ score count))
! 	  (insert-file-contents-literally f)
  	  (when (> (spam-stat-score-buffer) 0.9)
  	    (setq score (1+ score)))
  	  (erase-buffer))))