Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Framasoft
PeerTube
PeerTube
Commits
20373985
Verified
Commit
20373985
authored
Apr 08, 2021
by
Chocobozzz
Browse files
Fix static ffmpeg version check
parent
75cba40d
Changes
2
Hide whitespace changes
Inline
Side-by-side
server/helpers/ffmpeg-utils.ts
View file @
20373985
...
...
@@ -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
])
...
...
server/tests/cli/regenerate-thumbnails.ts
View file @
20373985
...
...
@@ -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 thumb
b
nails
'
,
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
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment