3 files changed, 23 insertions, 6 deletions

diff --git a/server/controllers/object-storage-proxy.ts b/server/controllers/object-storage-proxy.ts
index 6bff05f14..c530b57f8 100644
--- a/server/controllers/object-storage-proxy.ts
+++ b/server/controllers/object-storage-proxy.ts
@@ -110,6 +110,7 @@ function handleObjectStorageFailure (res: express.Response, err: Error) {
 
 function setS3Headers (res: express.Response, s3Response: GetObjectCommandOutput) {
   if (s3Response.$metadata.httpStatusCode === HttpStatusCode.PARTIAL_CONTENT_206) {
+    res.setHeader('Content-Range', s3Response.ContentRange)
     res.status(HttpStatusCode.PARTIAL_CONTENT_206)
   }
 }
diff --git a/server/tests/api/object-storage/videos.ts b/server/tests/api/object-storage/videos.ts
index 6862658cc..6aaf32c34 100644
--- a/server/tests/api/object-storage/videos.ts
+++ b/server/tests/api/object-storage/videos.ts
@@ -26,8 +26,12 @@ import {
   waitJobs,
   webtorrentAdd
 } from '@shared/server-commands'
+import { sha1 } from '@shared/extra-utils'
 
 async function checkFiles (options: {
+  server: PeerTubeServer
+  originServer: PeerTubeServer
+
   video: VideoDetails
 
   baseMockUrl?: string
@@ -39,6 +43,8 @@ async function checkFiles (options: {
   webtorrentPrefix?: string
 }) {
   const {
+    server,
+    originServer,
     video,
     playlistBucket,
     webtorrentBucket,
@@ -86,6 +92,7 @@ async function checkFiles (options: {
     const resSha = await makeRawRequest({ url: hls.segmentsSha256Url, expectedStatus: HttpStatusCode.OK_200 })
     expect(JSON.stringify(resSha.body)).to.not.throw
 
+    let i = 0
     for (const file of hls.files) {
       expectStartWith(file.fileUrl, start)
 
@@ -94,6 +101,15 @@ async function checkFiles (options: {
       expectStartWith(location, start)
 
       await makeRawRequest({ url: location, expectedStatus: HttpStatusCode.OK_200 })
+
+      if (originServer.internalServerNumber === server.internalServerNumber) {
+        const infohash = sha1(`${2 + hls.playlistUrl}+V${i}`)
+        const dbInfohashes = await originServer.sql.getPlaylistInfohash(hls.id)
+
+        expect(dbInfohashes).to.include(infohash)
+      }
+
+      i++
     }
   }
 
@@ -198,7 +214,7 @@ function runTestSuite (options: {
 
     for (const server of servers) {
       const video = await server.videos.get({ id: uuid })
-      const files = await checkFiles({ ...options, video, baseMockUrl })
+      const files = await checkFiles({ ...options, server, originServer: servers[0], video, baseMockUrl })
 
       deletedUrls = deletedUrls.concat(files)
     }
@@ -214,7 +230,7 @@ function runTestSuite (options: {
 
     for (const server of servers) {
       const video = await server.videos.get({ id: uuid })
-      const files = await checkFiles({ ...options, video, baseMockUrl })
+      const files = await checkFiles({ ...options, server, originServer: servers[0], video, baseMockUrl })
 
       deletedUrls = deletedUrls.concat(files)
     }
diff --git a/server/tests/api/videos/video-imports.ts b/server/tests/api/videos/video-imports.ts
index 80215f038..878452ed2 100644
--- a/server/tests/api/videos/video-imports.ts
+++ b/server/tests/api/videos/video-imports.ts
@@ -23,9 +23,8 @@ async function checkVideosServer1 (server: PeerTubeServer, idHttp: string, idMag
   const videoHttp = await server.videos.get({ id: idHttp })
 
   expect(videoHttp.name).to.equal('small video - youtube')
-  // FIXME: youtube-dl seems broken
-  // expect(videoHttp.category.label).to.equal('News & Politics')
-  // expect(videoHttp.licence.label).to.equal('Attribution')
+  expect(videoHttp.category.label).to.equal('News & Politics')
+  expect(videoHttp.licence.label).to.equal('Attribution')
   expect(videoHttp.language.label).to.equal('Unknown')
   expect(videoHttp.nsfw).to.be.false
   expect(videoHttp.description).to.equal('this is a super description')
@@ -460,7 +459,8 @@ describe('Test video imports', function () {
     })
   }
 
-  runSuite('youtube-dl')
+  // FIXME: youtube-dl seems broken
+  // runSuite('youtube-dl')
 
   runSuite('yt-dlp')