From 06424786a140e03fcb899232c3c418b7eaf26d5e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 30 Jun 2019 16:10:43 +0200
Subject: [PATCH] Fix support for MP4 files that are actually M4V files
(#11210)
Resolve #11187
---
app/models/concerns/attachmentable.rb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb
index 24f5968de4..7c78bb4569 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
--
GitLab