aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-11-22 17:27:46 +0100
committerChocobozzz <me@florianbigard.com>2019-11-25 10:59:50 +0100
commitefcd6f2e625c1c5d06025f27a2bf3a84d3f8b483 (patch)
tree03d961f65aec199ec32cb592831b1381bd50a149
parent0f2f274c9837bbcd95446778314c9c32831faa0e (diff)
downloadPeerTube-efcd6f2e625c1c5d06025f27a2bf3a84d3f8b483.tar.gz
PeerTube-efcd6f2e625c1c5d06025f27a2bf3a84d3f8b483.tar.zst
PeerTube-efcd6f2e625c1c5d06025f27a2bf3a84d3f8b483.zip
Fix fragmented download URL
-rw-r--r--client/src/app/shared/video/video-details.model.ts2
-rw-r--r--server/controllers/static.ts2
2 files changed, 3 insertions, 1 deletions
diff --git a/client/src/app/shared/video/video-details.model.ts b/client/src/app/shared/video/video-details.model.ts
index c2a85d8e8..14347a109 100644
--- a/client/src/app/shared/video/video-details.model.ts
+++ b/client/src/app/shared/video/video-details.model.ts
@@ -58,5 +58,7 @@ export class VideoDetails extends Video implements VideoDetailsServerModel {
58 58
59 getFiles () { 59 getFiles () {
60 if (this.files.length === 0) return this.getHlsPlaylist().files 60 if (this.files.length === 0) return this.getHlsPlaylist().files
61
62 return this.files
61 } 63 }
62} 64}
diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index 06123518f..7c900be92 100644
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -67,7 +67,7 @@ staticRouter.use(
67) 67)
68 68
69staticRouter.use( 69staticRouter.use(
70 STATIC_DOWNLOAD_PATHS.HLS_VIDEOS + ':id-:resolution([0-9]+).:extension', 70 STATIC_DOWNLOAD_PATHS.HLS_VIDEOS + ':id-:resolution([0-9]+)-fragmented.:extension',
71 asyncMiddleware(videosGetValidator), 71 asyncMiddleware(videosGetValidator),
72 asyncMiddleware(downloadHLSVideoFile) 72 asyncMiddleware(downloadHLSVideoFile)
73) 73)