self-hosted/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-01-02 12:48:35 +02:00
Code Issues Releases Activity

fix(mobile): stack entity handling (#6980)

Browse Source 
Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
This commit is contained in:
shenlong 2024-02-10 03:09:43 +00:00 committed by GitHub
parent fb8be51ff2
commit ec5e4dbcc2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mobile/lib/shared/models/asset.dart
View File

@ -34,7 +34,10 @@ class Asset {
isTrashed = remote.isTrashed, isTrashed = remote.isTrashed,
isReadOnly = remote.isReadOnly, isReadOnly = remote.isReadOnly,
isOffline = remote.isOffline, isOffline = remote.isOffline,
stackParentId = remote.stackParentId, // workaround to nullify stackParentId for the parent asset until we refactor the mobile app
// stack handling to properly handle it
stackParentId =
remote.stackParentId == remote.id ? null : remote.stackParentId,
stackCount = remote.stackCount; stackCount = remote.stackCount;
Asset.local(AssetEntity local, List<int> hash) Asset.local(AssetEntity local, List<int> hash)
@ -290,7 +293,6 @@ class Asset {
width: a.width ?? width, width: a.width ?? width,
height: a.height ?? height, height: a.height ?? height,
exifInfo: a.exifInfo?.copyWith(id: id) ?? exifInfo, exifInfo: a.exifInfo?.copyWith(id: id) ?? exifInfo,
stackCount: a.stackCount ?? stackCount,
); );
} else if (isRemote) { } else if (isRemote) {
return _copyWith( return _copyWith(
@ -305,7 +307,9 @@ class Asset {
id: id, id: id,
remoteId: remoteId, remoteId: remoteId,
livePhotoVideoId: livePhotoVideoId, livePhotoVideoId: livePhotoVideoId,
stackParentId: stackParentId, // workaround to nullify stackParentId for the parent asset until we refactor the mobile app
// stack handling to properly handle it
stackParentId: stackParentId == remoteId ? null : stackParentId,
stackCount: stackCount, stackCount: stackCount,
isFavorite: isFavorite, isFavorite: isFavorite,
isArchived: isArchived, isArchived: isArchived,
@ -323,8 +327,10 @@ class Asset {
width: a.width, width: a.width,
height: a.height, height: a.height,
livePhotoVideoId: a.livePhotoVideoId, livePhotoVideoId: a.livePhotoVideoId,
stackParentId: a.stackParentId, // workaround to nullify stackParentId for the parent asset until we refactor the mobile app
stackCount: a.stackCount ?? stackCount, // stack handling to properly handle it
stackParentId: a.stackParentId == a.remoteId ? null : a.stackParentId,
stackCount: a.stackCount,
// isFavorite + isArchived are not set by device-only assets // isFavorite + isArchived are not set by device-only assets
isFavorite: a.isFavorite, isFavorite: a.isFavorite,
isArchived: a.isArchived, isArchived: a.isArchived,

2
server/src/immich/api-v1/asset/asset.service.ts
View File

@ -113,7 +113,7 @@ export class AssetService {
const userId = dto.userId || auth.user.id; const userId = dto.userId || auth.user.id;
await this.access.requirePermission(auth, Permission.TIMELINE_READ, userId); await this.access.requirePermission(auth, Permission.TIMELINE_READ, userId);
const assets = await this.assetRepositoryV1.getAllByUserId(userId, dto); const assets = await this.assetRepositoryV1.getAllByUserId(userId, dto);
return assets.map((asset) => mapAsset(asset)); return assets.map((asset) => mapAsset(asset, { withStack: true }));
} }
async serveThumbnail(auth: AuthDto, assetId: string, dto: GetAssetThumbnailDto): Promise<ImmichFileResponse> { async serveThumbnail(auth: AuthDto, assetId: string, dto: GetAssetThumbnailDto): Promise<ImmichFileResponse> {