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

info: metadata search fixes

Browse source
This commit is contained in:
Thibault Deckers 2020-12-31 09:54:22 +09:00
parent 69349e2b2c
commit 0f87ca436a
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/widgets/fullscreen/info/info_search.dart
View file

@ -3,6 +3,7 @@ import 'package:aves/theme/icons.dart';
import 'package:aves/widgets/collection/empty.dart'; import 'package:aves/widgets/collection/empty.dart';
import 'package:aves/widgets/fullscreen/info/metadata/metadata_dir_tile.dart'; import 'package:aves/widgets/fullscreen/info/metadata/metadata_dir_tile.dart';
import 'package:aves/widgets/fullscreen/info/metadata/metadata_section.dart'; import 'package:aves/widgets/fullscreen/info/metadata/metadata_section.dart';
import 'package:collection/collection.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class InfoSearchDelegate extends SearchDelegate { class InfoSearchDelegate extends SearchDelegate {
@ -12,11 +13,11 @@ class InfoSearchDelegate extends SearchDelegate {
Map<String, MetadataDirectory> get metadata => metadataNotifier.value; Map<String, MetadataDirectory> get metadata => metadataNotifier.value;
static const suggestions = { static const suggestions = {
'Date & time': 'date or time or when', 'Date & time': 'date or time or when -timer -uptime -exposure',
'Description': 'abtract or description or comment', 'Description': 'abstract or description or comment',
'Dimensions': 'width or height or dimension or framesize', 'Dimensions': 'width or height or dimension or framesize or imagelength',
'Resolution': 'resolution', 'Resolution': 'resolution',
'Rights': 'rights or copyright or artist or creator or by-line or credit', 'Rights': 'rights or copyright or artist or creator or by-line or credit -tool',
}; };
InfoSearchDelegate({ InfoSearchDelegate({
@ -78,8 +79,16 @@ class InfoSearchDelegate extends SearchDelegate {
return SizedBox(); return SizedBox();
} }
final effectiveQueries = query.toUpperCase().split(' OR ').map((query) => query.trim()); final queryParts = query.toUpperCase().split(' ')..removeWhere((s) => s.isEmpty);
bool testKey(String key) => effectiveQueries.any(key.toUpperCase().contains); final queryExcludeIncludeGroups = groupBy<String, bool>(queryParts, (s) => s.startsWith('-'));
final queryExcludeAll = (queryExcludeIncludeGroups[true] ?? []).map((s) => s.substring(1));
final queryIncludeAny = (queryExcludeIncludeGroups[false] ?? []).join(' ').split(' OR ');
bool testKey(String key) {
key = key.toUpperCase();
return queryIncludeAny.any(key.contains) && queryExcludeAll.every((q) => !key.contains(q));
}
final filteredMetadata = Map.fromEntries(metadata.entries.map((kv) { final filteredMetadata = Map.fromEntries(metadata.entries.map((kv) {
final filteredDir = kv.value.filterKeys(testKey); final filteredDir = kv.value.filterKeys(testKey);
return MapEntry(kv.key, filteredDir); return MapEntry(kv.key, filteredDir);