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

Make folder.account weak and optional.

Browse Source
This commit is contained in:
Brent Simmons
2017-10-21 16:37:40 -07:00
parent c5c28464e0
commit 8d5e568cde
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Evergreen/MainWindow/AddFeed/AddFeedController.swift
View File

@@ -147,8 +147,8 @@ private extension AddFeedController {
if let account = container as? Account {
return AccountAndFolderSpecifier(account: account, folder: nil)
}
if let folder = container as? Folder {
return AccountAndFolderSpecifier(account: folder.account, folder: folder)
if let folder = container as? Folder, let account = folder.account {
return AccountAndFolderSpecifier(account: account, folder: folder)
}
return nil
}

4
Evergreen/MainWindow/Sidebar/SidebarViewController.swift
View File

@@ -194,8 +194,8 @@ private extension SidebarViewController {
if let feed = object as? Feed, let account = feed.account {
account.updateUnreadCounts(for: Set([feed]))
}
else if let folder = object as? Folder {
folder.account.updateUnreadCounts(for: folder.flattenedFeeds())
else if let folder = object as? Folder, let account = folder.account {
account.updateUnreadCounts(for: folder.flattenedFeeds())
}
}
}

11
Frameworks/Account/Folder.swift
View File

@@ -11,7 +11,7 @@ import Data
public final class Folder: DisplayNameProvider, Container, UnreadCountProvider {
public let account: Account
public weak var account: Account?
public var children = [AnyObject]()
var name: String?
static let untitledName = NSLocalizedString("Untitled ƒ", comment: "Folder name")
@@ -19,7 +19,10 @@ public final class Folder: DisplayNameProvider, Container, UnreadCountProvider {
// MARK: - Fetching Articles
public func fetchArticles() -> Set<Article> {
guard let account = account else {
return Set<Article>()
}
return account.fetchArticles(folder: self)
}
@@ -76,7 +79,11 @@ public final class Folder: DisplayNameProvider, Container, UnreadCountProvider {
var dictionary: [String: Any] {
get {
var d = [String: Any]()
guard let account = account else {
return d
}
if let name = name {
d[Key.name] = name