yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-04 02:09:37 +02:00
Code Issues Releases Wiki Activity

Merge branch 'release/5.0.0' into develop

Browse source
This commit is contained in:
Chocobozzz 2023-01-27 08:34:16 +01:00
commit a2be43f570
No known key found for this signature in database
GPG key ID: 583A612D890159BE
7 changed files with 99 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
shared/server-commands/videos/live-command.ts
View file

@ -192,12 +192,20 @@ export class LiveCommand extends AbstractCommand {
playlistNumber: number
segment: number
objectStorage: boolean
objectStorageBaseUrl?: string
}) {
const { server, objectStorage, playlistNumber, segment, videoUUID } = options
const {
server,
objectStorage,
playlistNumber,
segment,
videoUUID,
objectStorageBaseUrl = ObjectStorageCommand.getMockPlaylistBaseUrl()
} = options
const segmentName = `${playlistNumber}-00000${segment}.ts`
const baseUrl = objectStorage
? ObjectStorageCommand.getMockPlaylistBaseUrl() + 'hls'
? join(objectStorageBaseUrl, 'hls')
: server.url + '/static/streaming-playlists/hls'
let error = true