tm 7.45.

[elisp/tm.git] / tm-play.el

diff --git a/tm-play.el b/tm-play.el
index 1df7786..9d6e8f5 100644 (file)
--- a/tm-play.el
+++ b/tm-play.el
@@ -2,13 +2,13 @@
 ;;; tm-play.el --- decoder for tm-view.el
 ;;;
 ;;; Copyright (C) 1995 Free Software Foundation, Inc.
-;;; Copyright (C) 1994,1995 MORIOKA Tomohiko
+;;; Copyright (C) 1994 .. 1996 MORIOKA Tomohiko
 ;;;
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1995/9/26 (separated from tm-view.el)
 ;;; Version:
-;;;    $Id: tm-play.el,v 7.10 1995/12/14 15:37:13 morioka Exp $
+;;;    $Id: tm-play.el,v 7.14 1996/02/05 05:00:27 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -62,6 +62,13 @@
        (params (mime::content-info/parameters cinfo))
        (encoding (mime::content-info/encoding cinfo))
        )
+    ;; Check for VM
+    (if (< beg (point-min))
+       (setq beg (point-min))
+      )
+    (if (< (point-max) end)
+       (setq end (point-max))
+      )
     (if ctype
        (let (method cal ret)
          (setq cal (append (list (cons 'type ctype)
@@ -104,7 +111,7 @@
       (narrow-to-region beg end)
       (goto-char beg)
       (let ((method (cdr (assoc 'method cal)))
-           (name (mime-article/get-name cal))
+           (name (mime-article/get-filename cal))
            )
        (if method
            (let ((file (make-temp-name
@@ -140,10 +147,14 @@
           (lambda (arg)
             (if (stringp arg)
                 arg
-              (let ((ret (cdr (assoc (eval arg) cal))))
+              (let* ((item (eval arg))
+                     (ret (cdr (assoc item cal)))
+                     )
                 (if ret
                     ret
-                  "")
+                  (if (eq item 'encoding)
+                      "7bit"
+                    ""))
                 ))
             ))
          format))
@@ -180,15 +191,31 @@
   (concat (regexp-* mime-viewer/file-name-char-regexp)
          "\\(\\." mime-viewer/file-name-char-regexp "+\\)*"))
 
-(defun mime-article/get-name (param)
-  (let ((str (mime-viewer/get-subject param)))
-    (if (string-match " " str)
-       (if (or (string-match mime-viewer/file-name-regexp-1 str)
-               (string-match mime-viewer/file-name-regexp-2 str))
-           (substring str (match-beginning 0)(match-end 0))
-         )
-      (replace-as-filename str)
-      )))
+(defun mime-article/get-original-filename (param &optional encoding)
+  (or (mime-article/get-uu-filename param encoding)
+      (let (ret)
+       (or (if (or (and (setq ret (mime/Content-Disposition))
+                        (setq ret (assoc "filename" (cdr ret)))
+                        )
+                   (setq ret (assoc "name" param))
+                   (setq ret (assoc "x-name" param))
+                   )
+               (rfc822/strip-quoted-string (cdr ret))
+             )
+           (if (setq ret
+                     (or (rfc822/get-field-body "Content-Description")
+                         (rfc822/get-field-body "Subject")
+                         ))
+               (if (or (string-match mime-viewer/file-name-regexp-1 ret)
+                       (string-match mime-viewer/file-name-regexp-2 ret))
+                   (substring ret (match-beginning 0)(match-end 0))
+                 ))
+           ))
+      ))
+
+(defun mime-article/get-filename (param)
+  (replace-as-filename (mime-article/get-original-filename param))
+  )
 
 
 ;;; @ mail/news message
@@ -380,3 +407,5 @@
 ;;;
 
 (provide 'tm-play)
+
+;;; tm-play.el ends here