FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename XMLString struct — use two separate structs: AttributeKey and AttributeValue, to make it more clear what these are.

Browse Source
This commit is contained in:
Brent Simmons 2025-01-20 22:33:18 -08:00
parent 41a47f15f7
commit 743de0e065
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,20 +81,23 @@ private extension AtomParser {
static let modified = "modified".utf8CString static let modified = "modified".utf8CString
} }
private struct XMLString { private struct AttributeKey {
static let rel = "rel" static let rel = "rel"
static let alternate = "alternate"
static let related = "related"
static let enclosure = "enclosure"
static let href = "href" static let href = "href"
static let title = "title" static let title = "title"
static let type = "type" static let type = "type"
static let text = "text"
static let length = "length" static let length = "length"
static let xmlLang = "xml:lang" static let xmlLang = "xml:lang"
static let xmlBase = "xml:base" static let xmlBase = "xml:base"
} }
private struct AttributeValue {
static let text = "text"
static let alternate = "alternate"
static let related = "related"
static let enclosure = "enclosure"
}
func currentString(_ saxParser: SAXParser) -> String? { func currentString(_ saxParser: SAXParser) -> String? {
saxParser.currentStringWithTrimmedWhitespace saxParser.currentStringWithTrimmedWhitespace
@ -126,12 +129,12 @@ private extension AtomParser {
guard feed.link == nil, let currentAttributes else { guard feed.link == nil, let currentAttributes else {
return return
} }
guard let link = currentAttributes[XMLString.href] else { guard let link = currentAttributes[AttributeKey.href] else {
return return
} }
let isRelated: Bool = { let isRelated: Bool = {
if let related = currentAttributes[XMLString.rel], related == XMLString.alternate { // rel="alternate" if let related = currentAttributes[AttributeKey.rel], related == AttributeValue.alternate { // rel="alternate"
return true return true
} }
return currentAttributes.count == 1 // Example: <link href="https://www.allenpike.com/"/> — no rel or anything return currentAttributes.count == 1 // Example: <link href="https://www.allenpike.com/"/> — no rel or anything
@ -149,11 +152,11 @@ private extension AtomParser {
} }
if feed.language == nil { if feed.language == nil {
feed.language = currentAttributes[XMLString.xmlLang] feed.language = currentAttributes[AttributeKey.xmlLang]
} }
if xmlBaseURL == nil { if xmlBaseURL == nil {
if let xmlBase = currentAttributes[XMLString.xmlBase] { if let xmlBase = currentAttributes[AttributeKey.xmlBase] {
if let baseURL = URL(string: xmlBase) { if let baseURL = URL(string: xmlBase) {
xmlBaseURL = baseURL xmlBaseURL = baseURL
} }
@ -221,7 +224,7 @@ private extension AtomParser {
var content = currentString(saxParser) var content = currentString(saxParser)
if currentAttributes?[XMLString.type] == XMLString.text { if currentAttributes?[AttributeKey.type] == AttributeValue.text {
content = content?.replacingOccurrences(of: "\n", with: "\n<br>") content = content?.replacingOccurrences(of: "\n", with: "\n<br>")
} }
@ -241,27 +244,27 @@ private extension AtomParser {
guard let attributes = currentAttributes else { guard let attributes = currentAttributes else {
return return
} }
guard let urlString = attributes[XMLString.href], !urlString.isEmpty else { guard let urlString = attributes[AttributeKey.href], !urlString.isEmpty else {
return return
} }
let resolvedURLString = linkResolvedAgainstXMLBase(urlString) let resolvedURLString = linkResolvedAgainstXMLBase(urlString)
var rel = attributes[XMLString.rel] var rel = attributes[AttributeKey.rel]
if rel?.isEmpty ?? true { if rel?.isEmpty ?? true {
rel = XMLString.alternate rel = AttributeValue.alternate
} }
if rel == XMLString.related { if rel == AttributeValue.related {
if article.link == nil { if article.link == nil {
article.link = resolvedURLString article.link = resolvedURLString
} }
} }
else if rel == XMLString.alternate { else if rel == AttributeValue.alternate {
if article.permalink == nil { if article.permalink == nil {
article.permalink = resolvedURLString article.permalink = resolvedURLString
} }
} }
else if rel == XMLString.enclosure { else if rel == AttributeValue.enclosure {
if let enclosure = enclosure(resolvedURLString, attributes) { if let enclosure = enclosure(resolvedURLString, attributes) {
article.addEnclosure(enclosure) article.addEnclosure(enclosure)
} }
@ -283,10 +286,10 @@ private extension AtomParser {
func enclosure(_ urlString: String, _ attributes: StringDictionary) -> RSSEnclosure? { func enclosure(_ urlString: String, _ attributes: StringDictionary) -> RSSEnclosure? {
let enclosure = RSSEnclosure(url: urlString) let enclosure = RSSEnclosure(url: urlString)
enclosure.title = attributes[XMLString.title] enclosure.title = attributes[AttributeKey.title]
enclosure.mimeType = attributes[XMLString.type] enclosure.mimeType = attributes[AttributeKey.type]
if let lengthString = attributes[XMLString.length] { if let lengthString = attributes[AttributeKey.length] {
enclosure.length = Int(lengthString) enclosure.length = Int(lengthString)
} }