import * as Bull from 'bull'
import { move, remove, stat } from 'fs-extra'
-import { extname } from 'path'
+import { getLowercaseExtension } from '@server/helpers/core-utils'
import { retryTransactionWrapper } from '@server/helpers/database-utils'
+import { YoutubeDL } from '@server/helpers/youtube-dl'
import { isPostImportVideoAccepted } from '@server/lib/moderation'
import { Hooks } from '@server/lib/plugins/hooks'
+import { ServerConfigManager } from '@server/lib/server-config-manager'
import { isAbleToUploadVideo } from '@server/lib/user'
import { addOptimizeOrMergeAudioJob } from '@server/lib/video'
-import { getVideoFilePath } from '@server/lib/video-paths'
+import { generateWebTorrentVideoFilename, getVideoFilePath } from '@server/lib/video-paths'
import { ThumbnailModel } from '@server/models/video/thumbnail'
import { MVideoImportDefault, MVideoImportDefaultFiles, MVideoImportVideo } from '@server/types/models/video/video-import'
import {
import { logger } from '../../../helpers/logger'
import { getSecureTorrentName } from '../../../helpers/utils'
import { createTorrentAndSetInfoHash, downloadWebTorrentVideo } from '../../../helpers/webtorrent'
-import { downloadYoutubeDLVideo } from '../../../helpers/youtube-dl'
import { CONFIG } from '../../../initializers/config'
import { VIDEO_IMPORT_TIMEOUT } from '../../../initializers/constants'
import { sequelizeTypescript } from '../../../initializers/database'
videoImportId: videoImport.id
}
+ const youtubeDL = new YoutubeDL(videoImport.targetUrl, ServerConfigManager.Instance.getEnabledResolutions('vod'))
+
return processFile(
- () => downloadYoutubeDLVideo(videoImport.targetUrl, payload.fileExt, VIDEO_IMPORT_TIMEOUT),
+ () => youtubeDL.downloadYoutubeDLVideo(payload.fileExt, VIDEO_IMPORT_TIMEOUT),
videoImport,
options
)
const duration = await getDurationFromVideoFile(tempVideoPath)
// Prepare video file object for creation in database
+ const fileExt = getLowercaseExtension(tempVideoPath)
const videoFileData = {
- extname: extname(tempVideoPath),
+ extname: fileExt,
resolution: videoFileResolution,
size: stats.size,
+ filename: generateWebTorrentVideoFilename(videoFileResolution, fileExt),
fps,
videoId: videoImport.videoId
}
let thumbnailModel: MThumbnail
let thumbnailSave: object
if (!videoImportWithFiles.Video.getMiniature()) {
- thumbnailModel = await generateVideoMiniature(videoImportWithFiles.Video, videoFile, ThumbnailType.MINIATURE)
+ thumbnailModel = await generateVideoMiniature({
+ video: videoImportWithFiles.Video,
+ videoFile,
+ type: ThumbnailType.MINIATURE
+ })
thumbnailSave = thumbnailModel.toJSON()
}
let previewModel: MThumbnail
let previewSave: object
if (!videoImportWithFiles.Video.getPreview()) {
- previewModel = await generateVideoMiniature(videoImportWithFiles.Video, videoFile, ThumbnailType.PREVIEW)
+ previewModel = await generateVideoMiniature({
+ video: videoImportWithFiles.Video,
+ videoFile,
+ type: ThumbnailType.PREVIEW
+ })
previewSave = previewModel.toJSON()
}
})
})
- Notifier.Instance.notifyOnFinishedVideoImport(videoImportUpdated, true)
+ Notifier.Instance.notifyOnFinishedVideoImport({ videoImport: videoImportUpdated, success: true })
if (video.isBlacklisted()) {
const videoBlacklist = Object.assign(video.VideoBlacklist, { Video: video })
}
await videoImport.save()
- Notifier.Instance.notifyOnFinishedVideoImport(videoImport, false)
+ Notifier.Instance.notifyOnFinishedVideoImport({ videoImport, success: false })
throw err
}