X-Git-Url: http://git.chise.org/gitweb/?p=elisp%2Fflim.git;a=blobdiff_plain;f=mmbuffer.el;h=c605a59726f7727749ecf98e3a2be35fa25ff786;hp=448d88eb772e992fdacf501face84f580e1710c9;hb=refs%2Fheads%2Flimit-1_14;hpb=9cf6838bc986b73bc83955794f7424e9d3e1539d

diff --git a/mmbuffer.el b/mmbuffer.el
index 448d88e..c605a59 100644
--- a/mmbuffer.el
+++ b/mmbuffer.el
@@ -1,8 +1,8 @@
 ;;; mmbuffer.el --- MIME entity module for binary buffer
 
-;; Copyright (C) 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1998,1999,2000 Free Software Foundation, Inc.
 
-;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Author: MORIOKA Tomohiko <tomo@m17n.org>
 ;; Keywords: MIME, multimedia, mail, news
 
 ;; This file is part of FLIM (Faithful Library about Internet Message).
@@ -19,185 +19,336 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
+(require 'mmgeneric)
 (require 'mime)
-(require 'mime-parse)
 
-(mm-define-backend buffer)
+(eval-and-compile
+  (luna-define-class mime-buffer-entity (mime-entity)
+		     (buffer
+		      header-start
+		      header-end
+		      body-start
+		      body-end))
 
-(mm-define-method initialize-instance ((entity buffer))
-  (mime-entity-set-buffer-internal
-   entity (mime-entity-location-internal entity))
+  (luna-define-internal-accessors 'mime-buffer-entity)
+  )
+
+(luna-define-method initialize-instance :after ((entity mime-buffer-entity)
+						&rest init-args)
+  (or (mime-buffer-entity-buffer-internal entity)
+      (mime-buffer-entity-set-buffer-internal
+       entity (get-buffer (mime-entity-location-internal entity))))
   (save-excursion
-    (set-buffer (mime-entity-buffer-internal entity))
-    (setq mime-message-structure entity)
-    (let ((header-start (point-min))
-	  header-end
-	  body-start
-	  (body-end (point-max)))
+    (set-buffer (mime-buffer-entity-buffer-internal entity))
+    (let ((header-start
+	   (or (mime-buffer-entity-header-start-internal entity)
+	       (mime-buffer-entity-set-header-start-internal
+		entity (point-min))))
+	  (header-end (mime-buffer-entity-header-end-internal entity))
+	  (body-start (mime-buffer-entity-body-start-internal entity))
+	  (body-end
+	   (or (mime-buffer-entity-body-end-internal entity)
+	       (mime-buffer-entity-set-body-end-internal entity (point-max)))))
       (goto-char header-start)
-      (if (re-search-forward "^$" nil t)
-	  (setq header-end (match-end 0)
-		body-start (if (= header-end body-end)
-			       body-end
-			     (1+ header-end)))
-	(setq header-end (point-min)
-	      body-start (point-min)))
-      (save-restriction
-	(narrow-to-region header-start header-end)
-	(mime-entity-set-content-type-internal
-	 entity
-	 (let ((str (std11-fetch-field "Content-Type")))
-	   (if str
-	       (mime-parse-Content-Type str)
-	     )))
+      (unless (and header-end body-start)
+	(if (re-search-forward "^$" body-end t)
+	    (setq header-end (match-end 0)
+		  body-start (if (= header-end body-end)
+				 body-end
+			       (1+ header-end)))
+	  (setq header-end (point-min)
+		body-start (point-min)))
+	(mime-buffer-entity-set-header-end-internal entity header-end)
+	(mime-buffer-entity-set-body-start-internal entity body-start)
 	)
-      (mime-entity-set-header-start-internal entity header-start)
-      (mime-entity-set-header-end-internal entity header-end)
-      (mime-entity-set-body-start-internal entity body-start)
-      (mime-entity-set-body-end-internal entity body-end)
-      )))
+      (or (mime-entity-content-type-internal entity)
+	  (save-restriction
+	    (narrow-to-region header-start header-end)
+	    (mime-entity-set-content-type-internal
+	     entity
+	     (let ((str (std11-fetch-field "Content-Type")))
+	       (if str
+		   (mime-parse-Content-Type str)
+		 )))
+	    ))
+      ))
+  entity)
+
+(luna-define-method mime-entity-name ((entity mime-buffer-entity))
+  (buffer-name (mime-buffer-entity-buffer-internal entity))
+  )
+
 
-(mm-define-method entity-point-min ((entity buffer))
-  (mime-entity-header-start-internal entity))
+;;; @ entity
+;;;
 
-(mm-define-method entity-point-max ((entity buffer))
-  (mime-entity-body-end-internal entity))
+(luna-define-method mime-insert-entity ((entity mime-buffer-entity))
+  (insert-buffer-substring (mime-buffer-entity-buffer-internal entity)
+			   (mime-buffer-entity-header-start-internal entity)
+			   (mime-buffer-entity-body-end-internal entity))
+  )
 
-(mm-define-method fetch-field ((entity buffer) field-name)
+(luna-define-method mime-write-entity ((entity mime-buffer-entity) filename)
   (save-excursion
-    (set-buffer (mime-entity-buffer-internal entity))
-    (save-restriction
-      (narrow-to-region (mime-entity-header-start-internal entity)
-			(mime-entity-header-end-internal entity))
-      (std11-fetch-field field-name)
-      )))
+    (set-buffer (mime-buffer-entity-buffer-internal entity))
+    (let ((coding-system-for-write 'raw-text-dos))
+      (write-region (mime-buffer-entity-header-start-internal entity)
+		    (mime-buffer-entity-body-end-internal entity)
+		    filename))))
 
-(mm-define-method entity-cooked-p ((entity buffer)) nil)
 
-(mm-define-method entity-children ((entity buffer))
-  (let* ((content-type (mime-entity-content-type entity))
-	 (primary-type (mime-content-type-primary-type content-type)))
-    (cond ((eq primary-type 'multipart)
-	   (mime-parse-multipart entity)
-	   (mime-entity-children-internal entity)
-	   )
-	  ((and (eq primary-type 'message)
-		(memq (mime-content-type-subtype content-type)
-		      '(rfc822 news external-body)
-		      ))
-	   (mime-parse-encapsulated entity)
-	   (mime-entity-children-internal entity)
-	   )
-	  )))
-
-(mm-define-method entity-content ((entity buffer))
+;;; @ entity header
+;;;
+
+
+;;; @ entity body
+;;;
+
+(luna-define-method mime-entity-body ((entity mime-buffer-entity))
+  (save-excursion
+    (set-buffer (mime-buffer-entity-buffer-internal entity))
+    (buffer-substring (mime-buffer-entity-body-start-internal entity)
+		      (mime-buffer-entity-body-end-internal entity))))
+
+(luna-define-method mime-insert-entity-body ((entity mime-buffer-entity))
+  (insert-buffer-substring (mime-buffer-entity-buffer-internal entity)
+			   (mime-buffer-entity-body-start-internal entity)
+			   (mime-buffer-entity-body-end-internal entity))
+  )
+
+(luna-define-method mime-write-entity-body ((entity mime-buffer-entity)
+					    filename)
   (save-excursion
-    (set-buffer (mime-entity-buffer-internal entity))
+    (set-buffer (mime-buffer-entity-buffer-internal entity))
+    (binary-write-decoded-region
+     (mime-buffer-entity-body-start-internal entity)
+     (mime-buffer-entity-body-end-internal entity)
+     filename)))
+
+
+;;; @ entity content
+;;;
+
+(luna-define-method mime-entity-content ((entity mime-buffer-entity))
+  (save-excursion
+    (set-buffer (mime-buffer-entity-buffer-internal entity))
     (mime-decode-string
-     (buffer-substring (mime-entity-body-start-internal entity)
-		       (mime-entity-body-end-internal entity))
+     (buffer-substring (mime-buffer-entity-body-start-internal entity)
+		       (mime-buffer-entity-body-end-internal entity))
      (mime-entity-encoding entity))))
 
-(mm-define-method write-entity-content ((entity buffer) filename)
+(luna-define-method mime-insert-entity-content ((entity mime-buffer-entity))
+  (insert (with-current-buffer (mime-buffer-entity-buffer-internal entity)
+	    (mime-decode-string
+	     (buffer-substring (mime-buffer-entity-body-start-internal entity)
+			       (mime-buffer-entity-body-end-internal entity))
+	     (mime-entity-encoding entity)))))
+
+(luna-define-method mime-write-entity-content ((entity mime-buffer-entity)
+					       filename)
   (save-excursion
-    (set-buffer (mime-entity-buffer-internal entity))
-    (mime-write-decoded-region (mime-entity-body-start-internal entity)
-			       (mime-entity-body-end-internal entity)
+    (set-buffer (mime-buffer-entity-buffer-internal entity))
+    (mime-write-decoded-region (mime-buffer-entity-body-start-internal entity)
+			       (mime-buffer-entity-body-end-internal entity)
 			       filename
 			       (or (mime-entity-encoding entity) "7bit"))
     ))
 
-(mm-define-method write-entity ((entity buffer) filename)
-  (save-excursion
-    (set-buffer (mime-entity-buffer-internal entity))
-    (write-region-as-binary (mime-entity-header-start-internal entity)
-			    (mime-entity-body-end-internal entity)
-			    filename)
-    ))
 
-(mm-define-method write-entity-body ((entity buffer) filename)
-  (save-excursion
-    (set-buffer (mime-entity-buffer-internal entity))
-    (write-region-as-binary (mime-entity-body-start-internal entity)
-			    (mime-entity-body-end-internal entity)
-			    filename)
-    ))
+;;; @ header field
+;;;
 
-(defun mime-visible-field-p (field-name visible-fields invisible-fields)
-  (or (catch 'found
-	(while visible-fields
-	  (let ((regexp (car visible-fields)))
-	    (if (string-match regexp field-name)
-		(throw 'found t)
-	      ))
-	  (setq visible-fields (cdr visible-fields))
-	  ))
-      (catch 'found
-	(while invisible-fields
-	  (let ((regexp (car invisible-fields)))
-	    (if (string-match regexp field-name)
-		(throw 'found nil)
-	      ))
-	  (setq invisible-fields (cdr invisible-fields))
-	  )
-	t)))
-
-(mm-define-method insert-decoded-header ((entity buffer)
-					 &optional invisible-fields
-					 visible-fields)
-  (save-restriction
-    (narrow-to-region (point)(point))
-    (let ((the-buf (current-buffer))
-	  (src-buf (mime-entity-buffer-internal entity))
-	  (h-end (mime-entity-header-end-internal entity))
-	  beg p end field-name len field)
+(luna-define-method mime-entity-fetch-field :around
+  ((entity mime-buffer-entity) field-name)
+  (or (luna-call-next-method)
       (save-excursion
-	(set-buffer src-buf)
-	(goto-char (mime-entity-header-start-internal entity))
+	(set-buffer (mime-buffer-entity-buffer-internal entity))
 	(save-restriction
-	  (narrow-to-region (point) h-end)
-	  (while (re-search-forward std11-field-head-regexp nil t)
-	    (setq beg (match-beginning 0)
-		  p (match-end 0)
-		  field-name (buffer-substring beg (1- p))
-		  len (string-width field-name)
-		  end (std11-field-end))
-	    (when (mime-visible-field-p field-name
-					visible-fields invisible-fields)
-	      (setq field (intern (capitalize field-name)))
-	      (save-excursion
-		(set-buffer the-buf)
-		(insert field-name)
-		(insert ":")
-		(cond ((memq field eword-decode-ignored-field-list)
-		       ;; Don't decode
-		       (insert-buffer-substring src-buf p end)
-		       )
-		      ((memq field eword-decode-structured-field-list)
-		       ;; Decode as structured field
-		       (let ((body (save-excursion
-				     (set-buffer src-buf)
-				     (buffer-substring p end)
-				     )))
-			 (insert (eword-decode-and-fold-structured-field
-				  body (1+ len)))
-			 ))
-		      (t
-		       ;; Decode as unstructured field
-		       (let ((body (save-excursion
-				     (set-buffer src-buf)
-				     (buffer-substring p end)
-				     )))
-			 (insert (eword-decode-unstructured-field-body
-				  body (1+ len)))
-			 )))
-		(insert "\n")
-		))))))))
+	  (narrow-to-region (mime-buffer-entity-header-start-internal entity)
+			    (mime-buffer-entity-header-end-internal entity))
+	  (let ((ret (std11-fetch-field field-name)))
+	    (when ret
+	      (or (symbolp field-name)
+		  (setq field-name (intern (capitalize field-name))))
+  	      (mime-entity-set-original-header-internal
+	       entity
+	       (put-alist field-name ret
+			  (mime-entity-original-header-internal entity)))
+	      ret))))))
+
+(luna-define-method mime-insert-header ((entity mime-buffer-entity)
+					&optional invisible-fields
+					visible-fields)
+  (mime-insert-header-from-buffer
+   (mime-buffer-entity-buffer-internal entity)
+   (mime-buffer-entity-header-start-internal entity)
+   (mime-buffer-entity-header-end-internal entity)
+   invisible-fields visible-fields)
+  )
+
+
+;;; @ header buffer
+;;;
+
+;; (luna-define-method mime-entity-header-buffer ((entity mime-buffer-entity))
+;;   (mime-buffer-entity-buffer-internal entity)
+;;   )
+
+;; (luna-define-method mime-goto-header-start-point ((entity mime-buffer-entity))
+;;   (set-buffer (mime-buffer-entity-buffer-internal entity))
+;;   (goto-char (mime-buffer-entity-header-start-internal entity))
+;;   )
+
+;; (luna-define-method mime-entity-header-start-point ((entity
+;;                                                      mime-buffer-entity))
+;;   (mime-buffer-entity-header-start-internal entity)
+;;   )
+
+;; (luna-define-method mime-entity-header-end-point ((entity
+;;                                                    mime-buffer-entity))
+;;   (mime-buffer-entity-header-end-internal entity)
+;;   )
+
+
+;;; @ body buffer
+;;;
+
+;; (luna-define-method mime-entity-body-buffer ((entity mime-buffer-entity))
+;;   (mime-buffer-entity-buffer-internal entity)
+;;   )
+
+;; (luna-define-method mime-goto-body-start-point ((entity mime-buffer-entity))
+;;   (set-buffer (mime-buffer-entity-buffer-internal entity))
+;;   (goto-char (mime-buffer-entity-body-start-internal entity))
+;;   )
+
+;; (luna-define-method mime-goto-body-end-point ((entity mime-buffer-entity))
+;;   (set-buffer (mime-buffer-entity-buffer-internal entity))
+;;   (goto-char (mime-buffer-entity-body-end-internal entity))
+;;   )
+
+;; (luna-define-method mime-entity-body-start-point ((entity mime-buffer-entity))
+;;   (mime-buffer-entity-body-start-internal entity)
+;;   )
+
+;; (luna-define-method mime-entity-body-end-point ((entity mime-buffer-entity))
+;;   (mime-buffer-entity-body-end-internal entity)
+;;   )
+
+
+;;; @ buffer (obsolete)
+;;;
+
+;; (luna-define-method mime-entity-buffer ((entity mime-buffer-entity))
+;;   (mime-buffer-entity-buffer-internal entity)
+;;   )
+
+;; (luna-define-method mime-entity-point-min ((entity mime-buffer-entity))
+;;   (mime-buffer-entity-header-start-internal entity)
+;;   )
+
+;; (luna-define-method mime-entity-point-max ((entity mime-buffer-entity))
+;;   (mime-buffer-entity-body-end-internal entity)
+;;   )
+
+
+;;; @ children
+;;;
+
+(defun mmbuffer-parse-multipart (entity &optional representation-type)
+  (with-current-buffer (mime-buffer-entity-buffer-internal entity)
+    (or representation-type
+	(setq representation-type
+	      (mime-entity-representation-type-internal entity)))
+    (let* ((content-type (mime-entity-content-type-internal entity))
+	   (dash-boundary
+	    (concat "--"
+		    (mime-content-type-parameter content-type "boundary")))
+	   (delimiter       (concat "\n" (regexp-quote dash-boundary)))
+	   (close-delimiter (concat delimiter "--[ \t]*$"))
+	   (rsep (concat delimiter "[ \t]*\n"))
+	   (dc-ctl
+	    (if (eq (mime-content-type-subtype content-type) 'digest)
+		(make-mime-content-type 'message 'rfc822)
+	      (make-mime-content-type 'text 'plain)
+	      ))
+	   (body-start (mime-buffer-entity-body-start-internal entity))
+	   (body-end (mime-buffer-entity-body-end-internal entity)))
+      (save-restriction
+	(goto-char body-end)
+	(narrow-to-region body-start
+			  (if (re-search-backward close-delimiter nil t)
+			      (match-beginning 0)
+			    body-end))
+	(goto-char body-start)
+	(if (re-search-forward
+	     (concat "^" (regexp-quote dash-boundary) "[ \t]*\n")
+	     nil t)
+	    (let ((cb (match-end 0))
+		  ce ncb ret children
+		  (node-id (mime-entity-node-id-internal entity))
+		  (i 0))
+	      (while (re-search-forward rsep nil t)
+		(setq ce (match-beginning 0))
+		(setq ncb (match-end 0))
+		(save-restriction
+		  (narrow-to-region cb ce)
+		  (setq ret (mime-parse-message representation-type dc-ctl
+						entity (cons i node-id)))
+		  )
+		(setq children (cons ret children))
+		(goto-char (setq cb ncb))
+		(setq i (1+ i))
+		)
+	      (setq ce (point-max))
+	      (save-restriction
+		(narrow-to-region cb ce)
+		(setq ret (mime-parse-message representation-type dc-ctl
+					      entity (cons i node-id)))
+		)
+	      (setq children (cons ret children))
+	      (mime-entity-set-children-internal entity (nreverse children))
+	      )
+	  (mime-entity-set-content-type-internal
+	   entity (make-mime-content-type 'message 'x-broken))
+	  nil)
+	))))
+
+(defun mmbuffer-parse-encapsulated (entity &optional external
+					   representation-type)
+  (mime-entity-set-children-internal
+   entity
+   (with-current-buffer (mime-buffer-entity-buffer-internal entity)
+     (save-restriction
+       (narrow-to-region (mime-buffer-entity-body-start-internal entity)
+			 (mime-buffer-entity-body-end-internal entity))
+       (list (mime-parse-message
+	      (if external
+		  (progn
+		    (require 'mmexternal)
+		    'mime-external-entity)
+		(or representation-type
+		    (mime-entity-representation-type-internal entity)))
+	      nil
+	      entity (cons 0 (mime-entity-node-id-internal entity))))))))
+
+(luna-define-method mime-entity-children ((entity mime-buffer-entity))
+  (let* ((content-type (mime-entity-content-type entity))
+	 (primary-type (mime-content-type-primary-type content-type))
+	 sub-type)
+    (cond ((eq primary-type 'multipart)
+	   (mmbuffer-parse-multipart entity))
+	  ((eq primary-type 'message)
+	   (setq sub-type (mime-content-type-subtype content-type))
+	   (cond ((eq sub-type 'external-body)
+		  (mmbuffer-parse-encapsulated entity 'external))
+		 ((memq sub-type '(rfc822 news))
+		  (mmbuffer-parse-encapsulated entity)))))))
 
 
 ;;; @ end