From: Chocobozzz <me@florianbigard.com>
Date: Mon, 12 Jul 2021 12:35:17 +0000 (+0200)
Subject: Fix HTTP fallback with no webtorrent files
X-Git-Tag: v3.3.0~18
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=3e9cf56480101af06cdeae9dbae04fdcb4973a7f;p=github%2FChocobozzz%2FPeerTube.git

Fix HTTP fallback with no webtorrent files
---

diff --git a/client/src/assets/player/peertube-player-manager.ts b/client/src/assets/player/peertube-player-manager.ts
index 814253188..ba0a6ab80 100644
--- a/client/src/assets/player/peertube-player-manager.ts
+++ b/client/src/assets/player/peertube-player-manager.ts
@@ -388,6 +388,7 @@ export class PeertubePlayerManager {
   private static addWebTorrentOptions (plugins: VideoJSPluginOptions, options: PeertubePlayerManagerOptions) {
     const commonOptions = options.common
     const webtorrentOptions = options.webtorrent
+    const p2pMediaLoaderOptions = options.p2pMediaLoader
 
     const autoplay = this.getAutoPlayValue(commonOptions.autoplay) === 'play'
       ? true
@@ -397,7 +398,11 @@ export class PeertubePlayerManager {
       autoplay,
       videoDuration: commonOptions.videoDuration,
       playerElement: commonOptions.playerElement,
-      videoFiles: webtorrentOptions.videoFiles,
+      videoFiles: webtorrentOptions.videoFiles.length !== 0
+        ? webtorrentOptions.videoFiles
+        // The WebTorrent plugin won't be able to play these files, but it will fallback to HTTP mode
+        : p2pMediaLoaderOptions.videoFiles,
+      fallbackVideoFiles: p2pMediaLoaderOptions.videoFiles,
       startTime: commonOptions.startTime
     }