X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fassets%2Fplayer%2Fp2p-media-loader%2Fsegment-url-builder.ts;h=039777cea85564a48821c12faaf4ff321d213750;hb=da3324177025b15ca23d84dd4249e3c7ba95053c;hp=fb990a19dd44558bcfcb0ee72a89da16421967f2;hpb=c47106315ae3c403239cda29c49b4bba51ddccb2;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/assets/player/p2p-media-loader/segment-url-builder.ts b/client/src/assets/player/p2p-media-loader/segment-url-builder.ts index fb990a19d..039777cea 100644 --- a/client/src/assets/player/p2p-media-loader/segment-url-builder.ts +++ b/client/src/assets/player/p2p-media-loader/segment-url-builder.ts @@ -1,17 +1,9 @@ -import { basename } from 'path' import { Segment } from 'p2p-media-loader-core' +import { RedundancyUrlManager } from './redundancy-url-manager' -function segmentUrlBuilderFactory (baseUrls: string[]) { +function segmentUrlBuilderFactory (redundancyUrlManager: RedundancyUrlManager) { return function segmentBuilder (segment: Segment) { - const max = baseUrls.length + 1 - const i = getRandomInt(max) - - if (i === max - 1) return segment.url - - const newBaseUrl = baseUrls[i] - const middlePart = newBaseUrl.endsWith('/') ? '' : '/' - - return newBaseUrl + middlePart + basename(segment.url) + return redundancyUrlManager.buildUrl(segment.url) } } @@ -20,9 +12,3 @@ function segmentUrlBuilderFactory (baseUrls: string[]) { export { segmentUrlBuilderFactory } - -// --------------------------------------------------------------------------- - -function getRandomInt (max: number) { - return Math.floor(Math.random() * Math.floor(max)) -}