From ff6a64f0fc710286f5e9919287e89769b1af5329 Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Fri, 8 Sep 2017 17:11:51 -0700
Subject: [PATCH] notify cropper service on upload

---
 app/logical/s3_backup_service.rb | 22 ++++++++++++++--------
 app/models/upload.rb             |  8 ++++++++
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/app/logical/s3_backup_service.rb b/app/logical/s3_backup_service.rb
index 156f7926f..c5ea8432b 100644
--- a/app/logical/s3_backup_service.rb
+++ b/app/logical/s3_backup_service.rb
@@ -8,24 +8,30 @@ class S3BackupService < BackupService
   end
 
   def backup(file_path, type: nil, **options)
-    key = s3_key(file_path, type)
-    upload_to_s3(key, file_path)
+    keys = s3_keys(file_path, type)
+    keys.each do |key|
+      upload_to_s3(key, file_path)
+    end
   end
 
   def delete(file_path, type: nil)
-    key = s3_key(file_path, type)
-    delete_from_s3(key)
+    keys = s3_keys(file_path, type)
+    keys.each do |key|
+      delete_from_s3(key)
+    end
   end
 
 protected
-  def s3_key(file_path, type)
+  def s3_keys(file_path, type)
+    name = File.basename(file_path)
+
     case type
     when :original
-      "#{File.basename(file_path)}"
+      [name]
     when :preview
-      "preview/#{File.basename(file_path)}"
+      ["preview/#{name}", "cropped/small/#{name}", "cropped/large/#{name}"]
     when :large
-      "sample/#{File.basename(file_path)}"
+      ["sample/#{name}"]
     else
       raise ArgumentError.new("Unknown type: #{type}")
     end
diff --git a/app/models/upload.rb b/app/models/upload.rb
index d0b9abd8b..862daf5fb 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -142,6 +142,7 @@ class Upload < ApplicationRecord
         User.where(id: CurrentUser.id).update_all("post_upload_count = post_upload_count + 1")
         create_artist_commentary(post) if include_artist_commentary?
         ugoira_service.save_frame_data(post) if is_ugoira?
+        notify_cropper(post)
         update_attributes(:status => "completed", :post_id => post.id)
       else
         update_attribute(:status, "error: " + post.errors.full_messages.join(", "))
@@ -197,6 +198,13 @@ class Upload < ApplicationRecord
         end
       end
     end
+
+    def notify_cropper(post)
+      if Danbooru.config.aws_sqs_cropper_url && is_image?
+        sqs = SqsService.new(Danbooru.config.aws_sqs_cropper_url)
+        sqs.send_message("#{post.id},https://#{Danbooru.config.hostnames.first}/data/#{post.md5}.#{post.file_ext}")
+      end
+    end
   end
 
   module FileMethods