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

Handle feed renames in the inspector. Handle multiple selection. Fix #137.

Browse Source
This commit is contained in:
Brent Simmons
2018-01-23 21:49:33 -08:00
parent aa32b09d2d
commit f109237bfa
6 changed files with 79 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Frameworks/Data/Feed.swift
View File

@@ -20,7 +20,13 @@ public final class Feed: DisplayNameProvider, UnreadCountProvider, Hashable {
public var faviconURL: String?
public var name: String?
public var authors: Set<Author>?
public var editedName: String?
public var editedName: String? {
didSet {
postDisplayNameDidChangeNotification()
}
}
public var conditionalGetInfo: HTTPConditionalGetInfo?
public var contentHash: String?
public let hashValue: Int
@@ -29,7 +35,13 @@ public final class Feed: DisplayNameProvider, UnreadCountProvider, Hashable {
public var nameForDisplay: String {
get {
return (editedName ?? name) ?? 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")
}
}