- Don't require `mmgeneric' and `mime-parse'.
authormorioka <morioka>
Sat, 22 May 1999 13:20:16 +0000 (13:20 +0000)
committermorioka <morioka>
Sat, 22 May 1999 13:20:16 +0000 (13:20 +0000)
- Require mime.
- Use `luna'.
(mime-buffer-entity-buffer-internal): Renamed from
`mime-entity-set-buffer-internal'.
(mime-buffer-entity-set-buffer-internal): Likewise.
(mime-buffer-entity-header-start-internal): Likewise.
(mime-buffer-entity-set-header-start-internal): Likewise.
(mime-buffer-entity-header-end-internal): Likewise.
(mime-buffer-entity-set-header-end-internal): Likewise.
(mime-buffer-entity-body-start-internal): Likewise.
(mime-buffer-entity-set-body-start-internal): Likewise.
(mime-buffer-entity-body-end-internal): Likewise.
(mime-buffer-entity-set-body-end-internal): Likewise.
(mime-entity-name): New method.
(mime-parse-multipart): New function [moved from mime-parse.el].
(mime-parse-encapsulated): Likewise.
(mime-parse-message): Likewise.
(mime-entity-children): New method.
(mime-goto-header-start-point): New method.
(mime-visible-field-p): New function [moved from mmgeneric.el].
(mime-insert-header-from-buffer): Likewise.
(mime-insert-header): New method.
(mime-entity-content): Use `luna-define-method'.
(mime-insert-text-content): New method.
((mime-entity-fetch-field): Use `luna-define-method'.
(mime-entity-header-buffer): New method.
(mime-entity-body-buffer): Likewise.
(mime-entity-buffer): Likewise.
(mime-entity-point-min): Use `luna-define-method'.
(mime-entity-point-max): Use `luna-define-method'.
(mime-parse-buffer): New function [moved from mmgeneric.el].

mmbuffer.el

index 38432fb..62ddbee 100644 (file)
 
 ;;; Code:
 
-(require 'mmgeneric)
+(require 'mime)
 
-(mm-define-backend buffer (generic))
+(eval-and-compile
+  (luna-define-class mime-buffer-entity (mime-entity)
+                    (buffer
+                     header-start
+                     header-end
+                     body-start
+                     body-end))
+
+  (luna-define-internal-accessors 'mime-buffer-entity)
+  )
 
 (mm-define-method initialize-instance ((entity buffer))
-  (mime-entity-set-buffer-internal
+  (mime-buffer-entity-set-buffer-internal
    entity (mime-entity-location-internal entity))
   (save-excursion
-    (set-buffer (mime-entity-buffer-internal entity))
+    (set-buffer (mime-buffer-entity-buffer-internal entity))
     (setq mime-message-structure entity)
     (let ((header-start (point-min))
          header-end
               (mime-parse-Content-Type str)
             )))
        )
-      (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)
+      (mime-buffer-entity-set-header-start-internal entity header-start)
+      (mime-buffer-entity-set-header-end-internal entity header-end)
+      (mime-buffer-entity-set-body-start-internal entity body-start)
+      (mime-buffer-entity-set-body-end-internal entity body-end)
+      )))
+
+(luna-define-method mime-entity-name ((entity mime-buffer-entity))
+  (buffer-name (mime-buffer-entity-buffer-internal entity))
+  )
+
+
+;;; @ message parser
+;;;
+
+(defun mime-parse-multipart (entity)
+  (goto-char (point-min))
+  (let* ((representation-type
+         (mime-entity-representation-type-internal entity))
+        (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)
+           ))
+        (header-end (mime-buffer-entity-header-end-internal entity))
+        (body-end (mime-buffer-entity-body-end-internal entity)))
+    (save-restriction
+      (goto-char body-end)
+      (narrow-to-region header-end
+                       (if (re-search-backward close-delimiter nil t)
+                           (match-beginning 0)
+                         body-end))
+      (goto-char header-end)
+      (if (re-search-forward rsep 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 mime-parse-encapsulated (entity)
+  (mime-entity-set-children-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
+           (mime-entity-representation-type-internal entity) nil
+           entity (cons 0 (mime-entity-node-id-internal entity))))
+     )))
+
+(defun mime-parse-message (representation-type &optional default-ctl 
+                                              parent node-id)
+  (let ((header-start (point-min))
+       header-end
+       body-start
+       (body-end (point-max))
+       content-type)
+    (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)
+      (setq content-type (or (let ((str (std11-fetch-field "Content-Type")))
+                              (if str
+                                  (mime-parse-Content-Type str)
+                                ))
+                            default-ctl))
+      )
+    (luna-make-entity representation-type
+                     :location (current-buffer)
+                     :content-type content-type
+                     :parent parent
+                     :node-id node-id
+                     :buffer (current-buffer)
+                     :header-start header-start
+                     :header-end header-end
+                     :body-start body-start
+                     :body-end body-end)
+    ))
+
+(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)))
+    (cond ((eq primary-type 'multipart)
+          (mime-parse-multipart entity)
+          )
+         ((and (eq primary-type 'message)
+               (memq (mime-content-type-subtype content-type)
+                     '(rfc822 news external-body)
+                     ))
+          (mime-parse-encapsulated 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))
+  )
+
+(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)))
+
+(defun mime-insert-header-from-buffer (buffer start end
+                                             &optional invisible-fields
+                                             visible-fields)
+  (let ((the-buf (current-buffer))
+       (mode-obj (mime-find-field-presentation-method 'wide))
+       field-decoder
+       f-b p f-e field-name len field field-body)
+    (save-excursion
+      (set-buffer buffer)
+      (save-restriction
+       (narrow-to-region start end)
+       (goto-char start)
+       (while (re-search-forward std11-field-head-regexp nil t)
+         (setq f-b (match-beginning 0)
+               p (match-end 0)
+               field-name (buffer-substring f-b p)
+               len (string-width field-name)
+               f-e (std11-field-end))
+         (when (mime-visible-field-p field-name
+                                     visible-fields invisible-fields)
+           (setq field (intern
+                        (capitalize (buffer-substring f-b (1- p))))
+                 field-body (buffer-substring p f-e)
+                 field-decoder (inline (mime-find-field-decoder-internal
+                                        field mode-obj)))
+           (with-current-buffer the-buf
+             (insert field-name)
+             (insert (if field-decoder
+                         (funcall field-decoder field-body len)
+                       ;; Don't decode
+                       field-body))
+             (insert "\n")
+             )))))))
+
+(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)
+  )
+
+(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-buffer-entity-body-start-internal entity)
+                      (mime-buffer-entity-body-end-internal entity))
+     (mime-entity-encoding entity))))
+
+(luna-define-method mime-insert-text-content ((entity mime-buffer-entity))
+  (insert
+   (decode-mime-charset-string (mime-entity-content entity)
+                              (or (mime-content-type-parameter
+                                   (mime-entity-content-type entity)
+                                   "charset")
+                                  default-mime-charset)
+                              'CRLF)
+   ))
+
 ;;; redefine to speed up
 
 (mm-define-method entity-point-min ((entity buffer))
-  (mime-entity-header-start-internal entity))
+  (mime-buffer-entity-header-start-internal entity))
 
 (mm-define-method entity-point-max ((entity buffer))
-  (mime-entity-body-end-internal entity))
+  (mime-buffer-entity-body-end-internal entity))
 
-(mm-define-method fetch-field ((entity buffer) field-name)
+(luna-define-method mime-entity-fetch-field ((entity mime-buffer-entity)
+                                            field-name)
   (save-excursion
-    (set-buffer (mime-entity-buffer-internal entity))
+    (set-buffer (mime-buffer-entity-buffer-internal entity))
     (save-restriction
-      (narrow-to-region (mime-entity-header-start-internal entity)
-                       (mime-entity-header-end-internal entity))
+      (narrow-to-region (mime-buffer-entity-header-start-internal entity)
+                       (mime-buffer-entity-header-end-internal entity))
       (std11-fetch-field field-name)
       )))
 
-(mm-define-method entity-content ((entity buffer))
-  (save-excursion
-    (set-buffer (mime-entity-buffer-internal entity))
-    (mime-decode-string
-     (buffer-substring (mime-entity-body-start-internal entity)
-                      (mime-entity-body-end-internal entity))
-     (mime-entity-encoding entity))))
-
 (mm-define-method insert-entity-content ((entity buffer))
-  (insert (with-current-buffer (mime-entity-buffer-internal entity)
+  (insert (with-current-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)
   (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 insert-entity ((entity buffer))
-  (insert-buffer-substring (mime-entity-buffer-internal entity)
-                          (mime-entity-header-start-internal entity)
-                          (mime-entity-body-end-internal 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 write-entity ((entity buffer) filename)
   (save-excursion
-    (set-buffer (mime-entity-buffer-internal entity))
-    (write-region-as-raw-text-CRLF (mime-entity-header-start-internal entity)
-                                  (mime-entity-body-end-internal entity)
-                                  filename)
+    (set-buffer (mime-buffer-entity-buffer-internal entity))
+    (write-region-as-raw-text-CRLF
+     (mime-buffer-entity-header-start-internal entity)
+     (mime-buffer-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)
+    (set-buffer (mime-buffer-entity-buffer-internal entity))
+    (write-region-as-binary (mime-buffer-entity-body-start-internal entity)
+                           (mime-buffer-entity-body-end-internal entity)
                            filename)
     ))
 
 
+;;; @ buffer
+;;;
+
+(luna-define-method mime-entity-header-buffer ((entity mime-buffer-entity))
+  (mime-buffer-entity-buffer-internal entity)
+  )
+
+(luna-define-method mime-entity-body-buffer ((entity mime-buffer-entity))
+  (mime-buffer-entity-buffer-internal entity)
+  )
+
+(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)
+  )
+
+
+;;; @ utility
+;;;
+
+;;;###autoload
+(defun mime-parse-buffer (&optional buffer representation-type)
+  "Parse BUFFER as a MIME message.
+If buffer is omitted, it parses current-buffer."
+  (save-excursion
+    (if buffer (set-buffer buffer))
+    (setq mime-message-structure
+         (mime-parse-message (or representation-type 'buffer) nil))
+    ))
+
+
 ;;; @ end
 ;;;