NW
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix static ffmpeg version check

This commit is contained in:
Chocobozzz 2021-04-08 10:08:11 +02:00
parent 75cba40de7
commit 20373985c0
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/helpers/ffmpeg-utils.ts
View File

@ -657,7 +657,7 @@ function getFFmpegVersion () {
return execPromise(`${ffmpegPath} -version`) return execPromise(`${ffmpegPath} -version`)
.then(stdout => { .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}`)) if (!parsed || !parsed[1]) return rej(new Error(`Could not find ffmpeg version in ${stdout}`))
return res(parsed[1]) return res(parsed[1])

4
server/tests/cli/regenerate-thumbnails.ts
View File

@ -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) this.timeout(15000)
const env = getEnvCli(servers[0]) const env = getEnvCli(servers[0])
await execCLI(`${env} npm run regenerate-thumbnails`) 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) const res1 = await makeRawRequest(join(servers[0].url, video1.thumbnailPath), HttpStatusCode.OK_200)
expect(res1.body).to.not.have.lengthOf(0) expect(res1.body).to.not.have.lengthOf(0)