diff options
author | Chocobozzz <me@florianbigard.com> | 2021-12-15 16:25:33 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-12-16 10:08:55 +0100 |
commit | 9576506763c20c7efbdb229483440a1fc984cf4d (patch) | |
tree | 58b3b52b85693c00a9dac2e73fed220ac65cc243 | |
parent | bf1c3c78b0e2b70bb46168a9dec0d3fa0997ab14 (diff) | |
download | PeerTube-9576506763c20c7efbdb229483440a1fc984cf4d.tar.gz PeerTube-9576506763c20c7efbdb229483440a1fc984cf4d.tar.zst PeerTube-9576506763c20c7efbdb229483440a1fc984cf4d.zip |
Add P2P enabled/disabled in player card
-rw-r--r-- | client/src/assets/player/peertube-player-manager.ts | 3 | ||||
-rw-r--r-- | client/src/assets/player/stats/stats-card.ts | 5 | ||||
-rwxr-xr-x | 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 { | |||
193 | player.stats({ | 193 | player.stats({ |
194 | videoUUID: options.common.videoUUID, | 194 | videoUUID: options.common.videoUUID, |
195 | videoIsLive: options.common.isLive, | 195 | videoIsLive: options.common.isLive, |
196 | mode | 196 | mode, |
197 | p2pEnabled: options.common.p2pEnabled | ||
197 | }) | 198 | }) |
198 | 199 | ||
199 | player.on('p2pInfo', (_, data: PlayerNetworkInfo) => { | 200 | 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 { | |||
7 | videoUUID: string | 7 | videoUUID: string |
8 | videoIsLive: boolean | 8 | videoIsLive: boolean |
9 | mode: 'webtorrent' | 'p2p-media-loader' | 9 | mode: 'webtorrent' | 'p2p-media-loader' |
10 | p2pEnabled: boolean | ||
10 | } | 11 | } |
11 | 12 | ||
12 | interface PlayerNetworkInfo { | 13 | interface PlayerNetworkInfo { |
@@ -33,6 +34,7 @@ class StatsCard extends Component { | |||
33 | updateInterval: any | 34 | updateInterval: any |
34 | 35 | ||
35 | mode: 'webtorrent' | 'p2p-media-loader' | 36 | mode: 'webtorrent' | 'p2p-media-loader' |
37 | p2pEnabled: boolean | ||
36 | 38 | ||
37 | metadataStore: any = {} | 39 | metadataStore: any = {} |
38 | 40 | ||
@@ -200,7 +202,7 @@ class StatsCard extends Component { | |||
200 | ? `${playerNetworkInfo.totalDownloaded} ⇓ / ${playerNetworkInfo.totalUploaded} ⇑` | 202 | ? `${playerNetworkInfo.totalDownloaded} ⇓ / ${playerNetworkInfo.totalUploaded} ⇑` |
201 | : undefined | 203 | : undefined |
202 | const downloadBreakdown = playerNetworkInfo.downloadedFromServer | 204 | const downloadBreakdown = playerNetworkInfo.downloadedFromServer |
203 | ? `${playerNetworkInfo.downloadedFromServer} from server · ${playerNetworkInfo.downloadedFromPeers} from peers` | 205 | ? `${playerNetworkInfo.downloadedFromServer} from servers · ${playerNetworkInfo.downloadedFromPeers} from peers` |
204 | : undefined | 206 | : undefined |
205 | 207 | ||
206 | const bufferProgress = progress !== undefined | 208 | const bufferProgress = progress !== undefined |
@@ -209,6 +211,7 @@ class StatsCard extends Component { | |||
209 | 211 | ||
210 | return ` | 212 | return ` |
211 | ${this.buildElement(player.localize('Player mode'), this.mode || 'HTTP')} | 213 | ${this.buildElement(player.localize('Player mode'), this.mode || 'HTTP')} |
214 | ${this.buildElement(player.localize('P2P'), player.localize(this.p2pEnabled ? 'enabled' : 'disabled'))} | ||
212 | 215 | ||
213 | ${this.buildElement(player.localize('Video UUID'), this.options_.videoUUID)} | 216 | ${this.buildElement(player.localize('Video UUID'), this.options_.videoUUID)} |
214 | 217 | ||
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 = { | |||
51 | 'Buffer Progress': 'Buffer Progress', | 51 | 'Buffer Progress': 'Buffer Progress', |
52 | 'Buffer State': 'Buffer State', | 52 | 'Buffer State': 'Buffer State', |
53 | 'Live Latency': 'Live Latency', | 53 | 'Live Latency': 'Live Latency', |
54 | 'P2P': 'P2P', | ||
55 | 'enabled': 'enabled', | ||
56 | 'disabled': 'disabled', | ||
54 | ' off': ' off', | 57 | ' off': ' off', |
55 | 'Player mode': 'Player mode' | 58 | 'Player mode': 'Player mode' |
56 | } | 59 | } |