diff options
| author | Reverite <github@reverite.sh> | 2019-07-07 16:25:42 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-07-07 16:25:42 -0700 |
| commit | 7d99f12fd03cf2f861d0747c3bbcd4a8cf454d99 (patch) | |
| tree | 7b166c33fefb4bf3cc6f6dee46f5883f7428d80a /app/models/concerns/attachmentable.rb | |
| parent | 100bb17b1317f07c0eaa89da869f960b6cff611f (diff) | |
| parent | fce885f271f8651702d606406e21677280071e40 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/models/concerns/attachmentable.rb')
| -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 |