cotugno/immich
2
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-11-15 18:08:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(server): do not match live photos across libraries (#11952)

Browse Source
This commit is contained in:
Jason Rasmussen 2024-08-20 21:23:50 -04:00 committed by GitHub
parent fd225e7462
commit 29d229c5ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/interfaces/asset.interface.ts
View File

@ -16,6 +16,7 @@ export interface AssetStatsOptions {
export interface LivePhotoSearchOptions {
ownerId: string;
libraryId?: string | null;
livePhotoCID: string;
otherAssetId: string;
type: AssetType;

3
server/src/repositories/asset.repository.ts
View File

@ -363,12 +363,13 @@ export class AssetRepository implements IAssetRepository {
}
findLivePhotoMatch(options: LivePhotoSearchOptions): Promise<AssetEntity | null> {
const { ownerId, otherAssetId, livePhotoCID, type } = options;
const { ownerId, libraryId, otherAssetId, livePhotoCID, type } = options;
return this.repository.findOne({
where: {
id: Not(otherAssetId),
ownerId,
libraryId: libraryId || IsNull(),
type,
exifInfo: {
livePhotoCID,

23
server/src/services/metadata.service.spec.ts
View File

@ -218,6 +218,29 @@ describe(MetadataService.name, () => {
assetStub.livePhotoMotionAsset.id,
);
});
it('should search by libraryId', async () => {
assetMock.getByIds.mockResolvedValue([
{
...assetStub.livePhotoStillAsset,
libraryId: 'library-id',
exifInfo: { livePhotoCID: 'CID' } as ExifEntity,
},
]);
assetMock.findLivePhotoMatch.mockResolvedValue(null);
await expect(sut.handleLivePhotoLinking({ id: assetStub.livePhotoStillAsset.id })).resolves.toBe(
JobStatus.SKIPPED,
);
expect(assetMock.findLivePhotoMatch).toHaveBeenCalledWith({
ownerId: 'user-id',
otherAssetId: 'live-photo-still-asset',
livePhotoCID: 'CID',
libraryId: 'library-id',
type: 'VIDEO',
});
});
});
describe('handleQueueMetadataExtraction', () => {

1
server/src/services/metadata.service.ts
View File

@ -173,6 +173,7 @@ export class MetadataService {
const match = await this.assetRepository.findLivePhotoMatch({
livePhotoCID: asset.exifInfo.livePhotoCID,
ownerId: asset.ownerId,
libraryId: asset.libraryId,
otherAssetId: asset.id,
type: otherType,
});