Merge branch 'main' into feat/mobile-ocr

server/src/repositories/asset-edit.repository.ts

@@ -1,6 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { Kysely } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
+import { columns } from 'src/database';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { AssetEditActionItem, AssetEditActionItemResponseDto } from 'src/dtos/editing.dto';
 import { DB } from 'src/schema';
@@ -9,9 +10,7 @@ import { DB } from 'src/schema';
 export class AssetEditRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
 
-  @GenerateSql({
-    params: [DummyValue.UUID],
-  })
+  @GenerateSql({ params: [DummyValue.UUID] })
   replaceAll(assetId: string, edits: AssetEditActionItem[]): Promise<AssetEditActionItemResponseDto[]> {
     return this.db.transaction().execute(async (trx) => {
       await trx.deleteFrom('asset_edit').where('assetId', '=', assetId).execute();
@@ -28,9 +27,7 @@ export class AssetEditRepository {
     });
   }
 
-  @GenerateSql({
-    params: [DummyValue.UUID],
-  })
+  @GenerateSql({ params: [DummyValue.UUID] })
   getAll(assetId: string): Promise<AssetEditActionItemResponseDto[]> {
     return this.db
       .selectFrom('asset_edit')
@@ -39,4 +36,14 @@ export class AssetEditRepository {
       .orderBy('sequence', 'asc')
       .execute();
   }
+
+  @GenerateSql({ params: [DummyValue.UUID] })
+  getWithSyncInfo(assetId: string) {
+    return this.db
+      .selectFrom('asset_edit')
+      .select(columns.syncAssetEdit)
+      .where('assetId', '=', assetId)
+      .orderBy('sequence', 'asc')
+      .execute();
+  }
 }

server/src/repositories/media.repository.ts

@@ -243,23 +243,26 @@ export class MediaRepository {
         bitrate: this.parseInt(results.format.bit_rate),
       },
       videoStreams: results.streams
-        .filter((stream) => stream.codec_type === 'video')
-        .filter((stream) => !stream.disposition?.attached_pic)
-        .map((stream) => ({
-          index: stream.index,
-          height: this.parseInt(stream.height),
-          width: this.parseInt(stream.width),
-          codecName: stream.codec_name === 'h265' ? 'hevc' : stream.codec_name,
-          codecType: stream.codec_type,
-          frameCount: this.parseInt(options?.countFrames ? stream.nb_read_packets : stream.nb_frames),
-          rotation: this.parseInt(stream.rotation),
-          isHDR: stream.color_transfer === 'smpte2084' || stream.color_transfer === 'arib-std-b67',
-          bitrate: this.parseInt(stream.bit_rate),
-          pixelFormat: stream.pix_fmt || 'yuv420p',
-          colorPrimaries: stream.color_primaries,
-          colorSpace: stream.color_space,
-          colorTransfer: stream.color_transfer,
-        })),
+        .filter((stream) => stream.codec_type === 'video' && !stream.disposition?.attached_pic)
+        .map((stream) => {
+          const height = this.parseInt(stream.height);
+          const dar = this.getDar(stream.display_aspect_ratio);
+          return {
+            index: stream.index,
+            height,
+            width: dar ? Math.round(height * dar) : this.parseInt(stream.width),
+            codecName: stream.codec_name === 'h265' ? 'hevc' : stream.codec_name,
+            codecType: stream.codec_type,
+            frameCount: this.parseInt(options?.countFrames ? stream.nb_read_packets : stream.nb_frames),
+            rotation: this.parseInt(stream.rotation),
+            isHDR: stream.color_transfer === 'smpte2084' || stream.color_transfer === 'arib-std-b67',
+            bitrate: this.parseInt(stream.bit_rate),
+            pixelFormat: stream.pix_fmt || 'yuv420p',
+            colorPrimaries: stream.color_primaries,
+            colorSpace: stream.color_space,
+            colorTransfer: stream.color_transfer,
+          };
+        }),
       audioStreams: results.streams
         .filter((stream) => stream.codec_type === 'audio')
         .map((stream) => ({
@@ -352,4 +355,15 @@ export class MediaRepository {
   private parseFloat(value: string | number | undefined): number {
     return Number.parseFloat(value as string) || 0;
   }
+
+  private getDar(dar: string | undefined): number {
+    if (dar) {
+      const [darW, darH] = dar.split(':').map(Number);
+      if (darW && darH) {
+        return darW / darH;
+      }
+    }
+
+    return 0;
+  }
 }

server/src/repositories/sync.repository.ts

@@ -53,6 +53,7 @@ export class SyncRepository {
   albumUser: AlbumUserSync;
   asset: AssetSync;
   assetExif: AssetExifSync;
+  assetEdit: AssetEditSync;
   assetFace: AssetFaceSync;
   assetMetadata: AssetMetadataSync;
   assetOcr: AssetOcrSync;
@@ -76,6 +77,7 @@ export class SyncRepository {
     this.albumUser = new AlbumUserSync(this.db);
     this.asset = new AssetSync(this.db);
     this.assetExif = new AssetExifSync(this.db);
+    this.assetEdit = new AssetEditSync(this.db);
     this.assetFace = new AssetFaceSync(this.db);
     this.assetMetadata = new AssetMetadataSync(this.db);
     this.assetOcr = new AssetOcrSync(this.db);
@@ -93,7 +95,7 @@ export class SyncRepository {
   }
 }
 
-class BaseSync {
+export class BaseSync {
   constructor(protected db: Kysely<DB>) {}
 
   protected backfillQuery<T extends keyof DB>(t: T, { nowId, beforeUpdateId, afterUpdateId }: SyncBackfillOptions) {
@@ -503,6 +505,30 @@ class AssetExifSync extends BaseSync {
   }
 }
 
+class AssetEditSync extends BaseSync {
+  @GenerateSql({ params: [dummyQueryOptions], stream: true })
+  getDeletes(options: SyncQueryOptions) {
+    return this.auditQuery('asset_edit_audit', options)
+      .select(['asset_edit_audit.id', 'editId'])
+      .innerJoin('asset', 'asset.id', 'asset_edit_audit.assetId')
+      .where('asset.ownerId', '=', options.userId)
+      .stream();
+  }
+
+  cleanupAuditTable(daysAgo: number) {
+    return this.auditCleanup('asset_edit_audit', daysAgo);
+  }
+
+  @GenerateSql({ params: [dummyQueryOptions], stream: true })
+  getUpserts(options: SyncQueryOptions) {
+    return this.upsertQuery('asset_edit', options)
+      .select([...columns.syncAssetEdit, 'asset_edit.updateId'])
+      .innerJoin('asset', 'asset.id', 'asset_edit.assetId')
+      .where('asset.ownerId', '=', options.userId)
+      .stream();
+  }
+}
+
 class MemorySync extends BaseSync {
   @GenerateSql({ params: [dummyQueryOptions], stream: true })
   getDeletes(options: SyncQueryOptions) {

server/src/repositories/websocket.repository.ts

@@ -11,7 +11,7 @@ import { AssetResponseDto } from 'src/dtos/asset-response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { NotificationDto } from 'src/dtos/notification.dto';
 import { ReleaseNotification, ServerVersionResponseDto } from 'src/dtos/server.dto';
-import { SyncAssetExifV1, SyncAssetV1 } from 'src/dtos/sync.dto';
+import { SyncAssetEditV1, SyncAssetExifV1, SyncAssetV1 } from 'src/dtos/sync.dto';
 import { AppRestartEvent, ArgsOf, EventRepository } from 'src/repositories/event.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { handlePromiseError } from 'src/utils/misc';
@@ -37,7 +37,7 @@ export interface ClientEventMap {
 
   AssetUploadReadyV1: [{ asset: SyncAssetV1; exif: SyncAssetExifV1 }];
   AppRestartV1: [AppRestartEvent];
-  AssetEditReadyV1: [{ asset: SyncAssetV1 }];
+  AssetEditReadyV1: [{ asset: SyncAssetV1; edit: SyncAssetEditV1[] }];
 }
 
 export type AuthFn = (client: Socket) => Promise<AuthDto>;