import * as Bull from 'bull'
import { move, remove, stat } from 'fs-extra'
import { extname } from 'path'
+import { retryTransactionWrapper } from '@server/helpers/database-utils'
import { isPostImportVideoAccepted } from '@server/lib/moderation'
import { Hooks } from '@server/lib/plugins/hooks'
import { isAbleToUploadVideo } from '@server/lib/user'
import { addOptimizeOrMergeAudioJob } from '@server/lib/video'
-import { getVideoFilePath } from '@server/lib/video-paths'
+import { generateVideoFilename, 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 {
VideoImportPayload,
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'
import { federateVideoIfNeeded } from '../../activitypub/videos'
import { Notifier } from '../../notifier'
import { generateVideoMiniature } from '../../thumbnail'
+import { YoutubeDL } from '@server/helpers/youtube-dl'
+import { getEnabledResolutions } from '@server/lib/config'
async function processVideoImport (job: Bull.Job) {
const payload = job.data as VideoImportPayload
const options = {
type: payload.type,
- videoImportId: payload.videoImportId,
-
- generateThumbnail: true,
- generatePreview: true
+ videoImportId: payload.videoImportId
}
const target = {
torrentName: videoImport.torrentName ? getSecureTorrentName(videoImport.torrentName) : undefined,
const videoImport = await getVideoImportOrDie(payload.videoImportId)
const options = {
type: payload.type,
- videoImportId: videoImport.id,
-
- generateThumbnail: payload.generateThumbnail,
- generatePreview: payload.generatePreview
+ videoImportId: videoImport.id
}
+ const youtubeDL = new YoutubeDL(videoImport.targetUrl, getEnabledResolutions('vod'))
+
return processFile(
- () => downloadYoutubeDLVideo(videoImport.targetUrl, payload.fileExt, VIDEO_IMPORT_TIMEOUT),
+ () => youtubeDL.downloadYoutubeDLVideo(payload.fileExt, VIDEO_IMPORT_TIMEOUT),
videoImport,
options
)
type ProcessFileOptions = {
type: VideoImportYoutubeDLPayloadType | VideoImportTorrentPayloadType
videoImportId: number
-
- generateThumbnail: boolean
- generatePreview: boolean
}
async function processFile (downloader: () => Promise<string>, videoImport: MVideoImportDefault, options: ProcessFileOptions) {
let tempVideoPath: string
const duration = await getDurationFromVideoFile(tempVideoPath)
// Prepare video file object for creation in database
+ const fileExt = extname(tempVideoPath)
const videoFileData = {
- extname: extname(tempVideoPath),
+ extname: fileExt,
resolution: videoFileResolution,
size: stats.size,
+ filename: generateVideoFilename(videoImport.Video, false, videoFileResolution, fileExt),
fps,
videoId: videoImport.videoId
}
await move(tempVideoPath, videoDestFile)
tempVideoPath = null // This path is not used anymore
- // Process thumbnail
+ // Generate miniature if the import did not created it
let thumbnailModel: MThumbnail
- if (options.generateThumbnail) {
- thumbnailModel = await generateVideoMiniature(videoImportWithFiles.Video, videoFile, ThumbnailType.MINIATURE)
+ let thumbnailSave: object
+ if (!videoImportWithFiles.Video.getMiniature()) {
+ thumbnailModel = await generateVideoMiniature({
+ video: videoImportWithFiles.Video,
+ videoFile,
+ type: ThumbnailType.MINIATURE
+ })
+ thumbnailSave = thumbnailModel.toJSON()
}
- // Process preview
+ // Generate preview if the import did not created it
let previewModel: MThumbnail
- if (options.generatePreview) {
- previewModel = await generateVideoMiniature(videoImportWithFiles.Video, videoFile, ThumbnailType.PREVIEW)
+ let previewSave: object
+ if (!videoImportWithFiles.Video.getPreview()) {
+ previewModel = await generateVideoMiniature({
+ video: videoImportWithFiles.Video,
+ videoFile,
+ type: ThumbnailType.PREVIEW
+ })
+ previewSave = previewModel.toJSON()
}
// Create torrent
await createTorrentAndSetInfoHash(videoImportWithFiles.Video, videoFile)
- const { videoImportUpdated, video } = await sequelizeTypescript.transaction(async t => {
- const videoImportToUpdate = videoImportWithFiles as MVideoImportVideo
+ const videoFileSave = videoFile.toJSON()
+
+ const { videoImportUpdated, video } = await retryTransactionWrapper(() => {
+ return sequelizeTypescript.transaction(async t => {
+ const videoImportToUpdate = videoImportWithFiles as MVideoImportVideo
+
+ // Refresh video
+ const video = await VideoModel.load(videoImportToUpdate.videoId, t)
+ if (!video) throw new Error('Video linked to import ' + videoImportToUpdate.videoId + ' does not exist anymore.')
+
+ const videoFileCreated = await videoFile.save({ transaction: t })
+
+ // Update video DB object
+ video.duration = duration
+ video.state = CONFIG.TRANSCODING.ENABLED ? VideoState.TO_TRANSCODE : VideoState.PUBLISHED
+ await video.save({ transaction: t })
- // Refresh video
- const video = await VideoModel.load(videoImportToUpdate.videoId, t)
- if (!video) throw new Error('Video linked to import ' + videoImportToUpdate.videoId + ' does not exist anymore.')
+ if (thumbnailModel) await video.addAndSaveThumbnail(thumbnailModel, t)
+ if (previewModel) await video.addAndSaveThumbnail(previewModel, t)
- const videoFileCreated = await videoFile.save({ transaction: t })
- videoImportToUpdate.Video = Object.assign(video, { VideoFiles: [ videoFileCreated ] })
+ // Now we can federate the video (reload from database, we need more attributes)
+ const videoForFederation = await VideoModel.loadAndPopulateAccountAndServerAndTags(video.uuid, t)
+ await federateVideoIfNeeded(videoForFederation, true, t)
- // Update video DB object
- video.duration = duration
- video.state = CONFIG.TRANSCODING.ENABLED ? VideoState.TO_TRANSCODE : VideoState.PUBLISHED
- await video.save({ transaction: t })
+ // Update video import object
+ videoImportToUpdate.state = VideoImportState.SUCCESS
+ const videoImportUpdated = await videoImportToUpdate.save({ transaction: t }) as MVideoImportVideo
+ videoImportUpdated.Video = video
- if (thumbnailModel) await video.addAndSaveThumbnail(thumbnailModel, t)
- if (previewModel) await video.addAndSaveThumbnail(previewModel, t)
+ videoImportToUpdate.Video = Object.assign(video, { VideoFiles: [ videoFileCreated ] })
- // Now we can federate the video (reload from database, we need more attributes)
- const videoForFederation = await VideoModel.loadAndPopulateAccountAndServerAndTags(video.uuid, t)
- await federateVideoIfNeeded(videoForFederation, true, t)
+ logger.info('Video %s imported.', video.uuid)
- // Update video import object
- videoImportToUpdate.state = VideoImportState.SUCCESS
- const videoImportUpdated = await videoImportToUpdate.save({ transaction: t }) as MVideoImportVideo
- videoImportUpdated.Video = video
+ return { videoImportUpdated, video: videoForFederation }
+ }).catch(err => {
+ // Reset fields
+ if (thumbnailModel) thumbnailModel = new ThumbnailModel(thumbnailSave)
+ if (previewModel) previewModel = new ThumbnailModel(previewSave)
- logger.info('Video %s imported.', video.uuid)
+ videoFile = new VideoFileModel(videoFileSave)
- return { videoImportUpdated, video: videoForFederation }
+ throw err
+ })
})
Notifier.Instance.notifyOnFinishedVideoImport(videoImportUpdated, true)
projects / github / Chocobozzz / PeerTube.git / blobdiff