FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove baseURL from ArticleRenderer.

This commit is contained in:
Brent Simmons 2019-02-12 22:55:26 -08:00
parent c78f5d442d
commit af150b9b42
1 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
NetNewsWire/MainWindow/Detail/ArticleRenderer.swift
View File

@ -13,7 +13,6 @@ import Account
struct ArticleRenderer { struct ArticleRenderer {
private let baseURL: URL?
private let article: Article? private let article: Article?
private let articleStyle: ArticleStyle private let articleStyle: ArticleStyle
private let appearance: NSAppearance? private let appearance: NSAppearance?
@ -24,12 +23,6 @@ struct ArticleRenderer {
self.articleStyle = style self.articleStyle = style
self.appearance = appearance self.appearance = appearance
self.title = article?.title ?? "" self.title = article?.title ?? ""
if let article = article {
self.baseURL = ArticleRenderer.baseURL(for: article)
}
else {
self.baseURL = nil
}
} }
// MARK: - API // MARK: - API
@ -48,31 +41,6 @@ struct ArticleRenderer {
let renderer = ArticleRenderer(article: nil, style: style, appearance: appearance) let renderer = ArticleRenderer(article: nil, style: style, appearance: appearance)
return renderer.noSelectionHTML return renderer.noSelectionHTML
} }
static func baseURL(for article: Article) -> URL? {
var s = article.url
if s == nil {
s = article.feed?.homePageURL
}
if s == nil {
s = article.feed?.url
}
guard let urlString = s else {
return nil
}
var urlComponents = URLComponents(string: urlString)
if urlComponents == nil {
return nil
}
// Can’t use url-with-fragment as base URL. The webview won’t load. See scripting.com/rss.xml for example.
urlComponents!.fragment = nil
guard let url = urlComponents!.url, url.scheme == "http" || url.scheme == "https" else {
return nil
}
return url
}
} }
// MARK: - Private // MARK: - Private