diff options
author | ThibG <thib@sitedethib.com> | 2020-03-22 17:59:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-22 17:59:47 +0100 |
commit | d101438b9d1bd827c191605cb21d58f83de2124d (patch) | |
tree | b36d73f45175add7aa114bb42fca5a528a9b24a4 /lib/paperclip/attachment_extensions.rb | |
parent | 7115b0b8c99b7e88aee264be75945e592dec33e4 (diff) | |
parent | 9da4bd098cac88c3e44157765adcff01445ba31a (diff) |
Merge pull request #1305 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib/paperclip/attachment_extensions.rb')
-rw-r--r-- | lib/paperclip/attachment_extensions.rb | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/lib/paperclip/attachment_extensions.rb b/lib/paperclip/attachment_extensions.rb new file mode 100644 index 000000000..3b308af5f --- /dev/null +++ b/lib/paperclip/attachment_extensions.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +module Paperclip + module AttachmentExtensions + # We overwrite this method to support delayed processing in + # Sidekiq. Since we process the original file to reduce disk + # usage, and we still want to generate thumbnails straight + # away, it's the only style we need to exclude + def process_style?(style_name, style_args) + if style_name == :original && instance.respond_to?(:delay_processing?) && instance.delay_processing? + false + else + style_args.empty? || style_args.include?(style_name) + end + end + + def reprocess_original! + old_original_path = path(:original) + reprocess!(:original) + new_original_path = path(:original) + + if new_original_path != old_original_path + @queued_for_delete << old_original_path + flush_deletes + end + end + end +end + +Paperclip::Attachment.prepend(Paperclip::AttachmentExtensions) |