X-Git-Url: http://gitweb.fperrin.net/?p=atom.el.git;a=blobdiff_plain;f=atom.el;h=ce01f85a09e4c18b16c267392ee03fdc64051166;hp=875ef87f318f7b93e62dfa9c9e216a4eae3f6217;hb=36d9eaeb906863b92a3756eb6483f7cd05767e04;hpb=3164c2d46402bcd550dbeacf0f9e85324ab1ad58
diff --git a/atom.el b/atom.el
index 875ef87..ce01f85 100644
--- a/atom.el
+++ b/atom.el
@@ -66,42 +66,45 @@
(require 'xml)
-(defun atom-create (title link &optional author self updated id)
+(defun atom-create (title link &optional subtitle self id author updated)
"Create a new atom structure.
TITLE is the title for the feed, a short, text-only, human
readable string.
-AUTHOR is the author of the feed. See `atom-massage-author' for
-the possible ways to specify it.
-
-SELF is the canonical URL to this feed.
-
LINK is the URL of a page responible for the content of this
feed.
-UPDATED is the date the feed was last updated. If not given,
-`(current-time)' is used.
+SUBTITLE is a subtitle for the feed; it can be a bit longer than
+TITLE, maybe a paragraph long.
+
+SELF is the canonical URL to this feed.
ID is a unique identifier for this feed. If not given, it
-defaults to LINK."
+defaults to SELF.
+
+AUTHOR is the author of the feed. See `atom-massage-author' for
+the possible ways to specify it.
+
+UPDATED is the date the feed was last updated. If not given,
+`(current-time)' is used."
(let ((atom-feed (list (list 'title nil title))))
- (atom-modify-entry atom-feed 'link (list (list (cons 'href link))))
+ (atom-modify-entry atom-feed 'link `(((href . ,link))))
(atom-modify-entry atom-feed 'author (atom-massage-author author))
+ (if subtitle (atom-modify-entry atom-feed 'subtitle subtitle))
(if self (atom-modify-entry atom-feed 'link
`(((href . ,self) (rel . "self")
(type . "application/atom+xml")))))
(atom-modify-entry atom-feed 'updated (atom-format-time updated))
- (atom-modify-entry atom-feed 'id (or id link))
+ (atom-modify-entry atom-feed 'id (or id self link))
atom-feed))
(defun atom-push-entry (atom entry)
"Add the entry ENTRY to the feed ATOM."
- (nconc atom (list `(entry nil . ,entry))))
+ (nconc atom (list `(entry nil ,@entry))))
(defun atom-modify-entry (entry name val)
- "Set the NAME element of ENTRY to VAL. A true MULTIPLE means
-to add a new element instead of updating it when it already exists."
+ "Set the NAME element of ENTRY to VAL."
(let ((elem (if (stringp val)
(list name nil val)
(cons name val))))
@@ -148,10 +151,8 @@ when the content of the entry ."
be a string enconding a valid HTML fragment. See `atom-add-entry'
for additional details."
(atom-add-entry atom
- title link
- (atom-massage-html content)
- (and summary (atom-massage-html summary))
- updated id))
+ title link (atom-massage-html content)
+ updated id (and summary (atom-massage-html summary))))
(defun atom-add-xhtml-entry (atom title link content
&optional updated id summary)
@@ -159,10 +160,8 @@ for additional details."
given either as a string, or as an XML tree, of a valid XHTML
fragment. See `atom-add-entry' for additional details."
(atom-add-entry atom
- title link
- (atom-massage-xhtml content)
- (and summary (atom-massage-xhtml summary))
- updated id))
+ title link (atom-massage-xhtml content)
+ updated id (and summary (atom-massage-xhtml summary))))
(defun atom-print (atom)
"Print the Atom feed ATOM in the current buffer."
@@ -171,15 +170,108 @@ fragment. See `atom-add-entry' for additional details."
(xml-print atom)
(insert "\n"))
+(defun atom-write-file (atom filename)
+ "Writes the feed ATOM to FILENAME."
+ (with-temp-buffer
+ (atom-print atom)
+ (write-region (point-min) (point-max) filename)))
+
+
+(defun atom-to-rss (atom)
+ "Translate an Atom feed into an RSS one, returning the translation.
+
+Some information may be lost or approximated."
+ (let ((rss (list (assoc 'title atom))))
+ (atom-to-rss-translator atom rss '((subtitle . description)
+ (updated . pubDate)
+ (link . link)))
+ (atom-to-rss-modify-time rss)
+ (atom-to-rss-modify-link rss)
+ (dolist (entry (xml-get-children atom 'entry))
+ (push (atom-to-rss-item entry) rss))
+ (reverse rss)))
+
+(defun atom-to-rss-item (entry)
+ "Translates an Atom entry into an RSS item."
+ (let ((item (list (assoc 'title entry))))
+ (atom-to-rss-translator
+ (xml-node-children entry) item
+ '((id . guid) (content . description) (updated . pubDate) (link . link)))
+ (atom-to-rss-modify-time item)
+ (atom-to-rss-modify-link item)
+ (let ((guid (assoc 'guid item))
+ (descr (assoc 'description item)))
+ (if guid
+ (setcar (cdr guid) (list (cons 'isPermaLink "false"))))
+ (if (and descr
+ (equal (xml-get-attribute descr 'type) "xhtml"))
+ (setcar (cddr descr) (xml-node-text descr))))
+ `(item nil ,@item)))
+
+(defun atom-to-rss-translator (source target translations)
+ (dolist (translation translations)
+ (let* ((from (car translation))
+ (to (cdr translation))
+ (data (copy-tree (cdr (assoc from source)))))
+ (when data
+ (atom-modify-entry target to data)))))
+
+(defun xml-node-text (node)
+ (with-temp-buffer
+ (xml-print (xml-node-children node))
+ (buffer-string)))
+
+(defun atom-to-rss-modify-link (entry)
+ (let* ((link (assoc 'link entry))
+ (link-addr (xml-get-attribute-or-nil link 'href)))
+ (message "%S" link)
+ (when link
+ (setcar (cdr link) nil)
+ (setcdr (cdr link) (cons link-addr nil)))))
+
+(defun atom-print-as-rss (atom)
+ (let ((rss (atom-to-rss atom)))
+ (insert "\n")
+ (insert "