-
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: handle git installation of ffmpeg #5917
fix: handle git installation of ffmpeg #5917
Conversation
shared/ffmpeg/ffmpeg-version.ts
Outdated
|
||
// Fix ffmpeg version that does not include patch version (4.4 for example) | ||
let version = parsed[1] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a heads-up, I don't think this check was ever working properly.
The promise here wasn't being resolved, so the caller was probably just await
ing forever when the version was parsed successfully.
It just looked like everything was running smoothly, since the #checkFFmpegVersion
method was a non-blocking call.
5474e22
to
7a34093
Compare
server/tests/helpers/core-utils.ts
Outdated
}) | ||
|
||
it('Should parse FFmpeg version from GitHub dev release', function () { | ||
const actual = parseSemVersion('5.1.git') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I actually compiled and installed n6.1-dev, which showed this version string.
Not sure if that's a typo or what, but a bit odd that the tag and version name don't match up. 🤔
Hmm, seems to me the failing test isn't related to this PR. From my local machine:
|
7a34093
to
9247c18
Compare
Thanks! |
Description
Resolves the error that occurred when using an unconventional distribution of FFmpeg with a non-standard version string. For example, compiled from source, or a third-party fork.
#getFFmpegVersion
returns the full version string of the FFmpeg now, regardless of format.#parseSemVersion
returnsnull
if the string is not a semantic version string.#parseSemVersion
handles normalization, such as if the patch segment is missing.#parseSemVersion
returnsnull
), then we log a warning that we can't check compatibility.Related issues
Has this been tested?