X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fobject-storage%2Fkeys.ts;h=4f17073f48afab4ef079ad0520b667bcd8ca2b88;hb=450de91e22ba1388e14e12ada875c94e0c38f5d3;hp=51947477513b5cfa3b469f75b79b75beae4bd457;hpb=0305db28c98fd6cf43a3c50ba92c76215e99d512;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/object-storage/keys.ts b/server/lib/object-storage/keys.ts index 519474775..4f17073f4 100644 --- a/server/lib/object-storage/keys.ts +++ b/server/lib/object-storage/keys.ts @@ -1,12 +1,12 @@ import { join } from 'path' -import { MStreamingPlaylist, MVideoUUID } from '@server/types/models' +import { MStreamingPlaylistVideo } from '@server/types/models' -function generateHLSObjectStorageKey (playlist: MStreamingPlaylist, video: MVideoUUID, filename: string) { - return join(generateHLSObjectBaseStorageKey(playlist, video), filename) +function generateHLSObjectStorageKey (playlist: MStreamingPlaylistVideo, filename: string) { + return join(generateHLSObjectBaseStorageKey(playlist), filename) } -function generateHLSObjectBaseStorageKey (playlist: MStreamingPlaylist, video: MVideoUUID) { - return playlist.getStringType() + '_' + video.uuid +function generateHLSObjectBaseStorageKey (playlist: MStreamingPlaylistVideo) { + return join(playlist.getStringType(), playlist.Video.uuid) } function generateWebTorrentObjectStorageKey (filename: string) {