renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle relative <link> elements in Atom parser — use xml:base when present to resolve. Add test case.

Browse Source
This commit is contained in:
Brent Simmons
2025-01-20 17:59:39 -08:00
parent ccb1b8294e
commit d22f3819cd
3 changed files with 52 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Modules/Parser/Sources/Parser/FeedParser/Feeds/XML/AtomParser.swift
View File

@@ -25,6 +25,7 @@ final class AtomParser {
attributesStack.last
}
private var xmlBaseURL: URL?
private var parsingXHTML = false
private var xhtmlString: String?
@@ -90,6 +91,7 @@ private extension AtomParser {
static let type = "type"
static let length = "length"
static let xmlLang = "xml:lang"
static let xmlBase = "xml:base"
}
func currentString(_ saxParser: SAXParser) -> String? {
@@ -139,13 +141,23 @@ private extension AtomParser {
}
}
func addFeedLanguage() {
func addFeedAttributes() {
guard feed.language == nil, let currentAttributes else {
guard let currentAttributes else {
return
}
feed.language = currentAttributes[XMLString.xmlLang]
if feed.language == nil {
feed.language = currentAttributes[XMLString.xmlLang]
}
if xmlBaseURL == nil {
if let xmlBase = currentAttributes[XMLString.xmlBase] {
if let baseURL = URL(string: xmlBase) {
xmlBaseURL = baseURL
}
}
}
}
func addArticle() {
@@ -225,7 +237,8 @@ private extension AtomParser {
guard let urlString = attributes[XMLString.href], !urlString.isEmpty else {
return
}
let resolvedURLString = linkResolvedAgainstXMLBase(urlString)
var rel = attributes[XMLString.rel]
if rel?.isEmpty ?? true {
rel = XMLString.alternate
@@ -233,21 +246,33 @@ private extension AtomParser {
if rel == XMLString.related {
if article.link == nil {
article.link = urlString
article.link = resolvedURLString
}
}
else if rel == XMLString.alternate {
if article.permalink == nil {
article.permalink = urlString
article.permalink = resolvedURLString
}
}
else if rel == XMLString.enclosure {
if let enclosure = enclosure(urlString, attributes) {
if let enclosure = enclosure(resolvedURLString, attributes) {
article.addEnclosure(enclosure)
}
}
}
func linkResolvedAgainstXMLBase(_ urlString: String) -> String {
guard let xmlBaseURL else {
return urlString
}
if let resolvedURL = URL(string: urlString, relativeTo: xmlBaseURL) {
return resolvedURL.absoluteString
}
return urlString
}
func enclosure(_ urlString: String, _ attributes: StringDictionary) -> RSSEnclosure? {
let enclosure = RSSEnclosure(url: urlString)
@@ -351,7 +376,7 @@ extension AtomParser: SAXParserDelegate {
}
if SAXEqualTags(localName, XMLName.feed) {
addFeedLanguage()
addFeedAttributes()
}
saxParser.beginStoringCharacters()