From: "Eric Schulte" <schulte.eric@gmail.com>
To: Carsten Dominik <carsten.dominik@gmail.com>
Cc: Org Mode <emacs-orgmode@gnu.org>
Subject: Re: [PATCH] sha1 hash of latex fragments to avoid regeneration
Date: Tue, 17 Nov 2009 08:24:52 -0700 [thread overview]
Message-ID: <m28we5p41n.fsf@gmail.com> (raw)
In-Reply-To: <C52F7505-57B8-490B-83DA-3B38FC4C246B@gmail.com> (Carsten Dominik's message of "Tue, 17 Nov 2009 14:21:50 +0100")
Carsten Dominik <carsten.dominik@gmail.com> writes:
> Wow, this is fantastic!
>
> Do you think it is ready to be included (because you say first pass...)
>
Yes,
I said first pass because I had only done minimal testing. However all
indications are that it works, and there are no further changes I would
like to make, so if it looks good to you I would say "yes", please apply
it.
Thanks -- Eric
>
> - Carsten
>
> On Nov 17, 2009, at 3:42 AM, Eric Schulte wrote:
>
>> "Eric Schulte" <schulte.eric@gmail.com> writes:
>>
>>> Hi Carsten,
>>>
>>> Thanks for the feedback, I have comments inline below
>>>
>>> Carsten Dominik <carsten.dominik@gmail.com> writes:
>>
>> [...]
>>
>>>> Now, I am sure that you are already planning to do the same
>>>> for ditaa images etc?
>>>
>>> of course :)
>>
>> A first pass at a patch implementing caching of ditaa and dot images
>> generated by org-exp-blocks is attached. It seems to work in all
>> initial tests, and it will only remove files which match the following
>> pattern
>>
>> "beginning-of-file-name_\\([[:alnum:]]+\\)\\.extension"
>>
>> such that the length of the part matched by \\([[:alnum:]]+\\) is 40
>> characters.
>>
>> Best -- Eric
>>
>> From bd90d519a7d3e16732f4f377ccce51bdb97cef90 Mon Sep 17 00:00:00 2001
>> From: Eric Schulte <schulte.eric@gmail.com>
>> Date: Mon, 16 Nov 2009 19:33:11 -0700
>> Subject: [PATCH] use sha1 hash keys to cache ditaa and dot images
>> when exporting through org-exp-blocks
>>
>> ---
>> lisp/ChangeLog | 6 ++++
>> lisp/org-exp-blocks.el | 60 +++++++++++++++++++++++++++++++++++++
>> +---------
>> 2 files changed, 54 insertions(+), 12 deletions(-)
>>
>> diff --git a/lisp/ChangeLog b/lisp/ChangeLog
>> index 5f83aaa..c2d44fa 100755
>> --- a/lisp/ChangeLog
>> +++ b/lisp/ChangeLog
>> @@ -1,3 +1,9 @@
>> +2009-11-17 Eric Schulte <schulte.eric@gmail.com>
>> +
>> + * org-exp-blocks.el (org-export-blocks-format-ditaa): Use sha1
>> + hash keys to cache and re-use images generated by the
>> + org-exp-blocks interface to ditaa and dot.
>> +
>> 2009-11-16 Carsten Dominik <carsten.dominik@gmail.com>
>>
>> * org-html.el (org-export-html-home/up-format): Add an ID to the
>> diff --git a/lisp/org-exp-blocks.el b/lisp/org-exp-blocks.el
>> index 71e1608..72fe6c4 100644
>> --- a/lisp/org-exp-blocks.el
>> +++ b/lisp/org-exp-blocks.el
>> @@ -217,9 +217,15 @@ Specify the path at which the image should be
>> saved as the first
>> element of headers, any additional elements of headers will be
>> passed to the ditaa utility as command line arguments."
>> (message "ditaa-formatting...")
>> - (let ((out-file (if headers (car headers)))
>> - (args (if (cdr headers) (mapconcat 'identity (cdr headers) " ")))
>> - (data-file (make-temp-file "org-ditaa")))
>> + (let* ((args (if (cdr headers) (mapconcat 'identity (cdr headers)
>> " ")))
>> + (data-file (make-temp-file "org-ditaa"))
>> + (hash (sha1 (prin1-to-string (list body args))))
>> + (raw-out-file (if headers (car headers)))
>> + (out-file-parts (if (string-match
>> "\\(.+\\)\\.\\([^\\.]+\\)
>> $" raw-out-file)
>> + (cons (match-string 1 raw-out-file)
>> + (match-string 2 raw-out-file))
>> + (cons raw-out-file "png")))
>> + (out-file (concat (car out-file-parts) "_" hash "." (cdr
>> out-file-parts))))
>> (unless (file-exists-p org-ditaa-jar-path)
>> (error (format "Could not find ditaa.jar at %s" org-ditaa-jar-
>> path)))
>> (setq body (if (string-match "^\\([^:\\|:[^ ]\\)" body)
>> @@ -229,9 +235,21 @@ passed to the ditaa utility as command line
>> arguments."
>> "\n")))
>> (cond
>> ((or htmlp latexp docbookp)
>> - (with-temp-file data-file (insert body))
>> - (message (concat "java -jar " org-ditaa-jar-path " " args " "
>> data-file " " out-file))
>> - (shell-command (concat "java -jar " org-ditaa-jar-path " "
>> args " " data-file " " out-file))
>> + (unless (file-exists-p out-file)
>> + (mapc ;; remove old hashed versions of this file
>> + (lambda (file)
>> + (when (and (string-match (concat (regexp-quote (car out-
>> file-parts))
>> + "_\\([[:alnum:]]+\\)\\."
>> + (regexp-quote (cdr out-
>> file-parts)))
>> + file)
>> + (= (length (match-string 1 out-file)) 40))
>> + (delete-file (expand-file-name file
>> + (file-name-directory
>> out-file)))))
>> + (directory-files (or (file-name-directory out-file)
>> + default-directory)))
>> + (with-temp-file data-file (insert body))
>> + (message (concat "java -jar " org-ditaa-jar-path " " args "
>> " data-file " " out-file))
>> + (shell-command (concat "java -jar " org-ditaa-jar-path " "
>> args " " data-file " " out-file)))
>> (format "\n[[file:%s]]\n" out-file))
>> (t (concat
>> "\n#+BEGIN_EXAMPLE\n"
>> @@ -259,14 +277,32 @@ digraph data_relationships {
>> }
>> #+end_dot"
>> (message "dot-formatting...")
>> - (let ((out-file (if headers (car headers)))
>> - (args (if (cdr headers) (mapconcat 'identity (cdr headers) " ")))
>> - (data-file (make-temp-file "org-ditaa")))
>> + (let* ((args (if (cdr headers) (mapconcat 'identity (cdr headers)
>> " ")))
>> + (data-file (make-temp-file "org-ditaa"))
>> + (hash (sha1 (prin1-to-string (list body args))))
>> + (raw-out-file (if headers (car headers)))
>> + (out-file-parts (if (string-match
>> "\\(.+\\)\\.\\([^\\.]+\\)
>> $" raw-out-file)
>> + (cons (match-string 1 raw-out-file)
>> + (match-string 2 raw-out-file))
>> + (cons raw-out-file "png")))
>> + (out-file (concat (car out-file-parts) "_" hash "." (cdr
>> out-file-parts))))
>> (cond
>> ((or htmlp latexp docbookp)
>> - (with-temp-file data-file (insert body))
>> - (message (concat "dot " data-file " " args " -o " out-file))
>> - (shell-command (concat "dot " data-file " " args " -o " out-
>> file))
>> + (unless (file-exists-p out-file)
>> + (mapc ;; remove old hashed versions of this file
>> + (lambda (file)
>> + (when (and (string-match (concat (regexp-quote (car out-
>> file-parts))
>> + "_\\([[:alnum:]]+\\)\\."
>> + (regexp-quote (cdr out-
>> file-parts)))
>> + file)
>> + (= (length (match-string 1 out-file)) 40))
>> + (delete-file (expand-file-name file
>> + (file-name-directory
>> out-file)))))
>> + (directory-files (or (file-name-directory out-file)
>> + default-directory)))
>> + (with-temp-file data-file (insert body))
>> + (message (concat "dot " data-file " " args " -o " out-file))
>> + (shell-command (concat "dot " data-file " " args " -o "
>> out-
>> file)))
>> (format "\n[[file:%s]]\n" out-file))
>> (t (concat
>> "\n#+BEGIN_EXAMPLE\n"
>> --
>> 1.6.4.73.gc144
>>
>
> - Carsten
next prev parent reply other threads:[~2009-11-17 15:25 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-16 0:07 [PATCH] sha1 hash of latex fragments to avoid regeneration Eric Schulte
2009-11-16 6:57 ` Carsten Dominik
2009-11-17 0:11 ` Eric Schulte
2009-11-17 2:42 ` Eric Schulte
2009-11-17 13:21 ` Carsten Dominik
2009-11-17 15:24 ` Eric Schulte [this message]
2009-11-17 15:36 ` Carsten Dominik
2009-11-17 17:02 ` Eric Schulte
[not found] ` <m23a4dozic.fsf-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2009-12-02 10:35 ` Francesco Pizzolante
2009-12-05 16:35 ` Eric Schulte
[not found] ` <yn43a3pqsyw.fsf-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2009-12-07 12:48 ` Francesco Pizzolante
2009-12-23 15:17 ` Eric Schulte
2009-11-17 13:14 ` Carsten Dominik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m28we5p41n.fsf@gmail.com \
--to=schulte.eric@gmail.com \
--cc=carsten.dominik@gmail.com \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).