Creepso/Ferrite-backup
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 15 Packages Wiki Activity Actions

Properly filter available sources

Browse source 
- Make searching case insensitive
- Fix catalog title not hiding when searching an installed source name
This commit is contained in:
Skitty 2022-09-05 18:00:45 -05:00
parent ff35ab7cfa
commit dc8bba3cd8
No known key found for this signature in database
GPG key ID: B2B1A65BF534A127
1 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
Ferrite/Views/SourcesView.swift
View file

@ -73,26 +73,10 @@ struct SourcesView: View {
} }
} }
if !filteredAvailableSources.isEmpty, sourceManager.availableSources.contains(where: { availableSource in if !filteredAvailableSources.isEmpty {
!sources.contains(
where: {
availableSource.name == $0.name &&
availableSource.listId == $0.listId &&
availableSource.author == $0.author
}
)
}) {
Section(header: InlineHeader("Catalog")) { Section(header: InlineHeader("Catalog")) {
ForEach(filteredAvailableSources, id: \.self) { availableSource in ForEach(filteredAvailableSources, id: \.self) { availableSource in
if !sources.contains( SourceCatalogButtonView(availableSource: availableSource)
where: {
availableSource.name == $0.name &&
availableSource.listId == $0.listId &&
availableSource.author == $0.author
}
) {
SourceCatalogButtonView(availableSource: availableSource)
}
} }
} }
} }
@ -109,7 +93,15 @@ struct SourcesView: View {
filteredUpdatedSources = updatedSources filteredUpdatedSources = updatedSources
viewTask = Task { viewTask = Task {
await sourceManager.fetchSourcesFromUrl() await sourceManager.fetchSourcesFromUrl()
filteredAvailableSources = sourceManager.availableSources filteredAvailableSources = sourceManager.availableSources.filter { availableSource in
!sources.contains(
where: {
availableSource.name == $0.name &&
availableSource.listId == $0.listId &&
availableSource.author == $0.author
}
)
}
checkedForSources = true checkedForSources = true
} }
} }
@ -125,8 +117,19 @@ struct SourcesView: View {
} }
} }
.onChange(of: searchText) { _ in .onChange(of: searchText) { _ in
filteredAvailableSources = sourceManager.availableSources.filter { searchText.isEmpty ? true : $0.name.contains(searchText) } filteredAvailableSources = sourceManager.availableSources.filter { availableSource in
filteredUpdatedSources = updatedSources.filter { searchText.isEmpty ? true : $0.name.contains(searchText) } searchText.isEmpty ? true : availableSource.name.lowercased().contains(searchText.lowercased())
&& !sources.contains(
where: {
availableSource.name == $0.name &&
availableSource.listId == $0.listId &&
availableSource.author == $0.author
}
)
}
filteredUpdatedSources = updatedSources.filter {
searchText.isEmpty ? true : $0.name.lowercased().contains(searchText.lowercased())
}
if #available(iOS 15.0, *) { if #available(iOS 15.0, *) {
if searchText.isEmpty { if searchText.isEmpty {
sources.nsPredicate = nil sources.nsPredicate = nil