X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-play.el;h=a7326a0a9cf3af8c1964798984c58b326a61517b;hb=bf765ed3ff2c3d2546f0687131812b307f9bd041;hp=f5d1499ca466db1494e2181b3934719052d13951;hpb=90fd81d2748c52ded81e92c6b271aaabc32c2da9;p=elisp%2Fsemi.git diff --git a/mime-play.el b/mime-play.el index f5d1499..a7326a0 100644 --- a/mime-play.el +++ b/mime-play.el @@ -84,6 +84,38 @@ If MODE is specified, play as it. Default MODE is \"play\"." (goto-char mime-preview-after-decoded-position) ))))) +(defun mime-sort-situation (situation) + (sort situation + #'(lambda (a b) + (let ((a-t (car a)) + (b-t (car b)) + (order '((type . 1) + (subtype . 2) + (mode . 3) + (major-mode . 4))) + a-order b-order) + (if (symbolp a-t) + (let ((ret (assq a-t order))) + (if ret + (setq a-order (cdr ret)) + (setq a-order 5) + )) + (setq a-order 6) + ) + (if (symbolp b-t) + (let ((ret (assq b-t order))) + (if ret + (setq b-order (cdr ret)) + (setq b-order 5) + )) + (setq b-order 6) + ) + (if (= a-order b-order) + (string< (format "%s" a-t)(format "%s" b-t)) + (< a-order b-order)) + ))) + ) + (defun mime-raw-play-entity (entity-info &optional mode) "Play entity specified by ENTITY-INFO. It decodes the entity to call internal or external method. The method @@ -91,33 +123,21 @@ is selected from variable `mime-acting-condition'. If MODE is specified, play as it. Default MODE is \"play\"." (let ((beg (mime-entity-point-min entity-info)) (end (mime-entity-point-max entity-info)) - (c-type (mime-entity-media-type entity-info)) - (c-subtype (mime-entity-media-subtype entity-info)) - (params (mime-entity-parameters entity-info)) - (encoding (mime-entity-encoding entity-info)) - ) - (or c-type - (setq c-type 'text - c-subtype 'plain)) - ;; Check for VM - (if (< beg (point-min)) - (setq beg (point-min)) - ) - (if (< (point-max) end) - (setq end (point-max)) - ) + (content-type (mime-entity-content-type entity-info)) + (encoding (mime-entity-encoding entity-info))) + (or content-type + (setq content-type (make-mime-content-type 'text 'plain))) (let (method cal ret) - (setq cal (list* (cons 'type c-type) - (cons 'subtype c-subtype) + (setq cal (list* (cons 'major-mode major-mode) (cons 'encoding encoding) - (cons 'major-mode major-mode) - params)) + content-type)) (if mode (setq cal (cons (cons 'mode mode) cal)) ) (setq ret (or (ctree-match-calist mime-acting-situation-examples cal) - (ctree-match-calist-partially mime-acting-situation-examples cal) + (ctree-match-calist-partially mime-acting-situation-examples + cal) cal)) (setq ret (or (ctree-find-calist mime-acting-condition ret @@ -135,6 +155,7 @@ specified, play as it. Default MODE is \"play\"." (cdr (assq 'method situation))) situation))) ret))) + (setq ret (mime-sort-situation ret)) (ctree-set-calist-strictly 'mime-acting-situation-examples ret) ) (t @@ -145,21 +166,63 @@ specified, play as it. Default MODE is \"play\"." (fboundp method)) (funcall method beg end ret) ) + ((stringp method) + (mime-activate-mailcap-method beg end ret) + ) ((and (listp method)(stringp (car method))) (mime-activate-external-method beg end ret) ) (t (mime-show-echo-buffer "No method are specified for %s\n" - (mime-type/subtype-string c-type c-subtype)) - )) - ) - )) + (mime-type/subtype-string + (mime-content-type-primary-type content-type) + (mime-content-type-subtype content-type)) + ))) + ))) ;;; @ external decoder ;;; +(defvar mime-mailcap-method-filename-alist nil) + +(defun mime-activate-mailcap-method (start end situation) + (save-excursion + (save-restriction + (narrow-to-region start end) + (goto-char start) + (let ((method (cdr (assoc 'method situation))) + (name (expand-file-name (mime-raw-get-filename situation) + mime-temp-directory))) + (mime-write-decoded-region (if (re-search-forward "^$" end t) + (1+ (match-end 0)) + (point-min)) + end name + (cdr (assq 'encoding situation))) + (message "External method is starting...") + (let ((process + (let ((command + (mailcap-format-command + method + (cons (cons 'filename name) situation)))) + (start-process command mime-echo-buffer-name + shell-file-name shell-command-switch command) + ))) + (set-alist 'mime-mailcap-method-filename-alist process name) + (set-process-sentinel process 'mime-mailcap-method-sentinel) + ) + ;;(mime-show-echo-buffer) + )))) + +(defun mime-mailcap-method-sentinel (process event) + (let ((file (cdr (assq process mime-mailcap-method-filename-alist)))) + (if (file-exists-p file) + (delete-file file) + )) + (remove-alist 'mime-mailcap-method-filename-alist process) + (message (format "%s %s" process event))) + (defun mime-activate-external-method (beg end cal) (save-excursion (save-restriction @@ -272,11 +335,16 @@ window.") (concat (regexp-* mime-view-file-name-char-regexp) "\\(\\." mime-view-file-name-char-regexp "+\\)*")) -(defun mime-raw-get-original-filename (param &optional encoding) - (or (mime-raw-get-uu-filename param encoding) +(defun mime-raw-get-original-filename (param) + (or (if (member (cdr (assq 'encoding param)) + mime-view-uuencode-encoding-name-list) + (mime-raw-get-uu-filename)) (let (ret) - (or (if (or (and (setq ret (mime/Content-Disposition)) - (setq ret (assoc "filename" (cdr ret))) + (or (if (or (and (setq ret (mime-read-Content-Disposition)) + (setq ret + (assoc + "filename" + (mime-content-disposition-parameters ret))) ) (setq ret (assoc "name" param)) (setq ret (assoc "x-name" param)) @@ -507,7 +575,7 @@ to write." ;;; (defvar mime-raw-dired-function - (if mime/use-multi-frame + (if (and (>= emacs-major-version 19) window-system) (function dired-other-frame) (function mime-raw-dired-function-for-one-frame) )) @@ -586,7 +654,11 @@ to write." (set-buffer buffer) (erase-buffer) (insert-file-contents file) - (eval-current-buffer)) + (eval-current-buffer) + ;; format check + (or (eq (car mime-acting-situation-examples) 'type) + (setq mime-acting-situation-examples nil)) + ) (kill-buffer buffer)))) ;;; mime-play.el ends here