X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime.el;h=293b3e7eea1a3e77178510e84637d5a260ccbd36;hb=8c7cab8199f8a11ab69dc7731d9e5306f58e86d5;hp=7961592a9bd2e24015111e677f2f0a444235cc4b;hpb=9f3504543849ff72022a8b8ce1d589a3e986b5fe;p=elisp%2Fflim.git

diff --git a/mime.el b/mime.el
index 7961592..293b3e7 100644
--- a/mime.el
+++ b/mime.el
@@ -53,9 +53,6 @@ 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.")
 
@@ -63,54 +60,59 @@ current-buffer, and return it.")
 ;;; @ Entity Representation and Implementation
 ;;;
 
-(defvar mime-entity-implementation-alist nil)
-
 (defsubst mime-find-function (service type)
   (let ((imps (cdr (assq type mime-entity-implementation-alist))))
     (if imps
-	(let ((func (cdr (assq service imps))))
-	  (unless func
-	    (setq func (intern (format "mm%s-%s" type service)))
-	    (set-alist 'mime-entity-implementation-alist
-		       type (put-alist service func imps))
-	    )
-	  func)
-      (let ((prefix (format "mm%s" type)))
-	(require (intern prefix))
-	(let ((func (intern (format "%s-%s" prefix service))))
-	  (set-alist 'mime-entity-implementation-alist
-		     type
-		     (list (cons service func)))
-	  func)))))
+	(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)
+(defsubst mime-entity-send (entity message &rest args)
+  "Send MESSAGE to ENTITY with ARGS, and return the result."
   (apply (mime-find-function
-	  service (mime-entity-representation-type-internal entity))
+	  message (mime-entity-representation-type-internal entity))
 	 entity
 	 args))
 
+(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."
-  (funcall (mime-find-function 'open-entity type) location)
-  )
+  (let ((entity (make-mime-entity-internal type location)))
+    (mime-entity-send entity 'initialize-instance)
+    entity))
 
-(defun mime-entity-cooked-p (entity)
-  "Return non-nil if contents of ENTITY has been already code-converted."
-  (funcall (mime-entity-function entity 'cooked-p))
-  )
+(mm-define-generic entity-cooked-p (entity)
+  "Return non-nil if contents of ENTITY has been already code-converted.")
 
 
 ;;; @ Entity as node of message
 ;;;
 
-(defalias 'mime-entity-children	'mime-entity-children-internal)
+(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)
 
@@ -139,18 +141,15 @@ If MESSAGE is not specified, `mime-message-structure' is used."
 
 (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)
-  "Return t if ENTITY is root-entity (message)."
-  (null (mime-entity-node-id 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
@@ -160,11 +159,11 @@ ENTITY is used."
   (or (mime-entity-buffer-internal entity)
       (mime-entity-send entity 'entity-buffer)))
 
-(defun mime-entity-point-min (entity)
-  (mime-entity-send entity 'entity-point-min))
+(mm-define-generic entity-point-min (entity)
+  "Return the start point of ENTITY in the buffer which contains ENTITY.")
 
-(defun mime-entity-point-max (entity)
-  (mime-entity-send entity 'entity-point-max))
+(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)
@@ -191,39 +190,59 @@ ENTITY is used."
       (setq field-name (intern (capitalize (capitalize field-name)))))
   (or entity
       (setq entity mime-message-structure))
-  (let* ((header (mime-entity-original-header-internal entity))
-	 (field-body (cdr (assq field-name header))))
-    (or field-body
-	(progn
-	  (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)
+  (cond ((eq field-name 'Date)
+	 (or (mime-entity-date-internal entity)
+	     (mime-entity-set-date-internal
+	      entity (mime-entity-send entity 'fetch-field "Date"))
+	     ))
+	((eq field-name 'Message-Id)
+	 (or (mime-entity-message-id-internal entity)
+	     (mime-entity-set-message-id-internal
+	      entity (mime-entity-send entity 'fetch-field "Message-Id"))
+	     ))
+	((eq field-name 'References)
+	 (or (mime-entity-references-internal entity)
+	     (mime-entity-set-references-internal
+	      entity (mime-entity-send entity 'fetch-field "References"))
+	     ))
+	(t
+	 (let* ((header (mime-entity-original-header-internal entity))
+		(field-body (cdr (assq field-name header))))
+	   (or field-body
+	       (progn
+		 (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))
+	   ))))
+
+(defun mime-entity-content-type (entity)
+  (or (mime-entity-content-type-internal entity)
+      (let ((ret (mime-fetch-field 'Content-Type entity)))
+	(if ret
+	    (mime-entity-set-content-type-internal
+	     entity (mime-parse-Content-Type ret))
+	  ))))
 
 (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))))))
+	    (mime-entity-set-content-disposition-internal
+	     entity (mime-parse-Content-Disposition ret))
+	  ))))
 
 (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)))
+      (let ((ret (mime-fetch-field 'Content-Transfer-Encoding entity)))
+	(mime-entity-set-encoding-internal
+	 entity
+	 (or (and ret (mime-parse-Content-Transfer-Encoding ret))
+	     default-encoding "7bit"))
+	)))
 
 (defun mime-read-field (field-name &optional entity)
   (or (symbolp field-name)
@@ -270,30 +289,12 @@ ENTITY is used."
 		    entity (put-alist field-name field header))
 		   field)))))))
 
-(defun eword-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)))
-
-(defun mime-insert-decoded-header (entity &optional invisible-fields
-					  visible-fields)
-  "Insert before point a decoded header of ENTITY."
-  (mime-entity-send entity 'insert-decoded-header
-		    invisible-fields visible-fields))
+(mm-define-generic insert-header (entity &optional invisible-fields
+					 visible-fields)
+  "Insert before point a decoded header of ENTITY.")
+
+(define-obsolete-function-alias
+  'mime-insert-decoded-header 'mime-insert-header)
 
 
 ;;; @ Entity Attributes
@@ -336,20 +337,20 @@ ENTITY is used."
 ;;; @ Entity Content
 ;;;
 
-(defun mime-entity-content (entity)
-  (mime-entity-send entity 'entity-content))
+(mm-define-generic entity-content (entity)
+  "Return content of ENTITY as byte sequence (string).")
+
+(mm-define-generic insert-text-content (entity)
+  "Insert decoded text body of ENTITY.")
 
-(defun mime-write-entity-content (entity filename)
-  "Write content of ENTITY into FILENAME."
-  (mime-entity-send entity 'write-entity-content filename))
+(mm-define-generic write-entity-content (entity filename)
+  "Write content of ENTITY into FILENAME.")
 
-(defun mime-write-entity (entity filename)
-  "Write ENTITY into FILENAME."
-  (mime-entity-send entity 'write-entity filename))
+(mm-define-generic write-entity (entity filename)
+  "Write header and body of ENTITY into FILENAME.")
 
-(defun mime-write-entity-body (entity filename)
-  "Write body of ENTITY into FILENAME."
-  (mime-entity-send entity 'write-entity-body filename))
+(mm-define-generic write-entity-body (entity filename)
+  "Write body of ENTITY into FILENAME.")
 
 
 ;;; @ end