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

Fix compilation issues with tests after Account API changes.

Browse Source
This commit is contained in:
Kiel Gillard 2019-12-09 18:53:36 +11:00
parent e3e07e771d
commit 2401b0be1b
11 changed files with 379 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Frameworks/Account/AccountTests/Feedly/FeedlyAddNewFeedOperationTests.swift
View File

@ -164,7 +164,7 @@ class FeedlyAddNewFeedOperationTests: XCTestCase {
XCTAssert(progress.isComplete) XCTAssert(progress.isComplete)
support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "feedStream", subdirectory: subdirectory) support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "feedStream", subdirectory: subdirectory)
support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds", subdirectory: subdirectory) support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds", subdirectory: subdirectory, testCase: self)
} }
class TestFeedlyAddFeedToCollectionService: FeedlyAddFeedToCollectionService { class TestFeedlyAddFeedToCollectionService: FeedlyAddFeedToCollectionService {

155
Frameworks/Account/AccountTests/Feedly/FeedlySetStarredArticlesOperationTests.swift
View File

@ -48,9 +48,13 @@ class FeedlySetStarredArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let accountArticlesIDs = account.fetchStarredArticleIDs() let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
XCTAssertTrue(accountArticlesIDs.isEmpty) account.fetchStarredArticleIDs { accountArticlesIDs in
XCTAssertEqual(accountArticlesIDs, testIds) XCTAssertTrue(accountArticlesIDs.isEmpty)
XCTAssertEqual(accountArticlesIDs, testIds)
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
func testSetOneArticleIdStarred() { func testSetOneArticleIdStarred() {
@ -68,8 +72,12 @@ class FeedlySetStarredArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let accountArticlesIDs = account.fetchStarredArticleIDs() let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
XCTAssertEqual(accountArticlesIDs.count, testIds.count) account.fetchStarredArticleIDs { accountArticlesIDs in
XCTAssertEqual(accountArticlesIDs.count, testIds.count)
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
func testSetManyArticleIdsStarred() { func testSetManyArticleIdsStarred() {
@ -87,8 +95,12 @@ class FeedlySetStarredArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let accountArticlesIDs = account.fetchStarredArticleIDs() let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
XCTAssertEqual(accountArticlesIDs.count, testIds.count) account.fetchStarredArticleIDs { accountArticlesIDs in
XCTAssertEqual(accountArticlesIDs.count, testIds.count)
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
func testSetSomeArticleIdsUnstarred() { func testSetSomeArticleIdsUnstarred() {
@ -121,8 +133,12 @@ class FeedlySetStarredArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let remainingAccountArticlesIDs = account.fetchStarredArticleIDs() let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
XCTAssertEqual(remainingAccountArticlesIDs, remainingStarredIds) account.fetchStarredArticleIDs { remainingAccountArticlesIDs in
XCTAssertEqual(remainingAccountArticlesIDs, remainingStarredIds)
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
func testSetAllArticleIdsUnstarred() { func testSetAllArticleIdsUnstarred() {
@ -155,8 +171,12 @@ class FeedlySetStarredArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let remainingAccountArticlesIDs = account.fetchStarredArticleIDs() let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
XCTAssertEqual(remainingAccountArticlesIDs, remainingStarredIds) account.fetchStarredArticleIDs { remainingAccountArticlesIDs in
XCTAssertEqual(remainingAccountArticlesIDs, remainingStarredIds)
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
// MARK: - Updating Article Unread Status // MARK: - Updating Article Unread Status
@ -200,15 +220,18 @@ class FeedlySetStarredArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let accountArticlesIDs = account.fetchStarredArticleIDs() let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
XCTAssertEqual(accountArticlesIDs, remainingStarredIds) account.fetchStarredArticleIDs { accountArticlesIDs in
XCTAssertEqual(accountArticlesIDs, remainingStarredIds)
let idsOfStarredArticles = Set(account
.fetchArticles(.articleIDs(remainingStarredIds)) let idsOfStarredArticles = Set(self.account
.filter { $0.status.boolStatus(forKey: .starred) == true } .fetchArticles(.articleIDs(remainingStarredIds))
.map { $0.articleID }) .filter { $0.status.boolStatus(forKey: .starred) == true }
.map { $0.articleID })
XCTAssertEqual(idsOfStarredArticles, remainingStarredIds)
XCTAssertEqual(idsOfStarredArticles, remainingStarredIds)
}
waitForExpectations(timeout: 2)
} }
func testSetManyArticlesUnread() { func testSetManyArticlesUnread() {
@ -250,15 +273,18 @@ class FeedlySetStarredArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let accountArticlesIDs = account.fetchStarredArticleIDs() let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
XCTAssertEqual(accountArticlesIDs, remainingStarredIds) account.fetchStarredArticleIDs { accountArticlesIDs in
XCTAssertEqual(accountArticlesIDs, remainingStarredIds)
let idsOfStarredArticles = Set(account
.fetchArticles(.articleIDs(remainingStarredIds)) let idsOfStarredArticles = Set(self.account
.filter { $0.status.boolStatus(forKey: .starred) == true } .fetchArticles(.articleIDs(remainingStarredIds))
.map { $0.articleID }) .filter { $0.status.boolStatus(forKey: .starred) == true }
.map { $0.articleID })
XCTAssertEqual(idsOfStarredArticles, remainingStarredIds)
XCTAssertEqual(idsOfStarredArticles, remainingStarredIds)
}
waitForExpectations(timeout: 2)
} }
func testSetOneArticleUnread() { func testSetOneArticleUnread() {
@ -294,15 +320,19 @@ class FeedlySetStarredArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let accountArticlesIDs = account.fetchStarredArticleIDs() let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
XCTAssertEqual(accountArticlesIDs, remainingStarredIds) account.fetchStarredArticleIDs { accountArticlesIDs in
XCTAssertEqual(accountArticlesIDs, remainingStarredIds)
let idsOfStarredArticles = Set(account
.fetchArticles(.articleIDs(remainingStarredIds)) let idsOfStarredArticles = Set(self.account
.filter { $0.status.boolStatus(forKey: .starred) == true } .fetchArticles(.articleIDs(remainingStarredIds))
.map { $0.articleID }) .filter { $0.status.boolStatus(forKey: .starred) == true }
.map { $0.articleID })
XCTAssertEqual(idsOfStarredArticles, remainingStarredIds)
XCTAssertEqual(idsOfStarredArticles, remainingStarredIds)
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
func testSetNoArticlesRead() { func testSetNoArticlesRead() {
@ -337,15 +367,19 @@ class FeedlySetStarredArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let accountArticlesIDs = account.fetchStarredArticleIDs() let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
XCTAssertEqual(accountArticlesIDs, remainingStarredIds) account.fetchStarredArticleIDs { accountArticlesIDs in
XCTAssertEqual(accountArticlesIDs, remainingStarredIds)
let idsOfStarredArticles = Set(account
.fetchArticles(.articleIDs(remainingStarredIds)) let idsOfStarredArticles = Set(self.account
.filter { $0.status.boolStatus(forKey: .starred) == true } .fetchArticles(.articleIDs(remainingStarredIds))
.map { $0.articleID }) .filter { $0.status.boolStatus(forKey: .starred) == true }
.map { $0.articleID })
XCTAssertEqual(idsOfStarredArticles, remainingStarredIds)
XCTAssertEqual(idsOfStarredArticles, remainingStarredIds)
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
func testSetAllArticlesAndArticleIdsWithSomeArticlesIngested() { func testSetAllArticlesAndArticleIdsWithSomeArticlesIngested() {
@ -383,16 +417,21 @@ class FeedlySetStarredArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let accountArticlesIDs = account.fetchStarredArticleIDs() let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
XCTAssertEqual(accountArticlesIDs, remainingStarredIds) account.fetchStarredArticleIDs { accountArticlesIDs in
XCTAssertEqual(accountArticlesIDs, remainingStarredIds)
let someTestItems = Set(someItemsAndFeeds.flatMap { $0.value })
let someRemainingStarredIdsOfIngestedArticles = Set(someTestItems.compactMap { $0.syncServiceID }) let someTestItems = Set(someItemsAndFeeds.flatMap { $0.value })
let idsOfStarredArticles = Set(account let someRemainingStarredIdsOfIngestedArticles = Set(someTestItems.compactMap { $0.syncServiceID })
.fetchArticles(.articleIDs(someRemainingStarredIdsOfIngestedArticles)) let idsOfStarredArticles = Set(self.account
.filter { $0.status.boolStatus(forKey: .starred) == true } .fetchArticles(.articleIDs(someRemainingStarredIdsOfIngestedArticles))
.map { $0.articleID }) .filter { $0.status.boolStatus(forKey: .starred) == true }
.map { $0.articleID })
XCTAssertEqual(idsOfStarredArticles, someRemainingStarredIdsOfIngestedArticles)
XCTAssertEqual(idsOfStarredArticles, someRemainingStarredIdsOfIngestedArticles)
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
} }

153
Frameworks/Account/AccountTests/Feedly/FeedlySetUnreadArticlesOperationTests.swift
View File

@ -48,9 +48,14 @@ class FeedlySetUnreadArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let accountArticlesIDs = account.fetchUnreadArticleIDs() let fetchIdsExpectation = expectation(description: "Fetched Articles Ids")
XCTAssertTrue(accountArticlesIDs.isEmpty) account.fetchUnreadArticleIDs { accountArticlesIDs in
XCTAssertEqual(accountArticlesIDs.count, testIds.count) XCTAssertTrue(accountArticlesIDs.isEmpty)
XCTAssertEqual(accountArticlesIDs.count, testIds.count)
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
func testSetOneArticleIdUnread() { func testSetOneArticleIdUnread() {
@ -68,8 +73,12 @@ class FeedlySetUnreadArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let accountArticlesIDs = account.fetchUnreadArticleIDs() let fetchIdsExpectation = expectation(description: "Fetched Articles Ids")
XCTAssertEqual(accountArticlesIDs.count, testIds.count) account.fetchUnreadArticleIDs { accountArticlesIDs in
XCTAssertEqual(accountArticlesIDs.count, testIds.count)
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
func testSetManyArticleIdsUnread() { func testSetManyArticleIdsUnread() {
@ -87,8 +96,12 @@ class FeedlySetUnreadArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let accountArticlesIDs = account.fetchUnreadArticleIDs() let fetchIdsExpectation = expectation(description: "Fetched Articles Ids")
XCTAssertEqual(accountArticlesIDs.count, testIds.count) account.fetchUnreadArticleIDs { accountArticlesIDs in
XCTAssertEqual(accountArticlesIDs.count, testIds.count)
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
func testSetSomeArticleIdsRead() { func testSetSomeArticleIdsRead() {
@ -121,8 +134,12 @@ class FeedlySetUnreadArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let remainingAccountArticlesIDs = account.fetchUnreadArticleIDs() let fetchIdsExpectation = expectation(description: "Fetched Articles Ids")
XCTAssertEqual(remainingAccountArticlesIDs, remainingUnreadIds) account.fetchUnreadArticleIDs { remainingAccountArticlesIDs in
XCTAssertEqual(remainingAccountArticlesIDs, remainingUnreadIds)
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
func testSetAllArticleIdsRead() { func testSetAllArticleIdsRead() {
@ -155,8 +172,12 @@ class FeedlySetUnreadArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let remainingAccountArticlesIDs = account.fetchUnreadArticleIDs() let fetchIdsExpectation = expectation(description: "Fetched Articles Ids")
XCTAssertEqual(remainingAccountArticlesIDs, remainingUnreadIds) account.fetchUnreadArticleIDs { remainingAccountArticlesIDs in
XCTAssertEqual(remainingAccountArticlesIDs, remainingUnreadIds)
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
// MARK: - Updating Article Unread Status // MARK: - Updating Article Unread Status
@ -200,15 +221,18 @@ class FeedlySetUnreadArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let accountArticlesIDs = account.fetchUnreadArticleIDs() let fetchIdsExpectation = expectation(description: "Fetched Articles Ids")
XCTAssertEqual(accountArticlesIDs, remainingUnreadIds) account.fetchUnreadArticleIDs { accountArticlesIDs in
XCTAssertEqual(accountArticlesIDs, remainingUnreadIds)
let idsOfUnreadArticles = Set(account let idsOfUnreadArticles = Set(self.account
.fetchArticles(.articleIDs(remainingUnreadIds)) .fetchArticles(.articleIDs(remainingUnreadIds))
.filter { $0.status.boolStatus(forKey: .read) == false } .filter { $0.status.boolStatus(forKey: .read) == false }
.map { $0.articleID }) .map { $0.articleID })
XCTAssertEqual(idsOfUnreadArticles, remainingUnreadIds) XCTAssertEqual(idsOfUnreadArticles, remainingUnreadIds)
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
func testSetManyArticlesUnread() { func testSetManyArticlesUnread() {
@ -250,15 +274,18 @@ class FeedlySetUnreadArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let accountArticlesIDs = account.fetchUnreadArticleIDs() let fetchIdsExpectation = expectation(description: "Fetched Articles Ids")
XCTAssertEqual(accountArticlesIDs, remainingUnreadIds) account.fetchUnreadArticleIDs { accountArticlesIDs in
XCTAssertEqual(accountArticlesIDs, remainingUnreadIds)
let idsOfUnreadArticles = Set(account
.fetchArticles(.articleIDs(remainingUnreadIds)) let idsOfUnreadArticles = Set(self.account
.filter { $0.status.boolStatus(forKey: .read) == false } .fetchArticles(.articleIDs(remainingUnreadIds))
.map { $0.articleID }) .filter { $0.status.boolStatus(forKey: .read) == false }
.map { $0.articleID })
XCTAssertEqual(idsOfUnreadArticles, remainingUnreadIds)
XCTAssertEqual(idsOfUnreadArticles, remainingUnreadIds)
fetchIdsExpectation.fulfill()
}
} }
func testSetOneArticleUnread() { func testSetOneArticleUnread() {
@ -294,15 +321,19 @@ class FeedlySetUnreadArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let accountArticlesIDs = account.fetchUnreadArticleIDs() let fetchIdsExpectation = expectation(description: "Fetched Articles Ids")
XCTAssertEqual(accountArticlesIDs, remainingUnreadIds) account.fetchUnreadArticleIDs { accountArticlesIDs in
XCTAssertEqual(accountArticlesIDs, remainingUnreadIds)
let idsOfUnreadArticles = Set(account
.fetchArticles(.articleIDs(remainingUnreadIds)) let idsOfUnreadArticles = Set(self.account
.filter { $0.status.boolStatus(forKey: .read) == false } .fetchArticles(.articleIDs(remainingUnreadIds))
.map { $0.articleID }) .filter { $0.status.boolStatus(forKey: .read) == false }
.map { $0.articleID })
XCTAssertEqual(idsOfUnreadArticles, remainingUnreadIds)
XCTAssertEqual(idsOfUnreadArticles, remainingUnreadIds)
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
func testSetNoArticlesRead() { func testSetNoArticlesRead() {
@ -337,15 +368,18 @@ class FeedlySetUnreadArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let accountArticlesIDs = account.fetchUnreadArticleIDs() let fetchIdsExpectation = expectation(description: "Fetched Articles Ids")
XCTAssertEqual(accountArticlesIDs, remainingUnreadIds) account.fetchUnreadArticleIDs { accountArticlesIDs in
XCTAssertEqual(accountArticlesIDs, remainingUnreadIds)
let idsOfUnreadArticles = Set(account
.fetchArticles(.articleIDs(remainingUnreadIds)) let idsOfUnreadArticles = Set(self.account
.filter { $0.status.boolStatus(forKey: .read) == false } .fetchArticles(.articleIDs(remainingUnreadIds))
.map { $0.articleID }) .filter { $0.status.boolStatus(forKey: .read) == false }
.map { $0.articleID })
XCTAssertEqual(idsOfUnreadArticles, remainingUnreadIds)
XCTAssertEqual(idsOfUnreadArticles, remainingUnreadIds)
fetchIdsExpectation.fulfill()
}
} }
func testSetAllArticlesAndArticleIdsWithSomeArticlesIngested() { func testSetAllArticlesAndArticleIdsWithSomeArticlesIngested() {
@ -383,16 +417,19 @@ class FeedlySetUnreadArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let accountArticlesIDs = account.fetchUnreadArticleIDs() let fetchIdsExpectation = expectation(description: "Fetched Articles Ids")
XCTAssertEqual(accountArticlesIDs, remainingUnreadIds) account.fetchUnreadArticleIDs { accountArticlesIDs in
XCTAssertEqual(accountArticlesIDs, remainingUnreadIds)
let someTestItems = Set(someItemsAndFeeds.flatMap { $0.value })
let someRemainingUnreadIdsOfIngestedArticles = Set(someTestItems.compactMap { $0.syncServiceID }) let someTestItems = Set(someItemsAndFeeds.flatMap { $0.value })
let idsOfUnreadArticles = Set(account let someRemainingUnreadIdsOfIngestedArticles = Set(someTestItems.compactMap { $0.syncServiceID })
.fetchArticles(.articleIDs(someRemainingUnreadIdsOfIngestedArticles)) let idsOfUnreadArticles = Set(self.account
.filter { $0.status.boolStatus(forKey: .read) == false } .fetchArticles(.articleIDs(someRemainingUnreadIdsOfIngestedArticles))
.map { $0.articleID }) .filter { $0.status.boolStatus(forKey: .read) == false }
.map { $0.articleID })
XCTAssertEqual(idsOfUnreadArticles, someRemainingUnreadIdsOfIngestedArticles)
XCTAssertEqual(idsOfUnreadArticles, someRemainingUnreadIdsOfIngestedArticles)
fetchIdsExpectation.fulfill()
}
} }
} }

30
Frameworks/Account/AccountTests/Feedly/FeedlySyncAllOperationTests.swift
View File

@ -171,9 +171,9 @@ class FeedlySyncAllOperationTests: XCTestCase {
support.checkFoldersAndFeeds(in: account, againstCollectionsAndFeedsInJSONNamed: "collections", subdirectory: subdirectory) support.checkFoldersAndFeeds(in: account, againstCollectionsAndFeedsInJSONNamed: "collections", subdirectory: subdirectory)
support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "global.all", subdirectory: subdirectory) support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "global.all", subdirectory: subdirectory)
support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "global.all@MTZkOTdkZWQ1NzM6NTE2OjUzYjgyNmEy", subdirectory: subdirectory) support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "global.all@MTZkOTdkZWQ1NzM6NTE2OjUzYjgyNmEy", subdirectory: subdirectory)
support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds", subdirectory: subdirectory) support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds", subdirectory: subdirectory, testCase: self)
support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds@MTZkOTRhOTNhZTQ6MzExOjUzYjgyNmEy", subdirectory: subdirectory) support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds@MTZkOTRhOTNhZTQ6MzExOjUzYjgyNmEy", subdirectory: subdirectory, testCase: self)
support.checkStarredStatuses(in: account, againstItemsInStreamInJSONNamed: "starred", subdirectory: subdirectory) support.checkStarredStatuses(in: account, againstItemsInStreamInJSONNamed: "starred", subdirectory: subdirectory, testCase: self)
support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "starred", subdirectory: subdirectory) support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "starred", subdirectory: subdirectory)
} }
@ -187,9 +187,9 @@ class FeedlySyncAllOperationTests: XCTestCase {
let subdirectory = "feedly-2-changestatuses" let subdirectory = "feedly-2-changestatuses"
support.checkFoldersAndFeeds(in: account, againstCollectionsAndFeedsInJSONNamed: "collections", subdirectory: subdirectory) support.checkFoldersAndFeeds(in: account, againstCollectionsAndFeedsInJSONNamed: "collections", subdirectory: subdirectory)
support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "global.all", subdirectory: subdirectory) support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "global.all", subdirectory: subdirectory)
support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds", subdirectory: subdirectory) support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds", subdirectory: subdirectory, testCase: self)
support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds@MTZkOTJkNjIwM2Q6MTEzYjpkNDUwNjA3MQ==", subdirectory: subdirectory) support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds@MTZkOTJkNjIwM2Q6MTEzYjpkNDUwNjA3MQ==", subdirectory: subdirectory, testCase: self)
support.checkStarredStatuses(in: account, againstItemsInStreamInJSONNamed: "starred", subdirectory: subdirectory) support.checkStarredStatuses(in: account, againstItemsInStreamInJSONNamed: "starred", subdirectory: subdirectory, testCase: self)
support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "starred", subdirectory: subdirectory) support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "starred", subdirectory: subdirectory)
} }
@ -203,9 +203,9 @@ class FeedlySyncAllOperationTests: XCTestCase {
let subdirectory = "feedly-3-changestatusesagain" let subdirectory = "feedly-3-changestatusesagain"
support.checkFoldersAndFeeds(in: account, againstCollectionsAndFeedsInJSONNamed: "collections", subdirectory: subdirectory) support.checkFoldersAndFeeds(in: account, againstCollectionsAndFeedsInJSONNamed: "collections", subdirectory: subdirectory)
support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "global.all", subdirectory: subdirectory) support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "global.all", subdirectory: subdirectory)
support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds", subdirectory: subdirectory) support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds", subdirectory: subdirectory, testCase: self)
support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds@MTZkOGRlMjVmM2M6M2YyOmQ0NTA2MDcx", subdirectory: subdirectory) support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds@MTZkOGRlMjVmM2M6M2YyOmQ0NTA2MDcx", subdirectory: subdirectory, testCase: self)
support.checkStarredStatuses(in: account, againstItemsInStreamInJSONNamed: "starred", subdirectory: subdirectory) support.checkStarredStatuses(in: account, againstItemsInStreamInJSONNamed: "starred", subdirectory: subdirectory, testCase: self)
support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "starred", subdirectory: subdirectory) support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "starred", subdirectory: subdirectory)
} }
@ -219,9 +219,9 @@ class FeedlySyncAllOperationTests: XCTestCase {
let subdirectory = "feedly-4-addfeedsandfolders" let subdirectory = "feedly-4-addfeedsandfolders"
support.checkFoldersAndFeeds(in: account, againstCollectionsAndFeedsInJSONNamed: "collections", subdirectory: subdirectory) support.checkFoldersAndFeeds(in: account, againstCollectionsAndFeedsInJSONNamed: "collections", subdirectory: subdirectory)
support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "global.all", subdirectory: subdirectory) support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "global.all", subdirectory: subdirectory)
support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds", subdirectory: subdirectory) support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds", subdirectory: subdirectory, testCase: self)
support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds@MTZkOTE3YTRlMzQ6YWZjOmQ0NTA2MDcx", subdirectory: subdirectory) support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds@MTZkOTE3YTRlMzQ6YWZjOmQ0NTA2MDcx", subdirectory: subdirectory, testCase: self)
support.checkStarredStatuses(in: account, againstItemsInStreamInJSONNamed: "starred", subdirectory: subdirectory) support.checkStarredStatuses(in: account, againstItemsInStreamInJSONNamed: "starred", subdirectory: subdirectory, testCase: self)
support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "starred", subdirectory: subdirectory) support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "starred", subdirectory: subdirectory)
} }
@ -235,9 +235,9 @@ class FeedlySyncAllOperationTests: XCTestCase {
let subdirectory = "feedly-5-removefeedsandfolders" let subdirectory = "feedly-5-removefeedsandfolders"
support.checkFoldersAndFeeds(in: account, againstCollectionsAndFeedsInJSONNamed: "collections", subdirectory: subdirectory) support.checkFoldersAndFeeds(in: account, againstCollectionsAndFeedsInJSONNamed: "collections", subdirectory: subdirectory)
support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "global.all", subdirectory: subdirectory) support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "global.all", subdirectory: subdirectory)
support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds", subdirectory: subdirectory) support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds", subdirectory: subdirectory, testCase: self)
support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds@MTZkOGRlMjVmM2M6M2YxOmQ0NTA2MDcx", subdirectory: subdirectory) support.checkUnreadStatuses(in: account, againstIdsInStreamInJSONNamed: "unreadIds@MTZkOGRlMjVmM2M6M2YxOmQ0NTA2MDcx", subdirectory: subdirectory, testCase: self)
support.checkStarredStatuses(in: account, againstItemsInStreamInJSONNamed: "starred", subdirectory: subdirectory) support.checkStarredStatuses(in: account, againstItemsInStreamInJSONNamed: "starred", subdirectory: subdirectory, testCase: self)
support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "starred", subdirectory: subdirectory) support.checkArticles(in: account, againstItemsInStreamInJSONNamed: "starred", subdirectory: subdirectory)
} }

70
Frameworks/Account/AccountTests/Feedly/FeedlySyncStarredArticlesOperationTests.swift
View File

@ -55,19 +55,24 @@ class FeedlySyncStarredArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let expectedArticleIds = Set(items.map { $0.id }) let expectedArticleIds = Set(items.map { $0.id })
let starredArticleIds = account.fetchStarredArticleIDs() let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
let missingIds = expectedArticleIds.subtracting(starredArticleIds) account.fetchStarredArticleIDs { starredArticleIds in
XCTAssertTrue(missingIds.isEmpty, "These article ids were not marked as starred.") let missingIds = expectedArticleIds.subtracting(starredArticleIds)
XCTAssertTrue(missingIds.isEmpty, "These article ids were not marked as starred.")
// Fetch articles directly because account.fetchArticles(.starred) fetches starred articles for feeds subscribed to.
let expectedArticles = account.fetchArticles(.articleIDs(expectedArticleIds)) // Fetch articles directly because account.fetchArticles(.starred) fetches starred articles for feeds subscribed to.
XCTAssertEqual(expectedArticles.count, expectedArticleIds.count, "Did not fetch all the articles.") let expectedArticles = self.account.fetchArticles(.articleIDs(expectedArticleIds))
XCTAssertEqual(expectedArticles.count, expectedArticleIds.count, "Did not fetch all the articles.")
let starredArticles = account.fetchArticles(.articleIDs(starredArticleIds))
XCTAssertEqual(expectedArticleIds.count, expectedArticles.count) let starredArticles = self.account.fetchArticles(.articleIDs(starredArticleIds))
let missingArticles = expectedArticles.subtracting(starredArticles) XCTAssertEqual(expectedArticleIds.count, expectedArticles.count)
XCTAssertTrue(missingArticles.isEmpty, "These articles should be starred and fetched.") let missingArticles = expectedArticles.subtracting(starredArticles)
XCTAssertEqual(expectedArticles, starredArticles) XCTAssertTrue(missingArticles.isEmpty, "These articles should be starred and fetched.")
XCTAssertEqual(expectedArticles, starredArticles)
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
func testIngestsOnePageFailure() { func testIngestsOnePageFailure() {
@ -98,8 +103,12 @@ class FeedlySyncStarredArticlesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let starredArticleIds = account.fetchStarredArticleIDs() let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
XCTAssertTrue(starredArticleIds.isEmpty) account.fetchStarredArticleIDs { starredArticleIds in
XCTAssertTrue(starredArticleIds.isEmpty)
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
func testIngestsManyPagesSuccess() { func testIngestsManyPagesSuccess() {
@ -143,18 +152,23 @@ class FeedlySyncStarredArticlesOperationTests: XCTestCase {
// Find articles inserted. // Find articles inserted.
let expectedArticleIds = Set(service.pages.values.map { $0.items }.flatMap { $0 }.map { $0.id }) let expectedArticleIds = Set(service.pages.values.map { $0.items }.flatMap { $0 }.map { $0.id })
let starredArticleIds = account.fetchStarredArticleIDs() let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
let missingIds = expectedArticleIds.subtracting(starredArticleIds) account.fetchStarredArticleIDs { starredArticleIds in
XCTAssertTrue(missingIds.isEmpty, "These article ids were not marked as starred.") let missingIds = expectedArticleIds.subtracting(starredArticleIds)
XCTAssertTrue(missingIds.isEmpty, "These article ids were not marked as starred.")
// Fetch articles directly because account.fetchArticles(.starred) fetches starred articles for feeds subscribed to.
let expectedArticles = account.fetchArticles(.articleIDs(expectedArticleIds)) // Fetch articles directly because account.fetchArticles(.starred) fetches starred articles for feeds subscribed to.
XCTAssertEqual(expectedArticles.count, expectedArticleIds.count, "Did not fetch all the articles.") let expectedArticles = self.account.fetchArticles(.articleIDs(expectedArticleIds))
XCTAssertEqual(expectedArticles.count, expectedArticleIds.count, "Did not fetch all the articles.")
let starredArticles = account.fetchArticles(.articleIDs(starredArticleIds))
XCTAssertEqual(expectedArticleIds.count, expectedArticles.count) let starredArticles = self.account.fetchArticles(.articleIDs(starredArticleIds))
let missingArticles = expectedArticles.subtracting(starredArticles) XCTAssertEqual(expectedArticleIds.count, expectedArticles.count)
XCTAssertTrue(missingArticles.isEmpty, "These articles should be starred and fetched.") let missingArticles = expectedArticles.subtracting(starredArticles)
XCTAssertEqual(expectedArticles, starredArticles) XCTAssertTrue(missingArticles.isEmpty, "These articles should be starred and fetched.")
XCTAssertEqual(expectedArticles, starredArticles)
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
} }

28
Frameworks/Account/AccountTests/Feedly/FeedlySyncUnreadStatusesOperationTests.swift
View File

@ -55,9 +55,13 @@ class FeedlySyncUnreadStatusesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let expectedArticleIds = Set(ids) let expectedArticleIds = Set(ids)
let unreadArticleIds = account.fetchUnreadArticleIDs() let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
let missingIds = expectedArticleIds.subtracting(unreadArticleIds) account.fetchUnreadArticleIDs { unreadArticleIds in
XCTAssertTrue(missingIds.isEmpty, "These article ids were not marked as unread.") let missingIds = expectedArticleIds.subtracting(unreadArticleIds)
XCTAssertTrue(missingIds.isEmpty, "These article ids were not marked as unread.")
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
func testIngestsOnePageFailure() { func testIngestsOnePageFailure() {
@ -88,8 +92,12 @@ class FeedlySyncUnreadStatusesOperationTests: XCTestCase {
waitForExpectations(timeout: 2) waitForExpectations(timeout: 2)
let unreadArticleIds = account.fetchUnreadArticleIDs() let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
XCTAssertTrue(unreadArticleIds.isEmpty) account.fetchUnreadArticleIDs { unreadArticleIds in
XCTAssertTrue(unreadArticleIds.isEmpty)
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
func testIngestsManyPagesSuccess() { func testIngestsManyPagesSuccess() {
@ -133,8 +141,12 @@ class FeedlySyncUnreadStatusesOperationTests: XCTestCase {
// Find statuses inserted. // Find statuses inserted.
let expectedArticleIds = Set(service.pages.values.map { $0.ids }.flatMap { $0 }) let expectedArticleIds = Set(service.pages.values.map { $0.ids }.flatMap { $0 })
let unreadArticleIds = account.fetchUnreadArticleIDs() let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
let missingIds = expectedArticleIds.subtracting(unreadArticleIds) account.fetchUnreadArticleIDs { unreadArticleIds in
XCTAssertTrue(missingIds.isEmpty, "These article ids were not marked as unread.") let missingIds = expectedArticleIds.subtracting(unreadArticleIds)
XCTAssertTrue(missingIds.isEmpty, "These article ids were not marked as unread.")
fetchIdsExpectation.fulfill()
}
waitForExpectations(timeout: 2)
} }
} }

40
Frameworks/Account/AccountTests/Feedly/FeedlyTestSupport.swift
View File

@ -212,33 +212,41 @@ class FeedlyTestSupport {
} }
} }
func checkUnreadStatuses(in account: Account, againstIdsInStreamInJSONNamed name: String, subdirectory: String? = nil) { func checkUnreadStatuses(in account: Account, againstIdsInStreamInJSONNamed name: String, subdirectory: String? = nil, testCase: XCTestCase) {
let streamIds = testJSON(named: name, subdirectory: subdirectory) as! [String:Any] let streamIds = testJSON(named: name, subdirectory: subdirectory) as! [String:Any]
checkUnreadStatuses(in: account, correspondToIdsInJSONPayload: streamIds) checkUnreadStatuses(in: account, correspondToIdsInJSONPayload: streamIds, testCase: testCase)
} }
func checkUnreadStatuses(in testAccount: Account, correspondToIdsInJSONPayload streamIds: [String: Any]) { func checkUnreadStatuses(in testAccount: Account, correspondToIdsInJSONPayload streamIds: [String: Any], testCase: XCTestCase) {
let ids = Set(streamIds["ids"] as! [String]) let ids = Set(streamIds["ids"] as! [String])
let articleIds = testAccount.fetchUnreadArticleIDs() let fetchIdsExpectation = testCase.expectation(description: "Fetch Article Ids")
// Unread statuses can be paged from Feedly. testAccount.fetchUnreadArticleIDs { articleIds in
// Instead of joining test data, the best we can do is // Unread statuses can be paged from Feedly.
// make sure that these ids are marked as unread (a subset of the total). // Instead of joining test data, the best we can do is
XCTAssertTrue(ids.isSubset(of: articleIds), "Some articles in `ids` are not marked as unread.") // make sure that these ids are marked as unread (a subset of the total).
XCTAssertTrue(ids.isSubset(of: articleIds), "Some articles in `ids` are not marked as unread.")
fetchIdsExpectation.fulfill()
}
testCase.wait(for: [fetchIdsExpectation], timeout: 2)
} }
func checkStarredStatuses(in account: Account, againstItemsInStreamInJSONNamed name: String, subdirectory: String? = nil) { func checkStarredStatuses(in account: Account, againstItemsInStreamInJSONNamed name: String, subdirectory: String? = nil, testCase: XCTestCase) {
let streamIds = testJSON(named: name, subdirectory: subdirectory) as! [String:Any] let streamIds = testJSON(named: name, subdirectory: subdirectory) as! [String:Any]
checkStarredStatuses(in: account, correspondToStreamItemsIn: streamIds) checkStarredStatuses(in: account, correspondToStreamItemsIn: streamIds, testCase: testCase)
} }
func checkStarredStatuses(in testAccount: Account, correspondToStreamItemsIn stream: [String: Any]) { func checkStarredStatuses(in testAccount: Account, correspondToStreamItemsIn stream: [String: Any], testCase: XCTestCase) {
let items = stream["items"] as! [[String: Any]] let items = stream["items"] as! [[String: Any]]
let ids = Set(items.map { $0["id"] as! String }) let ids = Set(items.map { $0["id"] as! String })
let articleIds = testAccount.fetchStarredArticleIDs() let fetchIdsExpectation = testCase.expectation(description: "Fetch Article Ids")
// Starred articles can be paged from Feedly. testAccount.fetchStarredArticleIDs { articleIds in
// Instead of joining test data, the best we can do is // Starred articles can be paged from Feedly.
// make sure that these articles are marked as starred (a subset of the total). // Instead of joining test data, the best we can do is
XCTAssertTrue(ids.isSubset(of: articleIds), "Some articles in `ids` are not marked as starred.") // make sure that these articles are marked as starred (a subset of the total).
XCTAssertTrue(ids.isSubset(of: articleIds), "Some articles in `ids` are not marked as starred.")
fetchIdsExpectation.fulfill()
}
testCase.wait(for: [fetchIdsExpectation], timeout: 2)
} }
func check(_ entries: [FeedlyEntry], correspondToStreamItemsIn stream: [String: Any]) { func check(_ entries: [FeedlyEntry], correspondToStreamItemsIn stream: [String: Any]) {

2
Frameworks/Account/Feedly/Operations/FeedlyAddNewFeedOperation.swift
View File

@ -93,7 +93,7 @@ class FeedlyAddNewFeedOperation: FeedlyOperation, FeedlyOperationDelegate, Feedl
self.operationQueue.addOperation(createFeeds) self.operationQueue.addOperation(createFeeds)
let syncUnread = FeedlySyncUnreadStatusesOperation(account: account, credentials: credentials, service: syncUnreadIdsService, newerThan: nil, log: log) let syncUnread = FeedlySyncUnreadStatusesOperation(account: account, credentials: credentials, service: syncUnreadIdsService, newerThan: nil, log: log)
syncUnread.addDependency(addRequest) syncUnread.addDependency(createFeeds)
syncUnread.downloadProgress = downloadProgress syncUnread.downloadProgress = downloadProgress
self.operationQueue.addOperation(syncUnread) self.operationQueue.addOperation(syncUnread)

71
Frameworks/Account/Feedly/Operations/FeedlySetStarredArticlesOperation.swift
View File

@ -32,39 +32,44 @@ final class FeedlySetStarredArticlesOperation: FeedlyOperation {
return return
} }
let group = DispatchGroup() account.fetchStarredArticleIDs(didFetchStarredArticleIDs(_:))
}
let remoteStarredArticleIds = allStarredEntryIdsProvider.entryIds
account.fetchStarredArticleIDs { localStarredArticleIDs in private func didFetchStarredArticleIDs(_ localStarredArticleIDs: Set<String>) {
// Mark articles as starred guard !isCancelled else {
let deltaStarredArticleIDs = remoteStarredArticleIds.subtracting(localStarredArticleIDs) didFinish()
let markStarredArticles = self.account.fetchArticles(.articleIDs(deltaStarredArticleIDs)) return
self.account.update(markStarredArticles, statusKey: .starred, flag: true)
// Save any starred statuses for articles we haven't yet received
let markStarredArticleIDs = Set(markStarredArticles.map { $0.articleID })
let missingStarredArticleIDs = deltaStarredArticleIDs.subtracting(markStarredArticleIDs)
group.enter()
self.account.ensureStatuses(missingStarredArticleIDs, true, .starred, true) {
group.leave()
}
// Mark articles as unstarred
let deltaUnstarredArticleIDs = localStarredArticleIDs.subtracting(remoteStarredArticleIds)
let markUnstarredArticles = self.account.fetchArticles(.articleIDs(deltaUnstarredArticleIDs))
self.account.update(markUnstarredArticles, statusKey: .starred, flag: false)
// Save any unstarred statuses for articles we haven't yet received
let markUnstarredArticleIDs = Set(markUnstarredArticles.map { $0.articleID })
let missingUnstarredArticleIDs = deltaUnstarredArticleIDs.subtracting(markUnstarredArticleIDs)
group.enter()
self.account.ensureStatuses(missingUnstarredArticleIDs, true, .starred, false) {
group.leave()
}
group.notify(queue: .main) {
self.didFinish()
}
} }
let group = DispatchGroup()
let remoteStarredArticleIds = allStarredEntryIdsProvider.entryIds
// Mark articles as starred
let deltaStarredArticleIDs = remoteStarredArticleIds.subtracting(localStarredArticleIDs)
let markStarredArticles = account.fetchArticles(.articleIDs(deltaStarredArticleIDs))
account.update(markStarredArticles, statusKey: .starred, flag: true)
// Save any starred statuses for articles we haven't yet received
let markStarredArticleIDs = Set(markStarredArticles.map { $0.articleID })
let missingStarredArticleIDs = deltaStarredArticleIDs.subtracting(markStarredArticleIDs)
group.enter()
account.ensureStatuses(missingStarredArticleIDs, true, .starred, true) {
group.leave()
}
// Mark articles as unstarred
let deltaUnstarredArticleIDs = localStarredArticleIDs.subtracting(remoteStarredArticleIds)
let markUnstarredArticles = account.fetchArticles(.articleIDs(deltaUnstarredArticleIDs))
account.update(markUnstarredArticles, statusKey: .starred, flag: false)
// Save any unstarred statuses for articles we haven't yet received
let markUnstarredArticleIDs = Set(markUnstarredArticles.map { $0.articleID })
let missingUnstarredArticleIDs = deltaUnstarredArticleIDs.subtracting(markUnstarredArticleIDs)
group.enter()
account.ensureStatuses(missingUnstarredArticleIDs, true, .starred, false) {
group.leave()
}
group.notify(queue: .main, execute: didFinish)
} }
} }

74
Frameworks/Account/Feedly/Operations/FeedlySetUnreadArticlesOperation.swift
View File

@ -32,41 +32,45 @@ final class FeedlySetUnreadArticlesOperation: FeedlyOperation {
return return
} }
let group = DispatchGroup() account.fetchUnreadArticleIDs(didFetchUnreadArticleIDs(_:))
}
let remoteUnreadArticleIds = allUnreadIdsProvider.entryIds
//Set(entries.filter { $0.unread }.map { $0.id }) private func didFetchUnreadArticleIDs(_ localUnreadArticleIds: Set<String>) {
account.fetchUnreadArticleIDs { localUnreadArticleIds in guard !isCancelled else {
// Mark articles as unread didFinish()
let deltaUnreadArticleIds = remoteUnreadArticleIds.subtracting(localUnreadArticleIds) return
let markUnreadArticles = self.account.fetchArticles(.articleIDs(deltaUnreadArticleIds))
self.account.update(markUnreadArticles, statusKey: .read, flag: false)
// Save any unread statuses for articles we haven't yet received
let markUnreadArticleIDs = Set(markUnreadArticles.map { $0.articleID })
let missingUnreadArticleIDs = deltaUnreadArticleIds.subtracting(markUnreadArticleIDs)
group.enter()
self.account.ensureStatuses(missingUnreadArticleIDs, true, .read, false) {
group.leave()
}
// Mark articles as read
let deltaReadArticleIds = localUnreadArticleIds.subtracting(remoteUnreadArticleIds)
let markReadArticles = self.account.fetchArticles(.articleIDs(deltaReadArticleIds))
self.account.update(markReadArticles, statusKey: .read, flag: true)
// Save any read statuses for articles we haven't yet received
let markReadArticleIDs = Set(markReadArticles.map { $0.articleID })
let missingReadArticleIDs = deltaReadArticleIds.subtracting(markReadArticleIDs)
group.enter()
self.account.ensureStatuses(missingReadArticleIDs, true, .read, true) {
group.leave()
}
group.notify(queue: .main) {
self.didFinish()
}
} }
let group = DispatchGroup()
let remoteUnreadArticleIds = allUnreadIdsProvider.entryIds
// Mark articles as unread
let deltaUnreadArticleIds = remoteUnreadArticleIds.subtracting(localUnreadArticleIds)
let markUnreadArticles = account.fetchArticles(.articleIDs(deltaUnreadArticleIds))
account.update(markUnreadArticles, statusKey: .read, flag: false)
// Save any unread statuses for articles we haven't yet received
let markUnreadArticleIDs = Set(markUnreadArticles.map { $0.articleID })
let missingUnreadArticleIDs = deltaUnreadArticleIds.subtracting(markUnreadArticleIDs)
group.enter()
account.ensureStatuses(missingUnreadArticleIDs, true, .read, false) {
group.leave()
}
// Mark articles as read
let deltaReadArticleIds = localUnreadArticleIds.subtracting(remoteUnreadArticleIds)
let markReadArticles = account.fetchArticles(.articleIDs(deltaReadArticleIds))
account.update(markReadArticles, statusKey: .read, flag: true)
// Save any read statuses for articles we haven't yet received
let markReadArticleIDs = Set(markReadArticles.map { $0.articleID })
let missingReadArticleIDs = deltaReadArticleIds.subtracting(markReadArticleIDs)
group.enter()
account.ensureStatuses(missingReadArticleIDs, true, .read, true) {
group.leave()
}
group.notify(queue: .main, execute: didFinish)
} }
} }

16
Frameworks/Account/Feedly/Operations/FeedlySyncAllOperation.swift
View File

@ -35,13 +35,6 @@ final class FeedlySyncAllOperation: FeedlyOperation {
sendArticleStatuses.downloadProgress = downloadProgress sendArticleStatuses.downloadProgress = downloadProgress
self.operationQueue.addOperation(sendArticleStatuses) self.operationQueue.addOperation(sendArticleStatuses)
// Get each page of unread article ids in the global.all stream for the last 31 days (nil = Feedly API default).
let getUnread = FeedlySyncUnreadStatusesOperation(account: account, credentials: credentials, service: getUnreadService, newerThan: nil, log: log)
getUnread.delegate = self
getUnread.addDependency(sendArticleStatuses)
getUnread.downloadProgress = downloadProgress
self.operationQueue.addOperation(getUnread)
// Get all the Collections the user has. // Get all the Collections the user has.
let getCollections = FeedlyGetCollectionsOperation(service: getCollectionsService, log: log) let getCollections = FeedlyGetCollectionsOperation(service: getCollectionsService, log: log)
getCollections.delegate = self getCollections.delegate = self
@ -61,13 +54,18 @@ final class FeedlySyncAllOperation: FeedlyOperation {
createFeedsOperation.addDependency(mirrorCollectionsAsFolders) createFeedsOperation.addDependency(mirrorCollectionsAsFolders)
self.operationQueue.addOperation(createFeedsOperation) self.operationQueue.addOperation(createFeedsOperation)
// Get each page of unread article ids in the global.all stream for the last 31 days (nil = Feedly API default).
let getUnread = FeedlySyncUnreadStatusesOperation(account: account, credentials: credentials, service: getUnreadService, newerThan: nil, log: log)
getUnread.delegate = self
getUnread.addDependency(createFeedsOperation)
getUnread.downloadProgress = downloadProgress
self.operationQueue.addOperation(getUnread)
// Get each page of the global.all stream until we get either the content from the last sync or the last 31 days. // Get each page of the global.all stream until we get either the content from the last sync or the last 31 days.
let getStreamContents = FeedlySyncStreamContentsOperation(account: account, credentials: credentials, service: getStreamContentsService, newerThan: lastSuccessfulFetchStartDate, log: log) let getStreamContents = FeedlySyncStreamContentsOperation(account: account, credentials: credentials, service: getStreamContentsService, newerThan: lastSuccessfulFetchStartDate, log: log)
getStreamContents.delegate = self getStreamContents.delegate = self
getStreamContents.downloadProgress = downloadProgress getStreamContents.downloadProgress = downloadProgress
getStreamContents.addDependency(getCollections)
getStreamContents.addDependency(getUnread) getStreamContents.addDependency(getUnread)
getStreamContents.addDependency(createFeedsOperation)
self.operationQueue.addOperation(getStreamContents) self.operationQueue.addOperation(getStreamContents)
// Get each and every starred article. // Get each and every starred article.