X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fjob-queue%2Fhandlers%2Fvideo-import.ts;h=c5fc1061c2a8eb16d33d4447f072bcf0e56c6972;hb=7ccddd7b5250bd25a917a6e77e58b87b9484a2a4;hp=cdfe412cc6936f74c554e7ae5d89557089339b10;hpb=3d52b300ea79bec21f090e2447c4808307078618;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/job-queue/handlers/video-import.ts b/server/lib/job-queue/handlers/video-import.ts index cdfe412cc..c5fc1061c 100644 --- a/server/lib/job-queue/handlers/video-import.ts +++ b/server/lib/job-queue/handlers/video-import.ts @@ -6,42 +6,124 @@ import { VideoImportState } from '../../../../shared/models/videos' import { getDurationFromVideoFile, getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils' import { extname, join } from 'path' import { VideoFileModel } from '../../../models/video/video-file' -import { renamePromise, statPromise, unlinkPromise } from '../../../helpers/core-utils' -import { CONFIG, sequelizeTypescript } from '../../../initializers' -import { doRequestAndSaveToFile } from '../../../helpers/requests' +import { CONFIG, PREVIEWS_SIZE, sequelizeTypescript, THUMBNAILS_SIZE, VIDEO_IMPORT_TIMEOUT } from '../../../initializers' +import { downloadImage } from '../../../helpers/requests' import { VideoState } from '../../../../shared' import { JobQueue } from '../index' import { federateVideoIfNeeded } from '../../activitypub' import { VideoModel } from '../../../models/video/video' +import { downloadWebTorrentVideo } from '../../../helpers/webtorrent' +import { getSecureTorrentName } from '../../../helpers/utils' +import { remove, move, stat } from 'fs-extra' +import { Notifier } from '../../notifier' -export type VideoImportPayload = { +type VideoImportYoutubeDLPayload = { type: 'youtube-dl' videoImportId: number + thumbnailUrl: string downloadThumbnail: boolean downloadPreview: boolean } +type VideoImportTorrentPayload = { + type: 'magnet-uri' | 'torrent-file' + videoImportId: number +} + +export type VideoImportPayload = VideoImportYoutubeDLPayload | VideoImportTorrentPayload + async function processVideoImport (job: Bull.Job) { const payload = job.data as VideoImportPayload - logger.info('Processing video import in job %d.', job.id) - const videoImport = await VideoImportModel.loadAndPopulateVideo(payload.videoImportId) + if (payload.type === 'youtube-dl') return processYoutubeDLImport(job, payload) + if (payload.type === 'magnet-uri' || payload.type === 'torrent-file') return processTorrentImport(job, payload) +} + +// --------------------------------------------------------------------------- + +export { + processVideoImport +} + +// --------------------------------------------------------------------------- + +async function processTorrentImport (job: Bull.Job, payload: VideoImportTorrentPayload) { + logger.info('Processing torrent video import in job %d.', job.id) + + const videoImport = await getVideoImportOrDie(payload.videoImportId) + + const options = { + videoImportId: payload.videoImportId, + + downloadThumbnail: false, + downloadPreview: false, + + generateThumbnail: true, + generatePreview: true + } + const target = { + torrentName: videoImport.torrentName ? getSecureTorrentName(videoImport.torrentName) : undefined, + magnetUri: videoImport.magnetUri + } + return processFile(() => downloadWebTorrentVideo(target, VIDEO_IMPORT_TIMEOUT), videoImport, options) +} + +async function processYoutubeDLImport (job: Bull.Job, payload: VideoImportYoutubeDLPayload) { + logger.info('Processing youtubeDL video import in job %d.', job.id) + + const videoImport = await getVideoImportOrDie(payload.videoImportId) + const options = { + videoImportId: videoImport.id, + + downloadThumbnail: payload.downloadThumbnail, + downloadPreview: payload.downloadPreview, + thumbnailUrl: payload.thumbnailUrl, + + generateThumbnail: false, + generatePreview: false + } + + return processFile(() => downloadYoutubeDLVideo(videoImport.targetUrl, VIDEO_IMPORT_TIMEOUT), videoImport, options) +} + +async function getVideoImportOrDie (videoImportId: number) { + const videoImport = await VideoImportModel.loadAndPopulateVideo(videoImportId) if (!videoImport || !videoImport.Video) { throw new Error('Cannot import video %s: the video import or video linked to this import does not exist anymore.') } + return videoImport +} + +type ProcessFileOptions = { + videoImportId: number + + downloadThumbnail: boolean + downloadPreview: boolean + thumbnailUrl?: string + + generateThumbnail: boolean + generatePreview: boolean +} +async function processFile (downloader: () => Promise, videoImport: VideoImportModel, options: ProcessFileOptions) { let tempVideoPath: string let videoDestFile: string let videoFile: VideoFileModel + try { // Download video from youtubeDL - tempVideoPath = await downloadYoutubeDLVideo(videoImport.targetUrl) + tempVideoPath = await downloader() // Get information about this video + const stats = await stat(tempVideoPath) + const isAble = await videoImport.User.isAbleToUploadVideo({ size: stats.size }) + if (isAble === false) { + throw new Error('The user video quota is exceeded with this video to import.') + } + const { videoFileResolution } = await getVideoFileResolution(tempVideoPath) const fps = await getVideoFileFPS(tempVideoPath) - const stats = await statPromise(tempVideoPath) const duration = await getDurationFromVideoFile(tempVideoPath) // Create video file object in database @@ -53,32 +135,34 @@ async function processVideoImport (job: Bull.Job) { videoId: videoImport.videoId } videoFile = new VideoFileModel(videoFileData) - // Import if the import fails, to clean files + // To clean files if the import fails videoImport.Video.VideoFiles = [ videoFile ] // Move file videoDestFile = join(CONFIG.STORAGE.VIDEOS_DIR, videoImport.Video.getVideoFilename(videoFile)) - await renamePromise(tempVideoPath, videoDestFile) + await move(tempVideoPath, videoDestFile) tempVideoPath = null // This path is not used anymore // Process thumbnail - if (payload.downloadThumbnail) { - if (payload.thumbnailUrl) { - const destThumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, videoImport.Video.getThumbnailName()) - await doRequestAndSaveToFile({ method: 'GET', uri: payload.thumbnailUrl }, destThumbnailPath) + if (options.downloadThumbnail) { + if (options.thumbnailUrl) { + await downloadImage(options.thumbnailUrl, CONFIG.STORAGE.THUMBNAILS_DIR, videoImport.Video.getThumbnailName(), THUMBNAILS_SIZE) } else { await videoImport.Video.createThumbnail(videoFile) } + } else if (options.generateThumbnail) { + await videoImport.Video.createThumbnail(videoFile) } // Process preview - if (payload.downloadPreview) { - if (payload.thumbnailUrl) { - const destPreviewPath = join(CONFIG.STORAGE.PREVIEWS_DIR, videoImport.Video.getPreviewName()) - await doRequestAndSaveToFile({ method: 'GET', uri: payload.thumbnailUrl }, destPreviewPath) + if (options.downloadPreview) { + if (options.thumbnailUrl) { + await downloadImage(options.thumbnailUrl, CONFIG.STORAGE.PREVIEWS_DIR, videoImport.Video.getPreviewName(), PREVIEWS_SIZE) } else { await videoImport.Video.createPreview(videoFile) } + } else if (options.generatePreview) { + await videoImport.Video.createPreview(videoFile) } // Create torrent @@ -96,22 +180,30 @@ async function processVideoImport (job: Bull.Job) { // Update video DB object video.duration = duration video.state = CONFIG.TRANSCODING.ENABLED ? VideoState.TO_TRANSCODE : VideoState.PUBLISHED - const videoUpdated = await video.save({ transaction: t }) + await video.save({ transaction: t }) // Now we can federate the video (reload from database, we need more attributes) - const videoForFederation = await VideoModel.loadByUUIDAndPopulateAccountAndServerAndTags(video.uuid, t) + const videoForFederation = await VideoModel.loadAndPopulateAccountAndServerAndTags(video.uuid, t) await federateVideoIfNeeded(videoForFederation, true, t) // Update video import object videoImport.state = VideoImportState.SUCCESS const videoImportUpdated = await videoImport.save({ transaction: t }) - logger.info('Video %s imported.', videoImport.targetUrl) + logger.info('Video %s imported.', video.uuid) - videoImportUpdated.Video = videoUpdated + videoImportUpdated.Video = videoForFederation return videoImportUpdated }) + Notifier.Instance.notifyOnFinishedVideoImport(videoImportUpdated, true) + + if (videoImportUpdated.Video.VideoBlacklist) { + Notifier.Instance.notifyOnVideoAutoBlacklist(videoImportUpdated.Video) + } else { + Notifier.Instance.notifyOnNewVideo(videoImportUpdated.Video) + } + // Create transcoding jobs? if (videoImportUpdated.Video.state === VideoState.TO_TRANSCODE) { // Put uuid because we don't have id auto incremented for now @@ -120,12 +212,12 @@ async function processVideoImport (job: Bull.Job) { isNewVideo: true } - await JobQueue.Instance.createJob({ type: 'video-file', payload: dataInput }) + await JobQueue.Instance.createJob({ type: 'video-transcoding', payload: dataInput }) } } catch (err) { try { - if (tempVideoPath) await unlinkPromise(tempVideoPath) + if (tempVideoPath) await remove(tempVideoPath) } catch (errUnlink) { logger.warn('Cannot cleanup files after a video import error.', { err: errUnlink }) } @@ -134,12 +226,8 @@ async function processVideoImport (job: Bull.Job) { videoImport.state = VideoImportState.FAILED await videoImport.save() + Notifier.Instance.notifyOnFinishedVideoImport(videoImport, false) + throw err } } - -// --------------------------------------------------------------------------- - -export { - processVideoImport -}