diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-07-04 16:21:39 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-07-04 16:21:39 +0200 |
| commit | 6ab84c12a7ebc68fb8ce9a6b8228b28ec06a2c0f (patch) | |
| tree | 0f023e22bcb1ae01ce3fb4e43b771609493e4e65 /app/models/concerns | |
| parent | c94966891af1ff456c6382595c07c2d68c57ec49 (diff) | |
| parent | 99924f282f53593e670c70a38450a1c0e2d24c20 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/attachmentable.rb | 4 |
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 |