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

Commit major surgery but leave it unfinished. Everything is broken.

Browse Source
This commit is contained in:
Brent Simmons
2017-07-01 17:22:19 -07:00
parent 683d5aaf71
commit 944f05c71e
38 changed files with 1241 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Frameworks/RSParser/Feeds/JSON/RSSInJSONParser.swift
View File

@@ -47,7 +47,7 @@ public struct RSSInJSONParser {
let feedURL = parserData.url
let feedDescription = channelObject["description"] as? String
let items = parseItems(itemsObject!)
let items = parseItems(itemsObject!, parserData.url)
return ParsedFeed(type: .rssInJSON, title: title, homePageURL: homePageURL, feedURL: feedURL, feedDescription: feedDescription, nextURL: nil, iconURL: nil, faviconURL: nil, authors: nil, expired: false, hubs: nil, items: items)
@@ -58,15 +58,15 @@ public struct RSSInJSONParser {
private extension RSSInJSONParser {
static func parseItems(_ itemsObject: JSONArray) -> [ParsedItem] {
static func parseItems(_ itemsObject: JSONArray, _ feedURL: String) -> [ParsedItem] {
return itemsObject.flatMap{ (oneItemDictionary) -> ParsedItem? in
return parsedItemWithDictionary(oneItemDictionary)
return parsedItemWithDictionary(oneItemDictionary, feedURL)
}
}
static func parsedItemWithDictionary(_ itemDictionary: JSONDictionary) -> ParsedItem? {
static func parsedItemWithDictionary(_ itemDictionary: JSONDictionary, _ feedURL: String) -> ParsedItem? {
let externalURL = itemDictionary["link"] as? String
let title = itemDictionary["title"] as? String
@@ -126,7 +126,10 @@ private extension RSSInJSONParser {
uniqueID = (s as NSString).rsparser_md5Hash()
}
return ParsedItem(uniqueID: uniqueID, url: nil, externalURL: externalURL, title: title, contentHTML: contentHTML, contentText: contentText, summary: nil, imageURL: nil, bannerImageURL: nil, datePublished: datePublished, dateModified: nil, authors: authors, tags: tags, attachments: attachments)
if let uniqueID = uniqueID {
return ParsedItem(uniqueID: uniqueID, feedURL: feedURL, url: nil, externalURL: externalURL, title: title, contentHTML: contentHTML, contentText: contentText, summary: nil, imageURL: nil, bannerImageURL: nil, datePublished: datePublished, dateModified: nil, authors: authors, tags: tags, attachments: attachments)
}
return nil
}
static func parseAuthors(_ itemDictionary: JSONDictionary) -> [ParsedAuthor]? {