(substring str e)
))))
+
+;;; @ Content-Type
+;;;
+
+(defsubst make-mime-content-type (type subtype &optional parameters)
+ (list* (cons 'type type)
+ (cons 'subtype subtype)
+ (nreverse parameters))
+ )
+
(defun mime-parse-Content-Type (string)
"Parse STRING as field-body of Content-Type field.
Return value is
(setq dest (cons (car ret) dest)
string (cdr ret))
)
- (cons (intern type) (cons (intern subtype) (nreverse dest)))
+ (make-mime-content-type (intern type)(intern subtype)
+ (nreverse dest))
)))
+(defun mime-read-Content-Type ()
+ "Read field-body of Content-Type field from current-buffer,
+and return parsed it. Format of return value is as same as
+`mime-parse-Content-Type'."
+ (let ((str (std11-field-body "Content-Type")))
+ (if str
+ (mime-parse-Content-Type str)
+ )))
+
+(defsubst mime-content-type-primary-type (content-type)
+ "Return primary-type of CONTENT-TYPE."
+ (cdr (car content-type)))
+
+(defsubst mime-content-type-subtype (content-type)
+ "Return primary-type of CONTENT-TYPE."
+ (cdr (cadr content-type)))
+
+(defsubst mime-content-type-parameters (content-type)
+ "Return primary-type of CONTENT-TYPE."
+ (cddr content-type))
+
+
+;;; @ Content-Disposition
+;;;
(defconst mime-disposition-type-regexp mime-token-regexp)
(setq string (std11-unfold-string string))
(if (string-match `,(concat "^" mime-disposition-type-regexp) string)
(let* ((e (match-end 0))
- (ctype (downcase (substring string 0 e)))
+ (type (downcase (substring string 0 e)))
ret dest)
(setq string (substring string e))
(while (setq ret (mime-parse-parameter string))
(setq dest (cons (car ret) dest)
string (cdr ret))
)
- (cons ctype (nreverse dest))
+ (cons (cons 'type (intern type))
+ (nreverse dest))
)))
-
-;;; @ field reader
-;;;
-
-(defun mime-read-Content-Type ()
- "Read field-body of Content-Type field from current-buffer,
-and return parsed it. Format of return value is as same as
-`mime-parse-Content-Type'."
- (let ((str (std11-field-body "Content-Type")))
+(defun mime-read-Content-Disposition ()
+ "Read field-body of Content-Disposition field from current-buffer,
+and return parsed it."
+ (let ((str (std11-field-body "Content-Disposition")))
(if str
- (mime-parse-Content-Type str)
+ (mime-parse-Content-Disposition str)
)))
-(defun mime/Content-Transfer-Encoding (&optional default-encoding)
+(defsubst mime-content-disposition-type (content-disposition)
+ "Return disposition-type of CONTENT-DISPOSITION."
+ (cdr (car content-disposition)))
+
+(defsubst mime-content-disposition-parameters (content-disposition)
+ "Return disposition-parameters of CONTENT-DISPOSITION."
+ (cdr content-disposition))
+
+
+;;; @ Content-Transfer-Encoding
+;;;
+
+(defun mime-read-Content-Transfer-Encoding (&optional default-encoding)
"Read field-body of Content-Transfer-Encoding field from
current-buffer, and return it.
-If is is not found, return DEFAULT-ENCODING. [mime-parse.el]"
+If is is not found, return DEFAULT-ENCODING."
(let ((str (std11-field-body "Content-Transfer-Encoding")))
(if str
(progn
)
(downcase str)
)
- default-encoding)
- ))
-
-(defun mime/Content-Disposition ()
- "Read field-body of Content-Disposition field from current-buffer,
-and return parsed it. [mime-parse.el]"
- (let ((str (std11-field-body "Content-Disposition")))
- (if str
- (mime-parse-Content-Disposition str)
- )))
+ default-encoding)))
;;; @ message parser
(defsubst make-mime-entity (node-id
point-min point-max
- media-type media-subtype parameters
- encoding children)
+ content-type encoding children)
(vector node-id point-min point-max
- media-type media-subtype parameters encoding children))
+ content-type encoding children))
(defsubst mime-entity-node-id (entity-info) (aref entity-info 0))
(defsubst mime-entity-point-min (entity-info) (aref entity-info 1))
(defsubst mime-entity-point-max (entity-info) (aref entity-info 2))
-(defsubst mime-entity-media-type (entity-info) (aref entity-info 3))
-(defsubst mime-entity-media-subtype (entity-info) (aref entity-info 4))
-(defsubst mime-entity-parameters (entity-info) (aref entity-info 5))
-(defsubst mime-entity-encoding (entity-info) (aref entity-info 6))
-(defsubst mime-entity-children (entity-info) (aref entity-info 7))
-
+(defsubst mime-entity-content-type (entity-info) (aref entity-info 3))
+(defsubst mime-entity-encoding (entity-info) (aref entity-info 4))
+(defsubst mime-entity-children (entity-info) (aref entity-info 5))
+
+(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)))
-(defun mime-parse-multipart (boundary primtype subtype params encoding rcnum)
+(defun mime-parse-multipart (boundary content-type encoding node-id)
(goto-char (point-min))
(let* ((dash-boundary (concat "--" boundary))
(delimiter (concat "\n" (regexp-quote dash-boundary)))
)))
(rsep (concat delimiter "[ \t]*\n"))
(dc-ctl
- (if (eq subtype 'digest)
- '(message rfc822)
- '(text plain)
+ (if (eq (mime-content-type-subtype content-type) 'digest)
+ (make-mime-content-type 'message 'rfc822)
+ (make-mime-content-type 'text 'plain)
))
cb ce ret ncb children (i 0))
(save-restriction
(setq ncb (match-end 0))
(save-restriction
(narrow-to-region cb ce)
- (setq ret (mime-parse-message dc-ctl "7bit" (cons i rcnum)))
+ (setq ret (mime-parse-message dc-ctl "7bit" (cons i node-id)))
)
(setq children (cons ret children))
(goto-char (mime-entity-point-max ret))
(setq ce (point-max))
(save-restriction
(narrow-to-region cb ce)
- (setq ret (mime-parse-message dc-ctl "7bit" (cons i rcnum)))
+ (setq ret (mime-parse-message dc-ctl "7bit" (cons i node-id)))
)
(setq children (cons ret children))
)
- (make-mime-entity rcnum beg (point-max)
- primtype subtype params encoding
- (nreverse children))
+ (make-mime-entity node-id beg (point-max)
+ content-type encoding (nreverse children))
))
-(defun mime-parse-message (&optional default-ctl default-encoding rcnum)
+(defun mime-parse-message (&optional default-ctl default-encoding node-id)
"Parse current-buffer as a MIME message.
DEFAULT-CTL is used when an entity does not have valid Content-Type
field. Its format must be as same as return value of
mime-{parse|read}-Content-Type."
- (setq default-ctl (or (mime-read-Content-Type) default-ctl))
- (let ((primtype (car default-ctl))
- (subtype (car (cdr default-ctl)))
- (params (cdr (cdr default-ctl)))
- (encoding (or (mime/Content-Transfer-Encoding) default-encoding))
- )
- (let ((boundary (assoc "boundary" params)))
- (cond (boundary
- (setq boundary (std11-strip-quoted-string (cdr boundary)))
- (mime-parse-multipart
- boundary
- primtype subtype params encoding rcnum)
- )
- ((and (eq primtype 'message)
- (memq subtype '(rfc822 news))
- )
- (goto-char (point-min))
- (make-mime-entity rcnum (point-min) (point-max)
- primtype subtype params encoding
- (save-restriction
- (narrow-to-region
- (if (re-search-forward "^$" nil t)
- (1+ (match-end 0))
- (point-min)
- )
- (point-max))
- (list (mime-parse-message
- nil nil (cons 0 rcnum)))
- ))
- )
- (t
- (make-mime-entity rcnum (point-min) (point-max)
- primtype subtype params encoding
- nil)
- ))
- )))
+ (let* ((content-type (or (mime-read-Content-Type) default-ctl))
+ (encoding (mime-read-Content-Transfer-Encoding default-encoding))
+ (boundary (assoc "boundary"
+ (mime-content-type-parameters content-type))))
+ (cond (boundary
+ (setq boundary (std11-strip-quoted-string (cdr boundary)))
+ (mime-parse-multipart boundary content-type encoding node-id)
+ )
+ ((and (eq (mime-content-type-primary-type content-type)
+ 'message)
+ (memq (mime-content-type-subtype content-type)
+ '(rfc822 news))
+ )
+ (goto-char (point-min))
+ (make-mime-entity node-id (point-min) (point-max)
+ content-type encoding
+ (save-restriction
+ (narrow-to-region
+ (if (re-search-forward "^$" nil t)
+ (1+ (match-end 0))
+ (point-min)
+ )
+ (point-max))
+ (list (mime-parse-message
+ nil nil (cons 0 node-id)))
+ ))
+ )
+ (t
+ (make-mime-entity node-id (point-min) (point-max)
+ content-type encoding nil)
+ ))
+ ))
;;; @ utilities
projects / elisp / semi.git / blobdiff