0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[mob][photos] Revert to SearchService just for now

Browse source
This commit is contained in:
laurenspriem 2024-05-17 17:21:48 +05:30
parent 460025ce4a
commit cd9db4d10f
1 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
mobile/lib/services/machine_learning/face_ml/face_ml_service.dart
View file

@ -30,7 +30,6 @@ import "package:photos/models/file/file.dart";
import "package:photos/models/file/file_type.dart";
import "package:photos/models/ml/ml_versions.dart";
import "package:photos/service_locator.dart";
import "package:photos/services/collections_service.dart";
import 'package:photos/services/machine_learning/face_ml/face_clustering/face_clustering_service.dart';
import "package:photos/services/machine_learning/face_ml/face_clustering/face_info_for_clustering.dart";
import 'package:photos/services/machine_learning/face_ml/face_detection/detection.dart';
@ -44,6 +43,7 @@ import 'package:photos/services/machine_learning/face_ml/face_ml_result.dart';
import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
import 'package:photos/services/machine_learning/file_ml/file_ml.dart';
import 'package:photos/services/machine_learning/file_ml/remote_fileml_service.dart';
import "package:photos/services/search_service.dart";
import "package:photos/utils/file_util.dart";
import 'package:photos/utils/image_ml_isolate.dart';
import "package:photos/utils/image_ml_util.dart";
@ -570,16 +570,18 @@ class FaceMlService {
try {
isImageIndexRunning = true;
_logger.info('starting image indexing');
final w = (kDebugMode ? EnteWatch('FacesGetAllFiles') : null)?..start();
final uploadedFileIDs = await FilesDB.instance
.getOwnedFileIDs(Configuration.instance.getUserID()!);
w?.log('getOwnedFileIDs');
final enteFiles =
await FilesDB.instance.getUploadedFiles(uploadedFileIDs);
w?.log('getUploadedFiles');
// final w = (kDebugMode ? EnteWatch('FacesGetAllFiles') : null)?..start();
// final uploadedFileIDs = await FilesDB.instance
// .getOwnedFileIDs(Configuration.instance.getUserID()!);
// w?.log('getOwnedFileIDs');
// final enteFiles =
// await FilesDB.instance.getUploadedFiles(uploadedFileIDs);
// w?.log('getUploadedFiles');
final Map<int, int> alreadyIndexedFiles =
await FaceMLDataDB.instance.getIndexedFileIds();
w?.log('getIndexedFileIds');
// w?.log('getIndexedFileIds');
final List<EnteFile> enteFiles =
await SearchService.instance.getAllFiles();
// Make sure the image conversion isolate is spawned
// await ImageMlIsolate.instance.ensureSpawned();
@ -591,16 +593,17 @@ class FaceMlService {
final List<EnteFile> filesWithLocalID = <EnteFile>[];
final List<EnteFile> filesWithoutLocalID = <EnteFile>[];
final List<EnteFile> hiddenFiles = <EnteFile>[];
final ignoredCollections =
CollectionsService.instance.getHiddenCollectionIds();
// final ignoredCollections =
// CollectionsService.instance.getHiddenCollectionIds();
for (final EnteFile enteFile in enteFiles) {
if (_skipAnalysisEnteFile(enteFile, alreadyIndexedFiles)) {
fileSkippedCount++;
continue;
}
if (ignoredCollections.contains(enteFile.collectionID)) {
hiddenFiles.add(enteFile);
} else if ((enteFile.localID ?? '').isEmpty) {
// if (ignoredCollections.contains(enteFile.collectionID)) {
// hiddenFiles.add(enteFile);
// } else
if ((enteFile.localID ?? '').isEmpty) {
filesWithoutLocalID.add(enteFile);
} else {
filesWithLocalID.add(enteFile);
@ -1321,9 +1324,14 @@ class FaceMlService {
}
static Future<int> getIndexableFilesCount() async {
final indexableFileIDs = await FilesDB.instance
.getOwnedFileIDs(Configuration.instance.getUserID()!);
return indexableFileIDs.length;
// final indexableFileIDs = await FilesDB.instance
// .getOwnedFileIDs(Configuration.instance.getUserID()!);
final allFiles = await SearchService.instance.getAllFiles();
final indexableFiles = allFiles.where((file) {
return file.isUploaded && file.isOwner;
}).toList();
return indexableFiles.length;
}
bool _skipAnalysisEnteFile(EnteFile enteFile, Map<int, int> indexedFileIds) {