-import * as Bluebird from 'bluebird'
import * as express from 'express'
import { move, readFile } from 'fs-extra'
import * as magnetUtil from 'magnet-uri'
} from '@server/types/models'
import { MVideoImport, MVideoImportFormattable } from '@server/types/models/video/video-import'
import { VideoImportCreate, VideoImportState, VideoPrivacy, VideoState } from '../../../../shared'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type'
import { auditLoggerFactory, getAuditIdFromRes, VideoImportAuditView } from '../../../helpers/audit-logger'
import { moveAndProcessCaptionFile } from '../../../helpers/captions-utils'
import { VideoModel } from '../../../models/video/video'
import { VideoCaptionModel } from '../../../models/video/video-caption'
import { VideoImportModel } from '../../../models/video/video-import'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
const auditLogger = auditLoggerFactory('video-imports')
const videoImportsRouter = express.Router()
} catch (err) {
logger.info('Cannot fetch information from import for URL %s.', targetUrl, { err })
- return res.status(HttpStatusCode.BAD_REQUEST_400).json({
- error: 'Cannot fetch remote information of this URL.'
- }).end()
+ return res.status(HttpStatusCode.BAD_REQUEST_400)
+ .json({
+ error: 'Cannot fetch remote information of this URL.'
+ })
}
const video = buildVideo(res.locals.videoChannel.id, body, youtubeDLInfo)
videoImportId: videoImport.id,
generateThumbnail: !thumbnailModel,
generatePreview: !previewModel,
- fileExt: youtubeDLInfo.fileExt
- ? `.${youtubeDLInfo.fileExt}`
- : '.mp4'
+ fileExt: `.${youtubeDLInfo.ext || 'mp4'}`,
+ mergeExt: youtubeDLInfo.mergeExt ? `.${youtubeDLInfo.mergeExt}` : ''
}
await JobQueue.Instance.createJobWithPromise({ type: 'video-import', payload })
tags: string[]
videoImportAttributes: Partial<MVideoImport>
user: MUser
-}): Bluebird<MVideoImportFormattable> {
+}): Promise<MVideoImportFormattable> {
const { video, thumbnailModel, previewModel, videoChannel, tags, videoImportAttributes, user } = parameters
return sequelizeTypescript.transaction(async t => {