diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-06-24 14:47:48 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-24 15:02:59 +0200 |
| commit | ddd875ad9940c4c7ef53a31af23cd5fe89fcf0c9 (patch) | |
| tree | 7926abdec378339ee622a1f09b9a52178f4d0600 /lib/paperclip/type_corrector.rb | |
| parent | 38d28824475056766c97385b66f4e04a5123e3a2 (diff) | |
| parent | 66ac1bd063882f5a2f828c1c702089e37f36f217 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/media_attachment.rb Upstream added audio attachment support - app/serializers/initial_state_serializer.rb Upstream added audio attachment support and how mimetypes are returned - app/serializers/rest/instance_serializer.rb Upstream added a few fields - config/application.rb Upstream added a different paperclip transcoder
Diffstat (limited to 'lib/paperclip/type_corrector.rb')
| -rw-r--r-- | lib/paperclip/type_corrector.rb | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/lib/paperclip/type_corrector.rb b/lib/paperclip/type_corrector.rb new file mode 100644 index 000000000..0b0c10a56 --- /dev/null +++ b/lib/paperclip/type_corrector.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +require 'mime/types/columnar' + +module Paperclip + class TypeCorrector < Paperclip::Processor + def make + target_extension = options[:format] + extension = File.extname(attachment.instance.file_file_name) + + return @file unless options[:style] == :original && target_extension && extension != target_extension + + attachment.instance.file_content_type = options[:content_type] || attachment.instance.file_content_type + attachment.instance.file_file_name = File.basename(attachment.instance.file_file_name, '.*') + '.' + target_extension + + @file + end + end +end |