import { VideoImportModel } from '../../../models/video/video-import'
import { VideoImportState } from '../../../../shared/models/videos'
import { getDurationFromVideoFile, getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils'
-import { extname, join } from 'path'
+import { extname } from 'path'
import { VideoFileModel } from '../../../models/video/video-file'
import { VIDEO_IMPORT_TIMEOUT } from '../../../initializers/constants'
import { VideoState } from '../../../../shared'
-import { JobQueue } from '../index'
import { federateVideoIfNeeded } from '../../activitypub'
import { VideoModel } from '../../../models/video/video'
-import { downloadWebTorrentVideo } from '../../../helpers/webtorrent'
+import { createTorrentAndSetInfoHash, downloadWebTorrentVideo } from '../../../helpers/webtorrent'
import { getSecureTorrentName } from '../../../helpers/utils'
import { move, remove, stat } from 'fs-extra'
import { Notifier } from '../../notifier'
import { CONFIG } from '../../../initializers/config'
import { sequelizeTypescript } from '../../../initializers/database'
-import { createVideoMiniatureFromUrl, generateVideoMiniature } from '../../thumbnail'
+import { generateVideoMiniature } from '../../thumbnail'
import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type'
import { MThumbnail } from '../../../typings/models/video/thumbnail'
import { MVideoImportDefault, MVideoImportDefaultFiles, MVideoImportVideo } from '@server/typings/models/video/video-import'
+import { getVideoFilePath } from '@server/lib/video-paths'
+import { addOptimizeOrMergeAudioJob } from '@server/lib/videos'
type VideoImportYoutubeDLPayload = {
type: 'youtube-dl'
videoImportId: number
- thumbnailUrl: string
- downloadThumbnail: boolean
- downloadPreview: boolean
+ generateThumbnail: boolean
+ generatePreview: boolean
+
+ fileExt?: string
}
type VideoImportTorrentPayload = {
const options = {
videoImportId: payload.videoImportId,
- downloadThumbnail: false,
- downloadPreview: false,
-
generateThumbnail: true,
generatePreview: true
}
const options = {
videoImportId: videoImport.id,
- downloadThumbnail: payload.downloadThumbnail,
- downloadPreview: payload.downloadPreview,
- thumbnailUrl: payload.thumbnailUrl,
-
- generateThumbnail: false,
- generatePreview: false
+ generateThumbnail: payload.generateThumbnail,
+ generatePreview: payload.generatePreview
}
- return processFile(() => downloadYoutubeDLVideo(videoImport.targetUrl, VIDEO_IMPORT_TIMEOUT), videoImport, options)
+ return processFile(() => downloadYoutubeDLVideo(videoImport.targetUrl, payload.fileExt, VIDEO_IMPORT_TIMEOUT), videoImport, options)
}
async function getVideoImportOrDie (videoImportId: number) {
type ProcessFileOptions = {
videoImportId: number
- downloadThumbnail: boolean
- downloadPreview: boolean
- thumbnailUrl?: string
-
generateThumbnail: boolean
generatePreview: boolean
}
}
videoFile = new VideoFileModel(videoFileData)
- const videoWithFiles = Object.assign(videoImport.Video, { VideoFiles: [ videoFile ] })
+ const videoWithFiles = Object.assign(videoImport.Video, { VideoFiles: [ videoFile ], VideoStreamingPlaylists: [] })
// To clean files if the import fails
const videoImportWithFiles: MVideoImportDefaultFiles = Object.assign(videoImport, { Video: videoWithFiles })
// Move file
- videoDestFile = join(CONFIG.STORAGE.VIDEOS_DIR, videoImportWithFiles.Video.getVideoFilename(videoFile))
+ videoDestFile = getVideoFilePath(videoImportWithFiles.Video, videoFile)
await move(tempVideoPath, videoDestFile)
tempVideoPath = null // This path is not used anymore
// Process thumbnail
let thumbnailModel: MThumbnail
- if (options.downloadThumbnail && options.thumbnailUrl) {
- thumbnailModel = await createVideoMiniatureFromUrl(options.thumbnailUrl, videoImportWithFiles.Video, ThumbnailType.MINIATURE)
- } else if (options.generateThumbnail || options.downloadThumbnail) {
+ if (options.generateThumbnail) {
thumbnailModel = await generateVideoMiniature(videoImportWithFiles.Video, videoFile, ThumbnailType.MINIATURE)
}
// Process preview
let previewModel: MThumbnail
- if (options.downloadPreview && options.thumbnailUrl) {
- previewModel = await createVideoMiniatureFromUrl(options.thumbnailUrl, videoImportWithFiles.Video, ThumbnailType.PREVIEW)
- } else if (options.generatePreview || options.downloadPreview) {
+ if (options.generatePreview) {
previewModel = await generateVideoMiniature(videoImportWithFiles.Video, videoFile, ThumbnailType.PREVIEW)
}
// Create torrent
- await videoImportWithFiles.Video.createTorrentAndSetInfoHash(videoFile)
+ await createTorrentAndSetInfoHash(videoImportWithFiles.Video, videoFile)
const { videoImportUpdated, video } = await sequelizeTypescript.transaction(async t => {
const videoImportToUpdate = videoImportWithFiles as MVideoImportVideo
Notifier.Instance.notifyOnFinishedVideoImport(videoImportUpdated, true)
if (video.isBlacklisted()) {
- Notifier.Instance.notifyOnVideoAutoBlacklist(video)
+ const videoBlacklist = Object.assign(video.VideoBlacklist, { Video: video })
+
+ Notifier.Instance.notifyOnVideoAutoBlacklist(videoBlacklist)
} else {
Notifier.Instance.notifyOnNewVideoIfNeeded(video)
}
// Create transcoding jobs?
if (video.state === VideoState.TO_TRANSCODE) {
- // Put uuid because we don't have id auto incremented for now
- const dataInput = {
- type: 'optimize' as 'optimize',
- videoUUID: videoImportUpdated.Video.uuid,
- isNewVideo: true
- }
-
- await JobQueue.Instance.createJob({ type: 'video-transcoding', payload: dataInput })
+ await addOptimizeOrMergeAudioJob(videoImportUpdated.Video, videoFile)
}
} catch (err) {