X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fstatic.ts;h=139ba67cc290b09db1c9867911f14f43669ee04b;hb=3cd0734fd9b0ff21aaef02317a874e8f1c06e027;hp=2fd14131e23e262101b1360ecbce968e4ad5f9dd;hpb=f981dae8617271a2dc713bb683951730b306e0c5;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index 2fd14131e..139ba67cc 100644
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -1,24 +1,26 @@
-import * as express from 'express'
 import * as cors from 'cors'
-
-import {
-  CONFIG,
-  STATIC_MAX_AGE,
-  STATIC_PATHS
-} from '../initializers'
-import { VideosPreviewCache } from '../lib'
+import * as express from 'express'
+import { CONFIG, STATIC_DOWNLOAD_PATHS, STATIC_MAX_AGE, STATIC_PATHS } from '../initializers'
+import { VideosPreviewCache } from '../lib/cache'
+import { asyncMiddleware, videosGetValidator } from '../middlewares'
+import { VideoModel } from '../models/video/video'
 
 const staticRouter = express.Router()
 
 /*
-  Cors is very important to let other pods access torrent and video files
+  Cors is very important to let other servers access torrent and video files
 */
 
 const torrentsPhysicalPath = CONFIG.STORAGE.TORRENTS_DIR
 staticRouter.use(
   STATIC_PATHS.TORRENTS,
   cors(),
-  express.static(torrentsPhysicalPath, { maxAge: STATIC_MAX_AGE })
+  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
@@ -28,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
@@ -36,13 +43,24 @@ staticRouter.use(
   express.static(thumbnailsPhysicalPath, { maxAge: STATIC_MAX_AGE })
 )
 
+const avatarsPhysicalPath = CONFIG.STORAGE.AVATARS_DIR
+staticRouter.use(
+  STATIC_PATHS.AVATARS,
+  express.static(avatarsPhysicalPath, { maxAge: STATIC_MAX_AGE })
+)
+
 // Video previews path for express
-const previewsPhysicalPath = CONFIG.STORAGE.PREVIEWS_DIR
 staticRouter.use(
   STATIC_PATHS.PREVIEWS + ':uuid.jpg',
-  getPreview
+  asyncMiddleware(getPreview)
 )
 
+// robots.txt service
+staticRouter.get('/robots.txt', (req: express.Request, res: express.Response) => {
+  res.type('text/plain')
+  return res.send(CONFIG.INSTANCE.ROBOTS)
+})
+
 // ---------------------------------------------------------------------------
 
 export {
@@ -51,11 +69,32 @@ export {
 
 // ---------------------------------------------------------------------------
 
-function getPreview (req: express.Request, res: express.Response, next: express.NextFunction) {
-  VideosPreviewCache.Instance.getPreviewPath(req.params.uuid)
-    .then(path => {
-      if (!path) return res.sendStatus(404)
+async function getPreview (req: express.Request, res: express.Response, next: express.NextFunction) {
+  const path = await VideosPreviewCache.Instance.getPreviewPath(req.params.uuid)
+  if (!path) return res.sendStatus(404)
+
+  return res.sendFile(path, { maxAge: STATIC_MAX_AGE })
+}
+
+async function downloadTorrent (req: express.Request, res: express.Response, next: express.NextFunction) {
+  const { video, videoFile } = getVideoAndFile(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 } = getVideoAndFile(req, res)
+  if (!videoFile) return res.status(404).end()
+
+  return res.download(video.getVideoFilePath(videoFile), `${video.name}-${videoFile.resolution}p${videoFile.extname}`)
+}
+
+function getVideoAndFile (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 res.sendFile(path, { maxAge: STATIC_MAX_AGE })
-    })
+  return { video, videoFile }
 }