diff --git a/server/src/cores/storage.core.ts b/server/src/cores/storage.core.ts index 81228810de..8802145020 100644 --- a/server/src/cores/storage.core.ts +++ b/server/src/cores/storage.core.ts @@ -130,7 +130,7 @@ export class StorageCore { } static getHlsSessionFolder({ ownerId, sessionId }: HlsSessionFolder) { - return StorageCore.getNestedFolder(StorageFolder.EncodedVideo, ownerId, sessionId); + return StorageCore.getNestedPath(StorageFolder.EncodedVideo, ownerId, sessionId); } static getHlsVariantFolder({ ownerId, sessionId, variantIndex }: HlsVariantFolder) { diff --git a/server/src/services/transcoding.service.spec.ts b/server/src/services/transcoding.service.spec.ts index 7e61aa21af..4629033711 100644 --- a/server/src/services/transcoding.service.spec.ts +++ b/server/src/services/transcoding.service.spec.ts @@ -260,8 +260,8 @@ describe(TranscodingService.name, () => { '-svtav1-params', 'hierarchical-levels=3:lookahead=0:enable-tf=0:mbr=4000k', '-hls_segment_filename', - '/data/encoded-video/user-1/se/ss/6/seg_%d.m4s', - '/data/encoded-video/user-1/se/ss/6/playlist.m3u8', + '/data/encoded-video/user-1/se/ss/session-1/6/seg_%d.m4s', + '/data/encoded-video/user-1/se/ss/session-1/6/playlist.m3u8', ].sort(), }, { @@ -285,8 +285,8 @@ describe(TranscodingService.name, () => { '-vf', 'scale=720:-2', '-hls_segment_filename', - '/data/encoded-video/user-1/se/ss/4/seg_%d.m4s', - '/data/encoded-video/user-1/se/ss/4/playlist.m3u8', + '/data/encoded-video/user-1/se/ss/session-1/4/seg_%d.m4s', + '/data/encoded-video/user-1/se/ss/session-1/4/playlist.m3u8', ].sort(), }, { @@ -308,8 +308,8 @@ describe(TranscodingService.name, () => { '-vf', 'scale=480:-2', '-hls_segment_filename', - '/data/encoded-video/user-1/se/ss/2/seg_%d.m4s', - '/data/encoded-video/user-1/se/ss/2/playlist.m3u8', + '/data/encoded-video/user-1/se/ss/session-1/2/seg_%d.m4s', + '/data/encoded-video/user-1/se/ss/session-1/2/playlist.m3u8', ].sort(), }, ])('builds the expected FFmpeg command for $codec (variant $variantIndex)', async ({ variantIndex, expected }) => {