shadowfacts
/
Tusker
2
10
Fork 2
Code Issues 71 Pull Requests Releases Wiki Activity

Fix issues when changing scope after searching

This commit is contained in:
Shadowfacts 2024-01-22 17:21:53 -05:00
parent 32b8d27949
commit bf27b8fd47
1 changed files with 46 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
Tusker/Screens/Search/SearchResultsViewController.swift
View File

@ -46,6 +46,7 @@ class SearchResultsViewController: UIViewController, CollectionViewController {
private let searchSubject = PassthroughSubject<String?, Never>() private let searchSubject = PassthroughSubject<String?, Never>()
private var searchCancellable: AnyCancellable? private var searchCancellable: AnyCancellable?
private var currentQuery: String? private var currentQuery: String?
private var currentSearchResults: SearchResults?
init(mastodonController: MastodonController, scope: Scope = .all) { init(mastodonController: MastodonController, scope: Scope = .all) {
self.mastodonController = mastodonController self.mastodonController = mastodonController
@ -260,7 +261,14 @@ class SearchResultsViewController: UIViewController, CollectionViewController {
switch response { switch response {
case let .success(results, _): case let .success(results, _):
guard self.currentQuery == query else { return } guard self.currentQuery == query else { return }
self.showSearchResults(results) self.mastodonController.persistentContainer.performBatchUpdates { (context, addAccounts, addStatuses) in
addAccounts(results.accounts)
addStatuses(results.statuses)
} completion: {
DispatchQueue.main.async {
self.showSearchResults(results)
}
}
case let .failure(error): case let .failure(error):
DispatchQueue.main.async { DispatchQueue.main.async {
self.showSearchError(error) self.showSearchError(error)
@ -269,31 +277,29 @@ class SearchResultsViewController: UIViewController, CollectionViewController {
} }
} }
@MainActor
private func showSearchResults(_ results: SearchResults) { private func showSearchResults(_ results: SearchResults) {
self.currentSearchResults = results
var snapshot = dataSource.snapshot() var snapshot = dataSource.snapshot()
snapshot.deleteSections([.loadingIndicator]) snapshot.deleteSections([.loadingIndicator])
removeResults(from: &snapshot)
self.mastodonController.persistentContainer.performBatchUpdates({ (context, addAccounts, addStatuses) in let resultTypes = self.scope.resultTypes
let resultTypes = self.scope.resultTypes if !results.accounts.isEmpty && resultTypes.contains(.accounts) {
if !results.accounts.isEmpty && resultTypes.contains(.accounts) { snapshot.appendSections([.accounts])
snapshot.appendSections([.accounts]) snapshot.appendItems(results.accounts.map { .account($0.id) }, toSection: .accounts)
snapshot.appendItems(results.accounts.map { .account($0.id) }, toSection: .accounts) }
addAccounts(results.accounts) if !results.hashtags.isEmpty && resultTypes.contains(.hashtags) {
} snapshot.appendSections([.hashtags])
if !results.hashtags.isEmpty && resultTypes.contains(.hashtags) { snapshot.appendItems(results.hashtags.map { .hashtag($0) }, toSection: .hashtags)
snapshot.appendSections([.hashtags]) }
snapshot.appendItems(results.hashtags.map { .hashtag($0) }, toSection: .hashtags) if !results.statuses.isEmpty && resultTypes.contains(.statuses) {
} snapshot.appendSections([.statuses])
if !results.statuses.isEmpty && resultTypes.contains(.statuses) { snapshot.appendItems(results.statuses.map { .status($0.id, .unknown) }, toSection: .statuses)
snapshot.appendSections([.statuses]) }
snapshot.appendItems(results.statuses.map { .status($0.id, .unknown) }, toSection: .statuses)
addStatuses(results.statuses) dataSource.apply(snapshot)
}
}, completion: {
DispatchQueue.main.async {
self.dataSource.apply(snapshot)
}
})
} }
private func showSearchError(_ error: Client.Error) { private func showSearchError(_ error: Client.Error) {
@ -563,19 +569,25 @@ extension SearchResultsViewController: UISearchBarDelegate {
func searchBar(_ searchBar: UISearchBar, selectedScopeButtonIndexDidChange selectedScope: Int) { func searchBar(_ searchBar: UISearchBar, selectedScopeButtonIndexDidChange selectedScope: Int) {
let newQuery = searchBar.searchQueryWithOperators let newQuery = searchBar.searchQueryWithOperators
let newScope = Scope.allCases[selectedScope] let newScope = Scope.allCases[selectedScope]
if self.scope == .all && currentQuery == newQuery { if currentQuery == newQuery,
self.scope = newScope let currentSearchResults {
var snapshot = dataSource.snapshot() if self.scope == .all {
if snapshot.sectionIdentifiers.contains(.accounts) && scope != .people { self.scope = newScope
snapshot.deleteSections([.accounts]) var snapshot = dataSource.snapshot()
if snapshot.sectionIdentifiers.contains(.accounts) && scope != .people {
snapshot.deleteSections([.accounts])
}
if snapshot.sectionIdentifiers.contains(.hashtags) && scope != .hashtags {
snapshot.deleteSections([.hashtags])
}
if snapshot.sectionIdentifiers.contains(.statuses) && scope != .posts {
snapshot.deleteSections([.statuses])
}
dataSource.apply(snapshot)
} else {
self.scope = newScope
showSearchResults(currentSearchResults)
} }
if snapshot.sectionIdentifiers.contains(.hashtags) && scope != .hashtags {
snapshot.deleteSections([.hashtags])
}
if snapshot.sectionIdentifiers.contains(.statuses) && scope != .posts {
snapshot.deleteSections([.statuses])
}
dataSource.apply(snapshot)
} else { } else {
self.scope = newScope self.scope = newScope
performSearch(query: newQuery) performSearch(query: newQuery)