wip

open-api/immich-openapi-specs.json

@@ -2907,7 +2907,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "type": "number"
+                  "$ref": "#/components/schemas/LibraryStatsResponseDto"
                 }
               }
             },
@@ -9540,6 +9540,34 @@
         ],
         "type": "object"
       },
+      "LibraryStatsResponseDto": {
+        "properties": {
+          "photos": {
+            "default": 0,
+            "type": "integer"
+          },
+          "total": {
+            "default": 0,
+            "type": "integer"
+          },
+          "usage": {
+            "default": 0,
+            "format": "int64",
+            "type": "integer"
+          },
+          "videos": {
+            "default": 0,
+            "type": "integer"
+          }
+        },
+        "required": [
+          "photos",
+          "total",
+          "usage",
+          "videos"
+        ],
+        "type": "object"
+      },
       "LicenseKeyDto": {
         "properties": {
           "activationKey": {

open-api/typescript-sdk/src/fetch-client.ts

@@ -574,6 +574,12 @@ export type UpdateLibraryDto = {
     importPaths?: string[];
     name?: string;
 };
+export type LibraryStatsResponseDto = {
+    photos: number;
+    total: number;
+    usage: number;
+    videos: number;
+};
 export type ValidateLibraryDto = {
     exclusionPatterns?: string[];
     importPaths?: string[];
@@ -2106,7 +2112,7 @@ export function getLibraryStatistics({ id }: {
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
-        data: number;
+        data: LibraryStatsResponseDto;
     }>(`/libraries/${encodeURIComponent(id)}/statistics`, {
         ...opts
     }));

server/src/controllers/library.controller.ts

@@ -3,6 +3,7 @@ import { ApiTags } from '@nestjs/swagger';
 import {
   CreateLibraryDto,
   LibraryResponseDto,
+  LibraryStatsResponseDto,
   UpdateLibraryDto,
   ValidateLibraryDto,
   ValidateLibraryResponseDto,
@@ -58,7 +59,7 @@ export class LibraryController {
 
   @Get(':id/statistics')
   @Authenticated({ permission: Permission.LIBRARY_STATISTICS, admin: true })
-  getLibraryStatistics(@Param() { id }: UUIDParamDto): Promise<number> {
+  getLibraryStatistics(@Param() { id }: UUIDParamDto): Promise<LibraryStatsResponseDto> {
     return this.service.getStatistics(id);
   }
 

server/src/interfaces/asset.interface.ts

@@ -1,7 +1,6 @@
 import { Insertable, Updateable, UpdateResult } from 'kysely';
 import { AssetJobStatus, Assets, Exif } from 'src/db';
 import { AssetEntity } from 'src/entities/asset.entity';
-import { LibraryEntity } from 'src/entities/library.entity';
 import { AssetFileType, AssetOrder, AssetStatus, AssetType } from 'src/enum';
 import { AssetSearchOptions, SearchExploreItem } from 'src/interfaces/search.interface';
 import { Paginated, PaginationOptions } from 'src/utils/pagination';
@@ -171,7 +170,11 @@ export interface IAssetRepository {
   getChangedDeltaSync(options: AssetDeltaSyncOptions): Promise<AssetEntity[]>;
   upsertFile(file: UpsertFileOptions): Promise<void>;
   upsertFiles(files: UpsertFileOptions[]): Promise<void>;
-  detectOfflineExternalAssets(library: LibraryEntity): Promise<UpdateResult>;
+  detectOfflineExternalAssets(
+    libraryId: string,
+    importPaths: string[],
+    exclusionPatterns: string[],
+  ): Promise<UpdateResult>;
   filterNewExternalAssetPaths(libraryId: string, paths: string[]): Promise<string[]>;
   getLibraryAssetCount(options: AssetSearchOptions): Promise<number | undefined>;
 }

server/src/main.ts

@@ -13,7 +13,7 @@ if (immichApp) {
 let apiProcess: ChildProcess | undefined;
 
 const onError = (name: string, error: Error) => {
-  console.error(`${name} worker error: ${error}`);
+  console.error(`${name} worker error: ${error}, stack: ${error.stack}`);
 };
 
 const onExit = (name: string, exitCode: number | null) => {

server/src/queries/asset.repository.sql

@@ -262,8 +262,9 @@ with
     from
       "assets"
     where
-      "assets"."deletedAt" is null
-      and "assets"."isVisible" = $2
+      "assets"."fileCreatedAt" <= $2
+      and "assets"."deletedAt" is null
+      and "assets"."isVisible" = $3
   )
 select
   "timeBucket",
@@ -283,9 +284,10 @@ from
   "assets"
   left join "exif" on "assets"."id" = "exif"."assetId"
 where
-  "assets"."deletedAt" is null
-  and "assets"."isVisible" = $1
-  and date_trunc($2, "localDateTime" at time zone 'UTC') at time zone 'UTC' = $3
+  "assets"."fileCreatedAt" <= $1
+  and "assets"."deletedAt" is null
+  and "assets"."isVisible" = $2
+  and date_trunc($3, "localDateTime" at time zone 'UTC') at time zone 'UTC' = $4
 order by
   "assets"."localDateTime" desc
 

server/src/queries/library.repository.sql

@@ -130,7 +130,7 @@ select
 from
   "libraries"
   inner join "assets" on "assets"."libraryId" = "libraries"."id"
-  inner join "exif" on "exif"."assetId" = "assets"."id"
+  left join "exif" on "exif"."assetId" = "assets"."id"
 where
   "libraries"."id" = $6
 group by

server/src/repositories/asset.repository.ts

@@ -22,7 +22,6 @@ import {
   withStack,
   withTags,
 } from 'src/entities/asset.entity';
-import { LibraryEntity } from 'src/entities/library.entity';
 import { AssetFileType, AssetStatus, AssetType } from 'src/enum';
 import {
   AssetDeltaSyncOptions,
@@ -50,6 +49,8 @@ import { anyUuid, asUuid, mapUpsertColumns } from 'src/utils/database';
 import { globToSqlPattern } from 'src/utils/misc';
 import { Paginated, PaginationOptions, paginationHelper } from 'src/utils/pagination';
 
+const ASSET_CUTOFF_DATE = new Date('9000-01-01');
+
 @Injectable()
 export class AssetRepository implements IAssetRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
@@ -527,6 +528,7 @@ export class AssetRepository implements IAssetRepository {
     return this.db
       .selectFrom('assets')
       .selectAll('assets')
+      .where('assets.fileCreatedAt', '<=', ASSET_CUTOFF_DATE)
       .$call(withExif)
       .where('ownerId', '=', anyUuid(userIds))
       .where('isVisible', '=', true)
@@ -543,6 +545,7 @@ export class AssetRepository implements IAssetRepository {
         .with('assets', (qb) =>
           qb
             .selectFrom('assets')
+            .where('assets.fileCreatedAt', '<=', ASSET_CUTOFF_DATE)
             .select(truncatedDate<Date>(options.size).as('timeBucket'))
             .$if(!!options.isTrashed, (qb) => qb.where('assets.status', '!=', AssetStatus.DELETED))
             .where('assets.deletedAt', options.isTrashed ? 'is not' : 'is', null)
@@ -592,6 +595,7 @@ export class AssetRepository implements IAssetRepository {
   async getTimeBucket(timeBucket: string, options: TimeBucketOptions): Promise<AssetEntity[]> {
     return hasPeople(this.db, options.personId ? [options.personId] : undefined)
       .selectAll('assets')
+      .where('assets.fileCreatedAt', '<=', ASSET_CUTOFF_DATE)
       .$call(withExif)
       .$if(!!options.albumId, (qb) => withAlbums(qb, { albumId: options.albumId }))
       .$if(!!options.userIds, (qb) => qb.where('assets.ownerId', '=', anyUuid(options.userIds!)))
@@ -748,9 +752,16 @@ export class AssetRepository implements IAssetRepository {
       .execute();
   }
 
-  async detectOfflineExternalAssets(library: LibraryEntity): Promise<UpdateResult> {
-    const paths = library.importPaths.map((importPath) => `${importPath}%`);
-    const exclusions = library.exclusionPatterns.map((pattern) => globToSqlPattern(pattern));
+  @GenerateSql({
+    params: [{ libraryId: DummyValue.UUID, importPaths: [DummyValue.STRING], exclusionPatterns: [DummyValue.STRING] }],
+  })
+  async detectOfflineExternalAssets(
+    libraryId: string,
+    importPaths: string[],
+    exclusionPatterns: string[],
+  ): Promise<UpdateResult> {
+    const paths = importPaths.map((importPath) => `${importPath}%`);
+    const exclusions = exclusionPatterns.map((pattern) => globToSqlPattern(pattern));
 
     return this.db
       .updateTable('assets')
@@ -760,13 +771,16 @@ export class AssetRepository implements IAssetRepository {
       })
       .where('isOffline', '=', false)
       .where('isExternal', '=', true)
-      .where('libraryId', '=', asUuid(library.id))
+      .where('libraryId', '=', asUuid(libraryId))
       .where((eb) =>
         eb.or([eb('originalPath', 'not like', paths.join('|')), eb('originalPath', 'like', exclusions.join('|'))]),
       )
       .executeTakeFirstOrThrow();
   }
 
+  @GenerateSql({
+    params: [{ libraryId: DummyValue.UUID, paths: [DummyValue.STRING] }],
+  })
   async filterNewExternalAssetPaths(libraryId: string, paths: string[]): Promise<string[]> {
     const result = await this.db
       .selectFrom(