X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-play.el;h=67fa3928b05deca342a70651904c2a9cb921ea5c;hb=53ab6c426401d04d0d0ce99d6df144187be6ba01;hp=1df7786fb26cc643a6121d6214431f3d01e6e66a;hpb=d27eeadad105552b6bef913b0380aa53ccb3342c;p=elisp%2Ftm.git

diff --git a/tm-play.el b/tm-play.el
index 1df7786..67fa392 100644
--- 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.18 1996/05/11 10:09:00 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -31,7 +31,12 @@
 
 (require 'tm-view)
 
+(defvar mime-viewer/external-progs "/usr/local/share/tm"
+  "*Directory containing tm external methods.")
 
+(add-to-list 'exec-path mime-viewer/external-progs)
+
+	     
 ;;; @ content decoder
 ;;;
 
@@ -62,6 +67,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 +116,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
@@ -120,6 +132,7 @@
 		)
 	      (goto-char b)
 	      (write-region b end file)
+	      (message "External method is starting...")
 	      (setq cal (put-alist
 			 'name (replace-as-filename name) cal))
 	      (setq cal (put-alist 'file file cal))
@@ -130,7 +143,34 @@
 			  (mime-article/make-method-args cal
 							 (cdr (cdr method)))
 			  ))
-	      (apply (function start-process) args)
+	      (let ((process-environment
+		     (let* ((rest process-environment)
+			    (dest (cons nil nil))
+			    (prest dest)
+			    (path nil)
+			    cell)
+		       (while (and (setq cell (car rest))
+				   (not
+				    (if (string-match "^PATH=" cell)
+					(setq path
+					      (format
+					       "PATH=%s:%s"
+					       mime-viewer/external-progs
+					       (substring cell (match-end 0))
+					       )))))
+			 (setcar prest cell)
+			 (setcdr prest (cons nil nil))
+			 (setq rest (cdr rest)
+			       prest (cdr prest))
+			 )
+		       (setcar
+			prest
+			(or path
+			    (format "PATH=%s" mime-viewer/external-progs)))
+		       (setcdr prest (cdr rest))
+		       dest)))
+		(apply (function start-process) args)
+		)
 	      (mime-article/show-output-buffer)
 	      ))
 	))))
@@ -140,10 +180,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 +224,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 +440,5 @@
 ;;;
 
 (provide 'tm-play)
+
+;;; tm-play.el ends here