π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Search photos by uploaded file IDs
Neeraj Guptad27164cc58e8
diff --git a/mobile/apps/photos/lib/services/search_service.dart b/mobile/apps/photos/lib/services/search_service.dartindex 7ff484a6c8..cd6716759e 100644--- a/mobile/apps/photos/lib/services/search_service.dart+++ b/mobile/apps/photos/lib/services/search_service.dart@@ -303,6 +303,44 @@ class SearchService {return FilesDB.instance.hasAnyFile();}+ Future<List<GenericSearchResult>> getUploadedFileIDsSearchResults(+ String query,+ Set<int> uploadedFileIDs,+ ) async {+ if (uploadedFileIDs.isEmpty) {+ return [];+ }++ try {+ final files = await FilesDB.instance.getFilesFromIDs(+ uploadedFileIDs.toList(),+ dedupeByUploadId: true,+ collectionsToIgnore: ignoreCollections(),+ );+ if (files.isEmpty) {+ return [];+ }++ final matchedUploadedFileIDs = filesToUploadedFileIDs(files);+ return [+ GenericSearchResult(+ ResultType.file,+ query.trim(),+ files,+ hierarchicalSearchFilter: TopLevelGenericFilter(+ filterName: query.trim(),+ occurrence: kMostRelevantFilter,+ filterResultType: ResultType.file,+ matchedUploadedIDs: matchedUploadedFileIDs,+ ),+ ),+ ];+ } catch (e, s) {+ _logger.severe("Failed to search by uploaded file IDs", e, s);+ return [];+ }+ }+Future<List<EnteFile>> getAllFilesForHierarchicalSearch() async {if (_cachedFilesFuture != null &&_cachedFilesForHierarchicalSearch != null) {diff --git a/mobile/apps/photos/lib/ui/viewer/search/search_widget.dart b/mobile/apps/photos/lib/ui/viewer/search/search_widget.dartindex 7c46af7da2..594a2172fc 100644--- a/mobile/apps/photos/lib/ui/viewer/search/search_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/search/search_widget.dart@@ -30,6 +30,7 @@ class SearchWidget extends StatefulWidget {}class SearchWidgetState extends State<SearchWidget> {+ static const _uploadedFileIDsSearchPrefix = "uploaded_ids:";static final ValueNotifier<Stream<List<SearchResult>>?>searchResultsStreamNotifier = ValueNotifier(null);@@ -203,10 +204,6 @@ class SearchWidgetState extends State<SearchWidget> {BuildContext context,String query,) {- int resultCount = 0;- final maxResultCount = _isYearValid(query) ? 13 : 12;- final streamController = StreamController<List<SearchResult>>();-if (query.isEmpty) {return Stream<List<SearchResult>>.multi((controller) {controller.add([]);@@ -214,6 +211,23 @@ class SearchWidgetState extends State<SearchWidget> {});}+ 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 streamController = StreamController<List<SearchResult>>();+void onResultsReceived(List<SearchResult> results) {streamController.sink.add(results);resultCount++;