feat(mobile): search enhancement (#8392)

2024-04-01 09:45:11 -05:00
parent 861b72ef04
commit 27be813011
35 changed files with 4302 additions and 2766 deletions
@@ -20,7 +20,7 @@ class PersonService {

  PersonService(this._apiService, this._db);

-  Future<List<PersonResponseDto>> getCuratedPeople() async {
+  Future<List<PersonResponseDto>> getAllPeople() async {
    try {
      final peopleResponseDto = await _apiService.personApi.getAllPeople();
      return peopleResponseDto?.people ?? [];
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/modules/search/models/search_filter.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/providers/api.provider.dart';
 import 'package:immich_mobile/shared/providers/db.provider.dart';
@@ -29,25 +30,92 @@ class SearchService {
    }
  }

-  Future<List<Asset>?> searchAsset(
-    String searchTerm, {
-    bool smartSearch = true,
+  Future<List<String>?> getSearchSuggestions(
+    SearchSuggestionType type, {
+    String? country,
+    String? state,
+    String? make,
+    String? model,
  }) async {
-    // TODO search in local DB: 1. when offline, 2. to find local assets
    try {
-      final SearchResponseDto? results = await _apiService.searchApi.search(
-        query: searchTerm,
-        smart: smartSearch,
+      return await _apiService.searchApi.getSearchSuggestions(
+        type,
+        country: country,
+        state: state,
+        make: make,
+        model: model,
      );
-      if (results == null) {
+    } catch (e) {
+      debugPrint("[ERROR] [getSearchSuggestions] ${e.toString()}");
+      return [];
+    }
+  }
+
+  Future<List<Asset>?> search(SearchFilter filter, int page) async {
+    try {
+      SearchResponseDto? response;
+      AssetTypeEnum? type;
+      if (filter.mediaType == AssetType.image) {
+        type = AssetTypeEnum.IMAGE;
+      } else if (filter.mediaType == AssetType.video) {
+        type = AssetTypeEnum.VIDEO;
+      }
+
+      if (filter.context != null && filter.context!.isNotEmpty) {
+        response = await _apiService.searchApi.searchSmart(
+          SmartSearchDto(
+            query: filter.context!,
+            country: filter.location.country,
+            state: filter.location.state,
+            city: filter.location.city,
+            make: filter.camera.make,
+            model: filter.camera.model,
+            takenAfter: filter.date.takenAfter,
+            takenBefore: filter.date.takenBefore,
+            isArchived: filter.display.isArchive,
+            isFavorite: filter.display.isFavorite,
+            isNotInAlbum: filter.display.isNotInAlbum,
+            personIds: filter.people.map((e) => e.id).toList(),
+            type: type,
+            page: page,
+            size: 1000,
+          ),
+        );
+      } else {
+        response = await _apiService.searchApi.searchMetadata(
+          MetadataSearchDto(
+            originalFileName:
+                filter.filename != null && filter.filename!.isNotEmpty
+                    ? filter.filename
+                    : null,
+            country: filter.location.country,
+            state: filter.location.state,
+            city: filter.location.city,
+            make: filter.camera.make,
+            model: filter.camera.model,
+            takenAfter: filter.date.takenAfter,
+            takenBefore: filter.date.takenBefore,
+            isArchived: filter.display.isArchive,
+            isFavorite: filter.display.isFavorite,
+            isNotInAlbum: filter.display.isNotInAlbum,
+            personIds: filter.people.map((e) => e.id).toList(),
+            type: type,
+            page: page,
+            size: 1000,
+          ),
+        );
+      }
+
+      if (response == null) {
        return null;
      }
-      // TODO local DB might be out of date; add assets not yet in DB?
-      return _db.assets.getAllByRemoteId(results.assets.items.map((e) => e.id));
-    } catch (e) {
-      debugPrint("[ERROR] [searchAsset] ${e.toString()}");
-      return null;
+
+      return _db.assets
+          .getAllByRemoteId(response.assets.items.map((e) => e.id));
+    } catch (error) {
+      debugPrint("Error [search] $error");
    }
+    return null;
  }

  Future<List<CuratedLocationsResponseDto>?> getCuratedLocation() async {