From: Tom Hughes <tom@compton.nu>
Date: Mon, 15 Jul 2019 18:17:01 +0000 (+0100)
Subject: Skip uploading images for users that have a new style avatar
X-Git-Tag: live~2481
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/11c4aa7d73f212d1dfba920e3853b9b6d6cbd197

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 03939dad8..3316f7e56 100644
--- 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