From 20373985c0d83f672ece5c061f4c5e96942f6243 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 8 Apr 2021 10:08:11 +0200 Subject: Fix static ffmpeg version check --- server/helpers/ffmpeg-utils.ts | 2 +- server/tests/cli/regenerate-thumbnails.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/helpers/ffmpeg-utils.ts b/server/helpers/ffmpeg-utils.ts index 69cd397b9..01c3aa5f7 100644 --- a/server/helpers/ffmpeg-utils.ts +++ b/server/helpers/ffmpeg-utils.ts @@ -657,7 +657,7 @@ function getFFmpegVersion () { return execPromise(`${ffmpegPath} -version`) .then(stdout => { - const parsed = stdout.match(/ffmpeg version .(\d+\.\d+\.\d+)/) + const parsed = stdout.match(/ffmpeg version .?(\d+\.\d+\.\d+)/) if (!parsed || !parsed[1]) return rej(new Error(`Could not find ffmpeg version in ${stdout}`)) return res(parsed[1]) diff --git a/server/tests/cli/regenerate-thumbnails.ts b/server/tests/cli/regenerate-thumbnails.ts index 56005518a..a9c8642a5 100644 --- a/server/tests/cli/regenerate-thumbnails.ts +++ b/server/tests/cli/regenerate-thumbnails.ts @@ -77,14 +77,14 @@ describe('Test regenerate thumbnails script', function () { } }) - it('Should regenerate thumbnails from the CLI', async function () { + it('Should regenerate local thumbnails from the CLI', async function () { this.timeout(15000) const env = getEnvCli(servers[0]) await execCLI(`${env} npm run regenerate-thumbnails`) }) - it('Should have regenerated thumbbnails', async function () { + it('Should have regenerated local thumbnails', async function () { { const res1 = await makeRawRequest(join(servers[0].url, video1.thumbnailPath), HttpStatusCode.OK_200) expect(res1.body).to.not.have.lengthOf(0) -- cgit v1.2.3