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

NullSafety: Migrate location updation service

Browse source
This commit is contained in:
Neeraj Gupta 2022-12-30 14:38:23 +05:30
parent e9572dd908
commit 87e81c30c6
No known key found for this signature in database
GPG key ID: 3C5A1684DC1729E1
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
lib/services/local_file_update_service.dart
View file

@ -1,5 +1,3 @@
// @dart=2.9
import 'dart:async'; import 'dart:async';
import 'dart:core'; import 'dart:core';
import 'dart:io'; import 'dart:io';
@ -20,15 +18,15 @@ import 'package:shared_preferences/shared_preferences.dart';
// LocalFileUpdateService tracks all the potential local file IDs which have // LocalFileUpdateService tracks all the potential local file IDs which have
// changed/modified on the device and needed to be uploaded again. // changed/modified on the device and needed to be uploaded again.
class LocalFileUpdateService { class LocalFileUpdateService {
FileUpdationDB _fileUpdationDB; late FileUpdationDB _fileUpdationDB;
SharedPreferences _prefs; late SharedPreferences _prefs;
Logger _logger; late Logger _logger;
static const isLocationMigrationComplete = "fm_isLocationMigrationComplete"; static const isLocationMigrationComplete = "fm_isLocationMigrationComplete";
static const isLocalImportDone = "fm_IsLocalImportDone"; static const isLocalImportDone = "fm_IsLocalImportDone";
static const isBadCreationTimeImportDone = 'fm_badCreationTime'; static const isBadCreationTimeImportDone = 'fm_badCreationTime';
static const isBadCreationTimeMigrationComplete = static const isBadCreationTimeMigrationComplete =
'fm_badCreationTimeCompleted'; 'fm_badCreationTimeCompleted';
Completer<void> _existingMigration; Completer<void>? _existingMigration;
LocalFileUpdateService._privateConstructor() { LocalFileUpdateService._privateConstructor() {
_logger = Logger((LocalFileUpdateService).toString()); _logger = Logger((LocalFileUpdateService).toString());
@ -43,13 +41,13 @@ class LocalFileUpdateService {
LocalFileUpdateService._privateConstructor(); LocalFileUpdateService._privateConstructor();
bool isBadCreationMigrationCompleted() { bool isBadCreationMigrationCompleted() {
return _prefs.get(isBadCreationTimeMigrationComplete) ?? false; return (_prefs.getBool(isBadCreationTimeMigrationComplete) ?? false);
} }
Future<void> markUpdatedFilesForReUpload() async { Future<void> markUpdatedFilesForReUpload() async {
if (_existingMigration != null) { if (_existingMigration != null) {
_logger.info("migration is already in progress, skipping"); _logger.info("migration is already in progress, skipping");
return _existingMigration.future; return _existingMigration!.future;
} }
_existingMigration = Completer<void>(); _existingMigration = Completer<void>();
try { try {
@ -107,11 +105,10 @@ class LocalFileUpdateService {
MediaUploadData uploadData; MediaUploadData uploadData;
try { try {
uploadData = await getUploadData(file); uploadData = await getUploadData(file);
if (uploadData != null && if (uploadData.hashData != null &&
uploadData.hashData != null &&
file.hash != null && file.hash != null &&
(file.hash == uploadData.hashData.fileHash || (file.hash == uploadData.hashData!.fileHash ||
file.hash == uploadData.hashData.zipHash)) { file.hash == uploadData.hashData!.zipHash)) {
_logger.info("Skip file update as hash matched ${file.tag}"); _logger.info("Skip file update as hash matched ${file.tag}");
} else { } else {
_logger.info( _logger.info(
@ -119,15 +116,15 @@ class LocalFileUpdateService {
); );
await clearCache(file); await clearCache(file);
await FilesDB.instance.updateUploadedFile( await FilesDB.instance.updateUploadedFile(
file.localID, file.localID!,
file.title, file.title,
file.location, file.location,
file.creationTime, file.creationTime!,
file.modificationTime, file.modificationTime!,
null, null,
); );
} }
processedIDs.add(file.localID); processedIDs.add(file.localID!);
} catch (e) { } catch (e) {
_logger.severe("Failed to get file uploadData", e); _logger.severe("Failed to get file uploadData", e);
} finally {} } finally {}
@ -144,10 +141,8 @@ class LocalFileUpdateService {
// delete the file from app's internal cache if it was copied to app // delete the file from app's internal cache if it was copied to app
// for upload. Shared Media should only be cleared when the upload // for upload. Shared Media should only be cleared when the upload
// succeeds. // succeeds.
if (Platform.isIOS && if (Platform.isIOS && mediaUploadData.sourceFile != null) {
mediaUploadData != null && await mediaUploadData.sourceFile?.delete();
mediaUploadData.sourceFile != null) {
await mediaUploadData.sourceFile.delete();
} }
return mediaUploadData; return mediaUploadData;
} }
@ -165,8 +160,13 @@ class LocalFileUpdateService {
FileUpdationDB.badCreationTime, FileUpdationDB.badCreationTime,
); );
if (generatedIDs.isNotEmpty) { if (generatedIDs.isNotEmpty) {
final List<int> genIdIntList = final List<int> genIdIntList = [];
generatedIDs.map((e) => int.tryParse(e)).toList(); for (String genIdString in generatedIDs) {
final int? genIdInt = int.tryParse(genIdString);
if (genIdInt != null) {
genIdIntList.add(genIdInt);
}
}
final filesWithBadTime = final filesWithBadTime =
(await FilesDB.instance.getFilesFromGeneratedIDs(genIdIntList)) (await FilesDB.instance.getFilesFromGeneratedIDs(genIdIntList))
@ -196,7 +196,7 @@ class LocalFileUpdateService {
} }
_logger.info('_importFilesWithBadCreationTime'); _logger.info('_importFilesWithBadCreationTime');
final EnteWatch watch = EnteWatch("_importFilesWithBadCreationTime"); final EnteWatch watch = EnteWatch("_importFilesWithBadCreationTime");
final int ownerID = Configuration.instance.getUserID(); final int ownerID = Configuration.instance.getUserID()!;
final filesGeneratedID = await FilesDB.instance final filesGeneratedID = await FilesDB.instance
.getGeneratedIDForFilesOlderThan(jan011981Time, ownerID); .getGeneratedIDForFilesOlderThan(jan011981Time, ownerID);
await _fileUpdationDB.insertMultiple( await _fileUpdationDB.insertMultiple(