\f
-(defconst nnmbox-version "nnmbox 0.1"
+(defconst nnmbox-version "nnmbox 1.0"
"nnmbox version.")
(defvar nnmbox-current-group nil
(defvar nnmbox-status-string "")
(defvar nnmbox-group-alist nil)
+(defvar nnmbox-active-timestamp nil)
\f
;;; Interface functions
-(defun nnmbox-retrieve-headers (sequence &optional newsgroup server)
+(defun nnmbox-retrieve-headers (sequence &optional newsgroup server fetch-old)
(save-excursion
(set-buffer nntp-server-buffer)
(erase-buffer)
(count 0)
article art-string start stop)
(nnmbox-possibly-change-newsgroup newsgroup)
- (if (stringp (car sequence))
- 'headers
- (while sequence
- (setq article (car sequence))
- (setq art-string (nnmbox-article-string article))
- (set-buffer nnmbox-mbox-buffer)
- (if (or (search-forward art-string nil t)
- (progn (goto-char (point-min))
- (search-forward art-string nil t)))
- (progn
- (setq start
- (save-excursion
- (re-search-backward
- (concat "^" rmail-unix-mail-delimiter) nil t)
- (point)))
- (search-forward "\n\n" nil t)
- (setq stop (1- (point)))
- (set-buffer nntp-server-buffer)
- (insert (format "221 %d Article retrieved.\n" article))
- (insert-buffer-substring nnmbox-mbox-buffer start stop)
- (goto-char (point-max))
- (insert ".\n")))
- (setq sequence (cdr sequence))
- (setq count (1+ count))
- (and (numberp nnmail-large-newsgroup)
- (> number nnmail-large-newsgroup)
- (zerop (% count 20))
- gnus-verbose-backends
- (message "nnmbox: Receiving headers... %d%%"
- (/ (* count 100) number))))
-
+ (while sequence
+ (setq article (car sequence))
+ (setq art-string (nnmbox-article-string article))
+ (set-buffer nnmbox-mbox-buffer)
+ (if (or (search-forward art-string nil t)
+ (progn (goto-char (point-min))
+ (search-forward art-string nil t)))
+ (progn
+ (setq start
+ (save-excursion
+ (re-search-backward
+ (concat "^" rmail-unix-mail-delimiter) nil t)
+ (point)))
+ (search-forward "\n\n" nil t)
+ (setq stop (1- (point)))
+ (set-buffer nntp-server-buffer)
+ (insert (format "221 %d Article retrieved.\n" article))
+ (insert-buffer-substring nnmbox-mbox-buffer start stop)
+ (goto-char (point-max))
+ (insert ".\n")))
+ (setq sequence (cdr sequence))
+ (setq count (1+ count))
(and (numberp nnmail-large-newsgroup)
(> number nnmail-large-newsgroup)
+ (zerop (% count 20))
gnus-verbose-backends
- (message "nnmbox: Receiving headers...done"))
+ (message "nnmbox: Receiving headers... %d%%"
+ (/ (* count 100) number))))
- ;; Fold continuation lines.
- (set-buffer nntp-server-buffer)
- (goto-char (point-min))
- (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t)
- (replace-match " " t t))
- 'headers))))
+ (and (numberp nnmail-large-newsgroup)
+ (> number nnmail-large-newsgroup)
+ gnus-verbose-backends
+ (message "nnmbox: Receiving headers...done"))
+
+ (set-buffer nntp-server-buffer)
+ (nnheader-fold-continuation-lines)
+ 'headers)))
(defun nnmbox-open-server (server &optional defs)
(nnheader-init-server-buffer)
(setq nnmbox-current-server server)))
(defun nnmbox-close-server (&optional server)
+ (setq nnmbox-current-server nil)
t)
(defun nnmbox-server-opened (&optional server)
(defun nnmbox-request-article (article &optional newsgroup server buffer)
(nnmbox-possibly-change-newsgroup newsgroup)
- (if (stringp article)
- nil
- (save-excursion
- (set-buffer nnmbox-mbox-buffer)
- (goto-char (point-min))
- (if (search-forward (nnmbox-article-string article) nil t)
- (let (start stop)
- (re-search-backward (concat "^" rmail-unix-mail-delimiter) nil t)
- (setq start (point))
- (forward-line 1)
- (or (and (re-search-forward
- (concat "^" rmail-unix-mail-delimiter) nil t)
- (forward-line -1))
- (goto-char (point-max)))
- (setq stop (point))
- (let ((nntp-server-buffer (or buffer nntp-server-buffer)))
- (set-buffer nntp-server-buffer)
- (erase-buffer)
- (insert-buffer-substring nnmbox-mbox-buffer start stop)
- (goto-char (point-min))
- (while (looking-at "From ")
- (delete-char 5)
- (insert "X-From-Line: ")
- (forward-line 1))
- t))))))
+ (save-excursion
+ (set-buffer nnmbox-mbox-buffer)
+ (goto-char (point-min))
+ (if (search-forward (nnmbox-article-string article) nil t)
+ (let (start stop)
+ (re-search-backward (concat "^" rmail-unix-mail-delimiter) nil t)
+ (setq start (point))
+ (forward-line 1)
+ (or (and (re-search-forward
+ (concat "^" rmail-unix-mail-delimiter) nil t)
+ (forward-line -1))
+ (goto-char (point-max)))
+ (setq stop (point))
+ (let ((nntp-server-buffer (or buffer nntp-server-buffer)))
+ (set-buffer nntp-server-buffer)
+ (erase-buffer)
+ (insert-buffer-substring nnmbox-mbox-buffer start stop)
+ (goto-char (point-min))
+ (while (looking-at "From ")
+ (delete-char 5)
+ (insert "X-From-Line: ")
+ (forward-line 1))
+ (if (numberp article)
+ (cons nnmbox-current-group article)
+ (nnmbox-article-group-number)))))))
(defun nnmbox-request-group (group &optional server dont-check)
(save-excursion
(if (nnmbox-possibly-change-newsgroup group)
(if dont-check
t
- (nnmbox-get-new-mail group)
(save-excursion
(set-buffer nntp-server-buffer)
(erase-buffer)
(car active))))
t)))))
+(defun nnmbox-request-scan (&optional group server)
+ (nnmbox-read-mbox)
+ (nnmail-get-new-mail
+ 'nnmbox
+ (lambda ()
+ (save-excursion
+ (set-buffer nnmbox-mbox-buffer)
+ (save-buffer)))
+ nnmbox-mbox-file group
+ (lambda ()
+ (save-excursion
+ (let ((in-buf (current-buffer)))
+ (set-buffer nnmbox-mbox-buffer)
+ (goto-char (point-max))
+ (insert-buffer-substring in-buf))))))
+
(defun nnmbox-close-group (group &optional server)
t)
(defun nnmbox-request-list (&optional server)
- (if server (nnmbox-get-new-mail))
(save-excursion
(or (nnmail-find-file nnmbox-active-file)
(progn
(defun nnmbox-request-post (&optional server)
(mail-send-and-exit nil))
-(defalias 'nnmbox-request-post-buffer 'nnmail-request-post-buffer)
-
(defun nnmbox-request-expire-articles
(articles newsgroup &optional server force)
(nnmbox-possibly-change-newsgroup newsgroup)
- (let* ((days (or (and nnmail-expiry-wait-function
- (funcall nnmail-expiry-wait-function newsgroup))
- nnmail-expiry-wait))
- (is-old t)
+ (let* ((is-old t)
rest)
- (nnmbox-request-list)
- (setq nnmbox-group-alist (nnmail-get-active))
+ (nnmail-activate 'nnmbox)
(save-excursion
(set-buffer nnmbox-mbox-buffer)
- (while articles
+ (while (and articles is-old)
(goto-char (point-min))
(if (search-forward (nnmbox-article-string (car articles)) nil t)
- (if (or force
- (setq is-old
- (> (nnmail-days-between
- (current-time-string)
- (buffer-substring
- (point) (progn (end-of-line) (point))))
- days)))
+ (if (setq is-old
+ (nnmail-expired-article-p
+ newsgroup
+ (buffer-substring
+ (point) (progn (end-of-line) (point))) force))
(progn
(and gnus-verbose-backends
- (message "Deleting: %s" (car articles)))
+ (message "Deleting article %d in %s..."
+ (car articles) newsgroup))
(nnmbox-delete-mail))
(setq rest (cons (car articles) rest))))
(setq articles (cdr articles)))
(replace-match "From ")
(insert "From nobody " (current-time-string) "\n"))
(and
- (nnmbox-request-list)
- (setq nnmbox-group-alist (nnmail-get-active))
+ (nnmail-activate 'nnmbox)
(progn
(set-buffer buf)
(goto-char (point-min))
(save-buffer)
t)))
+(defun nnmbox-request-delete-group (group &optional force server)
+ (nnmbox-possibly-change-newsgroup group)
+ ;; Delete all articles in GROUP.
+ (if (not force)
+ () ; Don't delete the articles.
+ (save-excursion
+ (set-buffer nnmbox-mbox-buffer)
+ (goto-char (point-min))
+ ;; Delete all articles in this group.
+ (let ((ident (concat "\nX-Gnus-Newsgroup: " nnmbox-current-group ":"))
+ found)
+ (while (search-forward ident nil t)
+ (setq found t)
+ (nnmbox-delete-mail))
+ (and found (save-buffer)))))
+ ;; Remove the group from all structures.
+ (setq nnmbox-group-alist
+ (delq (assoc group nnmbox-group-alist) nnmbox-group-alist)
+ nnmbox-current-group nil)
+ ;; Save the active file.
+ (nnmail-save-active nnmbox-group-alist nnmbox-active-file)
+ t)
+
+(defun nnmbox-request-rename-group (group new-name &optional server)
+ (nnmbox-possibly-change-newsgroup group)
+ (save-excursion
+ (set-buffer nnmbox-mbox-buffer)
+ (goto-char (point-min))
+ (let ((ident (concat "\nX-Gnus-Newsgroup: " nnmbox-current-group ":"))
+ (new-ident (concat "\nX-Gnus-Newsgroup: " new-name ":"))
+ found)
+ (while (search-forward ident nil t)
+ (replace-match new-ident t t)
+ (setq found t))
+ (and found (save-buffer))))
+ (let ((entry (assoc group nnmbox-group-alist)))
+ (and entry (setcar entry new-name))
+ (setq nnmbox-current-group nil)
+ ;; Save the new group alist.
+ (nnmail-save-active nnmbox-group-alist nnmbox-active-file)
+ t))
+
\f
;;; Internal functions.
(not (buffer-name nnmbox-mbox-buffer)))
(save-excursion
(set-buffer (setq nnmbox-mbox-buffer
- (find-file-noselect nnmbox-mbox-file)))
+ (nnheader-find-file-noselect
+ nnmbox-mbox-file nil 'raw)))
(buffer-disable-undo (current-buffer))))
(if (not nnmbox-group-alist)
- (progn
- (nnmbox-request-list)
- (setq nnmbox-group-alist (nnmail-get-active))))
+ (nnmail-activate 'nnmbox))
(if newsgroup
(if (assoc newsgroup nnmbox-group-alist)
(setq nnmbox-current-group newsgroup))))
(defun nnmbox-article-string (article)
- (concat "\nX-Gnus-Newsgroup: " nnmbox-current-group ":"
- (int-to-string article) " "))
+ (if (numberp article)
+ (concat "\nX-Gnus-Newsgroup: " nnmbox-current-group ":"
+ (int-to-string article) " ")
+ (concat "\nMessage-ID: " article)))
+
+(defun nnmbox-article-group-number ()
+ (save-excursion
+ (goto-char (point-min))
+ (and (re-search-forward "^X-Gnus-Newsgroup: +\\([^:]+\\):\\([0-9]+\\) "
+ nil t)
+ (cons (buffer-substring (match-beginning 1) (match-end 1))
+ (string-to-int
+ (buffer-substring (match-beginning 2) (match-end 2)))))))
(defun nnmbox-save-mail (&optional group)
"Called narrowed to an article."
(let* ((nnmail-split-methods
(if group (list (list group "")) nnmail-split-methods))
- (group-art (nreverse (nnmail-article-group 'nnmbox-active-number))))
+ (group-art (nreverse (nnmail-article-group 'nnmbox-active-number)))
+ (delim (concat "^" rmail-unix-mail-delimiter)))
+ (goto-char (point-min))
+ ;; This might come from somewhere else.
+ (unless (looking-at delim)
+ (insert "From nobody " (current-time-string) "\n")
+ (goto-char (point-min)))
+ ;; Quote all "From " lines in the article.
+ (forward-line 1)
+ (while (re-search-forward delim nil t)
+ (beginning-of-line)
+ (insert "> "))
(nnmail-insert-lines)
(nnmail-insert-xref group-art)
(nnmbox-insert-newsgroup-line group-art)
- (run-hooks 'nnml-prepare-save-mail-hook)
+ (run-hooks 'nnmbox-prepare-save-mail-hook)
group-art))
(defun nnmbox-insert-newsgroup-line (group-art)
t))
(defun nnmbox-active-number (group)
- "Find the next article number in GROUP."
+ ;; Find the next article number in GROUP.
(let ((active (car (cdr (assoc group nnmbox-group-alist)))))
- (setcdr active (1+ (cdr active)))
+ (if active
+ (setcdr active (1+ (cdr active)))
+ ;; This group is new, so we create a new entry for it.
+ ;; This might be a bit naughty... creating groups on the drop of
+ ;; a hat, but I don't know...
+ (setq nnmbox-group-alist (cons (list group (setq active (cons 1 1)))
+ nnmbox-group-alist)))
(cdr active)))
(defun nnmbox-read-mbox ()
- (nnmbox-request-list)
- (setq nnmbox-group-alist (nnmail-get-active))
+ (nnmail-activate 'nnmbox)
(if (not (file-exists-p nnmbox-mbox-file))
(write-region 1 1 nnmbox-mbox-file t 'nomesg))
(if (and nnmbox-mbox-buffer
(let ((delim (concat "^" rmail-unix-mail-delimiter))
start end)
(set-buffer (setq nnmbox-mbox-buffer
- (find-file-noselect nnmbox-mbox-file)))
+ (nnheader-find-file-noselect
+ nnmbox-mbox-file nil 'raw)))
(buffer-disable-undo (current-buffer))
(goto-char (point-min))
(while (re-search-forward delim nil t)
(nnmbox-save-mail))))
(goto-char end))))))
-(defun nnmbox-get-new-mail (&optional group)
- "Read new incoming mail."
- (let* ((spools (nnmail-get-spool-files group))
- (group-in group)
- incoming incomings)
- (nnmbox-read-mbox)
- (if (or (not nnmbox-get-new-mail) (not nnmail-spool-file))
- ()
- ;; We go through all the existing spool files and split the
- ;; mail from each.
- (while spools
- (and
- (file-exists-p (car spools))
- (> (nth 7 (file-attributes (car spools))) 0)
- (progn
- (and gnus-verbose-backends
- (message "nnmbox: Reading incoming mail..."))
- (setq incoming
- (nnmail-move-inbox
- (car spools) (concat nnmbox-mbox-file "-Incoming")))
- (save-excursion
- (setq group (nnmail-get-split-group (car spools) group-in))
- (let ((in-buf (nnmail-split-incoming
- incoming 'nnmbox-save-mail t group)))
- (set-buffer nnmbox-mbox-buffer)
- (goto-char (point-max))
- (insert-buffer-substring in-buf)
- (kill-buffer in-buf)))))
- (setq spools (cdr spools)))
- ;; If we did indeed read any incoming spools, we save all info.
- (and (buffer-modified-p nnmbox-mbox-buffer)
- (save-excursion
- (nnmail-save-active nnmbox-group-alist nnmbox-active-file)
- (set-buffer nnmbox-mbox-buffer)
- (save-buffer)))
- (if incomings (run-hooks 'nnmail-read-incoming-hook))
- (while incomings
- (and nnmail-delete-incoming
- (file-writable-p incoming)
- (delete-file incoming))
- (setq incomings (cdr incomings))))))
-
-
(provide 'nnmbox)
;;; nnmbox.el ends here
projects / gnus / blobdiff