Merge branch 'release/3.1.0' into develop

[github/Chocobozzz/PeerTube.git] / shared / models / videos / video-file.model.ts

diff --git a/shared/models/videos/video-file.model.ts b/shared/models/videos/video-file.model.ts
index 6cc2d5aeec082d8e8c4787b12c9392860b7dcdf3..1e830b19c865ee6f1ffaa008f37cbe48b000c41b 100644 (file)
--- a/shared/models/videos/video-file.model.ts
+++ b/shared/models/videos/video-file.model.ts
@@ -1,15 +1,21 @@
-import { VideoConstant, VideoResolution } from '@shared/models'
-import { FfprobeData } from 'fluent-ffmpeg'
+import { VideoConstant } from './video-constant.model'
+import { VideoFileMetadata } from './video-file-metadata'
+import { VideoResolution } from './video-resolution.enum'
 
 export interface VideoFile {
-  magnetUri: string
   resolution: VideoConstant<VideoResolution>
   size: number // Bytes
+
   torrentUrl: string
   torrentDownloadUrl: string
+
   fileUrl: string
   fileDownloadUrl: string
+
   fps: number
-  metadata?: FfprobeData
+
+  metadata?: VideoFileMetadata
   metadataUrl?: string
+
+  magnetUri: string | null
 }