From ce33919c24e7402d92d81f3cd8e545df52d98240 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 6 Aug 2018 17:13:39 +0200 Subject: Import magnets with webtorrent --- server/controllers/api/videos/import.ts | 142 +++++++++++++++++++++++--------- 1 file changed, 105 insertions(+), 37 deletions(-) (limited to 'server/controllers/api/videos/import.ts') diff --git a/server/controllers/api/videos/import.ts b/server/controllers/api/videos/import.ts index 30a7d816c..c16a254d2 100644 --- a/server/controllers/api/videos/import.ts +++ b/server/controllers/api/videos/import.ts @@ -1,3 +1,4 @@ +import * as magnetUtil from 'magnet-uri' import * as express from 'express' import { auditLoggerFactory, VideoImportAuditView } from '../../../helpers/audit-logger' import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate, videoImportAddValidator } from '../../../middlewares' @@ -13,6 +14,10 @@ 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 { FilteredModelAttributes } from 'sequelize-typescript/lib/models/Model' +import { VideoChannelModel } from '../../../models/video/video-channel' +import * as Bluebird from 'bluebird' const auditLogger = auditLoggerFactory('video-imports') const videoImportsRouter = express.Router() @@ -41,7 +46,45 @@ 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) + + if (req.body.magnetUri) return addTorrentImport(req, res) +} + +async function addTorrentImport (req: express.Request, res: express.Response) { + const body: VideoImportCreate = req.body + const magnetUri = body.magnetUri + + const parsed = magnetUtil.decode(magnetUri) + const magnetName = isArray(parsed.name) ? parsed.name[0] : parsed.name as string + + const video = buildVideo(res.locals.videoChannel.id, body, { name: magnetName }) + + await processThumbnail(req, video) + await processPreview(req, video) + + const tags = null + const videoImportAttributes = { + magnetUri, + state: VideoImportState.PENDING + } + const videoImport: VideoImportModel = await insertIntoDB(video, res.locals.videoChannel, tags, videoImportAttributes) + + // Create job to import the video + const payload = { + type: 'magnet-uri' as 'magnet-uri', + videoImportId: videoImport.id, + magnetUri + } + 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()).end() +} + +async function addYoutubeDLImport (req: express.Request, res: express.Response) { const body: VideoImportCreate = req.body const targetUrl = body.targetUrl @@ -56,53 +99,94 @@ async function addVideoImport (req: express.Request, res: express.Response) { }).end() } - // Create video DB object + const video = buildVideo(res.locals.videoChannel.id, body, youtubeDLInfo) + + const downloadThumbnail = !await processThumbnail(req, video) + const downloadPreview = !await processPreview(req, video) + + const tags = body.tags || youtubeDLInfo.tags + const videoImportAttributes = { + targetUrl, + state: VideoImportState.PENDING + } + const videoImport: VideoImportModel = await insertIntoDB(video, res.locals.videoChannel, tags, videoImportAttributes) + + // 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()).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, + category: body.category || importData.category, + licence: body.licence || importData.licence, language: body.language || undefined, commentsEnabled: body.commentsEnabled || true, 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 } 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 true } - // Process preview file? + return false +} + +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 true } - const videoImport: VideoImportModel = await sequelizeTypescript.transaction(async t => { + return false +} + +function insertIntoDB ( + video: VideoModel, + videoChannel: VideoChannelModel, + tags: string[], + videoImportAttributes: FilteredModelAttributes +): Bluebird { + 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 + videoCreated.VideoChannel = videoChannel // Set tags to the video - const tags = body.tags ? body.tags : youtubeDLInfo.tags if (tags !== undefined) { const tagInstances = await TagModel.findOrCreateTags(tags, t) @@ -111,28 +195,12 @@ async function addVideoImport (req: express.Request, res: express.Response) { } // 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 + ) 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()).end() } -- cgit v1.2.3