From 092092969633bbcf6d4891a083ea497a7d5c3154 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 29 Jan 2019 08:37:25 +0100 Subject: Add hls support on server --- scripts/i18n/create-custom-files.ts | 5 ++++- scripts/update-host.ts | 14 ++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) (limited to 'scripts') diff --git a/scripts/i18n/create-custom-files.ts b/scripts/i18n/create-custom-files.ts index ab28f94c8..664207e1c 100755 --- a/scripts/i18n/create-custom-files.ts +++ b/scripts/i18n/create-custom-files.ts @@ -23,12 +23,15 @@ const playerKeys = { 'Speed': 'Speed', 'Subtitles/CC': 'Subtitles/CC', 'peers': 'peers', + 'peer': 'peer', 'Go to the video page': 'Go to the video page', 'Settings': 'Settings', 'Uses P2P, others may know you are watching this video.': 'Uses P2P, others may know you are watching this video.', 'Copy the video URL': 'Copy the video URL', 'Copy the video URL at the current time': 'Copy the video URL at the current time', - 'Copy embed code': 'Copy embed code' + 'Copy embed code': 'Copy embed code', + 'Total downloaded: ': 'Total downloaded: ', + 'Total uploaded: ': 'Total uploaded: ' } const playerTranslations = { target: join(__dirname, '../../../client/src/locale/source/player_en_US.xml'), diff --git a/scripts/update-host.ts b/scripts/update-host.ts index 422a3c9a7..64eba867a 100755 --- a/scripts/update-host.ts +++ b/scripts/update-host.ts @@ -13,6 +13,7 @@ import { VideoCommentModel } from '../server/models/video/video-comment' import { getServerActor } from '../server/helpers/utils' import { AccountModel } from '../server/models/account/account' import { VideoChannelModel } from '../server/models/video/video-channel' +import { VideoStreamingPlaylistModel } from '../server/models/video/video-streaming-playlist' run() .then(() => process.exit(0)) @@ -109,11 +110,9 @@ async function run () { console.log('Updating video and torrent files.') - const videos = await VideoModel.list() + const videos = await VideoModel.listLocal() for (const video of videos) { - if (video.isOwned() === false) continue - - console.log('Updated video ' + video.uuid) + console.log('Updating video ' + video.uuid) video.url = getVideoActivityPubUrl(video) await video.save() @@ -122,5 +121,12 @@ async function run () { console.log('Updating torrent file %s of video %s.', file.resolution, video.uuid) await video.createTorrentAndSetInfoHash(file) } + + for (const playlist of video.VideoStreamingPlaylists) { + playlist.playlistUrl = CONFIG.WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsMasterPlaylistStaticPath(video.uuid) + playlist.segmentsSha256Url = CONFIG.WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsSha256SegmentsStaticPath(video.uuid) + + await playlist.save() + } } } -- cgit v1.2.3