Improve torrent/video download

diff --git a/client/src/app/videos/+video-watch/modal/video-download.component.ts b/client/src/app/videos/+video-watch/modal/video-download.component.ts
index b06a7eef1741f88c629a1fb9ee3605bb15d6e45e..12f31b011a093fbbd6e0916b1b3eb12263edfb9c 100644 (file)
--- a/client/src/app/videos/+video-watch/modal/video-download.component.ts
+++ b/client/src/app/videos/+video-watch/modal/video-download.component.ts
@@ -41,7 +41,7 @@ export class VideoDownloadComponent implements OnInit {
       return
     }
 
-    const link = this.downloadType === 'direct' ? file.fileUrl : file.torrentUrl
-    window.open(link)
+    const link = this.downloadType === 'direct' ? file.fileDownloadUrl : file.torrentDownloadUrl
+    window.location.assign(link)
   }
 }

diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index c1bf384a49c07dc749dcc7a4d20fd9edf871a5ab..8bebe6fa7e836affbd43c347e9b8f2f03a2a0f97 100644 (file)
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -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 }
+}

diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index a353067308c5498e2227536ce7d31c2855f9805b..26ee3db47526d471d12f32d153a2812b3d4712ec 100644 (file)
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -389,6 +389,10 @@ const STATIC_PATHS = {
   WEBSEED: '/static/webseed/',
   AVATARS: '/static/avatars/'
 }
+const STATIC_DOWNLOAD_PATHS = {
+  TORRENTS: '/download/torrents/',
+  VIDEOS: '/download/videos/'
+}
 
 // Cache control
 let STATIC_MAX_AGE = '30d'
@@ -493,6 +497,7 @@ export {
   USER_PASSWORD_RESET_LIFETIME,
   IMAGE_MIMETYPE_EXT,
   SCHEDULER_INTERVAL,
+  STATIC_DOWNLOAD_PATHS,
   RATES_LIMIT,
   JOB_COMPLETED_LIFETIME,
   VIDEO_VIEW_LIFETIME

diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index 1640cd57f2a643ffcb92384b1429ad29c9e01959..5821ea3973274e18d730541f7850dbd00691a204 100644 (file)
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -29,7 +29,6 @@ import { VideoPrivacy, VideoResolution } from '../../../shared'
 import { VideoTorrentObject } from '../../../shared/models/activitypub/objects'
 import { Video, VideoDetails, VideoFile } from '../../../shared/models/videos'
 import { VideoFilter } from '../../../shared/models/videos/video-query.type'
-import { activityPubCollectionPagination } from '../../helpers/activitypub'
 import {
   createTorrentPromise,
   peertubeTruncate,
@@ -59,6 +58,7 @@ import {
   CONSTRAINTS_FIELDS,
   PREVIEWS_SIZE,
   REMOTE_SCHEME,
+  STATIC_DOWNLOAD_PATHS,
   STATIC_PATHS,
   THUMBNAILS_SIZE,
   VIDEO_CATEGORIES,
@@ -979,6 +979,10 @@ export class VideoModel extends Model<VideoModel> {
     )
   }
 
+  getTorrentFilePath (videoFile: VideoFileModel) {
+    return join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile))
+  }
+
   getVideoFilePath (videoFile: VideoFileModel) {
     return join(CONFIG.STORAGE.VIDEOS_DIR, this.getVideoFilename(videoFile))
   }
@@ -1112,7 +1116,9 @@ export class VideoModel extends Model<VideoModel> {
             magnetUri: this.generateMagnetUri(videoFile, baseUrlHttp, baseUrlWs),
             size: videoFile.size,
             torrentUrl: this.getTorrentUrl(videoFile, baseUrlHttp),
-            fileUrl: this.getVideoFileUrl(videoFile, baseUrlHttp)
+            torrentDownloadUrl: this.getTorrentDownloadUrl(videoFile, baseUrlHttp),
+            fileUrl: this.getVideoFileUrl(videoFile, baseUrlHttp),
+            fileDownloadUrl: this.getVideoFileDownloadUrl(videoFile, baseUrlHttp)
           } as VideoFile
         })
         .sort((a, b) => {
@@ -1367,10 +1373,18 @@ export class VideoModel extends Model<VideoModel> {
     return baseUrlHttp + STATIC_PATHS.TORRENTS + this.getTorrentFileName(videoFile)
   }
 
+  private getTorrentDownloadUrl (videoFile: VideoFileModel, baseUrlHttp: string) {
+    return baseUrlHttp + STATIC_DOWNLOAD_PATHS.TORRENTS + this.getTorrentFileName(videoFile)
+  }
+
   private getVideoFileUrl (videoFile: VideoFileModel, baseUrlHttp: string) {
     return baseUrlHttp + STATIC_PATHS.WEBSEED + this.getVideoFilename(videoFile)
   }
 
+  private getVideoFileDownloadUrl (videoFile: VideoFileModel, baseUrlHttp: string) {
+    return baseUrlHttp + STATIC_DOWNLOAD_PATHS.VIDEOS + this.getVideoFilename(videoFile)
+  }
+
   private generateMagnetUri (videoFile: VideoFileModel, baseUrlHttp: string, baseUrlWs: string) {
     const xs = this.getTorrentUrl(videoFile, baseUrlHttp)
     const announce = [ baseUrlWs + '/tracker/socket', baseUrlHttp + '/tracker/announce' ]

diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts
index eb40e82deb3b97f95434202aeb0d68354c41c4c6..1c86545d39982c07f8717c48db0ce980aa1a5037 100644 (file)
--- a/shared/models/videos/video.model.ts
+++ b/shared/models/videos/video.model.ts
@@ -14,7 +14,9 @@ export interface VideoFile {
   resolution: VideoConstant<VideoResolution>
   size: number // Bytes
   torrentUrl: string
+  torrentDownloadUrl: string
   fileUrl: string
+  fileDownloadUrl: string
 }
 
 export interface Video {