From 301c0e6b4d9dab7afed5592d34b32ea8002e24b7 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Thu, 24 Apr 2014 11:46:28 +0100 Subject: [PATCH] Re: [PATCH 08/11] emacs: Support caching in notmuch-get-bodypart-{binary, text} --- 50/a9a43bd709e266e0b20c43113cb891e7ea6010 | 180 ++++++++++++++++++++++ 1 file changed, 180 insertions(+) create mode 100644 50/a9a43bd709e266e0b20c43113cb891e7ea6010 diff --git a/50/a9a43bd709e266e0b20c43113cb891e7ea6010 b/50/a9a43bd709e266e0b20c43113cb891e7ea6010 new file mode 100644 index 000000000..dce48ca4a --- /dev/null +++ b/50/a9a43bd709e266e0b20c43113cb891e7ea6010 @@ -0,0 +1,180 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id C5257431FAF + for ; Thu, 24 Apr 2014 03:46:50 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.502 +X-Spam-Level: +X-Spam-Status: No, score=0.502 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id TC9hcCucmCBx for ; + Thu, 24 Apr 2014 03:46:43 -0700 (PDT) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id CDEEB431FAE + for ; Thu, 24 Apr 2014 03:46:42 -0700 (PDT) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1WdHAm-0004oP-0w; Thu, 24 Apr 2014 11:46:36 +0100 +Received: from 5751dfa2.skybroadband.com ([87.81.223.162] helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71) + (envelope-from ) + id 1WdHAl-00085x-L2; Thu, 24 Apr 2014 11:46:31 +0100 +From: Mark Walters +To: Austin Clements , notmuch@notmuchmail.org +Subject: Re: [PATCH 08/11] emacs: Support caching in + notmuch-get-bodypart-{binary, text} +In-Reply-To: <1398105468-14317-9-git-send-email-amdragon@mit.edu> +References: <1398105468-14317-1-git-send-email-amdragon@mit.edu> + <1398105468-14317-9-git-send-email-amdragon@mit.edu> +User-Agent: Notmuch/0.15.2+615~g78e3a93 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Thu, 24 Apr 2014 11:46:28 +0100 +Message-ID: <87sip3t37f.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 87.81.223.162 +X-QM-Geographic: According to ripencc, + this message was delivered by a machine in Britain (UK) (GB). +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: 61734a60742b5b0478ef6dceac2f28de (of first 20000 bytes) +X-SpamAssassin-Score: -0.1 +X-SpamAssassin-SpamBar: / +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored -0.1 points. + Summary of the scoring: + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * -0.1 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Thu, 24 Apr 2014 10:46:50 -0000 + + +On Mon, 21 Apr 2014, Austin Clements wrote: +> (The actual code change here is small, but requires re-indenting +> existing code.) +> --- +> emacs/notmuch-lib.el | 52 ++++++++++++++++++++++++++++++---------------------- +> 1 file changed, 30 insertions(+), 22 deletions(-) +> +> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el +> index fc67b14..fee8512 100644 +> --- a/emacs/notmuch-lib.el +> +++ b/emacs/notmuch-lib.el +> @@ -503,33 +503,39 @@ (defun notmuch-parts-filter-by-type (parts type) +> (lambda (part) (notmuch-match-content-type (plist-get part :content-type) type)) +> parts)) +> +> -(defun notmuch-get-bodypart-binary (msg part process-crypto) +> +(defun notmuch-get-bodypart-binary (msg part process-crypto &optional cache) +> "Return the unprocessed content of PART in MSG as a unibyte string. +> +> This returns the \"raw\" content of the given part after content +> transfer decoding, but with no further processing (see the +> discussion of --format=raw in man notmuch-show). In particular, +> this does no charset conversion." +> - (let ((args `("show" "--format=raw" +> - ,(format "--part=%d" (plist-get part :id)) +> - ,@(when process-crypto '("--decrypt")) +> - ,(notmuch-id-to-query (plist-get msg :id))))) +> - (with-temp-buffer +> - ;; Emacs internally uses a UTF-8-like multibyte string +> - ;; representation by default (regardless of the coding system, +> - ;; which only affects how it goes from outside data to this +> - ;; internal representation). This *almost* never matters. +> - ;; Annoyingly, it does matter if we use this data in an image +> - ;; descriptor, since Emacs will use its internal data buffer +> - ;; directly and this multibyte representation corrupts binary +> - ;; image formats. Since the caller is asking for binary data, a +> - ;; unibyte string is a more appropriate representation anyway. +> - (set-buffer-multibyte nil) +> - (let ((coding-system-for-read 'no-conversion)) +> - (apply #'call-process notmuch-command nil '(t nil) nil args) +> - (buffer-string))))) +> - +> -(defun notmuch-get-bodypart-text (msg part process-crypto) +> + (let ((data (plist-get part :binary-content))) +> + (when (not data) +> + (let ((args `("show" "--format=raw" +> + ,(format "--part=%d" (plist-get part :id)) +> + ,@(when process-crypto '("--decrypt")) +> + ,(notmuch-id-to-query (plist-get msg :id))))) +> + (with-temp-buffer +> + ;; Emacs internally uses a UTF-8-like multibyte string +> + ;; representation by default (regardless of the coding +> + ;; system, which only affects how it goes from outside data +> + ;; to this internal representation). This *almost* never +> + ;; matters. Annoyingly, it does matter if we use this data +> + ;; in an image descriptor, since Emacs will use its internal +> + ;; data buffer directly and this multibyte representation +> + ;; corrupts binary image formats. Since the caller is +> + ;; asking for binary data, a unibyte string is a more +> + ;; appropriate representation anyway. +> + (set-buffer-multibyte nil) +> + (let ((coding-system-for-read 'no-conversion)) +> + (apply #'call-process notmuch-command nil '(t nil) nil args) +> + (setq data (buffer-string))))) +> + (when cache +> + (plist-put part :binary-content data))) +> + data)) + +I am a little puzzled by this but that could be lack of familiarity with +elisp. As far as I can see plist-put will sometimes modify the original +plist and sometimes return a new plist. If the latter happens then I +think it works out as if we hadn't cached anything as the part passed to +the function is unmodified. That might not matter in this case (though I +find the lack of determinism disturbing). + +Or is something else going on? + +Best wishes + +Mark + + + +> + +> +(defun notmuch-get-bodypart-text (msg part process-crypto &optional cache) +> "Return the text content of PART in MSG. +> +> This returns the content of the given part as a multibyte Lisp +> @@ -546,7 +552,9 @@ (defun notmuch-get-bodypart-text (msg part process-crypto) +> (npart (apply #'notmuch-call-notmuch-sexp args))) +> (setq content (plist-get npart :content)) +> (when (not content) +> - (error "Internal error: No :content from %S" args)))) +> + (error "Internal error: No :content from %S" args))) +> + (when cache +> + (plist-put part :content content))) +> content)) +> +> ;; Workaround: The call to `mm-display-part' below triggers a bug in +> -- +> 1.9.1 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2