diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-06 12:26:58 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-06 12:26:58 +0100 |
| commit | 73471b1a52f242e86364ffb077ea6cadb3b07ae2 (patch) | |
| tree | 43dbb7748e281f8d80f15326f489cdea10ec857d /server/models/video/video-import.ts | |
| parent | c22419dd265c0c7185bf4197a1cb286eb3d8ebc0 (diff) | |
| parent | f5305c04aae14467d6f957b713c5a902275cbb89 (diff) | |
| download | PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.gz PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.zst PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.zip | |
Merge branch 'release/v1.2.0'
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, |