diff options
| author | ThibG <thib@sitedethib.com> | 2020-06-26 16:36:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-26 16:36:55 +0200 |
| commit | 10ede3eb27c5de5d4e3a283e333af2a54da6177d (patch) | |
| tree | 2e88bb2d667a416770a098915d8b3ea16ff9c208 /app/workers | |
| parent | 8f4aff9b6fe638b26b9d0bf0fe4151c2cc214d6d (diff) | |
| parent | de735286cd62acd9d0fbb0dd54c82098cc3a4993 (diff) | |
Merge pull request #1364 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/post_process_media_worker.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/workers/post_process_media_worker.rb b/app/workers/post_process_media_worker.rb index 148ae5e2b..73f9ae2bf 100644 --- a/app/workers/post_process_media_worker.rb +++ b/app/workers/post_process_media_worker.rb @@ -25,8 +25,14 @@ class PostProcessMediaWorker media_attachment = MediaAttachment.find(media_attachment_id) media_attachment.processing = :in_progress media_attachment.save + + # Because paperclip-av-transcover overwrites this attribute + # we will save it here and restore it after reprocess is done + previous_meta = media_attachment.file_meta + media_attachment.file.reprocess!(:original) media_attachment.processing = :complete + media_attachment.file_meta = previous_meta media_attachment.save rescue ActiveRecord::RecordNotFound true |