emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/webfeeder e9ce707 3/5: Parse author, title and subtitle


From: Stefan Monnier
Subject: [elpa] externals/webfeeder e9ce707 3/5: Parse author, title and subtitle XML when using default functions.
Date: Mon, 15 Mar 2021 22:29:35 -0400 (EDT)

branch: externals/webfeeder
commit e9ce707806d4731c7593f2ab267d1db3a304a017
Author: Pierre Neidhardt <mail@ambrevar.xyz>
Commit: Pierre Neidhardt <mail@ambrevar.xyz>

    Parse author, title and subtitle XML when using default functions.
---
 webfeeder.el | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/webfeeder.el b/webfeeder.el
index 3ab651c..59327b8 100644
--- a/webfeeder.el
+++ b/webfeeder.el
@@ -122,7 +122,7 @@ This is less reliable than `webfeeder-author-libxml'."
       (goto-char (point-min))
       (search-forward-regexp (rx line-start "<meta name=\"author\" content=\""
                                  (group (* (not (any "\"")))) "\""))
-      (match-string 1))))
+      (webfeeder--parse-xml-string (match-string 1)))))
 
 (defun webfeeder-author-libxml (html-file)
   "Return the author from the HTML-FILE, or nil if not found.
@@ -175,7 +175,7 @@ This is less reliable than `webfeeder-title-libxml'."
       (insert-file-contents html-file)
       (goto-char (point-min))
       (search-forward-regexp (rx line-start "<title>" (group (* (not (any 
"<")))) "</title>"))
-      (match-string 1))))
+      (webfeeder--parse-xml-string (match-string 1)))))
 
 (defun webfeeder-title-libxml (html-file)
   "Return the title from the HTML-FILE.
@@ -196,7 +196,7 @@ This is less reliable than `webfeeder-subtitle-libxml'."
       (insert-file-contents html-file)
       (goto-char (point-min))
       (search-forward-regexp (rx line-start "<span class=\"subtitle\">" (group 
(* (not (any "<")))) "</span>"))
-      (match-string 1))))
+      (webfeeder--parse-xml-string (match-string 1)))))
 
 (defun webfeeder-subtitle-libxml (html-file)
   "Return the subtitle from the HTML-FILE.
@@ -389,11 +389,13 @@ The date is set to epoch if the item date is nil."
   categories
   generator)
 
-(defun webfeeder--xml-escape-string (string)
-  "Like `xml-escape-string' but return nil on nil."
-  (if string
-      (xml-escape-string string)
-    nil))
+(defun webfeeder--parse-xml-string (string)
+  "Call `xml-parse-string' on string."
+  (when string
+    (with-temp-buffer
+      (insert string)
+      (goto-char (point-min))
+      (xml-parse-string))))
 
 ;;;###autoload
 (defun webfeeder-html-files-to-items (project-dir url html-files)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]