diff --git a/src/common/entities/MediaDTO.ts b/src/common/entities/MediaDTO.ts index 0a1a3e79..b56136ca 100644 --- a/src/common/entities/MediaDTO.ts +++ b/src/common/entities/MediaDTO.ts @@ -11,10 +11,14 @@ export interface MediaDTO extends FileDTO { missingThumbnails?: number; } +export type RatingTypes = 0 | 1 | 2 | 3 | 4 | 5; + export interface MediaMetadata { size: MediaDimension; creationDate: number; fileSize: number; + keywords?: string[]; + rating?: RatingTypes; } export interface MediaDimension { diff --git a/src/common/entities/PhotoDTO.ts b/src/common/entities/PhotoDTO.ts index 0fb626b2..1bd6b090 100644 --- a/src/common/entities/PhotoDTO.ts +++ b/src/common/entities/PhotoDTO.ts @@ -26,12 +26,8 @@ export interface FaceRegion { box?: FaceRegionBox; // some faces don t have region ass they are coming from keywords } -export type RatingTypes = 0 | 1 | 2 | 3 | 4 | 5; - export interface PhotoMetadata extends MediaMetadata { - rating?: RatingTypes; caption?: string; - keywords?: string[]; cameraData?: CameraMetadata; positionData?: PositionMetaData; size: MediaDimension; diff --git a/src/common/entities/VideoDTO.ts b/src/common/entities/VideoDTO.ts index 97abddd1..d9cefefc 100644 --- a/src/common/entities/VideoDTO.ts +++ b/src/common/entities/VideoDTO.ts @@ -1,6 +1,5 @@ import {DirectoryPathDTO} from './DirectoryDTO'; import {MediaDimension, MediaDTO, MediaMetadata} from './MediaDTO'; -import {PositionMetaData, CameraMetadata, RatingTypes} from './PhotoDTO'; export interface VideoDTO extends MediaDTO { id: number; @@ -16,6 +15,4 @@ export interface VideoMetadata extends MediaMetadata { duration: number; // in milliseconds fileSize: number; fps: number; - keywords?: string[]; - rating?: RatingTypes; }