From 20dcfd74982f4ec8a143696abed02b059d30d9ec Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 26 Aug 2020 15:03:00 +0200 Subject: [PATCH] Deprecate old static routes --- CHANGELOG.md | 4 ++++ server/initializers/constants.ts | 4 ++-- server/tests/api/server/services.ts | 2 +- server/tests/api/videos/video-captions.ts | 10 +++++----- server/tests/api/videos/video-imports.ts | 2 +- support/doc/api/openapi.yaml | 2 +- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab25788af..8561fc859 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ ### IMPORTANT NOTES * The minimum ffmpeg version required is now 4.1 + * Deprecate static routes that will be removed in 3.0 (you may not have to do anything if you used paths returned by the video REST API): + * `/static/avatars/`: use `/lazy-static/avatars/` instead + * `/static/previews/`: use `/lazy-static/previews/` instead + * `/static/video-captions/`: use `/lazy-static/video-captions/` instead * Use `playlistPosition` URL parameter for playlists instead of `videoId` to set the current playlist position ### Maintenance diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index c26c3a88c..171e9e9c2 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -545,8 +545,8 @@ const STATIC_DOWNLOAD_PATHS = { } const LAZY_STATIC_PATHS = { AVATARS: '/lazy-static/avatars/', - PREVIEWS: '/static/previews/', - VIDEO_CAPTIONS: '/static/video-captions/' + PREVIEWS: '/lazy-static/previews/', + VIDEO_CAPTIONS: '/lazy-static/video-captions/' } // Cache control diff --git a/server/tests/api/server/services.ts b/server/tests/api/server/services.ts index 897f37c04..680e7a817 100644 --- a/server/tests/api/server/services.ts +++ b/server/tests/api/server/services.ts @@ -70,7 +70,7 @@ describe('Test services', function () { const expectedHtml = '' - const expectedThumbnailUrl = 'http://localhost:' + server.port + '/static/previews/' + server.video.uuid + '.jpg' + const expectedThumbnailUrl = 'http://localhost:' + server.port + '/lazy-static/previews/' + server.video.uuid + '.jpg' expect(res.body.html).to.equal(expectedHtml) expect(res.body.title).to.equal(server.video.name) diff --git a/server/tests/api/videos/video-captions.ts b/server/tests/api/videos/video-captions.ts index b4ecb39f4..00e04d69d 100644 --- a/server/tests/api/videos/video-captions.ts +++ b/server/tests/api/videos/video-captions.ts @@ -83,13 +83,13 @@ describe('Test video captions', function () { const caption1: VideoCaption = res.body.data[0] expect(caption1.language.id).to.equal('ar') expect(caption1.language.label).to.equal('Arabic') - expect(caption1.captionPath).to.equal('/static/video-captions/' + videoUUID + '-ar.vtt') + expect(caption1.captionPath).to.equal('/lazy-static/video-captions/' + videoUUID + '-ar.vtt') await testCaptionFile(server.url, caption1.captionPath, 'Subtitle good 1.') const caption2: VideoCaption = res.body.data[1] expect(caption2.language.id).to.equal('zh') expect(caption2.language.label).to.equal('Chinese') - expect(caption2.captionPath).to.equal('/static/video-captions/' + videoUUID + '-zh.vtt') + expect(caption2.captionPath).to.equal('/lazy-static/video-captions/' + videoUUID + '-zh.vtt') await testCaptionFile(server.url, caption2.captionPath, 'Subtitle good 2.') } }) @@ -117,7 +117,7 @@ describe('Test video captions', function () { const caption1: VideoCaption = res.body.data[0] expect(caption1.language.id).to.equal('ar') expect(caption1.language.label).to.equal('Arabic') - expect(caption1.captionPath).to.equal('/static/video-captions/' + videoUUID + '-ar.vtt') + expect(caption1.captionPath).to.equal('/lazy-static/video-captions/' + videoUUID + '-ar.vtt') await testCaptionFile(server.url, caption1.captionPath, 'Subtitle good 2.') } }) @@ -148,7 +148,7 @@ describe('Test video captions', function () { const caption1: VideoCaption = res.body.data[0] expect(caption1.language.id).to.equal('ar') expect(caption1.language.label).to.equal('Arabic') - expect(caption1.captionPath).to.equal('/static/video-captions/' + videoUUID + '-ar.vtt') + expect(caption1.captionPath).to.equal('/lazy-static/video-captions/' + videoUUID + '-ar.vtt') const expected = 'WEBVTT FILE\r\n' + '\r\n' + @@ -185,7 +185,7 @@ describe('Test video captions', function () { expect(caption.language.id).to.equal('zh') expect(caption.language.label).to.equal('Chinese') - expect(caption.captionPath).to.equal('/static/video-captions/' + videoUUID + '-zh.vtt') + expect(caption.captionPath).to.equal('/lazy-static/video-captions/' + videoUUID + '-zh.vtt') await testCaptionFile(server.url, caption.captionPath, 'Subtitle good 2.') } }) diff --git a/server/tests/api/videos/video-imports.ts b/server/tests/api/videos/video-imports.ts index efda4fc7b..adb97aba4 100644 --- a/server/tests/api/videos/video-imports.ts +++ b/server/tests/api/videos/video-imports.ts @@ -123,7 +123,7 @@ describe('Test video imports', function () { const res = await importVideo(servers[0].url, servers[0].accessToken, attributes) expect(res.body.video.name).to.equal('small video - youtube') expect(res.body.video.thumbnailPath).to.equal(`/static/thumbnails/${res.body.video.uuid}.jpg`) - expect(res.body.video.previewPath).to.equal(`/static/previews/${res.body.video.uuid}.jpg`) + expect(res.body.video.previewPath).to.equal(`/lazy-static/previews/${res.body.video.uuid}.jpg`) await testImage(servers[0].url, 'video_import_thumbnail', res.body.video.thumbnailPath) await testImage(servers[0].url, 'video_import_preview', res.body.video.previewPath) diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml index 756c610c1..464dcfbce 100644 --- a/support/doc/api/openapi.yaml +++ b/support/doc/api/openapi.yaml @@ -3887,7 +3887,7 @@ components: example: /static/thumbnails/a65bc12f-9383-462e-81ae-8207e8b434ee.jpg previewPath: type: string - example: /static/previews/a65bc12f-9383-462e-81ae-8207e8b434ee.jpg + example: /lazy-static/previews/a65bc12f-9383-462e-81ae-8207e8b434ee.jpg embedPath: type: string example: /videos/embed/a65bc12f-9383-462e-81ae-8207e8b434ee