-import * as express from 'express'
-import * as magnetUtil from 'magnet-uri'
-import { auditLoggerFactory, getAuditIdFromRes, VideoImportAuditView } from '../../../helpers/audit-logger'
-import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate, videoImportAddValidator } from '../../../middlewares'
-import { MIMETYPES } from '../../../initializers/constants'
-import { getYoutubeDLInfo, YoutubeDLInfo } from '../../../helpers/youtube-dl'
-import { createReqFiles } from '../../../helpers/express-utils'
-import { logger } from '../../../helpers/logger'
-import { VideoImportCreate, VideoImportState, VideoPrivacy, VideoState } from '../../../../shared'
-import { VideoModel } from '../../../models/video/video'
-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 express from 'express'
+import { move, readFile } from 'fs-extra'
+import { decode } from 'magnet-uri'
+import parseTorrent, { Instance } from 'parse-torrent'
import { join } from 'path'
+import { buildYoutubeDLImport, buildVideoFromImport, insertFromImportIntoDB, YoutubeDlImportError } from '@server/lib/video-import'
+import { MThumbnail, MVideoThumbnail } from '@server/types/models'
+import { HttpStatusCode, ServerErrorCode, ThumbnailType, VideoImportCreate, VideoImportPayload, VideoImportState } from '@shared/models'
+import { auditLoggerFactory, getAuditIdFromRes, VideoImportAuditView } from '../../../helpers/audit-logger'
import { isArray } from '../../../helpers/custom-validators/misc'
-import * as Bluebird from 'bluebird'
-import * as parseTorrent from 'parse-torrent'
+import { cleanUpReqFiles, createReqFiles } from '../../../helpers/express-utils'
+import { logger } from '../../../helpers/logger'
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 { MIMETYPES } from '../../../initializers/constants'
+import { JobQueue } from '../../../lib/job-queue/job-queue'
+import { updateVideoMiniatureFromExisting } from '../../../lib/thumbnail'
import {
- MChannelAccountDefault,
- MThumbnail,
- MUser,
- MVideoAccountDefault,
- MVideoTag,
- MVideoThumbnailAccountDefault,
- MVideoWithBlacklistLight
-} from '@server/typings/models'
-import { MVideoImport, MVideoImportFormattable } from '@server/typings/models/video/video-import'
+ asyncMiddleware,
+ asyncRetryTransactionMiddleware,
+ authenticate,
+ videoImportAddValidator,
+ videoImportCancelValidator,
+ videoImportDeleteValidator
+} from '../../../middlewares'
const auditLogger = auditLoggerFactory('video-imports')
const videoImportsRouter = express.Router()
const reqVideoFileImport = createReqFiles(
[ 'thumbnailfile', 'previewfile', 'torrentfile' ],
- Object.assign({}, MIMETYPES.TORRENT.MIMETYPE_EXT, MIMETYPES.IMAGE.MIMETYPE_EXT),
- {
- thumbnailfile: CONFIG.STORAGE.TMP_DIR,
- previewfile: CONFIG.STORAGE.TMP_DIR,
- torrentfile: CONFIG.STORAGE.TMP_DIR
- }
+ { ...MIMETYPES.TORRENT.MIMETYPE_EXT, ...MIMETYPES.IMAGE.MIMETYPE_EXT }
)
videoImportsRouter.post('/imports',
authenticate,
reqVideoFileImport,
asyncMiddleware(videoImportAddValidator),
- asyncRetryTransactionMiddleware(addVideoImport)
+ asyncRetryTransactionMiddleware(handleVideoImport)
+)
+
+videoImportsRouter.post('/imports/:id/cancel',
+ authenticate,
+ asyncMiddleware(videoImportCancelValidator),
+ asyncRetryTransactionMiddleware(cancelVideoImport)
+)
+
+videoImportsRouter.delete('/imports/:id',
+ authenticate,
+ asyncMiddleware(videoImportDeleteValidator),
+ asyncRetryTransactionMiddleware(deleteVideoImport)
)
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-function addVideoImport (req: express.Request, res: express.Response) {
- if (req.body.targetUrl) return addYoutubeDLImport(req, res)
+async function deleteVideoImport (req: express.Request, res: express.Response) {
+ const videoImport = res.locals.videoImport
- const file = req.files && req.files['torrentfile'] ? req.files['torrentfile'][0] : undefined
- if (req.body.magnetUri || file) return addTorrentImport(req, res, file)
+ await videoImport.destroy()
+
+ return res.sendStatus(HttpStatusCode.NO_CONTENT_204)
}
-async function addTorrentImport (req: express.Request, res: express.Response, torrentfile: Express.Multer.File) {
+async function cancelVideoImport (req: express.Request, res: express.Response) {
+ const videoImport = res.locals.videoImport
+
+ videoImport.state = VideoImportState.CANCELLED
+ await videoImport.save()
+
+ return res.sendStatus(HttpStatusCode.NO_CONTENT_204)
+}
+
+function handleVideoImport (req: express.Request, res: express.Response) {
+ if (req.body.targetUrl) return handleYoutubeDlImport(req, res)
+
+ const file = req.files?.['torrentfile']?.[0]
+ if (req.body.magnetUri || file) return handleTorrentImport(req, res, file)
+}
+
+async function handleTorrentImport (req: express.Request, res: express.Response, torrentfile: Express.Multer.File) {
const body: VideoImportCreate = req.body
const user = res.locals.oauth.token.User
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)
+ const result = await processTorrentOrAbortRequest(req, res, torrentfile)
+ if (!result) return
- videoName = isArray(parsedTorrent.name) ? parsedTorrent.name[ 0 ] : parsedTorrent.name as string
+ videoName = result.name
+ torrentName = result.torrentName
} else {
- magnetUri = body.magnetUri
-
- const parsed = magnetUtil.decode(magnetUri)
- videoName = isArray(parsed.name) ? parsed.name[ 0 ] : parsed.name as string
+ const result = processMagnetURI(body)
+ magnetUri = result.magnetUri
+ videoName = result.name
}
- const video = buildVideo(res.locals.videoChannel.id, body, { name: videoName })
+ const video = await buildVideoFromImport({
+ channelId: res.locals.videoChannel.id,
+ importData: { name: videoName },
+ importDataOverride: body,
+ importType: 'torrent'
+ })
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({
+ const videoImport = await insertFromImportIntoDB({
video,
thumbnailModel,
previewModel,
videoChannel: res.locals.videoChannel,
- tags,
- videoImportAttributes,
- user
+ tags: body.tags || undefined,
+ user,
+ videoImportAttributes: {
+ magnetUri,
+ torrentName,
+ state: VideoImportState.PENDING,
+ userId: user.id
+ }
})
- // Create job to import the video
- const payload = {
- type: torrentfile ? 'torrent-file' as 'torrent-file' : 'magnet-uri' as 'magnet-uri',
+ const payload: VideoImportPayload = {
+ type: torrentfile
+ ? 'torrent-file'
+ : 'magnet-uri',
videoImportId: videoImport.id,
- magnetUri
+ preventException: false
}
await JobQueue.Instance.createJob({ type: 'video-import', payload })
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 {
- youtubeDLInfo = await getYoutubeDLInfo(targetUrl)
- } catch (err) {
- logger.info('Cannot fetch information from import for URL %s.', targetUrl, { err })
-
- return res.status(400).json({
- error: 'Cannot fetch remote information of this URL.'
- }).end()
- }
-
- const video = buildVideo(res.locals.videoChannel.id, body, youtubeDLInfo)
+function statusFromYtDlImportError (err: YoutubeDlImportError): number {
+ switch (err.code) {
+ case YoutubeDlImportError.CODE.NOT_ONLY_UNICAST_URL:
+ return HttpStatusCode.FORBIDDEN_403
- const thumbnailModel = await processThumbnail(req, video)
- const previewModel = await processPreview(req, video)
+ case YoutubeDlImportError.CODE.FETCH_ERROR:
+ return HttpStatusCode.BAD_REQUEST_400
- const tags = body.tags || youtubeDLInfo.tags
- const videoImportAttributes = {
- targetUrl,
- state: VideoImportState.PENDING,
- userId: user.id
+ default:
+ return HttpStatusCode.INTERNAL_SERVER_ERROR_500
}
- 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 })
+async function handleYoutubeDlImport (req: express.Request, res: express.Response) {
+ const body: VideoImportCreate = req.body
+ const targetUrl = body.targetUrl
+ const user = res.locals.oauth.token.User
- auditLogger.create(getAuditIdFromRes(res), new VideoImportAuditView(videoImport.toFormattedJSON()))
+ try {
+ const { job, videoImport } = await buildYoutubeDLImport({
+ targetUrl,
+ channel: res.locals.videoChannel,
+ importDataOverride: body,
+ thumbnailFilePath: req.files?.['thumbnailfile']?.[0].path,
+ previewFilePath: req.files?.['previewfile']?.[0].path,
+ user
+ })
+ await JobQueue.Instance.createJob(job)
- return res.json(videoImport.toFormattedJSON()).end()
-}
+ auditLogger.create(getAuditIdFromRes(res), new VideoImportAuditView(videoImport.toFormattedJSON()))
-function buildVideo (channelId: number, body: VideoImportCreate, importData: YoutubeDLInfo) {
- const videoData = {
- name: body.name || importData.name || 'Unknown name',
- remote: false,
- 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 || 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: channelId,
- originallyPublishedAt: importData.originallyPublishedAt
+ return res.json(videoImport.toFormattedJSON()).end()
+ } catch (err) {
+ logger.error('An error occurred while importing the video %s. ', targetUrl, { err })
+
+ return res.fail({
+ message: err.message,
+ status: statusFromYtDlImportError(err),
+ data: {
+ targetUrl
+ }
+ })
}
- const video = new VideoModel(videoData)
- video.url = getVideoActivityPubUrl(video)
-
- return video
}
-async function processThumbnail (req: express.Request, video: VideoModel) {
+async function processThumbnail (req: express.Request, video: MVideoThumbnail) {
const thumbnailField = req.files ? req.files['thumbnailfile'] : undefined
if (thumbnailField) {
- const thumbnailPhysicalFile = thumbnailField[ 0 ]
+ const thumbnailPhysicalFile = thumbnailField[0]
- return createVideoMiniatureFromExisting(thumbnailPhysicalFile.path, video, ThumbnailType.MINIATURE, false)
+ return updateVideoMiniatureFromExisting({
+ inputPath: thumbnailPhysicalFile.path,
+ video,
+ type: ThumbnailType.MINIATURE,
+ automaticallyGenerated: false
+ })
}
return undefined
}
-async function processPreview (req: express.Request, video: VideoModel) {
+async function processPreview (req: express.Request, video: MVideoThumbnail): Promise<MThumbnail> {
const previewField = req.files ? req.files['previewfile'] : undefined
if (previewField) {
const previewPhysicalFile = previewField[0]
- return createVideoMiniatureFromExisting(previewPhysicalFile.path, video, ThumbnailType.PREVIEW, false)
+ return updateVideoMiniatureFromExisting({
+ inputPath: previewPhysicalFile.path,
+ video,
+ type: ThumbnailType.PREVIEW,
+ automaticallyGenerated: false
+ })
}
return undefined
}
-function insertIntoDB (parameters: {
- video: MVideoThumbnailAccountDefault,
- thumbnailModel: MThumbnail,
- previewModel: MThumbnail,
- videoChannel: MChannelAccountDefault,
- tags: string[],
- videoImportAttributes: Partial<MVideoImport>,
- user: MUser
-}): Bluebird<MVideoImportFormattable> {
- 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) 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
+async function processTorrentOrAbortRequest (req: express.Request, res: express.Response, torrentfile: Express.Multer.File) {
+ const torrentName = torrentfile.originalname
+
+ // Rename the torrent to a secured name
+ const newTorrentPath = join(CONFIG.STORAGE.TORRENTS_DIR, getSecureTorrentName(torrentName))
+ await move(torrentfile.path, newTorrentPath, { overwrite: true })
+ torrentfile.path = newTorrentPath
+
+ const buf = await readFile(torrentfile.path)
+ const parsedTorrent = parseTorrent(buf) as Instance
+
+ if (parsedTorrent.files.length !== 1) {
+ cleanUpReqFiles(req)
+
+ res.fail({
+ type: ServerErrorCode.INCORRECT_FILES_IN_TORRENT,
+ message: 'Torrents with only 1 file are supported.'
})
+ return undefined
+ }
- // Set tags to the video
- if (tags) {
- const tagInstances = await TagModel.findOrCreateTags(tags, t)
+ return {
+ name: extractNameFromArray(parsedTorrent.name),
+ torrentName
+ }
+}
- await videoCreated.$set('Tags', tagInstances, sequelizeOptions)
- videoCreated.Tags = tagInstances
- } else {
- videoCreated.Tags = []
- }
+function processMagnetURI (body: VideoImportCreate) {
+ const magnetUri = body.magnetUri
+ const parsed = decode(magnetUri)
- // Create video import object in database
- const videoImport = await VideoImportModel.create(
- Object.assign({ videoId: videoCreated.id }, videoImportAttributes),
- sequelizeOptions
- ) as MVideoImportFormattable
- videoImport.Video = videoCreated
+ return {
+ name: extractNameFromArray(parsed.name),
+ magnetUri
+ }
+}
- return videoImport
- })
+function extractNameFromArray (name: string | string[]) {
+ return isArray(name) ? name[0] : name
}
projects / github / Chocobozzz / PeerTube.git / blobdiff