From 2a7490149c572833bd4cedd230bf978458ca3bc5 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 18 Aug 2020 17:55:35 +1000
Subject: [PATCH] DEV: don't fail if in uploads:fix_missing_s3 when fix fails

Previously a single error on a file like invalid extension could fail the
entire rake task
---
 lib/tasks/uploads.rake | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index 2fa4a110e20..c1ae8d88b49 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -1083,23 +1083,32 @@ def fix_missing_s3
       puts "Successfully downloaded upload id: #{upload.id} - #{upload.url} fixing upload"
 
       fixed_upload = nil
+      fix_error = nil
       Upload.transaction do
-        upload.update!(sha1: SecureRandom.hex)
-        fixed_upload = UploadCreator.new(tempfile, "temp.#{upload.extension}").create_for(Discourse.system_user.id)
+        begin
+          upload.update!(sha1: SecureRandom.hex)
+          fixed_upload = UploadCreator.new(tempfile, "temp.#{upload.extension}").create_for(Discourse.system_user.id)
+        rescue => fix_error
+          # invalid extension is the most common issue
+        end
         raise ActiveRecord::Rollback
       end
 
-      # we do not fix sha, it may be wrong for arbitrary reasons, if we correct it
-      # we may end up breaking posts
-      upload.update!(etag: fixed_upload.etag, url: fixed_upload.url, verified: nil)
+      if fix_error
+        puts "Failed to fix upload #{e}"
+      else
+        # we do not fix sha, it may be wrong for arbitrary reasons, if we correct it
+        # we may end up breaking posts
+        upload.update!(etag: fixed_upload.etag, url: fixed_upload.url, verified: nil)
 
-      OptimizedImage.where(upload_id: upload.id).destroy_all
-      rebake_ids = PostUpload.where(upload_id: upload.id).pluck(:post_id)
+        OptimizedImage.where(upload_id: upload.id).destroy_all
+        rebake_ids = PostUpload.where(upload_id: upload.id).pluck(:post_id)
 
-      if rebake_ids.present?
-        Post.where(id: rebake_ids).each do |post|
-          puts "rebake post #{post.id}"
-          post.rebake!
+        if rebake_ids.present?
+          Post.where(id: rebake_ids).each do |post|
+            puts "rebake post #{post.id}"
+            post.rebake!
+          end
         end
       end
     end