diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-03-10 14:39:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-10 14:39:40 +0100 |
commit | 8319d6ae72d4da6de51bd3d4b5c68040fc8dc3b4 (patch) | |
tree | 1f87041b2cd76222844960602cdc9f52fe206c7b /server/models/redundancy/video-redundancy.ts | |
parent | edb868655e52f934a71141175cf9dc6cb4753e11 (diff) | |
download | PeerTube-8319d6ae72d4da6de51bd3d4b5c68040fc8dc3b4.tar.gz PeerTube-8319d6ae72d4da6de51bd3d4b5c68040fc8dc3b4.tar.zst PeerTube-8319d6ae72d4da6de51bd3d4b5c68040fc8dc3b4.zip |
Add video file metadata to download modal, via ffprobe (#2411)
* Add video file metadata via ffprobe
* Federate video file metadata
* Add tests for file metadata generation
* Complete tests for videoFile metadata federation
* Lint migration and video-file for metadata
* Objectify metadata from getter in ffmpeg-utils
* Add metadataUrl to all videoFiles
* Simplify metadata API middleware
* Load playlist in videoFile when requesting metadata
Diffstat (limited to 'server/models/redundancy/video-redundancy.ts')
-rw-r--r-- | server/models/redundancy/video-redundancy.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/models/redundancy/video-redundancy.ts b/server/models/redundancy/video-redundancy.ts index 1b63d3818..857b9eca6 100644 --- a/server/models/redundancy/video-redundancy.ts +++ b/server/models/redundancy/video-redundancy.ts | |||
@@ -528,7 +528,7 @@ export class VideoRedundancyModel extends Model<VideoRedundancyModel> { | |||
528 | include: [ | 528 | include: [ |
529 | { | 529 | { |
530 | required: false, | 530 | required: false, |
531 | model: VideoFileModel.unscoped(), | 531 | model: VideoFileModel, |
532 | include: [ | 532 | include: [ |
533 | { | 533 | { |
534 | model: VideoRedundancyModel.unscoped(), | 534 | model: VideoRedundancyModel.unscoped(), |
@@ -547,7 +547,7 @@ export class VideoRedundancyModel extends Model<VideoRedundancyModel> { | |||
547 | where: redundancyWhere | 547 | where: redundancyWhere |
548 | }, | 548 | }, |
549 | { | 549 | { |
550 | model: VideoFileModel.unscoped(), | 550 | model: VideoFileModel, |
551 | required: false | 551 | required: false |
552 | } | 552 | } |
553 | ] | 553 | ] |
@@ -699,7 +699,7 @@ export class VideoRedundancyModel extends Model<VideoRedundancyModel> { | |||
699 | 699 | ||
700 | return { | 700 | return { |
701 | attributes: [], | 701 | attributes: [], |
702 | model: VideoFileModel.unscoped(), | 702 | model: VideoFileModel, |
703 | required: true, | 703 | required: true, |
704 | where: { | 704 | where: { |
705 | id: { | 705 | id: { |