about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-06-30 16:10:43 +0200
committerGitHub <noreply@github.com>2019-06-30 16:10:43 +0200
commit06424786a140e03fcb899232c3c418b7eaf26d5e (patch)
treef81f9bb09bda9bdf5afe37b11ff5c9266e888967
parentf895bf198470c1d4a0299b454433fdf1c35ee2b0 (diff)
Fix support for MP4 files that are actually M4V files (#11210)
Resolve #11187
-rw-r--r--app/models/concerns/attachmentable.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb
index 24f5968de..7c78bb456 100644
--- a/app/models/concerns/attachmentable.rb
+++ b/app/models/concerns/attachmentable.rb
@@ -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