3 files changed, 1 insertions, 98 deletions

diff --git a/server/lib/object-storage/keys.ts b/server/lib/object-storage/keys.ts
index 519474775..12acb3aec 100644
--- a/server/lib/object-storage/keys.ts
+++ b/server/lib/object-storage/keys.ts
@@ -6,7 +6,7 @@ function generateHLSObjectStorageKey (playlist: MStreamingPlaylist, video: MVide
 }
 
 function generateHLSObjectBaseStorageKey (playlist: MStreamingPlaylist, video: MVideoUUID) {
-  return playlist.getStringType() + '_' + video.uuid
+  return join(playlist.getStringType(), video.uuid)
 }
 
 function generateWebTorrentObjectStorageKey (filename: string) {
diff --git a/server/tests/cli/index.ts b/server/tests/cli/index.ts
index 7e6eebd17..c6dd0581a 100644
--- a/server/tests/cli/index.ts
+++ b/server/tests/cli/index.ts
@@ -1,7 +1,6 @@
 // Order of the tests we want to execute
 import './create-import-video-file-job'
 import './create-transcoding-job'
-import './optimize-old-videos'
 import './peertube'
 import './plugins'
 import './print-transcode-command'
diff --git a/server/tests/cli/optimize-old-videos.ts b/server/tests/cli/optimize-old-videos.ts
deleted file mode 100644
index 9b75ae164..000000000
--- a/server/tests/cli/optimize-old-videos.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-
-import 'mocha'
-import * as chai from 'chai'
-import { getMaxBitrate } from '@shared/core-utils'
-import {
-  cleanupTests,
-  createMultipleServers,
-  doubleFollow,
-  generateHighBitrateVideo,
-  PeerTubeServer,
-  setAccessTokensToServers,
-  wait,
-  waitJobs
-} from '@shared/extra-utils'
-import { getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from '../../helpers/ffprobe-utils'
-
-const expect = chai.expect
-
-describe('Test optimize old videos', function () {
-  let servers: PeerTubeServer[] = []
-
-  before(async function () {
-    this.timeout(200000)
-
-    // Run server 2 to have transcoding enabled
-    servers = await createMultipleServers(2)
-    await setAccessTokensToServers(servers)
-
-    await doubleFollow(servers[0], servers[1])
-
-    const tempFixturePath = await generateHighBitrateVideo()
-
-    // Upload two videos for our needs
-    await servers[0].videos.upload({ attributes: { name: 'video1', fixture: tempFixturePath } })
-    await servers[0].videos.upload({ attributes: { name: 'video2', fixture: tempFixturePath } })
-
-    await waitJobs(servers)
-  })
-
-  it('Should have two video files on each server', async function () {
-    this.timeout(30000)
-
-    for (const server of servers) {
-      const { data } = await server.videos.list()
-      expect(data).to.have.lengthOf(2)
-
-      for (const video of data) {
-        const videoDetails = await server.videos.get({ id: video.uuid })
-        expect(videoDetails.files).to.have.lengthOf(1)
-      }
-    }
-  })
-
-  it('Should run optimize script', async function () {
-    this.timeout(200000)
-
-    await servers[0].cli.execWithEnv('npm run optimize-old-videos')
-    await waitJobs(servers)
-
-    for (const server of servers) {
-      const { data } = await server.videos.list()
-      expect(data).to.have.lengthOf(2)
-
-      for (const video of data) {
-        await server.videos.view({ id: video.uuid })
-
-        // Refresh video
-        await waitJobs(servers)
-        await wait(5000)
-        await waitJobs(servers)
-
-        const videoDetails = await server.videos.get({ id: video.uuid })
-
-        expect(videoDetails.files).to.have.lengthOf(1)
-        const file = videoDetails.files[0]
-
-        expect(file.size).to.be.below(8000000)
-
-        const path = servers[0].servers.buildWebTorrentFilePath(file.fileUrl)
-        const bitrate = await getVideoFileBitrate(path)
-        const fps = await getVideoFileFPS(path)
-        const data = await getVideoFileResolution(path)
-
-        expect(data.resolution).to.equal(file.resolution.id)
-
-        const maxBitrate = getMaxBitrate({ ...data, fps })
-        expect(bitrate).to.be.below(maxBitrate)
-      }
-    }
-  })
-
-  after(async function () {
-    await cleanupTests(servers)
-  })
-})