diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
| commit | 88108880bbdba473cfe36ecbebc1c3c4f972e102 (patch) | |
| tree | b242efb3b4f0d7e49d88f2d1f2063b5b3b0489c0 /server/models/video/video-import.ts | |
| parent | 53a94c7cfa8368da4cd248d65df8346905938f0c (diff) | |
| parent | 9b712a2017e4ab3cf12cd6bd58278905520159d0 (diff) | |
| download | PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.gz PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.zst PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.zip | |
Merge branch 'develop' into pr/1217
Diffstat (limited to 'server/models/video/video-import.ts')
| -rw-r--r-- | server/models/video/video-import.ts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/server/models/video/video-import.ts b/server/models/video/video-import.ts index 8d442b3f8..c723e57c0 100644 --- a/server/models/video/video-import.ts +++ b/server/models/video/video-import.ts | |||
| @@ -144,6 +144,10 @@ export class VideoImportModel extends Model<VideoImportModel> { | |||
| 144 | }) | 144 | }) |
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | getTargetIdentifier () { | ||
| 148 | return this.targetUrl || this.magnetUri || this.torrentName | ||
| 149 | } | ||
| 150 | |||
| 147 | toFormattedJSON (): VideoImport { | 151 | toFormattedJSON (): VideoImport { |
| 148 | const videoFormatOptions = { | 152 | const videoFormatOptions = { |
| 149 | completeDescription: true, | 153 | completeDescription: true, |