TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[mob][photos] Revert regression

Browse Source
This commit is contained in:
laurenspriem
2024-05-20 15:12:12 +05:30
parent 84f7d20966
commit 58dcceca9f
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mobile/lib/services/machine_learning/face_ml/face_ml_service.dart
View File

@@ -840,7 +840,8 @@ class FaceMlService {
);
} else {
_logger.warning(
'Skipped putting embedding because of error ${result.toJsonString()}',);
'Skipped putting embedding because of error ${result.toJsonString()}',
);
}
await FaceMLDataDB.instance.bulkInsertFaces(faces);
return true;
@@ -1339,7 +1340,7 @@ class FaceMlService {
final int alreadyIndexedCount = await FaceMLDataDB.instance
.getIndexedFileCount(minimumMlVersion: faceMlVersion);
final int totalIndexableCount = await getIndexableFilesCount();
final int totalIndexableCount = (await getIndexableFileIDs()).length;
final ratio = alreadyIndexedCount / totalIndexableCount;
w?.log('getIndexedDoneRatio');
@@ -1347,11 +1348,9 @@ class FaceMlService {
return ratio;
}
static Future<int> getIndexableFilesCount() async {
final List<EnteFile> enteFiles = await SearchService.instance.getAllFiles();
final List<EnteFile> hiddenFiles =
await SearchService.instance.getHiddenFiles();
return enteFiles.length + hiddenFiles.length;
static Future<List<int>> getIndexableFileIDs() async {
return FilesDB.instance
.getOwnedFileIDs(Configuration.instance.getUserID()!);
}
bool _skipAnalysisEnteFile(EnteFile enteFile, Map<int, int> indexedFileIds) {

2
mobile/lib/ui/settings/machine_learning_settings_page.dart
View File

@@ -437,7 +437,7 @@ class FaceRecognitionStatusWidgetState
Future<(int, int, int, double)> getIndexStatus() async {
final indexedFiles = await FaceMLDataDB.instance
.getIndexedFileCount(minimumMlVersion: faceMlVersion);
final indexableFiles = await FaceMlService.getIndexableFilesCount();
final indexableFiles = (await FaceMlService.getIndexableFileIDs()).length;
final showIndexedFiles = min(indexedFiles, indexableFiles);
final pendingFiles = max(indexableFiles - indexedFiles, 0);
final foundFaces = await FaceMLDataDB.instance.getTotalFaceCount();