Implement search — fetch articles matching a search string from the database.

Frameworks/Account/Account.swift

@@ -496,6 +496,14 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
 		#endif
 	}
 
+	public func debugRunSearch() {
+		#if DEBUG
+			database.fetchArticlesMatching("Brent Simmons") { (articles) in
+				print(articles)
+			}
+		#endif
+	}
+
 	// MARK: - Notifications
 
 	@objc func downloadProgressDidChange(_ note: Notification) {

Frameworks/ArticlesDatabase/ArticlesDatabase.swift

@@ -25,7 +25,6 @@ public final class ArticlesDatabase {
 	private let articlesTable: ArticlesTable
 
 	public init(databaseFilePath: String, accountID: String) {
-
 		self.accountID = accountID
 		
 		let queue = RSDatabaseQueue(filepath: databaseFilePath, excludeFromBackup: false)
@@ -43,69 +42,60 @@ public final class ArticlesDatabase {
 	// MARK: - Fetching Articles
 
 	public func fetchArticles(for feedID: String) -> Set<Article> {
-
 		return articlesTable.fetchArticles(feedID)
 	}
 
 	public func fetchArticlesAsync(for feedID: String, _ resultBlock: @escaping ArticleResultBlock) {
-
 		articlesTable.fetchArticlesAsync(feedID, withLimits: true, resultBlock)
 	}
 
 	public func fetchUnreadArticles(for feedIDs: Set<String>) -> Set<Article> {
-		
 		return articlesTable.fetchUnreadArticles(for: feedIDs)
 	}
 
 	public func fetchTodayArticles(for feedIDs: Set<String>) -> Set<Article> {
-		
 		return articlesTable.fetchTodayArticles(for: feedIDs)
 	}
 
 	public func fetchStarredArticles(for feedIDs: Set<String>) -> Set<Article> {
-
 		return articlesTable.fetchStarredArticles(for: feedIDs)
 	}
 
+	public func fetchArticlesMatching(_ searchString: String, _ resultBlock: @escaping ArticleResultBlock) {
+		articlesTable.fetchArticlesMatching(searchString, resultBlock)
+	}
+
 	// MARK: - Unread Counts
 	
 	public func fetchUnreadCounts(for feedIDs: Set<String>, _ completion: @escaping UnreadCountCompletionBlock) {
-
 		articlesTable.fetchUnreadCounts(feedIDs, completion)
 	}
 
 	public func fetchUnreadCount(for feedIDs: Set<String>, since: Date, callback: @escaping (Int) -> Void) {
-
 		articlesTable.fetchUnreadCount(feedIDs, since, callback)
 	}
 
 	public func fetchStarredAndUnreadCount(for feedIDs: Set<String>, callback: @escaping (Int) -> Void) {
-
 		articlesTable.fetchStarredAndUnreadCount(feedIDs, callback)
 	}
 
 	public func fetchAllNonZeroUnreadCounts(_ completion: @escaping UnreadCountCompletionBlock) {
-
 		articlesTable.fetchAllUnreadCounts(completion)
 	}
 
 	// MARK: - Saving and Updating Articles
 
 	public func update(feedID: String, parsedFeed: ParsedFeed, completion: @escaping UpdateArticlesWithFeedCompletionBlock) {
-
 		return articlesTable.update(feedID, parsedFeed, completion)
 	}
 	
 	// MARK: - Status
 	
 	public func mark(_ articles: Set<Article>, statusKey: ArticleStatus.Key, flag: Bool) -> Set<ArticleStatus>? {
-
 		return articlesTable.mark(articles, statusKey, flag)
 	}
 
 	public func markEverywhereAsRead() {
-
 		articlesTable.markEverywhereAsRead()
 	}
 }
-

Frameworks/ArticlesDatabase/ArticlesTable.swift

@@ -79,6 +79,15 @@ final class ArticlesTable: DatabaseTable {
 		return fetchStarredArticles(feedIDs)
 	}
 
+	func fetchArticlesMatching(_ searchString: String, _ resultBlock: @escaping ArticleResultBlock) {
+		queue.fetch { (database) in
+			let articles = self.fetchArticlesMatching(searchString, database)
+			DispatchQueue.main.async {
+				resultBlock(articles)
+			}
+		}
+	}
+
 	// MARK: Updating
 	
 	func update(_ feedID: String, _ parsedFeed: ParsedFeed, _ completion: @escaping UpdateArticlesWithFeedCompletionBlock) {
@@ -425,6 +434,11 @@ private extension ArticlesTable {
 		return articles
 	}
 
+	func fetchArticlesMatching(_ searchString: String, _ database: FMDatabase) -> Set<Article> {
+		let whereClause = "(starred=1 or dateArrived>?) and userDeleted=0 and (textMatchesSearchString(title,?) or textMatchesSearchString(contentHTML,?) or textMatchesSearchString(contentText,?) or textMatchesSearchString(summary,?))"
+		let parameters: [AnyObject] = [articleCutoffDate as AnyObject, searchString as AnyObject, searchString as AnyObject, searchString as AnyObject, searchString as AnyObject]
+		return self.fetchArticlesWithWhereClause(database, whereClause: whereClause, parameters: parameters, withLimits: false)
+	}
 
 	func articlesWithSQL(_ sql: String, _ parameters: [AnyObject], _ database: FMDatabase) -> Set<Article> {
 

NetNewsWire/AppDelegate.swift

@@ -558,6 +558,14 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
 	}
 }
 
+// MARK: - Debug Menu
+extension AppDelegate {
+
+	@IBAction func debugSearch(_ sender: Any?) {
+		AccountManager.shared.localAccount.debugRunSearch()
+	}
+}
+
 private extension AppDelegate {
 
 	func createReaderWindow() -> MainWindowController {

NetNewsWire/Base.lproj/Main.storyboard

@@ -461,6 +461,12 @@
                                                 <action selector="debugTestCrashReportSending:" target="Ady-hI-5gd" id="olQ-kb-kkm"/>
                                             </connections>
                                         </menuItem>
+                                        <menuItem title="Debug Search" id="9Ot-wC-s5U">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="debugSearch:" target="Ady-hI-5gd" id="HvM-F7-u7s"/>
+                                            </connections>
+                                        </menuItem>
                                     </items>
                                 </menu>
                             </menuItem>