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

Remove extraneous get { from a bunch of read-only accessors.

Browse Source
This commit is contained in:
Brent Simmons
2018-02-14 13:14:25 -08:00
parent 192439abe7
commit 2f21dbf6be
44 changed files with 216 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
Frameworks/Data/Feed.swift
View File

@@ -34,15 +34,13 @@ public final class Feed: DisplayNameProvider, UnreadCountProvider, Hashable {
// MARK: - DisplayNameProvider
public var nameForDisplay: String {
get {
if let s = editedName, !s.isEmpty {
return s
}
if let s = name, !s.isEmpty {
return s
}
return NSLocalizedString("Untitled", comment: "Feed name")
if let s = editedName, !s.isEmpty {
return s
}
if let s = name, !s.isEmpty {
return s
}
return NSLocalizedString("Untitled", comment: "Feed name")
}
// MARK: - UnreadCountProvider
@@ -115,46 +113,44 @@ public final class Feed: DisplayNameProvider, UnreadCountProvider, Hashable {
}
public var dictionary: [String: Any] {
get {
var d = [String: Any]()
d[Key.url] = url
// feedID is not repeated when it’s the same as url
if (feedID != url) {
d[Key.feedID] = feedID
}
if let homePageURL = homePageURL {
d[Key.homePageURL] = homePageURL
}
if let iconURL = iconURL {
d[Key.iconURL] = iconURL
}
if let faviconURL = faviconURL {
d[Key.faviconURL] = faviconURL
}
if let name = name {
d[Key.name] = name
}
if let editedName = editedName {
d[Key.editedName] = editedName
}
if let authorsArray = authors?.diskArray() {
d[Key.authors] = authorsArray
}
if let contentHash = contentHash {
d[Key.contentHash] = contentHash
}
if unreadCount > 0 {
d[Key.unreadCount] = unreadCount
}
if let conditionalGetInfo = conditionalGetInfo {
d[Key.conditionalGetInfo] = conditionalGetInfo.dictionary
}
return d
var d = [String: Any]()
d[Key.url] = url
// feedID is not repeated when it’s the same as url
if (feedID != url) {
d[Key.feedID] = feedID
}
if let homePageURL = homePageURL {
d[Key.homePageURL] = homePageURL
}
if let iconURL = iconURL {
d[Key.iconURL] = iconURL
}
if let faviconURL = faviconURL {
d[Key.faviconURL] = faviconURL
}
if let name = name {
d[Key.name] = name
}
if let editedName = editedName {
d[Key.editedName] = editedName
}
if let authorsArray = authors?.diskArray() {
d[Key.authors] = authorsArray
}
if let contentHash = contentHash {
d[Key.contentHash] = contentHash
}
if unreadCount > 0 {
d[Key.unreadCount] = unreadCount
}
if let conditionalGetInfo = conditionalGetInfo {
d[Key.conditionalGetInfo] = conditionalGetInfo.dictionary
}
return d
}
// MARK: - Debug