From 387b5ffd4db1d804429e7d96b56aa39e2eebf544 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 19 Nov 2017 13:30:30 -0800 Subject: [PATCH] Make PseudoFeed a protocol and make TodayFeed a class. The various pseudo feeds are different enough that this is the right way to go. --- Evergreen.xcodeproj/project.pbxproj | 10 ++-- Evergreen/AppDelegate.swift | 3 +- Evergreen/Data/PseudoFeed.swift | 89 +--------------------------- Evergreen/Data/TodayFeed.swift | 91 +++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+), 94 deletions(-) create mode 100644 Evergreen/Data/TodayFeed.swift diff --git a/Evergreen.xcodeproj/project.pbxproj b/Evergreen.xcodeproj/project.pbxproj index d15c69cf9..bf6ded265 100644 --- a/Evergreen.xcodeproj/project.pbxproj +++ b/Evergreen.xcodeproj/project.pbxproj @@ -14,7 +14,6 @@ 842E45E71ED8C747000A8B52 /* DB5.plist in Resources */ = {isa = PBXBuildFile; fileRef = 842E45E61ED8C747000A8B52 /* DB5.plist */; }; 84513F901FAA63950023A1A9 /* FeedListControlsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84513F8F1FAA63950023A1A9 /* FeedListControlsView.swift */; }; 845B14921FC2028A0013CF92 /* PseudoFeed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845B14911FC2028A0013CF92 /* PseudoFeed.swift */; }; - 845B14A21FC21A080013CF92 /* TodayFeedDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845B14A11FC21A080013CF92 /* TodayFeedDelegate.swift */; }; 845F52ED1FB2B9FC00C10BF0 /* FeedPasteboardWriter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845F52EC1FB2B9FC00C10BF0 /* FeedPasteboardWriter.swift */; }; 846E773D1F6EF67A00A165E2 /* Account.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 846E773A1F6EF5D700A165E2 /* Account.framework */; }; 846E773E1F6EF67A00A165E2 /* Account.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 846E773A1F6EF5D700A165E2 /* Account.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; @@ -100,6 +99,7 @@ 84F204CE1FAACB660076E152 /* FeedListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F204CD1FAACB660076E152 /* FeedListViewController.swift */; }; 84F204DE1FAACB8B0076E152 /* FeedListTimelineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F204DD1FAACB8B0076E152 /* FeedListTimelineViewController.swift */; }; 84F204E01FAACBB30076E152 /* ArticleArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F204DF1FAACBB30076E152 /* ArticleArray.swift */; }; + 84F2D5251FC22D8100998D64 /* TodayFeed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F2D5241FC22D8100998D64 /* TodayFeed.swift */; }; 84FB9A2F1EDCD6C4003D53B9 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FB9A2D1EDCD6B8003D53B9 /* Sparkle.framework */; }; 84FB9A301EDCD6C4003D53B9 /* Sparkle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84FB9A2D1EDCD6B8003D53B9 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ @@ -399,7 +399,7 @@ 842E45E61ED8C747000A8B52 /* DB5.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = DB5.plist; path = Evergreen/Resources/DB5.plist; sourceTree = ""; }; 84513F8F1FAA63950023A1A9 /* FeedListControlsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedListControlsView.swift; sourceTree = ""; }; 845B14911FC2028A0013CF92 /* PseudoFeed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PseudoFeed.swift; sourceTree = ""; }; - 845B14A11FC21A080013CF92 /* TodayFeedDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TodayFeedDelegate.swift; sourceTree = ""; }; + 845B14A51FC2299E0013CF92 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; 845F52EC1FB2B9FC00C10BF0 /* FeedPasteboardWriter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedPasteboardWriter.swift; sourceTree = ""; }; 846E77161F6EF5D000A165E2 /* Database.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Database.xcodeproj; path = Frameworks/Database/Database.xcodeproj; sourceTree = ""; }; 846E77301F6EF5D600A165E2 /* Account.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Account.xcodeproj; path = Frameworks/Account/Account.xcodeproj; sourceTree = ""; }; @@ -478,6 +478,7 @@ 84F204CD1FAACB660076E152 /* FeedListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedListViewController.swift; sourceTree = ""; }; 84F204DD1FAACB8B0076E152 /* FeedListTimelineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedListTimelineViewController.swift; sourceTree = ""; }; 84F204DF1FAACBB30076E152 /* ArticleArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleArray.swift; sourceTree = ""; }; + 84F2D5241FC22D8100998D64 /* TodayFeed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TodayFeed.swift; sourceTree = ""; }; 84FB9A2D1EDCD6B8003D53B9 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Vendor/Sparkle.framework; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ @@ -592,7 +593,7 @@ isa = PBXGroup; children = ( 845B14911FC2028A0013CF92 /* PseudoFeed.swift */, - 845B14A11FC21A080013CF92 /* TodayFeedDelegate.swift */, + 84F2D5241FC22D8100998D64 /* TodayFeed.swift */, 849A97581ED9EB0D007D329B /* ArticleUtilities.swift */, ); name = Data; @@ -726,6 +727,7 @@ 849C64571ED37A5D003D8FC0 = { isa = PBXGroup; children = ( + 845B14A51FC2299E0013CF92 /* README.md */, 842E45E61ED8C747000A8B52 /* DB5.plist */, 849C64671ED37A5D003D8FC0 /* Assets.xcassets */, 849C64691ED37A5D003D8FC0 /* Main.storyboard */, @@ -1258,7 +1260,6 @@ files = ( 84F204E01FAACBB30076E152 /* ArticleArray.swift in Sources */, 849C64641ED37A5D003D8FC0 /* AppDelegate.swift in Sources */, - 845B14A21FC21A080013CF92 /* TodayFeedDelegate.swift in Sources */, 84513F901FAA63950023A1A9 /* FeedListControlsView.swift in Sources */, 84E46C7D1F75EF7B005ECFB3 /* AppDefaults.swift in Sources */, 842E45CE1ED8C308000A8B52 /* AppNotifications.swift in Sources */, @@ -1287,6 +1288,7 @@ 849A97981ED9EFAA007D329B /* Node-Extensions.swift in Sources */, 849A97531ED9EAC0007D329B /* AddFeedController.swift in Sources */, 849A97831ED9EC63007D329B /* StatusBarView.swift in Sources */, + 84F2D5251FC22D8100998D64 /* TodayFeed.swift in Sources */, 849A97431ED9EAA9007D329B /* AddFolderWindowController.swift in Sources */, 849A97921ED9EF65007D329B /* IndeterminateProgressWindowController.swift in Sources */, 849A97801ED9EC42007D329B /* DetailViewController.swift in Sources */, diff --git a/Evergreen/AppDelegate.swift b/Evergreen/AppDelegate.swift index ed250c269..8f3134aff 100644 --- a/Evergreen/AppDelegate.swift +++ b/Evergreen/AppDelegate.swift @@ -96,8 +96,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations { currentTheme = themeLoader.defaultTheme - let todayFeed = PseudoFeed(delegate: TodayFeedDelegate()) - pseudoFeeds += [todayFeed] + pseudoFeeds += [TodayFeed()] createAndShowMainWindow() diff --git a/Evergreen/Data/PseudoFeed.swift b/Evergreen/Data/PseudoFeed.swift index 09ada6ab0..bcedcf4ca 100644 --- a/Evergreen/Data/PseudoFeed.swift +++ b/Evergreen/Data/PseudoFeed.swift @@ -9,97 +9,10 @@ import Foundation import Data import RSCore -import Account -protocol PseudoFeedDelegate: DisplayNameProvider { +protocol PseudoFeed: class, DisplayNameProvider, UnreadCountProvider { - func fetchUnreadCount(for: Account, callback: @escaping (Int) -> Void) } -final class PseudoFeed: UnreadCountProvider, DisplayNameProvider { - private var timer: Timer? - private var unreadCounts = [Account: Int]() - private let delegate: PseudoFeedDelegate - - var nameForDisplay: String { - get { - return delegate.nameForDisplay - } - } - - var unreadCount = 0 { - didSet { - if unreadCount != oldValue { - postUnreadCountDidChangeNotification() - } - } - } - - init(delegate: PseudoFeedDelegate) { - - self.delegate = delegate - - NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil) - - startTimer() // Fetch unread count at startup - } - - @objc func unreadCountDidChange(_ note: Notification) { - - if note.object is Account { - startTimer() - } - } -} - -private extension PseudoFeed { - - // MARK: - Unread Counts - - private func fetchUnreadCount(for account: Account) { - - delegate.fetchUnreadCount(for: account) { (accountUnreadCount) in - self.unreadCounts[account] = accountUnreadCount - self.updateUnreadCount() - } - } - - private func fetchUnreadCounts() { - - AccountManager.shared.accounts.forEach { self.fetchUnreadCount(for: $0) } - } - - private func updateUnreadCount() { - - unreadCount = AccountManager.shared.accounts.reduce(0) { (result, account) -> Int in - if let oneUnreadCount = unreadCounts[account] { - return result + oneUnreadCount - } - return result - } - } - - // MARK: - Timer - - func stopTimer() { - - if let timer = timer { - timer.rs_invalidateIfValid() - } - timer = nil - } - - private static let fetchCoalescingDelay: TimeInterval = 0.2 - - func startTimer() { - - stopTimer() - - timer = Timer.scheduledTimer(withTimeInterval: PseudoFeed.fetchCoalescingDelay, repeats: false, block: { (timer) in - self.fetchUnreadCounts() - self.stopTimer() - }) - } -} diff --git a/Evergreen/Data/TodayFeed.swift b/Evergreen/Data/TodayFeed.swift new file mode 100644 index 000000000..89b2ab12f --- /dev/null +++ b/Evergreen/Data/TodayFeed.swift @@ -0,0 +1,91 @@ +// +// TodayFeed.swift +// Evergreen +// +// Created by Brent Simmons on 11/19/17. +// Copyright © 2017 Ranchero Software. All rights reserved. +// + +import Foundation +import Data +import Account + +final class TodayFeed: PseudoFeed { + + let nameForDisplay = NSLocalizedString("Today", comment: "Today pseudo-feed title") + + var unreadCount = 0 { + didSet { + if unreadCount != oldValue { + postUnreadCountDidChangeNotification() + } + } + } + + private var timer: Timer? + private var unreadCounts = [Account: Int]() + + init() { + + NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil) + startTimer() // Fetch unread count at startup + } + + @objc func unreadCountDidChange(_ note: Notification) { + + if note.object is Account { + startTimer() + } + } +} + +private extension TodayFeed { + + // MARK: - Unread Counts + + private func fetchUnreadCount(for account: Account) { + + account.fetchUnreadCountForToday { (accountUnreadCount) in + self.unreadCounts[account] = accountUnreadCount + self.updateUnreadCount() + } + } + + private func fetchUnreadCounts() { + + AccountManager.shared.accounts.forEach { self.fetchUnreadCount(for: $0) } + } + + private func updateUnreadCount() { + + unreadCount = AccountManager.shared.accounts.reduce(0) { (result, account) -> Int in + if let oneUnreadCount = unreadCounts[account] { + return result + oneUnreadCount + } + return result + } + } + + // MARK: - Timer + + func stopTimer() { + + if let timer = timer { + timer.rs_invalidateIfValid() + } + timer = nil + } + + private static let fetchCoalescingDelay: TimeInterval = 0.2 + + func startTimer() { + + stopTimer() + + timer = Timer.scheduledTimer(withTimeInterval: TodayFeed.fetchCoalescingDelay, repeats: false, block: { (timer) in + self.fetchUnreadCounts() + self.stopTimer() + }) + } +} +