aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers/api/videos/import.ts
diff options
context:
space:
mode:
Diffstat (limited to 'server/controllers/api/videos/import.ts')
-rw-r--r--server/controllers/api/videos/import.ts16
1 files changed, 5 insertions, 11 deletions
diff --git a/server/controllers/api/videos/import.ts b/server/controllers/api/videos/import.ts
index a4ec41d44..bfb690906 100644
--- a/server/controllers/api/videos/import.ts
+++ b/server/controllers/api/videos/import.ts
@@ -23,7 +23,7 @@ import { move, readFile } from 'fs-extra'
23import { autoBlacklistVideoIfNeeded } from '../../../lib/video-blacklist' 23import { autoBlacklistVideoIfNeeded } from '../../../lib/video-blacklist'
24import { CONFIG } from '../../../initializers/config' 24import { CONFIG } from '../../../initializers/config'
25import { sequelizeTypescript } from '../../../initializers/database' 25import { sequelizeTypescript } from '../../../initializers/database'
26import { createVideoThumbnailFromExisting } from '../../../lib/thumbnail' 26import { createVideoMiniatureFromExisting } from '../../../lib/thumbnail'
27import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type' 27import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type'
28import { ThumbnailModel } from '../../../models/video/thumbnail' 28import { ThumbnailModel } from '../../../models/video/thumbnail'
29 29
@@ -204,7 +204,7 @@ async function processThumbnail (req: express.Request, video: VideoModel) {
204 if (thumbnailField) { 204 if (thumbnailField) {
205 const thumbnailPhysicalFile = thumbnailField[ 0 ] 205 const thumbnailPhysicalFile = thumbnailField[ 0 ]
206 206
207 return createVideoThumbnailFromExisting(thumbnailPhysicalFile.path, video, ThumbnailType.THUMBNAIL) 207 return createVideoMiniatureFromExisting(thumbnailPhysicalFile.path, video, ThumbnailType.MINIATURE)
208 } 208 }
209 209
210 return undefined 210 return undefined
@@ -215,7 +215,7 @@ async function processPreview (req: express.Request, video: VideoModel) {
215 if (previewField) { 215 if (previewField) {
216 const previewPhysicalFile = previewField[0] 216 const previewPhysicalFile = previewField[0]
217 217
218 return createVideoThumbnailFromExisting(previewPhysicalFile.path, video, ThumbnailType.PREVIEW) 218 return createVideoMiniatureFromExisting(previewPhysicalFile.path, video, ThumbnailType.PREVIEW)
219 } 219 }
220 220
221 return undefined 221 return undefined
@@ -238,14 +238,8 @@ function insertIntoDB (parameters: {
238 const videoCreated = await video.save(sequelizeOptions) 238 const videoCreated = await video.save(sequelizeOptions)
239 videoCreated.VideoChannel = videoChannel 239 videoCreated.VideoChannel = videoChannel
240 240
241 if (thumbnailModel) { 241 if (thumbnailModel) await videoCreated.addAndSaveThumbnail(thumbnailModel, t)
242 thumbnailModel.videoId = videoCreated.id 242 if (previewModel) await videoCreated.addAndSaveThumbnail(previewModel, t)
243 videoCreated.addThumbnail(await thumbnailModel.save({ transaction: t }))
244 }
245 if (previewModel) {
246 previewModel.videoId = videoCreated.id
247 videoCreated.addThumbnail(await previewModel.save({ transaction: t }))
248 }
249 243
250 await autoBlacklistVideoIfNeeded(video, videoChannel.Account.User, t) 244 await autoBlacklistVideoIfNeeded(video, videoChannel.Account.User, t)
251 245