Browse Source

Fix support for MP4 files that are actually M4V files (#11210)

Resolve #11187
master
Eugen Rochko 5 years ago
committed by GitHub
parent
commit
06424786a1
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      app/models/concerns/attachmentable.rb

+ 3
- 1
app/models/concerns/attachmentable.rb View File

@ -60,7 +60,9 @@ module Attachmentable
end
def calculated_content_type(attachment)
Paperclip.run('file', '-b --mime :file', file: attachment.queued_for_write[:original].path).split(/[:;\s]+/).first.chomp
content_type = Paperclip.run('file', '-b --mime :file', file: attachment.queued_for_write[:original].path).split(/[:;\s]+/).first.chomp
content_type = 'video/mp4' if content_type == 'video/x-m4v'
content_type
rescue Terrapin::CommandLineError
''
end

Loading…
Cancel
Save