-import * as cors from 'cors'
-import * as express from 'express'
+import cors from 'cors'
+import express from 'express'
import { logger } from '@server/helpers/logger'
import { VideosTorrentCache } from '@server/lib/files-cache/videos-torrent-cache'
import { Hooks } from '@server/lib/plugins/hooks'
-import { getVideoFilePath } from '@server/lib/video-paths'
+import { VideoPathManager } from '@server/lib/video-path-manager'
import { MStreamingPlaylist, MVideo, MVideoFile, MVideoFullLight } from '@server/types/models'
-import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
-import { VideoStreamingPlaylistType } from '@shared/models'
+import { HttpStatusCode, VideoStorage, VideoStreamingPlaylistType } from '@shared/models'
import { STATIC_DOWNLOAD_PATHS } from '../initializers/constants'
import { asyncMiddleware, videosDownloadValidator } from '../middlewares'
async function downloadTorrent (req: express.Request, res: express.Response) {
const result = await VideosTorrentCache.Instance.getFilePath(req.params.filename)
- if (!result) return res.sendStatus(HttpStatusCode.NOT_FOUND_404)
+ if (!result) {
+ return res.fail({
+ status: HttpStatusCode.NOT_FOUND_404,
+ message: 'Torrent file not found'
+ })
+ }
const allowParameters = { torrentPath: result.path, downloadName: result.downloadName }
const video = res.locals.videoAll
const videoFile = getVideoFile(req, video.VideoFiles)
- if (!videoFile) return res.status(HttpStatusCode.NOT_FOUND_404).end()
+ if (!videoFile) {
+ return res.fail({
+ status: HttpStatusCode.NOT_FOUND_404,
+ message: 'Video file not found'
+ })
+ }
const allowParameters = { video, videoFile }
if (!checkAllowResult(res, allowParameters, allowedResult)) return
- return res.download(getVideoFilePath(video, videoFile), `${video.name}-${videoFile.resolution}p${videoFile.extname}`)
+ if (videoFile.storage === VideoStorage.OBJECT_STORAGE) {
+ return res.redirect(videoFile.getObjectStorageUrl())
+ }
+
+ await VideoPathManager.Instance.makeAvailableVideoFile(videoFile.withVideoOrPlaylist(video), path => {
+ // Express uses basename on filename parameter
+ const videoName = video.name.replace(/[/\\]/g, '_')
+ const filename = `${videoName}-${videoFile.resolution}p${videoFile.extname}`
+
+ return res.download(path, filename)
+ })
}
async function downloadHLSVideoFile (req: express.Request, res: express.Response) {
if (!streamingPlaylist) return res.status(HttpStatusCode.NOT_FOUND_404).end
const videoFile = getVideoFile(req, streamingPlaylist.VideoFiles)
- if (!videoFile) return res.status(HttpStatusCode.NOT_FOUND_404).end()
+ if (!videoFile) {
+ return res.fail({
+ status: HttpStatusCode.NOT_FOUND_404,
+ message: 'Video file not found'
+ })
+ }
const allowParameters = { video, streamingPlaylist, videoFile }
if (!checkAllowResult(res, allowParameters, allowedResult)) return
- const filename = `${video.name}-${videoFile.resolution}p-${streamingPlaylist.getStringType()}${videoFile.extname}`
- return res.download(getVideoFilePath(streamingPlaylist, videoFile), filename)
+ if (videoFile.storage === VideoStorage.OBJECT_STORAGE) {
+ return res.redirect(videoFile.getObjectStorageUrl())
+ }
+
+ await VideoPathManager.Instance.makeAvailableVideoFile(videoFile.withVideoOrPlaylist(streamingPlaylist), path => {
+ const filename = `${video.name}-${videoFile.resolution}p-${streamingPlaylist.getStringType()}${videoFile.extname}`
+
+ return res.download(path, filename)
+ })
}
function getVideoFile (req: express.Request, files: MVideoFile[]) {
function checkAllowResult (res: express.Response, allowParameters: any, result?: AllowedResult) {
if (!result || result.allowed !== true) {
logger.info('Download is not allowed.', { result, allowParameters })
- res.status(HttpStatusCode.FORBIDDEN_403)
- .json({ error: result?.errorMessage || 'Refused download' })
+ res.fail({
+ status: HttpStatusCode.FORBIDDEN_403,
+ message: result?.errorMessage || 'Refused download'
+ })
return false
}