From: Bastien Guerry <bzg@altern.org>
To: emacs-orgmode@gnu.org
Subject: [Accepted] [Orgmode,2/2] org-publish
Date: Wed, 9 Feb 2011 17:13:23 +0100 (CET) [thread overview]
Message-ID: <20110209161323.E7AEB80FF@myhost.localdomain> (raw)
In-Reply-To: 87bp2lcs6d.fsf@univ-nantes.fr
Patch 590 (http://patchwork.newartisans.com/patch/590/) is now "Accepted".
Maintainer comment: none
This relates to the following submission:
http://mid.gmane.org/%3C87bp2lcs6d.fsf%40univ-nantes.fr%3E
Here is the original message containing the patch:
> Content-Type: text/plain; charset="utf-8"
> MIME-Version: 1.0
> Content-Transfer-Encoding: 7bit
> Subject: [Orgmode,2/2] org-publish
> Date: Wed, 09 Feb 2011 17:23:54 -0000
> From: Manuel Giraud <manuel.giraud@univ-nantes.fr>
> X-Patchwork-Id: 590
> Message-Id: <87bp2lcs6d.fsf@univ-nantes.fr>
> To: Bastien <bastien.guerry@wikimedia.fr>
> Cc: emacs-orgmode <emacs-orgmode@gnu.org>
>
> Bastien <bastien.guerry@wikimedia.fr> writes:
>
> > I'd welcome a reworked version of this idea!
>
> Hi Bastien,
>
> Thanks for accepting my previous patch. Here's a new version of this last
> patch that support formated sitemap entry.
>
> --8<---------------cut here---------------start------------->8---
> commit 660ece15eca316075da6529560bf66565934b713
> Author: Manuel Giraud <manuel.giraud@univ-nantes.fr>
> Date: Tue Nov 23 16:20:15 2010 +0100
>
> formated sitemap
>
> Modified lisp/org-publish.el
> --8<---------------cut here---------------end--------------->8---
>
> Best regards,
>
>
> diff --git a/lisp/org-publish.el b/lisp/org-publish.el
> index 47b80db..98e09f3 100644
> --- a/lisp/org-publish.el
> +++ b/lisp/org-publish.el
> @@ -267,6 +267,22 @@ You can overwrite this default per project in your
> :group 'org-publish
> :type 'boolean)
>
> +(defcustom org-publish-sitemap-date-format "%Y-%m-%d"
> + "Format for `format-time-string' which is used to print a date
> +in the sitemap."
> + :group 'org-publish
> + :type 'string)
> +
> +(defcustom org-publish-sitemap-file-entry-format "%T"
> + "How a sitemap file entry is formated.
> +You could use brackets to delimit on what part the link will be.
> +
> +%T is the title.
> +%A is the author.
> +%D is the date formated using `org-publish-sitemap-date-format'."
> + :group 'org-publish
> + :type 'string)
> +
> ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
> ;;; Timestamp-related functions
>
> @@ -370,6 +386,8 @@ This splices all the components into the list."
> (defvar sitemap-sort-folders)
> (defvar sitemap-ignore-case)
> (defvar sitemap-requested)
> +(defvar sitemap-date-format)
> +(defvar sitemap-file-entry-format)
> (defun org-publish-compare-directory-files (a b)
> "Predicate for `sort', that sorts folders and files for sitemap."
> (let ((retval t))
> @@ -392,8 +410,10 @@ This splices all the components into the list."
> (not (string-lessp B A))))))
> ((or (equal sitemap-sort-files 'chronologically)
> (equal sitemap-sort-files 'anti-chronologically))
> - (let ((A (org-publish-find-date a))
> - (B (org-publish-find-date b)))
> + (let* ((adate (org-publish-find-date a))
> + (bdate (org-publish-find-date b))
> + (A (+ (lsh (car adate) 16) (cadr adate)))
> + (B (+ (lsh (car bdate) 16) (cadr bdate))))
> (setq retval (if (equal sitemap-sort-files 'chronologically)
> (<= A B)
> (>= A B)))))))
> @@ -701,6 +721,10 @@ If :makeindex is set, also produce a file theindex.org."
> "sitemap.org"))
> (sitemap-function (or (plist-get project-plist :sitemap-function)
> 'org-publish-org-sitemap))
> + (sitemap-date-format (or (plist-get project-plist :sitemap-date-format)
> + org-publish-sitemap-date-format))
> + (sitemap-file-entry-format (or (plist-get project-plist :sitemap-file-entry-format)
> + org-publish-sitemap-file-entry-format))
> (preparation-function (plist-get project-plist :preparation-function))
> (completion-function (plist-get project-plist :completion-function))
> (files (org-publish-get-base-files project exclude-regexp)) file)
> @@ -776,12 +800,32 @@ Default for SITEMAP-FILENAME is 'sitemap.org'."
> (setq indent-str (make-string
> (+ (length indent-str) 2) ?\ )))))))
> ;; This is common to 'flat and 'tree
> - (insert (concat indent-str " + [[file:" link "]["
> - (org-publish-find-title file)
> - "]]\n")))))
> + (let ((entry
> + (org-publish-format-file-entry sitemap-file-entry-format
> + file project-plist))
> + (regexp "\\(.*\\)\\[\\([^][]+\\)\\]\\(.*\\)"))
> + (cond ((string-match-p regexp entry)
> + (string-match regexp entry)
> + (insert (concat indent-str " + " (match-string 1 entry)
> + "[[file:" link "]["
> + (match-string 2 entry)
> + "]]" (match-string 3 entry) "\n")))
> + (t
> + (insert (concat indent-str " + [[file:" link "]["
> + entry
> + "]]\n"))))))))
> (save-buffer))
> (or visiting (kill-buffer sitemap-buffer))))
>
> +(defun org-publish-format-file-entry (fmt file project-plist)
> + (org-replace-escapes fmt
> + (list (cons "%T" (org-publish-find-title file))
> + (cons "%D" (format-time-string
> + sitemap-date-format
> + (org-publish-find-date file)))
> + (cons "%A" (or (plist-get project-plist :author)
> + user-full-name)))))
> +
> (defun org-publish-find-title (file)
> "Find the title of FILE in project."
> (or
> @@ -806,7 +850,9 @@ Default for SITEMAP-FILENAME is 'sitemap.org'."
> (defun org-publish-find-date (file)
> "Find the date of FILE in project.
> If FILE provides a #+date keyword use it else use the file
> -system's modification time."
> +system's modification time.
> +
> +It returns time in `current-time' format."
> (let ((visiting (find-buffer-visiting file)))
> (save-excursion
> (switch-to-buffer (or visiting (find-file file)))
> @@ -815,10 +861,9 @@ system's modification time."
> (unless visiting
> (kill-buffer (current-buffer)))
> (if date
> - (let ((dt (org-time-string-to-time date)))
> - (+ (lsh (car dt) 16) (cadr dt)))
> + (org-time-string-to-time date)
> (when (file-exists-p file)
> - (org-publish-cache-ctime-of-src file)))))))
> + (nth 5 (file-attributes file))))))))
>
> ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
> ;;; Interactive publishing functions
>
next prev parent reply other threads:[~2011-02-09 16:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-01 10:11 [Patch 2/2] org-publish Manuel Giraud
2011-02-08 17:04 ` Bastien
2011-02-09 12:23 ` Manuel Giraud
2011-02-09 16:13 ` Bastien Guerry [this message]
2011-02-09 16:14 ` Bastien
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=20110209161323.E7AEB80FF@myhost.localdomain \
--to=bzg@altern.org \
--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).