diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2020-04-06 14:11:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-06 14:11:22 +0200 |
| commit | 0773a512ac5019663545992a3300ae7ca0974876 (patch) | |
| tree | 0a45850f3e1e49d972bcf15f92f32458a56843c7 | |
| parent | 2924cef2f812b2ba74b8cf528f10e0f97c865942 (diff) | |
Fix trying to delete already deleted file when post-processing (#13406)
Fix #13403
| -rw-r--r-- | app/workers/post_process_media_worker.rb | 2 | ||||
| -rw-r--r-- | lib/paperclip/attachment_extensions.rb | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/app/workers/post_process_media_worker.rb b/app/workers/post_process_media_worker.rb index d3ebda194..148ae5e2b 100644 --- a/app/workers/post_process_media_worker.rb +++ b/app/workers/post_process_media_worker.rb @@ -25,7 +25,7 @@ class PostProcessMediaWorker media_attachment = MediaAttachment.find(media_attachment_id) media_attachment.processing = :in_progress media_attachment.save - media_attachment.file.reprocess_original! + media_attachment.file.reprocess!(:original) media_attachment.processing = :complete media_attachment.save rescue ActiveRecord::RecordNotFound diff --git a/lib/paperclip/attachment_extensions.rb b/lib/paperclip/attachment_extensions.rb index d9ec0159a..ce5780557 100644 --- a/lib/paperclip/attachment_extensions.rb +++ b/lib/paperclip/attachment_extensions.rb @@ -14,17 +14,6 @@ module Paperclip 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 - def variant?(other_filename) return true if original_filename == other_filename return false if original_filename.nil? |