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

Fix bug where search indexing wasn’t actually happening.

Browse Source
This commit is contained in:
Brent Simmons 2019-12-08 11:49:02 -08:00
parent a1675f0640
commit cb96fe64ed
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Frameworks/ArticlesDatabase/ArticlesTable.swift
View File

@ -440,6 +440,7 @@ final class ArticlesTable: DatabaseTable {
if articleIDs.isEmpty { if articleIDs.isEmpty {
return return
} }
self.searchTable.ensureIndexedArticles(articleIDs, database)
DispatchQueue.main.async { DispatchQueue.main.async {
self.indexUnindexedArticles() self.indexUnindexedArticles()

11
Frameworks/ArticlesDatabase/SearchTable.swift
View File

@ -77,12 +77,8 @@ final class SearchTable: DatabaseTable {
self.ensureIndexedArticles(articleIDs, database) self.ensureIndexedArticles(articleIDs, database)
} }
} }
}
// MARK: - Private
private extension SearchTable {
/// Add to, or update, the search index for articles with specified IDs.
func ensureIndexedArticles(_ articleIDs: Set<String>, _ database: FMDatabase) { func ensureIndexedArticles(_ articleIDs: Set<String>, _ database: FMDatabase) {
guard let articlesTable = articlesTable else { guard let articlesTable = articlesTable else {
return return
@ -97,6 +93,11 @@ private extension SearchTable {
let indexedArticles = articleSearchInfos.filter { $0.searchRowID != nil } let indexedArticles = articleSearchInfos.filter { $0.searchRowID != nil }
updateIndexForArticles(indexedArticles, database) updateIndexForArticles(indexedArticles, database)
} }
}
// MARK: - Private
private extension SearchTable {
func performInitialIndexForArticles(_ articles: Set<ArticleSearchInfo>, _ database: FMDatabase) { func performInitialIndexForArticles(_ articles: Set<ArticleSearchInfo>, _ database: FMDatabase) {
articles.forEach { performInitialIndex($0, database) } articles.forEach { performInitialIndex($0, database) }