Skip to content

High performance self-hosted photo and video management solution.

fix(server): do not filter out assets without preview path for person thumbnail generation (#18300)

Mert6a4d21205f54
diff --git a/e2e/src/api/specs/asset.e2e-spec.ts b/e2e/src/api/specs/asset.e2e-spec.ts
index 8c203860df..4673db5426 100644
--- a/e2e/src/api/specs/asset.e2e-spec.ts
+++ b/e2e/src/api/specs/asset.e2e-spec.ts
@@ -202,7 +202,6 @@ describe('/asset', () => {
{
name: 'Marie Curie',
birthDate: null,
- thumbnailPath: '',
isHidden: false,
faces: [
{
@@ -219,7 +218,6 @@ describe('/asset', () => {
{
name: 'Pierre Curie',
birthDate: null,
- thumbnailPath: '',
isHidden: false,
faces: [
{
diff --git a/server/src/queries/person.repository.sql b/server/src/queries/person.repository.sql
index 2ab0045e32..659abbde03 100644
--- a/server/src/queries/person.repository.sql
+++ b/server/src/queries/person.repository.sql
@@ -133,18 +133,24 @@ select
"asset_faces"."imageHeight" as "oldHeight",
"assets"."type",
"assets"."originalPath",
- "asset_files"."path" as "previewPath",
- "exif"."orientation" as "exifOrientation"
+ "exif"."orientation" as "exifOrientation",
+ (
+ select
+ "asset_files"."path"
+ from
+ "asset_files"
+ where
+ "asset_files"."assetId" = "assets"."id"
+ and "asset_files"."type" = 'preview'
+ ) as "previewPath"
from
"person"
inner join "asset_faces" on "asset_faces"."id" = "person"."faceAssetId"
inner join "assets" on "asset_faces"."assetId" = "assets"."id"
left join "exif" on "exif"."assetId" = "assets"."id"
- left join "asset_files" on "asset_files"."assetId" = "assets"."id"
where
"person"."id" = $1
and "asset_faces"."deletedAt" is null
- and "asset_files"."type" = $2
-- PersonRepository.reassignFace
update "asset_faces"
diff --git a/server/src/repositories/person.repository.ts b/server/src/repositories/person.repository.ts
index 478ff15d53..0b48e57f7a 100644
--- a/server/src/repositories/person.repository.ts
+++ b/server/src/repositories/person.repository.ts
@@ -1,5 +1,5 @@
import { Injectable } from '@nestjs/common';
-import { ExpressionBuilder, Insertable, Kysely, NotNull, Selectable, sql, Updateable } from 'kysely';
+import { ExpressionBuilder, Insertable, Kysely, Selectable, sql, Updateable } from 'kysely';
import { jsonObjectFrom } from 'kysely/helpers/postgres';
import { InjectKysely } from 'nestjs-kysely';
import { AssetFaces, DB, FaceSearch, Person } from 'src/db';
@@ -261,7 +261,6 @@ export class PersonRepository {
.innerJoin('asset_faces', 'asset_faces.id', 'person.faceAssetId')
.innerJoin('assets', 'asset_faces.assetId', 'assets.id')
.leftJoin('exif', 'exif.assetId', 'assets.id')
- .leftJoin('asset_files', 'asset_files.assetId', 'assets.id')
.select([
'person.ownerId',
'asset_faces.boundingBoxX1 as x1',
@@ -272,13 +271,18 @@ export class PersonRepository {
'asset_faces.imageHeight as oldHeight',
'assets.type',
'assets.originalPath',
- 'asset_files.path as previewPath',
'exif.orientation as exifOrientation',
])
+ .select((eb) =>
+ eb
+ .selectFrom('asset_files')
+ .select('asset_files.path')
+ .whereRef('asset_files.assetId', '=', 'assets.id')
+ .where('asset_files.type', '=', sql.lit(AssetFileType.PREVIEW))
+ .as('previewPath'),
+ )
.where('person.id', '=', id)
.where('asset_faces.deletedAt', 'is', null)
- .where('asset_files.type', '=', AssetFileType.PREVIEW)
- .$narrowType<{ exifImageWidth: NotNull; exifImageHeight: NotNull }>()
.executeTakeFirst();
}