2000-12-20 09:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

[gnus] / lisp / mm-extern.el

diff --git a/lisp/mm-extern.el b/lisp/mm-extern.el
index 847954a..5e58a12 100644 (file)
--- a/lisp/mm-extern.el
+++ b/lisp/mm-extern.el
@@ -34,30 +34,80 @@
 (defvar mm-extern-function-alist
   '((local-file . mm-extern-local-file)
     (url . mm-extern-url)
-;;;     (ftp . mm-extern-ftp)
-;;;     (anon-ftp . mm-extern-anon-ftp)
+    (anon-ftp . mm-extern-anon-ftp)
+    (ftp . mm-extern-ftp)
 ;;;     (tftp . mm-extern-tftp)
-;;;     (mail-server . mm-extern-mail-server))
+    (mail-server . mm-extern-mail-server)
+;;;     (afs . mm-extern-afs))
     ))
 
+(defvar mm-extern-anonymous "anonymous")
+
 (defun mm-extern-local-file (handle)
+  (erase-buffer)
   (let ((name (cdr (assq 'name (cdr (mm-handle-type handle)))))
        (coding-system-for-read mm-binary-coding-system))
+    (unless name
+      (error "The filename is not specified."))
     (mm-disable-multibyte-mule4)
-    (mm-insert-file-contents name nil nil nil nil t)))
+    (if (file-exists-p name)
+       (mm-insert-file-contents name nil nil nil nil t)
+      (error (format "File %s is gone." name)))))
 
 (defun mm-extern-url (handle)
+  (erase-buffer)
   (require 'url)
   (let ((url (cdr (assq 'url (cdr (mm-handle-type handle)))))
        (name buffer-file-name)
        (coding-system-for-read mm-binary-coding-system))
     (unless url
-      (error "URL is not specified"))
+      (error "URL is not specified."))
     (mm-with-unibyte-current-buffer-mule4
       (url-insert-file-contents url))
     (mm-disable-multibyte-mule4)
     (setq buffer-file-name name)))
 
+(defun mm-extern-anon-ftp (handle)
+  (erase-buffer)
+  (let* ((params (cdr (mm-handle-type handle)))
+        (name (cdr (assq 'name params)))
+        (site (cdr (assq 'site params)))
+        (directory (cdr (assq 'directory params)))
+        (mode (cdr (assq 'mode params)))
+        (path (concat "/" (or mm-extern-anonymous
+                              (read-string (format "ID for %s: " site)))
+                      "@" site ":" directory "/" name))
+        (coding-system-for-read mm-binary-coding-system))
+    (unless name
+      (error "The filename is not specified."))
+    (mm-disable-multibyte-mule4)
+    (mm-insert-file-contents path nil nil nil nil t)))
+
+(defun mm-extern-ftp (handle)
+  (let (mm-extern-anonymous)
+    (mm-extern-anon-ftp handle)))
+
+(defun mm-extern-mail-server (handle)
+  (require 'message)
+  (let* ((params (cdr (mm-handle-type handle)))
+        (server (cdr (assq 'server params)))
+        (subject (or (cdr (assq 'subject params)) "none"))
+        (buf (current-buffer))
+        info)
+    (if (y-or-n-p (format "Send a request message to %s?" server))
+       (save-window-excursion
+         (message-mail server subject)
+         (message-goto-body)
+         (delete-region (point) (point-max))
+         (insert-buffer buf)
+         (message "Requesting external body...")
+         (message-send-and-exit)
+         (setq info "Request is sent.")
+         (message info))
+      (setq info "Request is not sent."))
+    (goto-char (point-min))
+    (insert "[" info "]\n\n")))
+
 ;;;###autoload
 (defun mm-inline-external-body (handle &optional no-display)
   "Show the external-body part of HANDLE.
@@ -66,7 +116,11 @@ the entire message.
 If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
   (let* ((access-type (cdr (assq 'access-type 
                                 (cdr (mm-handle-type handle)))))
-        (func (cdr (assq (intern access-type) mm-extern-function-alist)))
+        (func (cdr (assq (intern 
+                          (downcase 
+                           (or access-type
+                               (error "Couldn't find access type."))))
+                         mm-extern-function-alist)))
         gnus-displaying-mime buf
         handles)
     (unless (mm-handle-cache handle)
@@ -81,18 +135,19 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
        (mm-destroy-parts handles)
        (error "Multipart external body is not supported."))
       (save-excursion ;; single part
-       (kill-buffer (mm-handle-buffer handles))
-       (set-buffer (setq buf (generate-new-buffer " *mm*")))
-       (condition-case err
-           (funcall func handle)
-         (error 
-          ;; Don't require gnus-util
-          (when (gnus-buffer-exists-p buf)
-            (kill-buffer buf))
-          (error err)))
-       (setcar handles (current-buffer))
+       (set-buffer (setq buf (mm-handle-buffer handles)))
+       (let (good)
+         (unwind-protect
+             (progn
+               (funcall func handle)
+               (setq good t))
+           (unless good
+             (mm-destroy-parts handles))))
        (mm-handle-set-cache handle handles))
-      (push handles gnus-article-mime-handles))
+      (if (listp (car gnus-article-mime-handles))
+         (push handles gnus-article-mime-handles)
+       (setq gnus-article-mime-handles
+             (list handles gnus-article-mime-handles))))
     (unless no-display
       (save-excursion
        (save-restriction