From fce2647eec979be8fba523d467cc2b70b5d15060 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 2 Jul 2023 16:57:49 -0700 Subject: [PATCH] Rename FetchFeedUnreadCountOperation.webFeedID to .feedID. --- .../Sources/ArticlesDatabase/ArticlesDatabase.swift | 4 ++-- .../Operations/FetchFeedUnreadCountOperation.swift | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesDatabase.swift b/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesDatabase.swift index 33084286d..3ba2fcedc 100644 --- a/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesDatabase.swift +++ b/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesDatabase.swift @@ -182,8 +182,8 @@ public final class ArticlesDatabase { } /// Fetch unread count for a single feed. - public func fetchUnreadCount(_ webFeedID: String, _ completion: @escaping SingleUnreadCountCompletionBlock) { - let operation = FetchFeedUnreadCountOperation(webFeedID: webFeedID, databaseQueue: queue, cutoffDate: articlesTable.articleCutoffDate) + public func fetchUnreadCount(_ feedID: String, _ completion: @escaping SingleUnreadCountCompletionBlock) { + let operation = FetchFeedUnreadCountOperation(feedID: feedID, databaseQueue: queue, cutoffDate: articlesTable.articleCutoffDate) operation.completionBlock = { operation in let fetchOperation = operation as! FetchFeedUnreadCountOperation completion(fetchOperation.result) diff --git a/ArticlesDatabase/Sources/ArticlesDatabase/Operations/FetchFeedUnreadCountOperation.swift b/ArticlesDatabase/Sources/ArticlesDatabase/Operations/FetchFeedUnreadCountOperation.swift index 03c6cf793..d7728fb26 100644 --- a/ArticlesDatabase/Sources/ArticlesDatabase/Operations/FetchFeedUnreadCountOperation.swift +++ b/ArticlesDatabase/Sources/ArticlesDatabase/Operations/FetchFeedUnreadCountOperation.swift @@ -25,10 +25,10 @@ public final class FetchFeedUnreadCountOperation: MainThreadOperation { private let queue: DatabaseQueue private let cutoffDate: Date - private let webFeedID: String + private let feedID: String - init(webFeedID: String, databaseQueue: DatabaseQueue, cutoffDate: Date) { - self.webFeedID = webFeedID + init(feedID: String, databaseQueue: DatabaseQueue, cutoffDate: Date) { + self.feedID = feedID self.queue = databaseQueue self.cutoffDate = cutoffDate } @@ -55,7 +55,7 @@ private extension FetchFeedUnreadCountOperation { func fetchUnreadCount(_ database: FMDatabase) { let sql = "select count(*) from articles natural join statuses where feedID=? and read=0;" - guard let resultSet = database.executeQuery(sql, withArgumentsIn: [webFeedID]) else { + guard let resultSet = database.executeQuery(sql, withArgumentsIn: [feedID]) else { informOperationDelegateOfCompletion() return }