From 9576506763c20c7efbdb229483440a1fc984cf4d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 15 Dec 2021 16:25:33 +0100 Subject: [PATCH] Add P2P enabled/disabled in player card --- client/src/assets/player/peertube-player-manager.ts | 3 ++- client/src/assets/player/stats/stats-card.ts | 5 ++++- scripts/i18n/create-custom-files.ts | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/client/src/assets/player/peertube-player-manager.ts b/client/src/assets/player/peertube-player-manager.ts index 57cdfca28..ac8134fa8 100644 --- a/client/src/assets/player/peertube-player-manager.ts +++ b/client/src/assets/player/peertube-player-manager.ts @@ -193,7 +193,8 @@ export class PeertubePlayerManager { player.stats({ videoUUID: options.common.videoUUID, videoIsLive: options.common.isLive, - mode + mode, + p2pEnabled: options.common.p2pEnabled }) player.on('p2pInfo', (_, data: PlayerNetworkInfo) => { diff --git a/client/src/assets/player/stats/stats-card.ts b/client/src/assets/player/stats/stats-card.ts index 45fd30d55..55d850eda 100644 --- a/client/src/assets/player/stats/stats-card.ts +++ b/client/src/assets/player/stats/stats-card.ts @@ -7,6 +7,7 @@ interface StatsCardOptions extends videojs.ComponentOptions { videoUUID: string videoIsLive: boolean mode: 'webtorrent' | 'p2p-media-loader' + p2pEnabled: boolean } interface PlayerNetworkInfo { @@ -33,6 +34,7 @@ class StatsCard extends Component { updateInterval: any mode: 'webtorrent' | 'p2p-media-loader' + p2pEnabled: boolean metadataStore: any = {} @@ -200,7 +202,7 @@ class StatsCard extends Component { ? `${playerNetworkInfo.totalDownloaded} ⇓ / ${playerNetworkInfo.totalUploaded} ⇑` : undefined const downloadBreakdown = playerNetworkInfo.downloadedFromServer - ? `${playerNetworkInfo.downloadedFromServer} from server · ${playerNetworkInfo.downloadedFromPeers} from peers` + ? `${playerNetworkInfo.downloadedFromServer} from servers · ${playerNetworkInfo.downloadedFromPeers} from peers` : undefined const bufferProgress = progress !== undefined @@ -209,6 +211,7 @@ class StatsCard extends Component { return ` ${this.buildElement(player.localize('Player mode'), this.mode || 'HTTP')} + ${this.buildElement(player.localize('P2P'), player.localize(this.p2pEnabled ? 'enabled' : 'disabled'))} ${this.buildElement(player.localize('Video UUID'), this.options_.videoUUID)} diff --git a/scripts/i18n/create-custom-files.ts b/scripts/i18n/create-custom-files.ts index 2a222ebce..d9328b125 100755 --- a/scripts/i18n/create-custom-files.ts +++ b/scripts/i18n/create-custom-files.ts @@ -51,6 +51,9 @@ const playerKeys = { 'Buffer Progress': 'Buffer Progress', 'Buffer State': 'Buffer State', 'Live Latency': 'Live Latency', + 'P2P': 'P2P', + 'enabled': 'enabled', + 'disabled': 'disabled', ' off': ' off', 'Player mode': 'Player mode' }