diff options
author | Reverite <github@reverite.sh> | 2019-05-06 18:17:05 -0700 |
---|---|---|
committer | Reverite <github@reverite.sh> | 2019-05-06 18:17:05 -0700 |
commit | 5b85256b334b13fad26a2bc073a874750a3cdc2e (patch) | |
tree | 2d523aa8266e42ae31ab82c7fc2533cf4a90ff0d /lib/paperclip/audio_transcoder.rb | |
parent | e10a9794f4ed7c90e3190f285359f55dd00da435 (diff) | |
parent | 89d2859296bc5a57a8db07be86239cc938a3f691 (diff) |
Merge remote-tracking branch 'glitch/master' into production
Diffstat (limited to 'lib/paperclip/audio_transcoder.rb')
-rw-r--r-- | lib/paperclip/audio_transcoder.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/paperclip/audio_transcoder.rb b/lib/paperclip/audio_transcoder.rb index 631ccb0be..323ec7bfe 100644 --- a/lib/paperclip/audio_transcoder.rb +++ b/lib/paperclip/audio_transcoder.rb @@ -3,10 +3,12 @@ module Paperclip class AudioTranscoder < Paperclip::Processor def make + max_aud_len = (ENV['MAX_AUDIO_LENGTH'] || 60.0).to_f + meta = ::Av.cli.identify(@file.path) # {:length=>"0:00:02.14", :duration=>2.14, :audio_encode=>"mp3", :audio_bitrate=>"44100 Hz", :audio_channels=>"mono"} - if meta[:duration] > 60.0 - raise Mastodon::ValidationError, "Audio uploads must be less than 60 seconds in length." + if meta[:duration] > max_aud_len + raise Mastodon::ValidationError, "Audio uploads must be less than #{max_aud_len} seconds in length." end final_file = Paperclip::Transcoder.make(file, options, attachment) |