X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fnndraft.el;h=1d320a552925440dbd0d2ef06c41e65fb6c78c84;hb=be8aa1df91ef09038eaadd01cdb250fc0e6eb546;hp=62409bbe972d374662962f1a0f3240d736657b5b;hpb=d49c9aab7fdcca8dee6c65ac78ae7c775b13cf67;p=gnus diff --git a/lisp/nndraft.el b/lisp/nndraft.el index 62409bbe9..1d320a552 100644 --- a/lisp/nndraft.el +++ b/lisp/nndraft.el @@ -1,7 +1,8 @@ ;;; nndraft.el --- draft article access for Gnus -;; Copyright (C) 1995,96,97 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 +;; Free Software Foundation, Inc. -;; Author: Lars Magne Ingebrigtsen +;; Author: Lars Magne Ingebrigtsen ;; Keywords: news ;; This file is part of GNU Emacs. @@ -26,22 +27,31 @@ ;;; Code: (require 'nnheader) +(require 'nnmail) +(require 'gnus-start) (require 'nnmh) (require 'nnoo) -(eval-and-compile (require 'cl)) +(require 'mm-util) +(eval-when-compile + (require 'cl) + ;; This is just to shut up the byte-compiler. + (fset 'nndraft-request-group 'ignore)) -(nnoo-declare nndraft) +(nnoo-declare nndraft + nnmh) -(eval-and-compile - (autoload 'mail-send-and-exit "sendmail")) - -(defvoo nndraft-directory nil - "Where nndraft will store its directory.") +(defvoo nndraft-directory (nnheader-concat gnus-directory "drafts/") + "Where nndraft will store its files." + nnmh-directory) +(defvoo nndraft-current-group "" nil nnmh-current-group) +(defvoo nndraft-get-new-mail nil nil nnmh-get-new-mail) +(defvoo nndraft-current-directory nil nil nnmh-current-directory) + (defconst nndraft-version "nndraft 1.0") -(defvoo nndraft-status-string "") +(defvoo nndraft-status-string "" nil nnmh-status-string) @@ -49,67 +59,69 @@ (nnoo-define-basics nndraft) +(deffoo nndraft-open-server (server &optional defs) + (nnoo-change-server 'nndraft server defs) + (cond + ((not (file-exists-p nndraft-directory)) + (nndraft-close-server) + (nnheader-report 'nndraft "No such file or directory: %s" + nndraft-directory)) + ((not (file-directory-p (file-truename nndraft-directory))) + (nndraft-close-server) + (nnheader-report 'nndraft "Not a directory: %s" nndraft-directory)) + (t + (nnheader-report 'nndraft "Opened server %s using directory %s" + server nndraft-directory) + t))) + (deffoo nndraft-retrieve-headers (articles &optional group server fetch-old) + (nndraft-possibly-change-group group) (save-excursion (set-buffer nntp-server-buffer) (erase-buffer) - (let* ((buf (get-buffer-create " *draft headers*")) - article) - (set-buffer buf) - (buffer-disable-undo (current-buffer)) - (erase-buffer) + (let* (article) ;; We don't support fetching by Message-ID. (if (stringp (car articles)) 'headers (while articles - (set-buffer buf) - (when (nndraft-request-article + (narrow-to-region (point) (point)) + (when (nndraft-request-article (setq article (pop articles)) group server (current-buffer)) (goto-char (point-min)) (if (search-forward "\n\n" nil t) (forward-line -1) (goto-char (point-max))) (delete-region (point) (point-max)) - (set-buffer nntp-server-buffer) - (goto-char (point-max)) + (goto-char (point-min)) (insert (format "221 %d Article retrieved.\n" article)) - (insert-buffer-substring buf) + (widen) + (goto-char (point-max)) (insert ".\n"))) (nnheader-fold-continuation-lines) 'headers)))) -(deffoo nndraft-open-server (server &optional defs) - (nnoo-change-server 'nndraft server defs) - (unless (assq 'nndraft-directory defs) - (setq nndraft-directory server)) - (cond - ((not (file-exists-p nndraft-directory)) - (nndraft-close-server) - (nnheader-report 'nndraft "No such file or directory: %s" - nndraft-directory)) - ((not (file-directory-p (file-truename nndraft-directory))) - (nndraft-close-server) - (nnheader-report 'nndraft "Not a directory: %s" nndraft-directory)) - (t - (nnheader-report 'nndraft "Opened server %s using directory %s" - server nndraft-directory) - t))) - (deffoo nndraft-request-article (id &optional group server buffer) + (nndraft-possibly-change-group group) (when (numberp id) - ;; We get the newest file of the auto-saved file and the + ;; We get the newest file of the auto-saved file and the ;; "real" file. (let* ((file (nndraft-article-filename id)) (auto (nndraft-auto-save-file-name file)) (newest (if (file-newer-than-file-p file auto) file auto)) (nntp-server-buffer (or buffer nntp-server-buffer))) (when (and (file-exists-p newest) - (nnmail-find-file newest)) - (save-excursion + (let ((nnmail-file-coding-system + (if (file-newer-than-file-p file auto) + (if (equal group "drafts") + message-draft-coding-system + mm-text-coding-system) + mm-auto-save-coding-system))) + (nnmail-find-file newest))) + (save-excursion (set-buffer nntp-server-buffer) (goto-char (point-min)) - ;; If there's a mail header separator in this file, + ;; If there's a mail header separator in this file, ;; we remove it. (when (re-search-forward (concat "^" mail-header-separator "$") nil t) @@ -118,119 +130,109 @@ (deffoo nndraft-request-restore-buffer (article &optional group server) "Request a new buffer that is restored to the state of ARTICLE." - (let ((file (nndraft-article-filename article ".state")) - nndraft-point nndraft-mode nndraft-buffer-name) - (when (file-exists-p file) - (load file t t t) - (when nndraft-buffer-name - (set-buffer (get-buffer-create - (generate-new-buffer-name nndraft-buffer-name))) - (nndraft-request-article article group server (current-buffer)) - (funcall nndraft-mode) - (let ((gnus-verbose-backends nil)) - (nndraft-request-expire-articles (list article) group server t)) - (goto-char nndraft-point)) - nndraft-buffer-name))) + (nndraft-possibly-change-group group) + (when (nndraft-request-article article group server (current-buffer)) + (message-remove-header "xref") + (message-remove-header "lines") + t)) (deffoo nndraft-request-update-info (group info &optional server) - (setcar (cddr info) nil) - (when (nth 3 info) - (setcar (nthcdr 3 info) nil)) + (nndraft-possibly-change-group group) + (gnus-info-set-read + info + (gnus-update-read-articles (gnus-group-prefixed-name group '(nndraft "")) + (nndraft-articles) t)) + (let ((marks (nth 3 info))) + (when marks + ;; Nix out all marks except the `unsend'-able article marks. + (setcar (nthcdr 3 info) + (if (assq 'unsend marks) + (list (assq 'unsend marks)) + nil)))) t) (deffoo nndraft-request-associate-buffer (group) "Associate the current buffer with some article in the draft group." - (let* ((gnus-verbose-backends nil) - (article (cdr (nndraft-request-accept-article - group (nnoo-current-server 'nndraft) t 'noinsert))) - (file (nndraft-article-filename article))) - (setq buffer-file-name file) - (setq buffer-auto-save-file-name (make-auto-save-file-name)) + (nndraft-open-server "") + (nndraft-request-group group) + (nndraft-possibly-change-group group) + (let ((gnus-verbose-backends nil) + (buf (current-buffer)) + article file) + (with-temp-buffer + (insert-buffer-substring buf) + (setq article (nndraft-request-accept-article + group (nnoo-current-server 'nndraft) t 'noinsert) + file (nndraft-article-filename article))) + (setq buffer-file-name (expand-file-name file) + buffer-auto-save-file-name (make-auto-save-file-name)) (clear-visited-file-modtime) article)) -(deffoo nndraft-request-group (group &optional server dont-check) - (prog1 - (nndraft-execute-nnmh-command - `(nnmh-request-group group "" ,dont-check)) - (nnheader-report 'nndraft nnmh-status-string))) - -(deffoo nndraft-request-list (&optional server dir) - (nndraft-execute-nnmh-command - `(nnmh-request-list nil ,dir))) - -(deffoo nndraft-request-newgroups (date &optional server) - (nndraft-execute-nnmh-command - `(nnmh-request-newgroups ,date ,server))) - -(deffoo nndraft-request-expire-articles - (articles group &optional server force) - (let ((res (nndraft-execute-nnmh-command - `(nnmh-request-expire-articles - ',articles group ,server ,force))) - article) +(deffoo nndraft-request-expire-articles (articles group &optional server force) + (nndraft-possibly-change-group group) + (let* ((nnmh-allow-delete-final t) + (res (nnoo-parent-function 'nndraft + 'nnmh-request-expire-articles + (list articles group server force))) + article) ;; Delete all the "state" files of articles that have been expired. (while articles (unless (memq (setq article (pop articles)) res) - (let ((file (nndraft-article-filename article ".state")) - (auto (nndraft-auto-save-file-name + (let ((auto (nndraft-auto-save-file-name (nndraft-article-filename article)))) - (when (file-exists-p file) - (funcall nnmail-delete-file-function file)) (when (file-exists-p auto) - (funcall nnmail-delete-file-function auto))))) + (funcall nnmail-delete-file-function auto))) + (dolist (backup + (let ((kept-new-versions 1) + (kept-old-versions 0)) + (find-backup-file-name + (nndraft-article-filename article)))) + (when (file-exists-p backup) + (funcall nnmail-delete-file-function backup))))) res)) (deffoo nndraft-request-accept-article (group &optional server last noinsert) - (let* ((point (point)) - (mode major-mode) - (name (buffer-name)) - (gnus-verbose-backends nil) - (gart (nndraft-execute-nnmh-command - `(nnmh-request-accept-article group ,server ,last noinsert))) - (state - (nndraft-article-filename (cdr gart) ".state"))) - ;; Write the "state" file. - (save-excursion - (nnheader-set-temp-buffer " *draft state*") - (insert (format "%S\n" `(setq nndraft-mode (quote ,mode) - nndraft-point ,point - nndraft-buffer-name ,name))) - (write-region (point-min) (point-max) state nil 'silent) - (kill-buffer (current-buffer))) - gart)) - -(deffoo nndraft-close-group (group &optional server) - t) + (nndraft-possibly-change-group group) + (let ((gnus-verbose-backends nil)) + (nnoo-parent-function 'nndraft 'nnmh-request-accept-article + (list group server last noinsert)))) + +(deffoo nndraft-request-replace-article (article group buffer) + (nndraft-possibly-change-group group) + (let ((nnmail-file-coding-system + (if (equal group "drafts") + mm-auto-save-coding-system + mm-text-coding-system))) + (nnoo-parent-function 'nndraft 'nnmh-request-replace-article + (list article group buffer)))) (deffoo nndraft-request-create-group (group &optional server args) - (if (file-exists-p nndraft-directory) - (if (file-directory-p nndraft-directory) + (nndraft-possibly-change-group group) + (if (file-exists-p nndraft-current-directory) + (if (file-directory-p nndraft-current-directory) t nil) (condition-case () (progn - (gnus-make-directory nndraft-directory) + (gnus-make-directory nndraft-current-directory) t) (file-error nil)))) ;;; Low-Level Interface -(defun nndraft-execute-nnmh-command (command) - (let ((dir (expand-file-name nndraft-directory))) - (when (string-match "/$" dir) - (setq dir (substring dir 0 (match-beginning 0)))) - (string-match "/[^/]+$" dir) - (let ((group (substring dir (1+ (match-beginning 0)))) - (nnmh-directory (substring dir 0 (1+ (match-beginning 0)))) - (nnmail-keep-last-article nil) - (nnmh-get-new-mail nil)) - (eval command)))) +(defun nndraft-possibly-change-group (group) + (when (and group + (not (equal group nndraft-current-group))) + (nndraft-open-server "") + (setq nndraft-current-group group) + (setq nndraft-current-directory + (nnheader-concat nndraft-directory group)))) (defun nndraft-article-filename (article &rest args) (apply 'concat - (file-name-as-directory nndraft-directory) + (file-name-as-directory nndraft-current-directory) (int-to-string article) args)) @@ -243,6 +245,23 @@ (make-auto-save-file-name)) (kill-buffer (current-buffer))))) +(defun nndraft-articles () + "Return the list of messages in the group." + (gnus-make-directory nndraft-current-directory) + (sort + (mapcar 'string-to-int + (directory-files nndraft-current-directory nil "\\`[0-9]+\\'" t)) + '<)) + +(nnoo-import nndraft + (nnmh + nnmh-retrieve-headers + nnmh-request-group + nnmh-close-group + nnmh-request-list + nnmh-request-newsgroups + nnmh-request-move-article)) + (provide 'nndraft) ;;; nndraft.el ends here