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

global search: do not return trashed items

Browse source
This commit is contained in:
Thibault Deckers 2022-02-24 18:12:23 +09:00
parent fc1234ca63
commit 529bd6b0e4
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/model/db/db_metadata.dart
View file

@ -30,7 +30,7 @@ abstract class MetadataDb {
Future<void> updateEntry(int id, AvesEntry entry); Future<void> updateEntry(int id, AvesEntry entry);
Future<Set<AvesEntry>> searchEntries(String query, {int? limit}); Future<Set<AvesEntry>> searchLiveEntries(String query, {int? limit});
// date taken // date taken

6
lib/model/db/db_metadata_sqflite.dart
View file

@ -215,11 +215,11 @@ class SqfliteMetadataDb implements MetadataDb {
} }
@override @override
Future<Set<AvesEntry>> searchEntries(String query, {int? limit}) async { Future<Set<AvesEntry>> searchLiveEntries(String query, {int? limit}) async {
final rows = await _db.query( final rows = await _db.query(
entryTable, entryTable,
where: 'title LIKE ?', where: 'title LIKE ? AND trashed = ?',
whereArgs: ['%$query%'], whereArgs: ['%$query%', 0],
orderBy: 'sourceDateTakenMillis DESC', orderBy: 'sourceDateTakenMillis DESC',
limit: limit, limit: limit,
); );

2
lib/services/global_search.dart
View file

@ -51,7 +51,7 @@ Future<List<Map<String, String?>>> _getSuggestions(dynamic args) async {
debugPrint('getSuggestions query=$query, locale=$locale use24hour=$use24hour'); debugPrint('getSuggestions query=$query, locale=$locale use24hour=$use24hour');
if (query is String && locale is String) { if (query is String && locale is String) {
final entries = await metadataDb.searchEntries(query, limit: 9); final entries = await metadataDb.searchLiveEntries(query, limit: 9);
suggestions.addAll(entries.map((entry) { suggestions.addAll(entries.map((entry) {
final date = entry.bestDate; final date = entry.bestDate;
return { return {