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

[mob] Index hidden files

Browse Source
This commit is contained in:
Neeraj Gupta
2024-05-18 05:31:04 +05:30
parent af88756b5d
commit ea587b6ccd
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -573,13 +573,7 @@ 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 Map<int, int> alreadyIndexedFiles =
await FaceMLDataDB.instance.getIndexedFileIds();
// w?.log('getIndexedFileIds');
@@ -596,22 +590,34 @@ class FaceMlService {
final List<EnteFile> filesWithLocalID = <EnteFile>[];
final List<EnteFile> filesWithoutLocalID = <EnteFile>[];
final List<EnteFile> hiddenFiles = <EnteFile>[];
// final ignoredCollections =
// CollectionsService.instance.getHiddenCollectionIds();
final List<int> allFileIDsToBeIndexed = await getIndexableFileIDs();
for (final EnteFile enteFile in enteFiles) {
allFileIDsToBeIndexed.remove(enteFile.uploadedFileID);
if (_skipAnalysisEnteFile(enteFile, alreadyIndexedFiles)) {
fileSkippedCount++;
continue;
}
// if (ignoredCollections.contains(enteFile.collectionID)) {
// hiddenFiles.add(enteFile);
// } else
if ((enteFile.localID ?? '').isEmpty) {
filesWithoutLocalID.add(enteFile);
} else {
filesWithLocalID.add(enteFile);
}
}
if (allFileIDsToBeIndexed.isNotEmpty) {
_logger.info(
'Found ${allFileIDsToBeIndexed.length} files outside searchable files',
);
final List<EnteFile> uploadFiles =
await FilesDB.instance.getUploadedFiles(allFileIDsToBeIndexed);
for (final EnteFile enteFile in uploadFiles) {
if (_skipAnalysisEnteFile(enteFile, alreadyIndexedFiles)) {
fileSkippedCount++;
continue;
}
hiddenFiles.add(enteFile);
}
}
// list of files where files with localID are first
final sortedBylocalID = <EnteFile>[];
@@ -1318,7 +1324,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');
@@ -1326,15 +1332,9 @@ class FaceMlService {
return ratio;
}
static Future<int> getIndexableFilesCount() async {
// 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;
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

@@ -434,7 +434,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();