X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime.el;h=92001735dc07c50fda39123a06edddf740eca507;hb=ebd8b3f8be03789c61063c6ed81cb28b02375b96;hp=907120953552d5f2db96451544bf3e7560c23832;hpb=cc0a80746c2e551fc4eabbc2812d39ec47973a6e;p=elisp%2Fflim.git

diff --git a/mime.el b/mime.el
index 9071209..9200173 100644
--- a/mime.el
+++ b/mime.el
@@ -53,16 +53,82 @@ and return parsed it.")
   "Read field-body of Content-Transfer-Encoding field from
 current-buffer, and return it.")
 
-(autoload 'mime-parse-message "mime-parse"
-  "Parse current-buffer as a MIME message.")
-
 (autoload 'mime-parse-buffer "mime-parse"
   "Parse BUFFER as a MIME message.")
 
 
+;;; @ Entity Representation and Implementation
+;;;
+
+(defsubst mime-find-function (service type)
+  (let ((imps (cdr (assq type mime-entity-implementation-alist))))
+    (if imps
+	(cdr (assq service imps))
+      (require (intern (format "mm%s" type)))
+      (cdr (assq service
+		 (cdr (assq type mime-entity-implementation-alist))))
+      )))
+
+(defsubst mime-entity-function (entity service)
+  (mime-find-function service
+		      (mime-entity-representation-type-internal entity)))
+
+(defsubst mime-entity-send (entity service &rest args)
+  (apply (mime-find-function
+	  service (mime-entity-representation-type-internal entity))
+	 entity
+	 args))
+
+(defsubst mm-arglist-to-arguments (arglist)
+  (let (dest)
+    (while arglist
+      (let ((arg (car arglist)))
+	(or (memq arg '(&optional &rest))
+	    (setq dest (cons arg dest)))
+	)
+      (setq arglist (cdr arglist)))
+    (nreverse dest)))
+
+(defmacro mm-define-generic (name args &optional doc)
+  (if doc
+      `(defun ,(intern (format "mime-%s" name)) ,args
+	 ,doc
+	 (mime-entity-send ,(car args) ',name
+			   ,@(mm-arglist-to-arguments (cdr args)))
+	 )
+    `(defun ,(intern (format "mime-%s" name)) ,args
+       (mime-entity-send ,(car args) ',name
+			 ,@(mm-arglist-to-arguments (cdr args)))
+       )))
+
+(put 'mm-define-generic 'lisp-indent-function 'defun)
+
+(defun mime-open-entity (type location)
+  "Open an entity and return it.
+TYPE is representation-type.
+LOCATION is location of entity.  Specification of it is depended on
+representation-type."
+  (let ((entity (make-mime-entity-internal type location)))
+    (mime-entity-send entity 'initialize-instance)
+    entity))
+
+(mm-define-generic entity-cooked-p (entity)
+  "Return non-nil if contents of ENTITY has been already code-converted.")
+
+
 ;;; @ Entity as node of message
 ;;;
 
+(defun mime-entity-children (entity)
+  (or (mime-entity-children-internal entity)
+      (mime-entity-send entity 'entity-children)))
+
+(defalias 'mime-entity-node-id 'mime-entity-node-id-internal)
+
+(defun mime-entity-number (entity)
+  "Return entity-number of ENTITY."
+  (reverse (mime-entity-node-id-internal entity)))
+
 (defun mime-find-entity-from-number (entity-number &optional message)
   "Return entity from ENTITY-NUMBER in MESSAGE.
 If MESSAGE is not specified, `mime-message-structure' is used."
@@ -77,25 +143,52 @@ If MESSAGE is not specified, `mime-message-structure' is used."
 	  ))
       )))
 
-(defsubst mime-find-entity-from-node-id (entity-node-id &optional message)
+(defun mime-find-entity-from-node-id (entity-node-id &optional message)
   "Return entity from ENTITY-NODE-ID in MESSAGE.
 If MESSAGE is not specified, `mime-message-structure' is used."
   (mime-find-entity-from-number (reverse entity-node-id) message))
 
-(defsubst mime-entity-parent (entity &optional message)
+(defun mime-entity-parent (entity &optional message)
   "Return mother entity of ENTITY.
-If MESSAGE is not specified, `mime-message-structure' in the buffer of
-ENTITY is used."
-  (mime-find-entity-from-node-id
-   (cdr (mime-entity-node-id entity))
-   (or message
-       (save-excursion
-	 (set-buffer (mime-entity-buffer entity))
-	 mime-message-structure))))
+If MESSAGE is specified, it is regarded as root entity."
+  (if (equal entity message)
+      nil
+    (mime-entity-parent-internal entity)))
+
+(defun mime-root-entity-p (entity &optional message)
+  "Return t if ENTITY is root-entity (message).
+If MESSAGE is specified, it is regarded as root entity."
+  (null (mime-entity-parent entity message)))
+
+
+;;; @ Entity Buffer
+;;;
+
+(defun mime-entity-buffer (entity)
+  (or (mime-entity-buffer-internal entity)
+      (mime-entity-send entity 'entity-buffer)))
+
+(mm-define-generic entity-point-min (entity)
+  "Return the start point of ENTITY in the buffer which contains ENTITY.")
 
-(defsubst mime-root-entity-p (entity)
-  "Return t if ENTITY is root-entity (message)."
-  (null (mime-entity-node-id entity)))
+(mm-define-generic entity-point-max (entity)
+  "Return the end point of ENTITY in the buffer which contains ENTITY.")
+
+(defun mime-entity-header-start (entity)
+  (or (mime-entity-header-start-internal entity)
+      (mime-entity-send entity 'entity-header-start)))
+
+(defun mime-entity-header-end (entity)
+  (or (mime-entity-header-end-internal entity)
+      (mime-entity-send entity 'entity-header-end)))
+
+(defun mime-entity-body-start (entity)
+  (or (mime-entity-body-start-internal entity)
+      (mime-entity-send entity 'entity-body-start)))
+
+(defun mime-entity-body-end (entity)
+  (or (mime-entity-body-end-internal entity)
+      (mime-entity-send entity 'entity-body-end)))
 
 
 ;;; @ Entity Header
@@ -106,23 +199,40 @@ ENTITY is used."
       (setq field-name (intern (capitalize (capitalize field-name)))))
   (or entity
       (setq entity mime-message-structure))
-  (let* ((header (mime-entity-original-header entity))
+  (let* ((header (mime-entity-original-header-internal entity))
 	 (field-body (cdr (assq field-name header))))
     (or field-body
 	(progn
-	  (if (save-excursion
-		(set-buffer (mime-entity-buffer entity))
-		(save-restriction
-		  (narrow-to-region (mime-entity-header-start entity)
-				    (mime-entity-header-end entity))
-		  (setq field-body
-			(std11-fetch-field (symbol-name field-name)))
-		  ))
-	      (mime-entity-set-original-header
+	  (if (setq field-body
+		    (mime-entity-send entity 'fetch-field
+				      (symbol-name field-name)))
+	      (mime-entity-set-original-header-internal
 	       entity (put-alist field-name field-body header))
 	    )
 	  field-body))))
 
+(defalias 'mime-entity-content-type 'mime-entity-content-type-internal)
+
+(defun mime-entity-content-disposition (entity)
+  (or (mime-entity-content-disposition-internal entity)
+      (let ((ret (mime-fetch-field 'Content-Disposition entity)))
+	(if ret
+	    (let ((disposition (mime-parse-Content-Disposition ret)))
+	      (when disposition
+		(mime-entity-set-content-disposition-internal
+		 entity disposition)
+		disposition))))))
+
+(defun mime-entity-encoding (entity &optional default-encoding)
+  (or (mime-entity-encoding-internal entity)
+      (let ((encoding
+	     (or (let ((ret (mime-fetch-field
+			     'Content-Transfer-Encoding entity)))
+		   (and ret (mime-parse-Content-Transfer-Encoding ret)))
+		 default-encoding "7bit")))
+	(mime-entity-set-encoding-internal entity encoding)
+	encoding)))
+
 (defun mime-read-field (field-name &optional entity)
   (or (symbolp field-name)
       (setq field-name (capitalize (capitalize field-name))))
@@ -138,7 +248,7 @@ ENTITY is used."
 	 (mime-entity-encoding entity)
 	 )
 	(t
-	 (let* ((header (mime-entity-parsed-header entity))
+	 (let* ((header (mime-entity-parsed-header-internal entity))
 		(field (cdr (assq field-name header))))
 	   (or field
 	       (let ((field-body (mime-fetch-field field-name entity)))
@@ -151,7 +261,7 @@ ENTITY is used."
 			  (setq field (std11-parse-addresses
 				       (eword-lexical-analyze field-body)))
 			  )
-			 ((eq field-name '(Sender Resent-Sender))
+			 ((memq field-name '(Sender Resent-Sender))
 			  (setq field (std11-parse-address
 				       (eword-lexical-analyze field-body)))
 			  )
@@ -161,26 +271,19 @@ ENTITY is used."
 			  (setq field (eword-decode-structured-field-body
 				       field-body)))
 			 (t
-			  (setq field (eword-decode-unstructured-field-body
-				       field-body))
+			  (setq field (ew-decode-field (symbol-name field-name)
+						       field-body))
 			  ))
-		   (mime-entity-set-parsed-header
+		   (mime-entity-set-parsed-header-internal
 		    entity (put-alist field-name field header))
 		   field)))))))
 
+(mm-define-generic insert-decoded-header (entity &optional invisible-fields
+					  visible-fields)
+  "Insert before point a decoded header of ENTITY.")
 
-;;; @ Entity Content
-;;;
-
-(defun mime-entity-content (entity)
-  (save-excursion
-    (set-buffer (mime-entity-buffer entity))
-    (mime-decode-string (buffer-substring (mime-entity-body-start entity)
-					  (mime-entity-body-end entity))
-			(mime-entity-encoding entity))))
 
-
-;;; @ Another Entity Information
+;;; @ Entity Attributes
 ;;;
 
 (defun mime-entity-uu-filename (entity)
@@ -195,6 +298,7 @@ ENTITY is used."
 	      )))))
 
 (defun mime-entity-filename (entity)
+  "Return filename of ENTITY."
   (or (mime-entity-uu-filename entity)
       (mime-content-disposition-filename
        (mime-entity-content-disposition entity))
@@ -205,6 +309,33 @@ ENTITY is used."
 	     ))))
 
 
+(defsubst mime-entity-media-type (entity)
+  (mime-content-type-primary-type (mime-entity-content-type entity)))
+(defsubst mime-entity-media-subtype (entity)
+  (mime-content-type-subtype (mime-entity-content-type entity)))
+(defsubst mime-entity-parameters (entity)
+  (mime-content-type-parameters (mime-entity-content-type entity)))
+(defsubst mime-entity-type/subtype (entity-info)
+  (mime-type/subtype-string (mime-entity-media-type entity-info)
+			    (mime-entity-media-subtype entity-info)))
+
+
+;;; @ Entity Content
+;;;
+
+(mm-define-generic entity-content (entity)
+  "Return content of ENTITY as byte sequence (string).")
+
+(mm-define-generic write-entity-content (entity filename)
+  "Write content of ENTITY into FILENAME.")
+
+(mm-define-generic write-entity (entity filename)
+  "Write header and body of ENTITY into FILENAME.")
+
+(mm-define-generic write-entity-body (entity filename)
+  "Write body of ENTITY into FILENAME.")
+
+
 ;;; @ end
 ;;;