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

Merge branch 'rewrite_device_sync' into rewrite_device_sync_remote

Browse source
This commit is contained in:
Neeraj Gupta 2022-09-01 20:57:09 +05:30
parent 567804f0f9 a018d33478
commit 06cc2d083f
No known key found for this signature in database
GPG key ID: 3C5A1684DC1729E1
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/db/device_files_db.dart
View file

@ -129,7 +129,7 @@ extension DeviceFiles on FilesDB {
// todo: covert it to batch // todo: covert it to batch
Future<void> insertLocalAssets( Future<void> insertLocalAssets(
List<LocalPathAsset> localPathAssets, { List<LocalPathAsset> localPathAssets, {
bool autoSync = false, bool shouldAutoBackup = false,
}) async { }) async {
final Database db = await database; final Database db = await database;
final Map<String, Set<String>> pathIDToLocalIDsMap = {}; final Map<String, Set<String>> pathIDToLocalIDsMap = {};
@ -149,7 +149,7 @@ extension DeviceFiles on FilesDB {
{ {
"id": localPathAsset.pathID, "id": localPathAsset.pathID,
"name": localPathAsset.pathName, "name": localPathAsset.pathName,
"should_backup": autoSync ? _sqlBoolTrue : _sqlBoolFalse "should_backup": shouldAutoBackup ? _sqlBoolTrue : _sqlBoolFalse
}, },
conflictAlgorithm: ConflictAlgorithm.ignore, conflictAlgorithm: ConflictAlgorithm.ignore,
); );

4
lib/services/local_sync_service.dart
View file

@ -291,9 +291,9 @@ class LocalSyncService {
); );
final Tuple2<List<LocalPathAsset>, List<File>> result = final Tuple2<List<LocalPathAsset>, List<File>> result =
await getLocalPathAssetsAndFiles(fromTime, toTime, _computer); await getLocalPathAssetsAndFiles(fromTime, toTime, _computer);
FilesDB.instance.insertLocalAssets( await FilesDB.instance.insertLocalAssets(
result.item1, result.item1,
autoSync: Configuration.instance.hasSelectedAllFoldersForBackup(), shouldAutoBackup: Configuration.instance.hasSelectedAllFoldersForBackup(),
); );
final List<File> files = result.item2; final List<File> files = result.item2;
if (files.isNotEmpty) { if (files.isNotEmpty) {