FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-02-02 12:06:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Continue progress on porting OPML code to Swift.

Browse Source
This commit is contained in:
Brent Simmons 2024-08-23 18:06:18 -07:00
parent a3c10165fa
commit b7462c89e0
4 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Modules/Parser/Sources/Parser/OPML/OPMLAttributes.swift
View File

@ -10,13 +10,13 @@ import Foundation
// OPML allows for arbitrary attributes.
// These are the common attributes in OPML files used as RSS subscription lists.
private static let opmlTextKey = "text"
private static let opmlTitleKey = "title"
private static let opmlDescriptionKey = "description"
private static let opmlTypeKey = "type"
private static let opmlVersionKey = "version"
private static let opmlHMTLURLKey = "htmlUrl"
private static let opmlXMLURLKey = "xmlUrl"
private let opmlTextKey = "text"
private let opmlTitleKey = "title"
private let opmlDescriptionKey = "description"
private let opmlTypeKey = "type"
private let opmlVersionKey = "version"
private let opmlHMTLURLKey = "htmlUrl"
private let opmlXMLURLKey = "xmlUrl"
// A frequent error in OPML files is to mess up the capitalization,
// so these do a case-insensitive lookup.

9
Modules/Parser/Sources/Parser/OPML/OPMLDocument.swift
View File

@ -9,6 +9,11 @@ import Foundation
final class OPMLDocument: OPMLItem, @unchecked Sendable {
var title: String?
var url: String?
var title: String? = nil
var url: String? = nil
init(url: String?) {
self.url = url
super.init(attributes: nil)
}
}

22
Modules/Parser/Sources/Parser/OPML/OPMLItem.swift
View File

@ -10,7 +10,7 @@ import os
class OPMLItem: @unchecked Sendable {
public let feedSpecifier: OPMLFeedSpecifier
public let feedSpecifier: ParsedOPMLFeedSpecifier
public let attributes: [String: String]
public let titleFromAttributes: String?
@ -20,23 +20,13 @@ class OPMLItem: @unchecked Sendable {
items.count > 0
}
init?(attributes: [String : String]) {
guard let feedURL = attributes.opml_xmlUrl, !feedURL.isEmpty else {
return nil
}
let titleFromAttributes = {
if let title = attributes.opml_title {
return title
}
return attributes.opml_text
}()
self.titleFromAttributes = titleFromAttributes
self.feedSpecifier = OPMLFeedSpecifier(title: titleFromAttributes, feedDescription: attributes.opml_description, homePageURL: attributes.opml_htmlUrl, feedURL: feedURL)
init(attributes: [String : String]?) {
self.titleFromAttributes = attributes.opml_title ?? attributes.opml_text
self.attributes = attributes
self.feedSpecifier = ParsedOPMLFeedSpecifier(title: self.titleFromAttributes, feedDescription: attributes.opml_description, homePageURL: attributes.opml_htmlUrl, feedURL: attributes.opml_xmlUrl)
}
func addItem(_ item: OPMLItem) {

4
Modules/Parser/Sources/Parser/OPML/OPMLParser.swift
View File

@ -12,6 +12,7 @@ public final class OPMLParser {
let url: String
let data: Data
private let opmlDocument: OPMLDocument
private var itemStack = [OPMLItem]()
enum OPMLParserError: Error {
@ -22,9 +23,10 @@ public final class OPMLParser {
self.url = parserData.url
self.data = parserData.data
self.opmlDocument = OPMLDocument(url: parserData.url)
}
func parse() throws -> OPMLDocument? {
func parse() throws -> ParsedOPMLDocument {
guard canParseData() else {
throw OPMLParserError.notOPML