FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #725 from tgt/tgt/feedbin-fixes

Browse Source 
Various Minor Feedbin Fixes
This commit is contained in:
Maurice Parker 2019-06-06 15:27:06 -05:00 committed by GitHub
commit e7ec59f31f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Frameworks/Account/Feed.swift
View File

@ -64,7 +64,7 @@ public final class Feed: DisplayNameProvider, Renamable, UnreadCountProvider, Ha
set { set {
let oldNameForDisplay = nameForDisplay let oldNameForDisplay = nameForDisplay
metadata.name = newValue metadata.name = newValue
if oldNameForDisplay != nameForDisplay { if oldNameForDisplay != newValue {
postDisplayNameDidChangeNotification() postDisplayNameDidChangeNotification()
} }
} }

2
Frameworks/Account/FeedFinder/FeedSpecifier.swift
View File

@ -46,7 +46,7 @@ struct FeedSpecifier: Hashable {
return feedSpecifiers.anyObject() return feedSpecifiers.anyObject()
} }
var currentHighScore = 0 var currentHighScore = Int.min
var currentBestFeed: FeedSpecifier? = nil var currentBestFeed: FeedSpecifier? = nil
for oneFeedSpecifier in feedSpecifiers { for oneFeedSpecifier in feedSpecifiers {

5
Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift
View File

@ -88,6 +88,7 @@ final class FeedbinAccountDelegate: AccountDelegate {
case .success(): case .success():
self.refreshArticles(account) { self.refreshArticles(account) {
self.sendArticleStatus(for: account) {
self.refreshArticleStatus(for: account) { self.refreshArticleStatus(for: account) {
self.refreshMissingArticles(account) { self.refreshMissingArticles(account) {
self.refreshProgress.clear() self.refreshProgress.clear()
@ -97,6 +98,7 @@ final class FeedbinAccountDelegate: AccountDelegate {
} }
} }
} }
}
case .failure(let error): case .failure(let error):
DispatchQueue.main.async { DispatchQueue.main.async {
@ -690,7 +692,10 @@ private extension FeedbinAccountDelegate {
DispatchQueue.main.sync { DispatchQueue.main.sync {
if let feed = account.idToFeedDictionary[subFeedId] { if let feed = account.idToFeedDictionary[subFeedId] {
feed.name = subscription.name feed.name = subscription.name
// If the name has been changed on the server remove the locally edited name
feed.editedName = nil
feed.homePageURL = subscription.homePageURL feed.homePageURL = subscription.homePageURL
feed.subscriptionID = String(subscription.subscriptionID)
} else { } else {
let feed = account.createFeed(with: subscription.name, url: subscription.url, feedID: subFeedId, homePageURL: subscription.homePageURL) let feed = account.createFeed(with: subscription.name, url: subscription.url, feedID: subFeedId, homePageURL: subscription.homePageURL)
feed.subscriptionID = String(subscription.subscriptionID) feed.subscriptionID = String(subscription.subscriptionID)