Skip uploading images for users that have a new style avatar

diff --git a/lib/tasks/upgrade_avatars.rake b/lib/tasks/upgrade_avatars.rake
index 03939dad84b7575522e31295bf278d2f5855290a..3316f7e56bf82dde7a7e3d0f462fcf2db9555942 100644 (file)
--- a/lib/tasks/upgrade_avatars.rake
+++ b/lib/tasks/upgrade_avatars.rake
@@ -1,15 +1,17 @@
 namespace "storage" do
   task :upgrade_avatars => :environment do
     User.active.where.not(:image_file_name => nil).in_batches.each_record do |user|
-      io = File.open(user.image.path)
-      filename = user.image.original_filename
-      content_type = if user.image.content_type.nil?
-                       MimeMagic.by_magic(io)&.type
-                     else
-                       user.image.content_type
-                     end
+      unless user.avatar.attached?
+        io = File.open(user.image.path)
+        filename = user.image.original_filename
+        content_type = if user.image.content_type.nil?
+                         MimeMagic.by_magic(io)&.type
+                       else
+                         user.image.content_type
+                       end
 
-      user.avatar.attach(:io => io, :filename => filename, :content_type => content_type)
+        user.avatar.attach(:io => io, :filename => filename, :content_type => content_type)
+      end
     end
   end
 end