Fix a couple first-run startup bugs.
This commit is contained in:
parent
b597387e1a
commit
d69058c10c
|
@ -672,7 +672,9 @@ private extension Account {
|
|||
do {
|
||||
fileData = try Data(contentsOf: opmlFileURL)
|
||||
} catch {
|
||||
NSApplication.shared.presentError(error)
|
||||
// Commented out because it’s not an error on first run.
|
||||
// TODO: make it so we know if it’s first run or not.
|
||||
//NSApplication.shared.presentError(error)
|
||||
return
|
||||
}
|
||||
guard let opmlData = fileData else {
|
||||
|
@ -811,6 +813,8 @@ private extension Account {
|
|||
database.fetchAllNonZeroUnreadCounts { (unreadCountDictionary) in
|
||||
|
||||
if unreadCountDictionary.isEmpty {
|
||||
self.fetchingAllUnreadCounts = false
|
||||
self.updateUnreadCount()
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
@ -45,13 +45,9 @@ struct FeedsImporter {
|
|||
let feedsToImport = feeds(with: feedDictionaries, account: account)
|
||||
|
||||
BatchUpdate.shared.perform {
|
||||
for feed in feedsToImport {
|
||||
if !account.hasFeed(with: feed.feedID) {
|
||||
account.addFeed(feed, to: nil)
|
||||
feedsToImport.forEach{ account.addFeed($0, to: nil) }
|
||||
}
|
||||
}
|
||||
}
|
||||
account.dirty = true
|
||||
account.structureDidChange()
|
||||
}
|
||||
|
||||
private static func feeds(with feedDictionaries: [DiskFeedDictionary], account: Account) -> Set<Feed> {
|
||||
|
|
Loading…
Reference in New Issue