diff options
author | Chocobozzz <me@florianbigard.com> | 2018-08-07 10:07:53 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-08-08 09:30:31 +0200 |
commit | a84b8fa5cf6e4cafb841af3db9bdfcc9531c09a4 (patch) | |
tree | cf2feafcfadb5b6e9784c86d67e692db8d599b7d /server/controllers/api/videos | |
parent | 990b6a0b0c4fbebc165e5cf7cec8fbc1cbaa6c66 (diff) | |
download | PeerTube-a84b8fa5cf6e4cafb841af3db9bdfcc9531c09a4.tar.gz PeerTube-a84b8fa5cf6e4cafb841af3db9bdfcc9531c09a4.tar.zst PeerTube-a84b8fa5cf6e4cafb841af3db9bdfcc9531c09a4.zip |
Add import.video.torrent configuration
Diffstat (limited to 'server/controllers/api/videos')
-rw-r--r-- | server/controllers/api/videos/import.ts | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/server/controllers/api/videos/import.ts b/server/controllers/api/videos/import.ts index df151e79d..94dafcdbd 100644 --- a/server/controllers/api/videos/import.ts +++ b/server/controllers/api/videos/import.ts | |||
@@ -61,12 +61,13 @@ export { | |||
61 | function addVideoImport (req: express.Request, res: express.Response) { | 61 | function addVideoImport (req: express.Request, res: express.Response) { |
62 | if (req.body.targetUrl) return addYoutubeDLImport(req, res) | 62 | if (req.body.targetUrl) return addYoutubeDLImport(req, res) |
63 | 63 | ||
64 | const file = req.files['torrentfile'][0] | 64 | const file = req.files && req.files['torrentfile'] ? req.files['torrentfile'][0] : undefined |
65 | if (req.body.magnetUri || file) return addTorrentImport(req, res, file) | 65 | if (req.body.magnetUri || file) return addTorrentImport(req, res, file) |
66 | } | 66 | } |
67 | 67 | ||
68 | async function addTorrentImport (req: express.Request, res: express.Response, torrentfile: Express.Multer.File) { | 68 | async function addTorrentImport (req: express.Request, res: express.Response, torrentfile: Express.Multer.File) { |
69 | const body: VideoImportCreate = req.body | 69 | const body: VideoImportCreate = req.body |
70 | const user = res.locals.oauth.token.User | ||
70 | 71 | ||
71 | let videoName: string | 72 | let videoName: string |
72 | let torrentName: string | 73 | let torrentName: string |
@@ -100,7 +101,8 @@ async function addTorrentImport (req: express.Request, res: express.Response, to | |||
100 | const videoImportAttributes = { | 101 | const videoImportAttributes = { |
101 | magnetUri, | 102 | magnetUri, |
102 | torrentName, | 103 | torrentName, |
103 | state: VideoImportState.PENDING | 104 | state: VideoImportState.PENDING, |
105 | userId: user.id | ||
104 | } | 106 | } |
105 | const videoImport: VideoImportModel = await insertIntoDB(video, res.locals.videoChannel, tags, videoImportAttributes) | 107 | const videoImport: VideoImportModel = await insertIntoDB(video, res.locals.videoChannel, tags, videoImportAttributes) |
106 | 108 | ||
@@ -120,6 +122,7 @@ async function addTorrentImport (req: express.Request, res: express.Response, to | |||
120 | async function addYoutubeDLImport (req: express.Request, res: express.Response) { | 122 | async function addYoutubeDLImport (req: express.Request, res: express.Response) { |
121 | const body: VideoImportCreate = req.body | 123 | const body: VideoImportCreate = req.body |
122 | const targetUrl = body.targetUrl | 124 | const targetUrl = body.targetUrl |
125 | const user = res.locals.oauth.token.User | ||
123 | 126 | ||
124 | let youtubeDLInfo: YoutubeDLInfo | 127 | let youtubeDLInfo: YoutubeDLInfo |
125 | try { | 128 | try { |
@@ -140,7 +143,8 @@ async function addYoutubeDLImport (req: express.Request, res: express.Response) | |||
140 | const tags = body.tags || youtubeDLInfo.tags | 143 | const tags = body.tags || youtubeDLInfo.tags |
141 | const videoImportAttributes = { | 144 | const videoImportAttributes = { |
142 | targetUrl, | 145 | targetUrl, |
143 | state: VideoImportState.PENDING | 146 | state: VideoImportState.PENDING, |
147 | userId: user.id | ||
144 | } | 148 | } |
145 | const videoImport: VideoImportModel = await insertIntoDB(video, res.locals.videoChannel, tags, videoImportAttributes) | 149 | const videoImport: VideoImportModel = await insertIntoDB(video, res.locals.videoChannel, tags, videoImportAttributes) |
146 | 150 | ||