diff options
| author | Chocobozzz <me@florianbigard.com> | 2022-06-03 14:32:44 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2022-06-03 14:32:44 +0200 |
| commit | e771ff815dba3b4a95633f4e1e10dacd222dfe61 (patch) | |
| tree | 9e1909e1fff3c602ac894b43dbf72316aca62b70 /server/controllers | |
| parent | 8a2166c9bfa452ce707740d99c64d668cd7cedce (diff) | |
| parent | 62f53731cf807562ba885b180e71bb75b3902443 (diff) | |
| download | PeerTube-e771ff815dba3b4a95633f4e1e10dacd222dfe61.tar.gz PeerTube-e771ff815dba3b4a95633f4e1e10dacd222dfe61.tar.zst PeerTube-e771ff815dba3b4a95633f4e1e10dacd222dfe61.zip | |
Merge branch 'release/4.2.0' into develop
Diffstat (limited to 'server/controllers')
| -rw-r--r-- | server/controllers/download.ts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/server/controllers/download.ts b/server/controllers/download.ts index 43d525f83..a270180c0 100644 --- a/server/controllers/download.ts +++ b/server/controllers/download.ts | |||
| @@ -86,7 +86,9 @@ async function downloadVideoFile (req: express.Request, res: express.Response) { | |||
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | await VideoPathManager.Instance.makeAvailableVideoFile(videoFile.withVideoOrPlaylist(video), path => { | 88 | await VideoPathManager.Instance.makeAvailableVideoFile(videoFile.withVideoOrPlaylist(video), path => { |
| 89 | const filename = `${video.name}-${videoFile.resolution}p${videoFile.extname}` | 89 | // Express uses basename on filename parameter |
| 90 | const videoName = video.name.replace(/[/\\]/g, '_') | ||
| 91 | const filename = `${videoName}-${videoFile.resolution}p${videoFile.extname}` | ||
| 90 | 92 | ||
| 91 | return res.download(path, filename) | 93 | return res.download(path, filename) |
| 92 | }) | 94 | }) |