From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:863f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms12 with LMTPS id iLFKEmh18l+EYgAAsNZ9tg (envelope-from ); Mon, 04 Jan 2021 01:54:48 +0000 Received: from out1.migadu.com ([2001:41d0:2:863f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id mB8SHWd18l+tUQAAbx9fmQ (envelope-from ); Mon, 04 Jan 2021 01:54:47 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1609725287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OQHGk585MaOvK4ZQolRvsAIXxSth6yDZDJmaEZ1+DY4=; b=Mug8MImMgtqEHdyUq2HRFk18SK+P9MawazkxnvfXr/irefELWZhGKBnbx8FSWwkyIDtwRh wcUUjdnk+VUIwOnEiFd0M0sBzeJopYTAAXiTu88ajbq70Rbfmyn1P8ZR2QX9CwthUid54p XF/BhQFQR4klRwWAC9Tg4le8+THA5/5g3ftJIbAWBum0aj1S9rLyirXZfYLFIoIkz7w/g4 deDK8OZGUqFyTSwRpVJMtpRQ47Vfna+BZ4IMqf6kmzB4UkxVjR1YJTKh3NJgjOWGXUbtB4 T2uK1bhmmpx+riILeOQubPPZRMK2o1W8rpIK/pEGxTwiQLcdk39JIu79qWcIaw== From: Kyle Meyer To: piem@inbox.kyleam.com Subject: [PATCH v2 2/3] piem-notmuch-am-ready-mbox: Improve handling of attachments Message-Id: <20210104015435.18397-3-kyle@kyleam.com> In-Reply-To: <20210104015435.18397-1-kyle@kyleam.com> References: <87zh1pbh7x.fsf@kyleam.com> <20210104015435.18397-1-kyle@kyleam.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: kyle@kyleam.com Date: Mon, 04 Jan 2021 01:54:47 GMT X-TUID: p8J9iptZmW7o piem-notmuch-am-ready-mbox tries to get attached patches from the plist returned by notmuch-show-get-message-properties. This works okay for simple cases, but it doesn't find a patch if the content is encoded or if the MIME tree isn't structured as expected. Instead use mm-decode functions to get a list of handles and display their content. This new approach, as well as the previous one, probably isn't compatible with `format-patch --attach' patches, but I'm not going to worry about that until I actually see such a patch in the wild. --- piem-notmuch.el | 52 +++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/piem-notmuch.el b/piem-notmuch.el index ff8654c..915675e 100644 --- a/piem-notmuch.el +++ b/piem-notmuch.el @@ -28,6 +28,7 @@ ;;; Code: +(require 'mm-decode) (require 'notmuch) (require 'piem) (require 'subr-x) @@ -78,29 +79,34 @@ (defun piem-notmuch-am-ready-mbox () those parts' contents (in order) as the mbox. Otherwise, use the message itself if it looks like a patch." (when (derived-mode-p 'notmuch-show-mode) - (let ((body (car (plist-get (notmuch-show-get-message-properties) - :body)))) - (pcase (plist-get body :content-type) - ((and "text/plain" - (guard (string-match-p piem-patch-subject-re - (notmuch-show-get-subject)))) - (let ((id (notmuch-show-get-message-id))) - (lambda () - (call-process notmuch-command nil t nil - "show" "--format=mbox" id)))) - ("multipart/mixed" - (when-let ((patches - (delq nil - (mapcar (lambda (part) - (and (piem-am-patch-attachment-p - (plist-get part :content-type) - (plist-get part :filename)) - (plist-get part :content))) - (plist-get body :content))))) - (cons (lambda () - (dolist (patch patches) - (insert patch))) - "mbox"))))))) + (let* ((handle (piem-notmuch--with-current-message + (mm-dissect-buffer))) + (n-attachments (notmuch-count-attachments handle)) + patches) + (if (= n-attachments 0) + (when (string-match-p piem-patch-subject-re + (notmuch-show-get-subject)) + (let ((id (notmuch-show-get-message-id))) + (lambda () + (call-process notmuch-command nil t nil + "show" "--format=mbox" id)))) + (notmuch-foreach-mime-part + (lambda (p) + (and (piem-am-patch-attachment-p + (mm-handle-media-type p) + (mm-handle-filename p)) + (with-temp-buffer + (mm-display-inline p) + (push (buffer-substring-no-properties + (point-min) (point-max)) + patches)))) + handle) + (when patches + (setq patches (nreverse patches)) + (cons (lambda () + (dolist (patch patches) + (insert patch))) + "mbox")))))) ;;;###autoload (define-minor-mode piem-notmuch-mode -- 2.29.2