better error handling for upload extension fixer

lib/tasks/uploads.rake

@@ -713,5 +713,5 @@ end
 
 task "uploads:fix_incorrect_extensions" => :environment do
   require_dependency "upload_fixer"
-  UploadFixer.fix_extensions
+  UploadFixer.fix_all_extensions
 end

lib/upload_fixer.rb

@@ -1,73 +1,81 @@
 class UploadFixer
-  def self.fix_extensions
+  def self.fix_all_extensions
     Upload.where("uploads.extension IS NOT NULL").find_each do |upload|
-      is_external = Discourse.store.external?
+      fix_extension_on_upload(upload)
-      previous_url = upload.url.dup
+    end
+  end
+
+  def self.fix_extension_on_upload(upload)
+    is_external = Discourse.store.external?
+    previous_url = upload.url.dup
+
+    source =
+      if is_external
+        "https:#{previous_url}"
+      else
+        Discourse.store.path_for(upload)
+      end
+
+    correct_extension = FastImage.type(source).to_s.downcase
+    current_extension = upload.extension.to_s.downcase
+
+    if correct_extension.present?
+      correct_extension = 'jpg' if correct_extension == 'jpeg'
+      current_extension = 'jpg' if current_extension == 'jpeg'
+
+      if correct_extension != current_extension
+        new_filename = change_extension(
+          upload.original_filename,
+          correct_extension
+        )
+
+        new_url = change_extension(previous_url, correct_extension)
 
-      source =
         if is_external
-          "https:#{previous_url}"
+          new_url = "/#{new_url}"
-        else
+          source = Discourse.store.get_path_for_upload(upload)
-          Discourse.store.path_for(upload)
+          destination = change_extension(source, correct_extension)
-        end
 
-      correct_extension = FastImage.type(source).to_s.downcase
+          Discourse.store.copy_file(
-      current_extension = upload.extension.to_s.downcase
+            previous_url,
-
+            source,
-      if correct_extension.present?
+            destination
-        correct_extension = 'jpg' if correct_extension == 'jpeg'
-        current_extension = 'jpg' if current_extension == 'jpeg'
-
-        if correct_extension != current_extension
-          new_filename = change_extension(
-            upload.original_filename,
-            correct_extension
           )
 
-          new_url = change_extension(previous_url, correct_extension)
+          upload.update!(
+            original_filename: new_filename,
+            url: new_url,
+            extension: correct_extension
+          )
 
-          if is_external
+          DbHelper.remap(previous_url, upload.url)
-            new_url = "/#{new_url}"
+          Discourse.store.remove_file(previous_url, source)
-            source = Discourse.store.get_path_for_upload(upload)
+        else
-            destination = change_extension(source, correct_extension)
+          destination = change_extension(source, correct_extension)
+          FileUtils.copy(source, destination)
 
-            Discourse.store.copy_file(
+          upload.update!(
-              previous_url,
+            original_filename: new_filename,
-              source,
+            url: new_url,
-              destination
+            extension: correct_extension
-            )
+          )
 
-            upload.update!(
+          DbHelper.remap(previous_url, upload.url)
-              original_filename: new_filename,
-              url: new_url,
-              extension: correct_extension
-            )
 
-            DbHelper.remap(previous_url, upload.url)
+          tombstone_path = source.sub("/uploads/", "/uploads/tombstone/")
-            Discourse.store.remove_file(previous_url, source)
+          FileUtils.mkdir_p(File.dirname(tombstone_path))
-          else
-            destination = change_extension(source, correct_extension)
-            FileUtils.copy(source, destination)
 
-            upload.update!(
+          FileUtils.move(
-              original_filename: new_filename,
+            source,
-              url: new_url,
+            tombstone_path
-              extension: correct_extension
+          )
-            )
-
-            DbHelper.remap(previous_url, upload.url)
-
-            tombstone_path = source.sub("/uploads/", "/uploads/tombstone/")
-            FileUtils.mkdir_p(File.dirname(tombstone_path))
-
-            FileUtils.move(
-              source,
-              tombstone_path
-            )
-          end
         end
+
       end
     end
+  rescue => e
+    STDERR.puts "Skipping upload: ailed to correct extension on upload id: #{upload.id} #{current_extension} => #{correct_extension}"
+    STDERR.puts e
   end
 
   private