superrob1500
/
mirror-immich
mirror of https://github.com/immich-app/immich
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename idskind

pull/28686/head
timonrieger 2026-06-02 17:14:32 +02:00
parent dcf32fe20c
commit ea45af02a5
No known key found for this signature in database
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
server/src/utils/database.ts
View File

@ -607,10 +607,10 @@ function existsEncodedVideoPath(eb: AssetExpressionBuilder, f: StringFilter) {
return out;
}
type IdsKind = 'album' | 'person' | 'tag';
type Membership = 'album' | 'person' | 'tag';
function idsAnyExists(eb: AssetExpressionBuilder, kind: IdsKind, ids: string[]) {
switch (kind) {
function idsAnyExists(eb: AssetExpressionBuilder, membership: Membership, ids: string[]) {
switch (membership) {
case 'album': {
return eb.exists((eb) =>
eb
@ -641,8 +641,8 @@ function idsAnyExists(eb: AssetExpressionBuilder, kind: IdsKind, ids: string[])
}
}
function idsAllExists(eb: AssetExpressionBuilder, kind: IdsKind, ids: string[]) {
switch (kind) {
function idsAllExists(eb: AssetExpressionBuilder, membership: Membership, ids: string[]) {
switch (membership) {
case 'album': {
return eb.exists((eb) =>
eb
@ -682,15 +682,22 @@ function idsAllExists(eb: AssetExpressionBuilder, kind: IdsKind, ids: string[])
}
}
function pushIdsFilter(preds: Expression<SqlBool>[], eb: AssetExpressionBuilder, kind: IdsKind, f: IdsFilter) {
if (f.any) {
preds.push(idsAnyExists(eb, kind, f.any));
function pushIdsFilter(
preds: Expression<SqlBool>[],
eb: AssetExpressionBuilder,
membership: Membership,
filter: IdsFilter,
) {
if (filter.any) {
preds.push(idsAnyExists(eb, membership, filter.any));
}
if (f.all) {
preds.push(f.all.length === 1 ? idsAnyExists(eb, kind, f.all) : idsAllExists(eb, kind, f.all));
if (filter.all) {
preds.push(
filter.all.length === 1 ? idsAnyExists(eb, membership, filter.all) : idsAllExists(eb, membership, filter.all),
);
}
if (f.none) {
preds.push(eb.not(idsAnyExists(eb, kind, f.none)));
if (filter.none) {
preds.push(eb.not(idsAnyExists(eb, membership, filter.none)));
}
}