Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-08-11 09:16:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(mobile): consistent handling of DateTime in SyncService (#2249)

Browse Source 
Co-authored-by: Fynn Petersen-Frey <zoodyy@users.noreply.github.com>
Co-authored-by: Alex <alex.tran1502@gmail.com>
This commit is contained in:
Fynn Petersen-Frey 2023-04-14 16:14:14 +02:00 committed by GitHub
parent d500ef77cf
commit 2179530084
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mobile/lib/shared/services/sync.service.dart
View File

@ -40,7 +40,7 @@ class SyncService {
dbUsers, dbUsers,
compare: (User a, User b) => a.id.compareTo(b.id), compare: (User a, User b) => a.id.compareTo(b.id),
both: (User a, User b) { both: (User a, User b) {
if (a.updatedAt != b.updatedAt) { if (!a.updatedAt.isAtSameMomentAs(b.updatedAt)) {
toUpsert.add(a); toUpsert.add(a);
return true; return true;
} }
@ -118,7 +118,7 @@ class SyncService {
// TODO instead of this heuristics: match by checksum once available // TODO instead of this heuristics: match by checksum once available
for (Asset a in inDb) { for (Asset a in inDb) {
if (a.ownerId == newAsset.ownerId && if (a.ownerId == newAsset.ownerId &&
a.fileModifiedAt == newAsset.fileModifiedAt) { a.fileModifiedAt.isAtSameMomentAs(newAsset.fileModifiedAt)) {
assert(match == null); assert(match == null);
match = a; match = a;
} }
@ -277,7 +277,7 @@ class SyncService {
album.name = dto.albumName; album.name = dto.albumName;
album.shared = dto.shared; album.shared = dto.shared;
album.modifiedAt = DateTime.parse(dto.updatedAt).toUtc(); album.modifiedAt = DateTime.parse(dto.updatedAt);
if (album.thumbnail.value?.remoteId != dto.albumThumbnailAssetId) { if (album.thumbnail.value?.remoteId != dto.albumThumbnailAssetId) {
album.thumbnail.value = await _db.assets album.thumbnail.value = await _db.assets
.where() .where()
@ -446,7 +446,8 @@ class SyncService {
toUpdate.isEmpty && toUpdate.isEmpty &&
toDelete.isEmpty && toDelete.isEmpty &&
album.name == ape.name && album.name == ape.name &&
album.modifiedAt == ape.lastModified) { ape.lastModified != null &&
album.modifiedAt.isAtSameMomentAs(ape.lastModified!)) {
// changes only affeted excluded albums // changes only affeted excluded albums
_log.fine( _log.fine(
"Only excluded assets in local album ${ape.name} changed. Stopping sync.", "Only excluded assets in local album ${ape.name} changed. Stopping sync.",
@ -495,7 +496,7 @@ class SyncService {
filterOptionGroup: FilterOptionGroup( filterOptionGroup: FilterOptionGroup(
updateTimeCond: DateTimeCond( updateTimeCond: DateTimeCond(
min: album.modifiedAt.add(const Duration(seconds: 1)), min: album.modifiedAt.add(const Duration(seconds: 1)),
max: ape.lastModified!, max: ape.lastModified ?? DateTime.now(),
), ),
), ),
) )
@ -507,7 +508,7 @@ class SyncService {
if (totalOnDevice != album.assets.length + newAssets.length) { if (totalOnDevice != album.assets.length + newAssets.length) {
return false; return false;
} }
album.modifiedAt = ape.lastModified?.toUtc() ?? DateTime.now().toUtc(); album.modifiedAt = ape.lastModified ?? DateTime.now();
final result = await _linkWithExistingFromDb(newAssets); final result = await _linkWithExistingFromDb(newAssets);
try { try {
await _db.writeTxn(() async { await _db.writeTxn(() async {
@ -533,9 +534,8 @@ class SyncService {
]) async { ]) async {
_log.info("Syncing a new local album to DB: ${ape.name}"); _log.info("Syncing a new local album to DB: ${ape.name}");
final Album a = Album.local(ape); final Album a = Album.local(ape);
final result = await _linkWithExistingFromDb( final assets = await ape.getAssets(excludedAssets: excludedAssets);
await ape.getAssets(excludedAssets: excludedAssets), final result = await _linkWithExistingFromDb(assets);
);
_log.info( _log.info(
"${result.first.length} assets already existed in DB, to upsert ${result.second.length}", "${result.first.length} assets already existed in DB, to upsert ${result.second.length}",
); );
@ -580,9 +580,7 @@ class SyncService {
// client and server, thus never reaching "both" case below // client and server, thus never reaching "both" case below
compare: Asset.compareByOwnerDeviceLocalId, compare: Asset.compareByOwnerDeviceLocalId,
both: (Asset a, Asset b) { both: (Asset a, Asset b) {
if ((a.isLocal || !b.isLocal) && if ((a.isLocal || !b.isLocal) && (a.isRemote || !b.isRemote)) {
(a.isRemote || !b.isRemote) &&
a.updatedAt == b.updatedAt) {
existing.add(a); existing.add(a);
return false; return false;
} else { } else {
@ -690,7 +688,8 @@ Pair<List<int>, List<Asset>> _handleAssetRemoval(
/// returns `true` if the albums differ on the surface /// returns `true` if the albums differ on the surface
Future<bool> _hasAssetPathEntityChanged(AssetPathEntity a, Album b) async { Future<bool> _hasAssetPathEntityChanged(AssetPathEntity a, Album b) async {
return a.name != b.name || return a.name != b.name ||
a.lastModified != b.modifiedAt || a.lastModified == null ||
!a.lastModified!.isAtSameMomentAs(b.modifiedAt) ||
await a.assetCountAsync != b.assetCount; await a.assetCountAsync != b.assetCount;
} }
@ -701,5 +700,5 @@ bool _hasAlbumResponseDtoChanged(AlbumResponseDto dto, Album a) {
dto.albumThumbnailAssetId != a.thumbnail.value?.remoteId || dto.albumThumbnailAssetId != a.thumbnail.value?.remoteId ||
dto.shared != a.shared || dto.shared != a.shared ||
dto.sharedUsers.length != a.sharedUsers.length || dto.sharedUsers.length != a.sharedUsers.length ||
DateTime.parse(dto.updatedAt).toUtc() != a.modifiedAt.toUtc(); !DateTime.parse(dto.updatedAt).isAtSameMomentAs(a.modifiedAt);
} }