X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fvideos%2Fimport.ts;h=28ced58368b2939f0957d09cb0f69f0723793646;hb=d7a25329f9e607894d29ab342b9cb66638b56dc0;hp=ee11b0741ded6fcacfa56e6e376857167ba1e7a2;hpb=5d08a6a74e83f2e4dfe2f3ba7f5a39371e1bc89e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/videos/import.ts b/server/controllers/api/videos/import.ts index ee11b0741..28ced5836 100644 --- a/server/controllers/api/videos/import.ts +++ b/server/controllers/api/videos/import.ts @@ -1,7 +1,8 @@ import * as express from 'express' -import { auditLoggerFactory, VideoImportAuditView } from '../../../helpers/audit-logger' +import * as magnetUtil from 'magnet-uri' +import { auditLoggerFactory, getAuditIdFromRes, VideoImportAuditView } from '../../../helpers/audit-logger' import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate, videoImportAddValidator } from '../../../middlewares' -import { CONFIG, IMAGE_MIMETYPE_EXT, PREVIEWS_SIZE, sequelizeTypescript, THUMBNAILS_SIZE } from '../../../initializers' +import { MIMETYPES } from '../../../initializers/constants' import { getYoutubeDLInfo, YoutubeDLInfo } from '../../../helpers/youtube-dl' import { createReqFiles } from '../../../helpers/express-utils' import { logger } from '../../../helpers/logger' @@ -11,18 +12,38 @@ import { getVideoActivityPubUrl } from '../../../lib/activitypub' import { TagModel } from '../../../models/video/tag' import { VideoImportModel } from '../../../models/video/video-import' import { JobQueue } from '../../../lib/job-queue/job-queue' -import { processImage } from '../../../helpers/image-utils' import { join } from 'path' +import { isArray } from '../../../helpers/custom-validators/misc' +import * as Bluebird from 'bluebird' +import * as parseTorrent from 'parse-torrent' +import { getSecureTorrentName } from '../../../helpers/utils' +import { move, readFile } from 'fs-extra' +import { autoBlacklistVideoIfNeeded } from '../../../lib/video-blacklist' +import { CONFIG } from '../../../initializers/config' +import { sequelizeTypescript } from '../../../initializers/database' +import { createVideoMiniatureFromExisting } from '../../../lib/thumbnail' +import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type' +import { + MChannelAccountDefault, + MThumbnail, + MUser, + MVideoAccountDefault, + MVideoTag, + MVideoThumbnailAccountDefault, + MVideoWithBlacklistLight +} from '@server/typings/models' +import { MVideoImport, MVideoImportFormattable } from '@server/typings/models/video/video-import' const auditLogger = auditLoggerFactory('video-imports') const videoImportsRouter = express.Router() const reqVideoFileImport = createReqFiles( - [ 'thumbnailfile', 'previewfile' ], - IMAGE_MIMETYPE_EXT, + [ 'thumbnailfile', 'previewfile', 'torrentfile' ], + Object.assign({}, MIMETYPES.TORRENT.MIMETYPE_EXT, MIMETYPES.IMAGE.MIMETYPE_EXT), { - thumbnailfile: CONFIG.STORAGE.THUMBNAILS_DIR, - previewfile: CONFIG.STORAGE.PREVIEWS_DIR + thumbnailfile: CONFIG.STORAGE.TMP_DIR, + previewfile: CONFIG.STORAGE.TMP_DIR, + torrentfile: CONFIG.STORAGE.TMP_DIR } ) @@ -41,9 +62,79 @@ export { // --------------------------------------------------------------------------- -async function addVideoImport (req: express.Request, res: express.Response) { +function addVideoImport (req: express.Request, res: express.Response) { + if (req.body.targetUrl) return addYoutubeDLImport(req, res) + + const file = req.files && req.files['torrentfile'] ? req.files['torrentfile'][0] : undefined + if (req.body.magnetUri || file) return addTorrentImport(req, res, file) +} + +async function addTorrentImport (req: express.Request, res: express.Response, torrentfile: Express.Multer.File) { + const body: VideoImportCreate = req.body + const user = res.locals.oauth.token.User + + let videoName: string + let torrentName: string + let magnetUri: string + + if (torrentfile) { + torrentName = torrentfile.originalname + + // Rename the torrent to a secured name + const newTorrentPath = join(CONFIG.STORAGE.TORRENTS_DIR, getSecureTorrentName(torrentName)) + await move(torrentfile.path, newTorrentPath) + torrentfile.path = newTorrentPath + + const buf = await readFile(torrentfile.path) + const parsedTorrent = parseTorrent(buf) + + videoName = isArray(parsedTorrent.name) ? parsedTorrent.name[ 0 ] : parsedTorrent.name as string + } else { + magnetUri = body.magnetUri + + const parsed = magnetUtil.decode(magnetUri) + videoName = isArray(parsed.name) ? parsed.name[ 0 ] : parsed.name as string + } + + const video = buildVideo(res.locals.videoChannel.id, body, { name: videoName }) + + const thumbnailModel = await processThumbnail(req, video) + const previewModel = await processPreview(req, video) + + const tags = body.tags || undefined + const videoImportAttributes = { + magnetUri, + torrentName, + state: VideoImportState.PENDING, + userId: user.id + } + const videoImport = await insertIntoDB({ + video, + thumbnailModel, + previewModel, + videoChannel: res.locals.videoChannel, + tags, + videoImportAttributes, + user + }) + + // Create job to import the video + const payload = { + type: torrentfile ? 'torrent-file' as 'torrent-file' : 'magnet-uri' as 'magnet-uri', + videoImportId: videoImport.id, + magnetUri + } + await JobQueue.Instance.createJob({ type: 'video-import', payload }) + + auditLogger.create(getAuditIdFromRes(res), new VideoImportAuditView(videoImport.toFormattedJSON())) + + return res.json(videoImport.toFormattedJSON()).end() +} + +async function addYoutubeDLImport (req: express.Request, res: express.Response) { const body: VideoImportCreate = req.body const targetUrl = body.targetUrl + const user = res.locals.oauth.token.User let youtubeDLInfo: YoutubeDLInfo try { @@ -56,82 +147,136 @@ async function addVideoImport (req: express.Request, res: express.Response) { }).end() } - // Create video DB object + const video = buildVideo(res.locals.videoChannel.id, body, youtubeDLInfo) + + const thumbnailModel = await processThumbnail(req, video) + const previewModel = await processPreview(req, video) + + const tags = body.tags || youtubeDLInfo.tags + const videoImportAttributes = { + targetUrl, + state: VideoImportState.PENDING, + userId: user.id + } + const videoImport = await insertIntoDB({ + video, + thumbnailModel, + previewModel, + videoChannel: res.locals.videoChannel, + tags, + videoImportAttributes, + user + }) + + // Create job to import the video + const payload = { + type: 'youtube-dl' as 'youtube-dl', + videoImportId: videoImport.id, + thumbnailUrl: youtubeDLInfo.thumbnailUrl, + downloadThumbnail: !thumbnailModel, + downloadPreview: !previewModel + } + await JobQueue.Instance.createJob({ type: 'video-import', payload }) + + auditLogger.create(getAuditIdFromRes(res), new VideoImportAuditView(videoImport.toFormattedJSON())) + + return res.json(videoImport.toFormattedJSON()).end() +} + +function buildVideo (channelId: number, body: VideoImportCreate, importData: YoutubeDLInfo) { const videoData = { - name: body.name || youtubeDLInfo.name, + name: body.name || importData.name || 'Unknown name', remote: false, - category: body.category || youtubeDLInfo.category, - licence: body.licence || youtubeDLInfo.licence, - language: undefined, - commentsEnabled: body.commentsEnabled || true, + category: body.category || importData.category, + licence: body.licence || importData.licence, + language: body.language || undefined, + commentsEnabled: body.commentsEnabled !== false, // If the value is not "false", the default is "true" + downloadEnabled: body.downloadEnabled !== false, waitTranscoding: body.waitTranscoding || false, state: VideoState.TO_IMPORT, - nsfw: body.nsfw || youtubeDLInfo.nsfw || false, - description: body.description || youtubeDLInfo.description, + nsfw: body.nsfw || importData.nsfw || false, + description: body.description || importData.description, support: body.support || null, privacy: body.privacy || VideoPrivacy.PRIVATE, duration: 0, // duration will be set by the import job - channelId: res.locals.videoChannel.id + channelId: channelId, + originallyPublishedAt: importData.originallyPublishedAt } const video = new VideoModel(videoData) video.url = getVideoActivityPubUrl(video) - // Process thumbnail file? + return video +} + +async function processThumbnail (req: express.Request, video: VideoModel) { const thumbnailField = req.files ? req.files['thumbnailfile'] : undefined - let downloadThumbnail = true if (thumbnailField) { const thumbnailPhysicalFile = thumbnailField[ 0 ] - await processImage(thumbnailPhysicalFile, join(CONFIG.STORAGE.THUMBNAILS_DIR, video.getThumbnailName()), THUMBNAILS_SIZE) - downloadThumbnail = false + + return createVideoMiniatureFromExisting(thumbnailPhysicalFile.path, video, ThumbnailType.MINIATURE, false) } - // Process preview file? + return undefined +} + +async function processPreview (req: express.Request, video: VideoModel) { const previewField = req.files ? req.files['previewfile'] : undefined - let downloadPreview = true if (previewField) { const previewPhysicalFile = previewField[0] - await processImage(previewPhysicalFile, join(CONFIG.STORAGE.PREVIEWS_DIR, video.getPreviewName()), PREVIEWS_SIZE) - downloadPreview = false + + return createVideoMiniatureFromExisting(previewPhysicalFile.path, video, ThumbnailType.PREVIEW, false) } - const videoImport: VideoImportModel = await sequelizeTypescript.transaction(async t => { + return undefined +} + +function insertIntoDB (parameters: { + video: MVideoThumbnailAccountDefault, + thumbnailModel: MThumbnail, + previewModel: MThumbnail, + videoChannel: MChannelAccountDefault, + tags: string[], + videoImportAttributes: Partial, + user: MUser +}): Bluebird { + const { video, thumbnailModel, previewModel, videoChannel, tags, videoImportAttributes, user } = parameters + + return sequelizeTypescript.transaction(async t => { const sequelizeOptions = { transaction: t } // Save video object in database - const videoCreated = await video.save(sequelizeOptions) - videoCreated.VideoChannel = res.locals.videoChannel + const videoCreated = await video.save(sequelizeOptions) as (MVideoAccountDefault & MVideoWithBlacklistLight & MVideoTag) + videoCreated.VideoChannel = videoChannel + + if (thumbnailModel) await videoCreated.addAndSaveThumbnail(thumbnailModel, t) + if (previewModel) await videoCreated.addAndSaveThumbnail(previewModel, t) + + await autoBlacklistVideoIfNeeded({ + video: videoCreated, + user, + notify: false, + isRemote: false, + isNew: true, + transaction: t + }) // Set tags to the video - if (youtubeDLInfo.tags !== undefined) { - const tagInstances = await TagModel.findOrCreateTags(youtubeDLInfo.tags, t) + if (tags) { + const tagInstances = await TagModel.findOrCreateTags(tags, t) await videoCreated.$set('Tags', tagInstances, sequelizeOptions) videoCreated.Tags = tagInstances + } else { + videoCreated.Tags = [] } // Create video import object in database - const videoImport = await VideoImportModel.create({ - targetUrl, - state: VideoImportState.PENDING, - videoId: videoCreated.id - }, sequelizeOptions) - + const videoImport = await VideoImportModel.create( + Object.assign({ videoId: videoCreated.id }, videoImportAttributes), + sequelizeOptions + ) as MVideoImportFormattable videoImport.Video = videoCreated return videoImport }) - - // Create job to import the video - const payload = { - type: 'youtube-dl' as 'youtube-dl', - videoImportId: videoImport.id, - thumbnailUrl: youtubeDLInfo.thumbnailUrl, - downloadThumbnail, - downloadPreview - } - await JobQueue.Instance.createJob({ type: 'video-import', payload }) - - auditLogger.create(res.locals.oauth.token.User.Account.Actor.getIdentifier(), new VideoImportAuditView(videoImport.toFormattedJSON())) - - return res.json(videoImport.toFormattedJSON()) }