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

Refactor _getFilesToBeUploaded logic (#1302)

Browse source
This commit is contained in:
Neeraj Gupta 2023-08-08 17:31:02 +05:30 committed by GitHub
parent 9ae658c954 e2371c480a
commit bb09c2165f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
lib/services/remote_sync_service.dart
View file

@ -489,31 +489,37 @@ class RemoteSyncService {
}
Future<List<File>> _getFilesToBeUploaded() async {
final deviceCollections = await _db.getDeviceCollections();
deviceCollections.removeWhere((element) => !element.shouldBackup);
final List<File> filesToBeUploaded = await _db.getFilesPendingForUpload();
if (!_config.shouldBackupVideos() || _shouldThrottleSync()) {
filesToBeUploaded
.removeWhere((element) => element.fileType == FileType.video);
final List<File> originalFiles = await _db.getFilesPendingForUpload();
if (originalFiles.isEmpty) {
return originalFiles;
}
if (filesToBeUploaded.isNotEmpty) {
final int prevCount = filesToBeUploaded.length;
final ignoredIDs = await IgnoredFilesService.instance.ignoredIDs;
filesToBeUploaded.removeWhere(
(file) =>
IgnoredFilesService.instance.shouldSkipUpload(ignoredIDs, file),
);
if (prevCount != filesToBeUploaded.length) {
_logger.info(
(prevCount - filesToBeUploaded.length).toString() +
" files were ignored for upload",
);
final bool shouldRemoveVideos =
!_config.shouldBackupVideos() || _shouldThrottleSync();
final ignoredIDs = await IgnoredFilesService.instance.ignoredIDs;
bool shouldSkipUploadFunc(File file) {
return IgnoredFilesService.instance.shouldSkipUpload(ignoredIDs, file);
}
final List<File> filesToBeUploaded = [];
int ignoredForUpload = 0;
int skippedVideos = 0;
for (var file in originalFiles) {
if (shouldRemoveVideos && file.fileType == FileType.video) {
skippedVideos++;
continue;
}
if (shouldSkipUploadFunc(file)) {
ignoredForUpload++;
continue;
}
filesToBeUploaded.add(file);
}
if (skippedVideos > 0 || ignoredForUpload > 0) {
_logger.info("Skipped $skippedVideos videos and $ignoredForUpload "
"ignored files for upload");
}
_sortByTimeAndType(filesToBeUploaded);
_logger.info(
filesToBeUploaded.length.toString() + " new files to be uploaded.",
);
_logger.info("${filesToBeUploaded.length} new files to be uploaded.");
return filesToBeUploaded;
}