diff options
author | Chocobozzz <me@florianbigard.com> | 2021-04-08 10:08:11 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-04-08 10:08:11 +0200 |
commit | 20373985c0d83f672ece5c061f4c5e96942f6243 (patch) | |
tree | 552a87731935ce5966368fd40c4cc7ebb1af853f /server | |
parent | 75cba40de749fa8bf6cd767acbfaf478a6a8acbd (diff) | |
download | PeerTube-20373985c0d83f672ece5c061f4c5e96942f6243.tar.gz PeerTube-20373985c0d83f672ece5c061f4c5e96942f6243.tar.zst PeerTube-20373985c0d83f672ece5c061f4c5e96942f6243.zip |
Fix static ffmpeg version check
Diffstat (limited to 'server')
-rw-r--r-- | server/helpers/ffmpeg-utils.ts | 2 | ||||
-rw-r--r-- | 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 () { | |||
657 | 657 | ||
658 | return execPromise(`${ffmpegPath} -version`) | 658 | return execPromise(`${ffmpegPath} -version`) |
659 | .then(stdout => { | 659 | .then(stdout => { |
660 | const parsed = stdout.match(/ffmpeg version .(\d+\.\d+\.\d+)/) | 660 | const parsed = stdout.match(/ffmpeg version .?(\d+\.\d+\.\d+)/) |
661 | if (!parsed || !parsed[1]) return rej(new Error(`Could not find ffmpeg version in ${stdout}`)) | 661 | if (!parsed || !parsed[1]) return rej(new Error(`Could not find ffmpeg version in ${stdout}`)) |
662 | 662 | ||
663 | return res(parsed[1]) | 663 | 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 () { | |||
77 | } | 77 | } |
78 | }) | 78 | }) |
79 | 79 | ||
80 | it('Should regenerate thumbnails from the CLI', async function () { | 80 | it('Should regenerate local thumbnails from the CLI', async function () { |
81 | this.timeout(15000) | 81 | this.timeout(15000) |
82 | 82 | ||
83 | const env = getEnvCli(servers[0]) | 83 | const env = getEnvCli(servers[0]) |
84 | await execCLI(`${env} npm run regenerate-thumbnails`) | 84 | await execCLI(`${env} npm run regenerate-thumbnails`) |
85 | }) | 85 | }) |
86 | 86 | ||
87 | it('Should have regenerated thumbbnails', async function () { | 87 | it('Should have regenerated local thumbnails', async function () { |
88 | { | 88 | { |
89 | const res1 = await makeRawRequest(join(servers[0].url, video1.thumbnailPath), HttpStatusCode.OK_200) | 89 | const res1 = await makeRawRequest(join(servers[0].url, video1.thumbnailPath), HttpStatusCode.OK_200) |
90 | expect(res1.body).to.not.have.lengthOf(0) | 90 | expect(res1.body).to.not.have.lengthOf(0) |