;;; Code:
(require 'nnheader)
-(require 'rmail)
(require 'nnmail)
-(require 'gnus)
-(eval-and-compile (require 'cl))
+(require 'gnus-start)
+(require 'nnoo)
+(require 'cl)
-(defvar nnmh-directory "~/Mail/"
+(nnoo-declare nnmh)
+
+(defvoo nnmh-directory message-directory
"*Mail spool directory.")
-(defvar nnmh-get-new-mail t
+(defvoo nnmh-get-new-mail t
"*If non-nil, nnmh will check the incoming mail file and split the mail.")
-(defvar nnmh-prepare-save-mail-hook nil
+(defvoo nnmh-prepare-save-mail-hook nil
"*Hook run narrowed to an article before saving.")
-(defvar nnmh-be-safe nil
+(defvoo nnmh-be-safe nil
"*If non-nil, nnmh will check all articles to make sure whether they are new or not.")
\f
(defconst nnmh-version "nnmh 1.0"
"nnmh version.")
-(defvar nnmh-current-directory nil
+(defvoo nnmh-current-directory nil
"Current news group directory.")
-(defvar nnmh-status-string "")
-(defvar nnmh-group-alist nil)
-
-\f
-
-(defvar nnmh-current-server nil)
-(defvar nnmh-server-alist nil)
-(defvar nnmh-server-variables
- `((nnmh-directory ,nnmh-directory)
- (nnmh-get-new-mail ,nnmh-get-new-mail)
- (nnmh-be-safe nil)
- (nnmh-prepare-save-mail-hook nil)
- (nnmh-current-directory nil)
- (nnmh-status-string "")
- (nnmh-group-alist)))
+(defvoo nnmh-status-string "")
+(defvoo nnmh-group-alist nil)
\f
;;; Interface functions.
-(defun nnmh-retrieve-headers (articles &optional newsgroup server fetch-old)
+(nnoo-define-basics nnmh)
+
+(deffoo nnmh-retrieve-headers (articles &optional newsgroup server fetch-old)
(save-excursion
(set-buffer nntp-server-buffer)
(erase-buffer)
(> number nnmail-large-newsgroup)))
(count 0)
beg article)
- (nnmh-possibly-change-directory newsgroup)
+ (nnmh-possibly-change-directory newsgroup server)
;; We don't support fetching by Message-ID.
(if (stringp (car articles))
'headers
nnmh-current-directory)
(int-to-string
(setq article (pop articles))))))
-
(not (file-directory-p file)))
(insert (format "221 %d Article retrieved.\n" article))
(setq beg (point))
(nnheader-fold-continuation-lines)
'headers))))
-(defun nnmh-open-server (server &optional defs)
- (nnheader-change-server 'nnmh server defs)
+(deffoo nnmh-open-server (server &optional defs)
+ (nnoo-change-server 'nnmh server defs)
(when (not (file-exists-p nnmh-directory))
(condition-case ()
(make-directory nnmh-directory t)
server nnmh-directory)
t)))
-(defun nnmh-close-server (&optional server)
- (setq nnmh-current-server nil
- nnmh-group-alist nil)
- t)
-
-(defun nnmh-server-opened (&optional server)
- (and (equal server nnmh-current-server)
- nntp-server-buffer
- (buffer-name nntp-server-buffer)))
-
-(defun nnmh-status-message (&optional server)
- nnmh-status-string)
-
-(defun nnmh-request-article (id &optional newsgroup server buffer)
- (nnmh-possibly-change-directory newsgroup)
+(deffoo nnmh-request-article (id &optional newsgroup server buffer)
+ (nnmh-possibly-change-directory newsgroup server)
(let ((file (if (stringp id)
nil
(concat nnmh-current-directory (int-to-string id))))
(save-excursion (nnmail-find-file file))
(string-to-int (file-name-nondirectory file)))))
-(defun nnmh-request-group (group &optional server dont-check)
+(deffoo nnmh-request-group (group &optional server dont-check)
(let ((pathname (nnmail-group-pathname group nnmh-directory))
dir)
(cond
(nnheader-report 'nnmh "Selected group %s" group)
t)
(t
+ ;; Re-scan the directory if it's on a foreign system.
+ (nnheader-re-read-dir pathname)
(setq dir
(sort
(mapcar (lambda (name) (string-to-int name))
(nnheader-report 'nnmh "Empty group %s" group)
(nnheader-insert (format "211 0 1 0 %s\n" group))))))))))
-(defun nnmh-request-scan (&optional group server)
+(deffoo nnmh-request-scan (&optional group server)
(nnmail-get-new-mail 'nnmh nil nnmh-directory group))
-(defun nnmh-request-list (&optional server dir)
- (unless dir
- (nnheader-insert "")
- (setq dir (file-truename (file-name-as-directory nnmh-directory))))
+(deffoo nnmh-request-list (&optional server dir)
+ (nnheader-insert "")
+ (let ((nnmh-toplev
+ (or dir (file-truename (file-name-as-directory nnmh-directory)))))
+ (nnmh-request-list-1 nnmh-toplev))
+ (setq nnmh-group-alist (nnmail-get-active))
+ t)
+
+(defvar nnmh-toplev)
+(defun nnmh-request-list-1 (dir)
(setq dir (expand-file-name dir))
;; Recurse down all directories.
(let ((dirs (and (file-readable-p dir)
dir)
;; Recurse down directories.
(while (setq dir (pop dirs))
- (when (and (not (string-match "/\\.\\.?$" dir))
+ (when (and (not (member (file-name-nondirectory dir) '("." "..")))
(file-directory-p dir)
(file-readable-p dir))
- (nnmh-request-list nil dir))))
+ (nnmh-request-list-1 dir))))
;; For each directory, generate an active file line.
- (unless (string= (expand-file-name nnmh-directory) dir)
+ (unless (string= (expand-file-name nnmh-toplev) dir)
(let ((files (mapcar
(lambda (name) (string-to-int name))
(directory-files dir nil "^[0-9]+$" t))))
"%s %d %d y\n"
(progn
(string-match
- (file-truename (file-name-as-directory
- (expand-file-name nnmh-directory))) dir)
+ (regexp-quote
+ (file-truename (file-name-as-directory
+ (expand-file-name nnmh-toplev)))) dir)
(nnheader-replace-chars-in-string
(substring dir (match-end 0)) ?/ ?.))
- (apply (function max) files)
- (apply (function min) files)))))))
- (setq nnmh-group-alist (nnmail-get-active))
+ (apply 'max files)
+ (apply 'min files)))))))
t)
-(defun nnmh-request-newgroups (date &optional server)
+(deffoo nnmh-request-newgroups (date &optional server)
(nnmh-request-list server))
-(defun nnmh-request-expire-articles (articles newsgroup &optional server force)
- (nnmh-possibly-change-directory newsgroup)
+(deffoo nnmh-request-expire-articles (articles newsgroup &optional server force)
+ (nnmh-possibly-change-directory newsgroup server)
(let* ((active-articles
(mapcar
(function
(lambda (name)
(string-to-int name)))
(directory-files nnmh-current-directory nil "^[0-9]+$" t)))
- (max-article (and active-articles (apply 'max active-articles)))
(is-old t)
article rest mod-time)
(nnmail-activate 'nnmh)
(condition-case ()
(funcall nnmail-delete-file-function article)
(file-error
+ (nnheader-message 1 "Couldn't delete article %s in %s"
+ article newsgroup)
(setq rest (cons (car articles) rest)))))
(setq rest (cons (car articles) rest))))
(setq articles (cdr articles)))
(message "")
(nconc rest articles)))
-(defun nnmh-close-group (group &optional server)
+(deffoo nnmh-close-group (group &optional server)
t)
-(defun nnmh-request-move-article
+(deffoo nnmh-request-move-article
(article group server accept-form &optional last)
(let ((buf (get-buffer-create " *nnmh move*"))
result)
(setq result (eval accept-form))
(kill-buffer (current-buffer))
result)
- (condition-case ()
- (funcall nnmail-delete-file-function
- (concat nnmh-current-directory (int-to-string article)))
- (file-error nil)))
+ (progn
+ (nnmh-possibly-change-directory group server)
+ (condition-case ()
+ (funcall nnmail-delete-file-function
+ (concat nnmh-current-directory (int-to-string article)))
+ (file-error nil))))
result))
-(defun nnmh-request-accept-article (group &optional last noinsert)
+(deffoo nnmh-request-accept-article (group &optional server last noinsert)
+ (nnmh-possibly-change-directory group server)
+ (nnmail-check-syntax)
(if (stringp group)
(and
(nnmail-activate 'nnmh)
(nnmail-activate 'nnmh)
(car (nnmh-save-mail noinsert)))))
-(defun nnmh-request-replace-article (article group buffer)
+(deffoo nnmh-request-replace-article (article group buffer)
(nnmh-possibly-change-directory group)
(save-excursion
(set-buffer buffer)
(nnmh-possibly-create-directory group)
(condition-case ()
(progn
- (write-region (point-min) (point-max)
- (concat nnmh-current-directory (int-to-string article))
- nil (if (nnheader-be-verbose 5) nil 'nomesg))
+ (nnmail-write-region
+ (point-min) (point-max)
+ (concat nnmh-current-directory (int-to-string article))
+ nil (if (nnheader-be-verbose 5) nil 'nomesg))
t)
(error nil))))
-(defun nnmh-request-create-group (group &optional server)
+(deffoo nnmh-request-create-group (group &optional server)
(nnmail-activate 'nnmh)
(or (assoc group nnmh-group-alist)
(let (active)
(setq nnmh-group-alist (cons (list group (setq active (cons 1 0)))
nnmh-group-alist))
(nnmh-possibly-create-directory group)
- (nnmh-possibly-change-directory group)
+ (nnmh-possibly-change-directory group server)
(let ((articles (mapcar
(lambda (file)
(string-to-int file))
(setcdr active (apply 'max articles)))))))
t)
-(defun nnmh-request-delete-group (group &optional force server)
- (nnmh-possibly-change-directory group)
+(deffoo nnmh-request-delete-group (group &optional force server)
+ (nnmh-possibly-change-directory group server)
;; Delete all articles in GROUP.
(if (not force)
() ; Don't delete the articles.
nnmh-current-directory nil)
t)
-(defun nnmh-request-rename-group (group new-name &optional server)
- (nnmh-possibly-change-directory group)
- ;; Rename directory.
- (and (file-writable-p nnmh-current-directory)
- (condition-case ()
- (progn
- (rename-file
- (directory-file-name nnmh-current-directory)
- (directory-file-name
- (nnmail-group-pathname new-name nnmh-directory)))
- t)
- (error nil))
- ;; That went ok, so we change the internal structures.
- (let ((entry (assoc group nnmh-group-alist)))
- (and entry (setcar entry new-name))
- (setq nnmh-current-directory nil)
- t)))
+(deffoo nnmh-request-rename-group (group new-name &optional server)
+ (nnmh-possibly-change-directory group server)
+ (let ((new-dir (nnmail-group-pathname new-name nnmh-directory))
+ (old-dir (nnmail-group-pathname group nnmh-directory)))
+ (when (condition-case ()
+ (progn
+ (make-directory new-dir t)
+ t)
+ (error nil))
+ ;; We move the articles file by file instead of renaming
+ ;; the directory -- there may be subgroups in this group.
+ ;; One might be more clever, I guess.
+ (let ((files (nnheader-article-to-file-alist old-dir)))
+ (while files
+ (rename-file
+ (concat old-dir (cdar files))
+ (concat new-dir (cdar files)))
+ (pop files)))
+ (when (<= (length (directory-files old-dir)) 2)
+ (condition-case ()
+ (delete-directory old-dir)
+ (error nil)))
+ ;; That went ok, so we change the internal structures.
+ (let ((entry (assoc group nnmh-group-alist)))
+ (and entry (setcar entry new-name))
+ (setq nnmh-current-directory nil)
+ t))))
\f
;;; Internal functions.
-(defun nnmh-possibly-change-directory (newsgroup)
+(defun nnmh-possibly-change-directory (newsgroup &optional server)
+ (when (and server
+ (not (nnmh-server-opened server)))
+ (nnmh-open-server server))
(if newsgroup
(let ((pathname (nnmail-group-pathname newsgroup nnmh-directory)))
(if (file-directory-p pathname)
(unless noinsert
(nnmail-insert-lines)
(nnmail-insert-xref group-art))
+ (run-hooks 'nnmail-prepare-save-mail-hook)
(run-hooks 'nnmh-prepare-save-mail-hook)
(goto-char (point-min))
(while (looking-at "From ")
;; It was already saved, so we just make a hard link.
(funcall nnmail-crosspost-link-function first file t)
;; Save the article.
- (write-region (point-min) (point-max) file nil nil)
+ (nnmail-write-region (point-min) (point-max) file nil nil)
(setq first file)))
(setq ga (cdr ga))))
group-art))
(insert ";; Gnus article active file for " group "\n\n")
(insert "(setq nnmh-newsgroup-articles '")
(insert (prin1-to-string articles) ")\n")
- (write-region (point-min) (point-max) nnmh-file nil 'nomesg)
+ (nnmail-write-region (point-min) (point-max) nnmh-file nil 'nomesg)
(kill-buffer (current-buffer)))))
(defun nnmh-deletable-article-p (group article)
projects / gnus / blobdiff