From a2caee9f5162232234de2e8aae6957cc7f38c853 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 1 Feb 2022 14:19:44 +0100 Subject: Fix HLS re transcoding with object storage enabled --- server/lib/object-storage/videos.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'server/lib/object-storage/videos.ts') 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' import { generateHLSObjectBaseStorageKey, generateHLSObjectStorageKey, generateWebTorrentObjectStorageKey } from './keys' import { lTags, makeAvailable, removeObject, removePrefix, storeObject } from './shared' -function storeHLSFile (playlist: MStreamingPlaylistVideo, filename: string) { - const baseHlsDirectory = getHLSDirectory(playlist.Video) - +function storeHLSFile (playlist: MStreamingPlaylistVideo, filename: string, path?: string) { return storeObject({ - inputPath: join(baseHlsDirectory, filename), + inputPath: path ?? join(getHLSDirectory(playlist.Video), filename), objectStorageKey: generateHLSObjectStorageKey(playlist, filename), bucketInfo: CONFIG.OBJECT_STORAGE.STREAMING_PLAYLISTS }) -- cgit v1.2.3