From 83ffce2a2419652e2574e1f90f64c6f70f3006b7 Mon Sep 17 00:00:00 2001 From: ashilkn Date: Wed, 11 Sep 2024 11:03:34 +0530 Subject: [PATCH] [mob][photos] Keep order of files (sorted by highest score) in magic section --- mobile/lib/services/magic_cache_service.dart | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/mobile/lib/services/magic_cache_service.dart b/mobile/lib/services/magic_cache_service.dart index 0907b46a77..b23247a3fe 100644 --- a/mobile/lib/services/magic_cache_service.dart +++ b/mobile/lib/services/magic_cache_service.dart @@ -4,13 +4,13 @@ import "dart:io"; import "package:logging/logging.dart"; import "package:path_provider/path_provider.dart"; +import "package:photos/db/files_db.dart"; import "package:photos/models/file/file.dart"; import "package:photos/models/search/generic_search_result.dart"; import "package:photos/models/search/search_types.dart"; import "package:photos/service_locator.dart"; import "package:photos/services/machine_learning/semantic_search/semantic_search_service.dart"; import "package:photos/services/remote_assets_service.dart"; -import "package:photos/services/search_service.dart"; import "package:shared_preferences/shared_preferences.dart"; class MagicCache { @@ -45,14 +45,16 @@ class MagicCache { extension MagicCacheServiceExtension on MagicCache { Future toGenericSearchResult() async { - final allEnteFiles = await SearchService.instance.getAllFiles(); final enteFilesInMagicCache = []; - for (EnteFile file in allEnteFiles) { - if (file.uploadedFileID != null && - fileUploadedIDs.contains(file.uploadedFileID as int)) { - enteFilesInMagicCache.add(file); + await FilesDB.instance + .getFilesFromIDs(fileUploadedIDs) + .then((idToEnteFile) { + for (int uploadedID in fileUploadedIDs) { + if (idToEnteFile[uploadedID] != null) { + enteFilesInMagicCache.add(idToEnteFile[uploadedID]!); + } } - } + }); return GenericSearchResult( ResultType.magic, title,