yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-05 19:42:24 +02:00
Code Issues Releases Wiki Activity

Improve torrent/video download

Browse source
This commit is contained in:
Chocobozzz 2018-05-29 18:30:11 +02:00
parent a20776fcbb
commit 02756fbd11
No known key found for this signature in database
GPG key ID: 583A612D890159BE
5 changed files with 61 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

38
server/controllers/static.ts
View file

@ -1,8 +1,9 @@
import * as cors from 'cors'
import * as express from 'express'
import { CONFIG, STATIC_MAX_AGE, STATIC_PATHS } from '../initializers'
import { CONFIG, STATIC_DOWNLOAD_PATHS, STATIC_MAX_AGE, STATIC_PATHS } from '../initializers'
import { VideosPreviewCache } from '../lib/cache'
import { asyncMiddleware } from '../middlewares'
import { asyncMiddleware, videosGetValidator } from '../middlewares'
import { VideoModel } from '../models/video/video'
const staticRouter = express.Router()
@ -16,6 +17,11 @@ staticRouter.use(
cors(),
express.static(torrentsPhysicalPath, { maxAge: 0 }) // Don't cache because we could regenerate the torrent file
)
staticRouter.use(
STATIC_DOWNLOAD_PATHS.TORRENTS + ':id-:resolution([0-9]+).torrent',
asyncMiddleware(videosGetValidator),
asyncMiddleware(downloadTorrent)
)
// Videos path for webseeding
const videosPhysicalPath = CONFIG.STORAGE.VIDEOS_DIR
@ -24,6 +30,11 @@ staticRouter.use(
cors(),
express.static(videosPhysicalPath, { maxAge: STATIC_MAX_AGE })
)
staticRouter.use(
STATIC_DOWNLOAD_PATHS.VIDEOS + ':id-:resolution([0-9]+).:extension',
asyncMiddleware(videosGetValidator),
asyncMiddleware(downloadVideoFile)
)
// Thumbnails path for express
const thumbnailsPhysicalPath = CONFIG.STORAGE.THUMBNAILS_DIR
@ -64,3 +75,26 @@ async function getPreview (req: express.Request, res: express.Response, next: ex
return res.sendFile(path, { maxAge: STATIC_MAX_AGE })
}
async function downloadTorrent (req: express.Request, res: express.Response, next: express.NextFunction) {
const { video, videoFile } = getVideoAndFileOr404(req, res)
if (!videoFile) return res.status(404).end()
return res.download(video.getTorrentFilePath(videoFile), `${video.name}-${videoFile.resolution}p.torrent`)
}
async function downloadVideoFile (req: express.Request, res: express.Response, next: express.NextFunction) {
const { video, videoFile } = getVideoAndFileOr404(req, res)
if (!videoFile) return res.status(404).end()
return res.download(video.getVideoFilePath(videoFile), `${video.name}-${videoFile.resolution}p${videoFile.extname}`)
}
function getVideoAndFileOr404 (req: express.Request, res: express.Response) {
const resolution = parseInt(req.params.resolution, 10)
const video: VideoModel = res.locals.video
const videoFile = video.VideoFiles.find(f => f.resolution === resolution)
return { video, videoFile }
}