tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust ffmpeg version detection in admin panel (#31130)

Browse Source 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Michael Stanclift 2024-07-26 09:13:56 -05:00 committed by GitHub
parent dfd43869c9
commit b120792f27
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/lib/admin/metrics/dimension/software_versions_dimension.rb
View File

@ -98,7 +98,8 @@ class Admin::Metrics::Dimension::SoftwareVersionsDimension < Admin::Metrics::Dim
end end
def ffmpeg_version def ffmpeg_version
version = `ffmpeg -version`.match(/ffmpeg version ([\d\.]+)/)[1] version_output = Terrapin::CommandLine.new(Rails.configuration.x.ffprobe_binary, '-show_program_version -v 0 -of json').run
version = Oj.load(version_output, mode: :strict, symbol_keys: true).dig(:program_version, :version)
{ {
key: 'ffmpeg', key: 'ffmpeg',
@ -106,7 +107,7 @@ class Admin::Metrics::Dimension::SoftwareVersionsDimension < Admin::Metrics::Dim
value: version, value: version,
human_value: version, human_value: version,
} }
rescue Errno::ENOENT rescue Terrapin::CommandNotFoundError, Terrapin::ExitStatusError, Oj::ParseError
nil nil
end end