4f303e1c1e
Make it so that when a user chooses a source to filter, only filter that specific source when a search occurs. Also fix the "no results found" overlay text by checking if the search bar textfield is being edited or not by modifiying ESSearchable. Signed-off-by: kingbri <bdashore3@proton.me>
105 lines
3.3 KiB
Swift
105 lines
3.3 KiB
Swift
//
|
|
// ContentView.swift
|
|
// Ferrite
|
|
//
|
|
// Created by Brian Dashore on 7/1/22.
|
|
//
|
|
|
|
import SwiftUI
|
|
|
|
struct ContentView: View {
|
|
@EnvironmentObject var scrapingModel: ScrapingViewModel
|
|
@EnvironmentObject var debridManager: DebridManager
|
|
@EnvironmentObject var navModel: NavigationViewModel
|
|
@EnvironmentObject var pluginManager: PluginManager
|
|
@EnvironmentObject var logManager: LoggingManager
|
|
|
|
@AppStorage("Behavior.AutocorrectSearch") var autocorrectSearch: Bool = false
|
|
|
|
@FetchRequest(
|
|
entity: Source.entity(),
|
|
sortDescriptors: []
|
|
) var sources: FetchedResults<Source>
|
|
|
|
@State private var isSearching = false
|
|
@State private var isEditingSearch = false
|
|
@State private var dismissAction: () -> Void = {}
|
|
|
|
var body: some View {
|
|
NavView {
|
|
List {
|
|
SearchResultsView()
|
|
}
|
|
.listStyle(.insetGrouped)
|
|
.inlinedList(inset: 20)
|
|
.navigationTitle("Search")
|
|
.overlay {
|
|
if
|
|
scrapingModel.searchResults.isEmpty,
|
|
isSearching,
|
|
scrapingModel.runningSearchTask == nil,
|
|
!isEditingSearch
|
|
{
|
|
Text(
|
|
pluginManager.filteredInstalledSources.isEmpty ?
|
|
"No results found" :
|
|
"No results found. Check your source filter and redo your search."
|
|
)
|
|
.padding(.horizontal)
|
|
}
|
|
}
|
|
.expandedSearchable(
|
|
text: $scrapingModel.searchText,
|
|
isSearching: $isSearching,
|
|
isEditingSearch: $isEditingSearch,
|
|
prompt: navModel.searchPrompt,
|
|
dismiss: $dismissAction,
|
|
scopeBarContent: {
|
|
SearchFilterHeaderView(sources: sources)
|
|
},
|
|
onSubmit: {
|
|
if
|
|
let runningSearchTask = scrapingModel.runningSearchTask,
|
|
runningSearchTask.isCancelled
|
|
{
|
|
scrapingModel.runningSearchTask = nil
|
|
return
|
|
}
|
|
|
|
executeSearch()
|
|
}
|
|
)
|
|
.autocorrectionDisabled(!autocorrectSearch)
|
|
.esAutocapitalization(autocorrectSearch ? .sentences : .none)
|
|
.onAppear {
|
|
navModel.getSearchPrompt()
|
|
}
|
|
.onChange(of: isEditingSearch) { newVal in
|
|
print(newVal)
|
|
}
|
|
}
|
|
}
|
|
|
|
func executeSearch() {
|
|
scrapingModel.runningSearchTask = Task {
|
|
await scrapingModel.scanSources(
|
|
sources:
|
|
scrapingModel.searchResults.isEmpty ?
|
|
sources.compactMap { $0 } :
|
|
(pluginManager.filteredInstalledSources.isEmpty ?
|
|
sources.compactMap { $0 } :
|
|
pluginManager.filteredInstalledSources),
|
|
debridManager: debridManager
|
|
)
|
|
|
|
logManager.hideIndeterminateToast()
|
|
scrapingModel.runningSearchTask = nil
|
|
}
|
|
}
|
|
}
|
|
|
|
struct ContentView_Previews: PreviewProvider {
|
|
static var previews: some View {
|
|
ContentView()
|
|
}
|
|
}
|