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

Update files that haven't been uploaded too

Browse source
This commit is contained in:
Vishnu Mohandas 2020-12-01 13:39:02 +05:30
parent e743fd6f41
commit 350b6423cf
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/db/files_db.dart
View file

@ -306,14 +306,13 @@ class FilesDB {
return _convertToFiles(results)[0];
}
Future<Set<String>> getUploadedLocalFileIDs() async {
Future<Set<String>> getExistingLocalFileIDs() async {
final db = await instance.database;
final rows = await db.query(
table,
columns: [columnLocalID],
distinct: true,
where:
'$columnLocalID IS NOT NULL AND $columnUploadedFileID IS NOT NULL AND $columnIsDeleted = 0',
where: '$columnLocalID IS NOT NULL',
);
final result = Set<String>();
for (final row in rows) {

17
lib/services/sync_service.dart
View file

@ -30,7 +30,6 @@ class SyncService {
final _uploader = FileUploader.instance;
final _collectionsService = CollectionsService.instance;
final _downloader = DiffFetcher();
final _uploadedLocalFileIDs = Set<String>();
bool _isSyncInProgress = false;
bool _syncStopRequested = false;
Future<void> _existingSync;
@ -68,7 +67,6 @@ class SyncService {
}
Future<void> sync() async {
_uploadedLocalFileIDs.addAll(await _db.getUploadedLocalFileIDs());
_syncStopRequested = false;
if (_isSyncInProgress) {
_logger.warning("Sync already in progress, skipping.");
@ -121,27 +119,30 @@ class SyncService {
if (!result) {
_logger.severe("Did not get permission");
}
final existingLocalFileIDs = await _db.getExistingLocalFileIDs();
final syncStartTime = DateTime.now().microsecondsSinceEpoch;
final lastDBUpdationTime = _prefs.getInt(_dbUpdationTimeKey);
if (lastDBUpdationTime != null && lastDBUpdationTime != 0) {
await _loadAndStorePhotos(lastDBUpdationTime, syncStartTime);
await _loadAndStorePhotos(
0, syncStartTime, existingLocalFileIDs);
} else {
// Load from 0 - 01.01.2010
var startTime = 0;
var toYear = 2010;
var toTime = DateTime(toYear).microsecondsSinceEpoch;
while (toTime < syncStartTime) {
await _loadAndStorePhotos(startTime, toTime);
await _loadAndStorePhotos(startTime, toTime, existingLocalFileIDs);
startTime = toTime;
toYear++;
toTime = DateTime(toYear).microsecondsSinceEpoch;
}
await _loadAndStorePhotos(startTime, syncStartTime);
await _loadAndStorePhotos(startTime, syncStartTime, existingLocalFileIDs);
}
await syncWithRemote();
}
Future<void> _loadAndStorePhotos(int fromTime, int toTime) async {
Future<void> _loadAndStorePhotos(
int fromTime, int toTime, Set<String> existingLocalFileIDs) async {
_logger.info("Loading photos from " +
getMonthAndYear(DateTime.fromMicrosecondsSinceEpoch(fromTime)) +
" to " +
@ -150,7 +151,7 @@ class SyncService {
if (files.isNotEmpty) {
_logger.info("Fetched " + files.length.toString() + " files.");
final updatedFiles =
files.where((file) => _uploadedLocalFileIDs.contains(file.localID));
files.where((file) => existingLocalFileIDs.contains(file.localID));
_logger.info(updatedFiles.length.toString() + " files were updated.");
for (final file in updatedFiles) {
await _db.updateUploadedFile(
@ -162,7 +163,7 @@ class SyncService {
null,
);
}
files.removeWhere((file) => _uploadedLocalFileIDs.contains(file.localID));
files.removeWhere((file) => existingLocalFileIDs.contains(file.localID));
await _db.insertMultiple(files);
_logger.info("Inserted " + files.length.toString() + " files.");
await _prefs.setInt(_dbUpdationTimeKey, toTime);

1
lib/utils/file_uploader.dart
View file

@ -351,7 +351,6 @@ class FileUploader {
final data = response.data;
file.uploadedFileID = data["id"];
file.updationTime = data["updationTime"];
file.ownerID = data["ownerID"];
file.fileDecryptionHeader = fileDecryptionHeader;
file.thumbnailDecryptionHeader = thumbnailDecryptionHeader;
file.metadataDecryptionHeader = metadataDecryptionHeader;