Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

filters: handle queries wrapped with "..."

Browse source
This commit is contained in:
Thibault Deckers 2020-04-12 16:23:09 +09:00
parent acc2cd6c9e
commit 28d2dff8b5
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/model/filters/query.dart
View file

@ -6,13 +6,26 @@ import 'package:outline_material_icons/outline_material_icons.dart';
class QueryFilter extends CollectionFilter { class QueryFilter extends CollectionFilter {
static const type = 'query'; static const type = 'query';
static final exactRegex = RegExp('^"(.*)"\$');
final String query; final String query;
bool Function(ImageEntry) _filter; bool Function(ImageEntry) _filter;
QueryFilter(this.query) { QueryFilter(this.query) {
var upQuery = query.toUpperCase(); var upQuery = query.toUpperCase();
// allow NOT queries starting with `-`
final not = upQuery.startsWith('-'); final not = upQuery.startsWith('-');
if (not) upQuery = upQuery.substring(1); if (not) {
upQuery = upQuery.substring(1);
}
// allow untrimmed queries wrapped with `"..."`
final matches = exactRegex.allMatches(upQuery);
if (matches.length == 1) {
upQuery = matches.elementAt(0).group(1);
}
_filter = not ? (entry) => !entry.search(upQuery) : (entry) => entry.search(upQuery); _filter = not ? (entry) => !entry.search(upQuery) : (entry) => entry.search(upQuery);
} }

6
lib/widgets/album/app_bar.dart
View file

@ -290,9 +290,9 @@ class SearchField extends StatelessWidget {
), ),
autofocus: true, autofocus: true,
onSubmitted: (query) { onSubmitted: (query) {
query = query.trim(); final cleanQuery = query.trim();
if (query.isNotEmpty) { if (cleanQuery.isNotEmpty) {
collection.addFilter(QueryFilter(query)); collection.addFilter(QueryFilter(cleanQuery));
} }
stateNotifier.value = PageState.browse; stateNotifier.value = PageState.browse;
}, },