aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib/object-storage/videos.ts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-02-01 14:19:44 +0100
committerChocobozzz <me@florianbigard.com>2022-02-01 14:19:44 +0100
commita2caee9f5162232234de2e8aae6957cc7f38c853 (patch)
treef6ca87b03ed80ca4b6625a7b2b31706cd4f831ad /server/lib/object-storage/videos.ts
parent0f11ec8dd32b50897c18588db948e96cf0fc2c70 (diff)
downloadPeerTube-a2caee9f5162232234de2e8aae6957cc7f38c853.tar.gz
PeerTube-a2caee9f5162232234de2e8aae6957cc7f38c853.tar.zst
PeerTube-a2caee9f5162232234de2e8aae6957cc7f38c853.zip
Fix HLS re transcoding with object storage enabled
Diffstat (limited to 'server/lib/object-storage/videos.ts')
-rw-r--r--server/lib/object-storage/videos.ts6
1 files changed, 2 insertions, 4 deletions
diff --git a/server/lib/object-storage/videos.ts b/server/lib/object-storage/videos.ts
index 8988f3e2a..066b48ab0 100644
--- a/server/lib/object-storage/videos.ts
+++ b/server/lib/object-storage/videos.ts
@@ -6,11 +6,9 @@ import { getHLSDirectory } from '../paths'
6import { generateHLSObjectBaseStorageKey, generateHLSObjectStorageKey, generateWebTorrentObjectStorageKey } from './keys' 6import { generateHLSObjectBaseStorageKey, generateHLSObjectStorageKey, generateWebTorrentObjectStorageKey } from './keys'
7import { lTags, makeAvailable, removeObject, removePrefix, storeObject } from './shared' 7import { lTags, makeAvailable, removeObject, removePrefix, storeObject } from './shared'
8 8
9function storeHLSFile (playlist: MStreamingPlaylistVideo, filename: string) { 9function storeHLSFile (playlist: MStreamingPlaylistVideo, filename: string, path?: string) {
10 const baseHlsDirectory = getHLSDirectory(playlist.Video)
11
12 return storeObject({ 10 return storeObject({
13 inputPath: join(baseHlsDirectory, filename), 11 inputPath: path ?? join(getHLSDirectory(playlist.Video), filename),
14 objectStorageKey: generateHLSObjectStorageKey(playlist, filename), 12 objectStorageKey: generateHLSObjectStorageKey(playlist, filename),
15 bucketInfo: CONFIG.OBJECT_STORAGE.STREAMING_PLAYLISTS 13 bucketInfo: CONFIG.OBJECT_STORAGE.STREAMING_PLAYLISTS
16 }) 14 })