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

Remove redundant code to sync diff

Browse source
This commit is contained in:
Vishnu Mohandas 2020-10-12 23:55:33 +05:30
parent 2f89dcde2a
commit 13715c924c
2 changed files with 3 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/services/sync_service.dart
View file

@ -158,32 +158,13 @@ class SyncService {
if (!Configuration.instance.hasConfiguredAccount()) { if (!Configuration.instance.hasConfiguredAccount()) {
return Future.error("Account not configured yet"); return Future.error("Account not configured yet");
} }
// TODO: Verify flow starting here
await CollectionsService.instance.sync(); await CollectionsService.instance.sync();
await _persistFilesDiff();
await _persistEncryptedFilesDiff(); await _persistEncryptedFilesDiff();
await _uploadDiff(); await _uploadDiff();
await _deletePhotosOnServer(); await _deletePhotosOnServer();
} }
Future<void> _persistFilesDiff() async {
final diff = await _downloader.getFilesDiff(_getSyncTime(), _diffLimit);
if (diff != null && diff.isNotEmpty) {
await _storeDiff(diff, _syncTimeKey);
FileRepository.instance.reloadFiles();
if (diff.length == _diffLimit) {
return await _persistFilesDiff();
}
}
}
int _getSyncTime() {
var syncTime = _prefs.getInt(_syncTimeKey);
if (syncTime == null) {
syncTime = 0;
}
return syncTime;
}
Future<void> _persistEncryptedFilesDiff() async { Future<void> _persistEncryptedFilesDiff() async {
final diff = await _downloader.getEncryptedFilesDiff( final diff = await _downloader.getEncryptedFilesDiff(
_getEncryptedFilesSyncTime(), _diffLimit); _getEncryptedFilesSyncTime(), _diffLimit);

24
lib/utils/file_downloader.dart
View file

@ -18,8 +18,9 @@ class DiffFetcher {
return _dio return _dio
.get( .get(
Configuration.instance.getHttpEndpoint() + "/files/diff", Configuration.instance.getHttpEndpoint() + "/files/diff",
options: Options(
headers: {"X-Auth-Token": Configuration.instance.getToken()}),
queryParameters: { queryParameters: {
"token": Configuration.instance.getToken(),
"sinceTime": lastSyncTime, "sinceTime": lastSyncTime,
"limit": limit, "limit": limit,
}, },
@ -60,25 +61,4 @@ class DiffFetcher {
return files; return files;
}); });
} }
Future<List<File>> getFilesDiff(int lastSyncTime, int limit) async {
Response response = await _dio.get(
Configuration.instance.getHttpEndpoint() + "/files/diff",
options:
Options(headers: {"X-Auth-Token": Configuration.instance.getToken()}),
queryParameters: {
"sinceTime": lastSyncTime,
"limit": limit,
},
).catchError((e) => _logger.severe(e));
if (response != null) {
Bus.instance.fire(RemoteSyncEvent(true));
return (response.data["diff"] as List)
.map((file) => new File.fromJson(file))
.toList();
} else {
Bus.instance.fire(RemoteSyncEvent(false));
return null;
}
}
} }