Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Merge remote-tracking branch 'upstream/main' into reorder-serach-results

ashil-pilote0f16f96cc4f
diff --cc mobile/apps/photos/lib/ui/viewer/search/search_widget.dart
index cd4052ec29,594a2172fc..00548a89bd
--- a/mobile/apps/photos/lib/ui/viewer/search/search_widget.dart
+++ b/mobile/apps/photos/lib/ui/viewer/search/search_widget.dart
@@@ -215,6 -211,23 +212,23 @@@ class SearchWidgetState extends State<S
});
}
+ if (query.startsWith(_uploadedFileIDsSearchPrefix)) {
+ final uploadedFileIDs = query
+ .substring(_uploadedFileIDsSearchPrefix.length)
+ .split(",")
+ .map((value) => int.tryParse(value.trim()))
+ .whereType<int>()
+ .where((id) => id > 0)
+ .toSet();
+ return Stream.fromFuture(
+ _searchService.getUploadedFileIDsSearchResults(query, uploadedFileIDs),
+ );
+ }
+
+ int resultCount = 0;
- final maxResultCount = _isYearValid(query) ? 13 : 12;
++ final maxResultCount = isYearSearchQuery(query) ? 13 : 12;
+ final streamController = StreamController<List<SearchResult>>();
+
void onResultsReceived(List<SearchResult> results) {
streamController.sink.add(results);
resultCount++;