From 10fbb07e1aaf306494aa8464a32bf391dd2bee16 Mon Sep 17 00:00:00 2001
From: Rishabh <rishabh.nambiar@discourse.org>
Date: Tue, 15 Jan 2019 15:23:55 +0530
Subject: [PATCH] FIX: include folder name in prefix for listing files on S3
 (follow-up on 3ec38f5a)

Fix the destination url in remap since it's already a part of s3_base_url
---
 lib/tasks/uploads.rake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index 106332794aa..c7b72e203ae 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -275,7 +275,7 @@ def migrate_to_s3
 
   s3_objects = []
   prefix = Rails.configuration.multisite ? "#{db}/original/" : "original/"
-  options = { bucket: bucket, prefix: prefix }
+  options = { bucket: bucket, prefix: prefix + folder }
 
   loop do
     response = s3.list_objects_v2(options)
@@ -347,7 +347,7 @@ def migrate_to_s3
     }
 
     from = "/uploads/#{db}/original/(\\dX/(?:[a-f0-9]/)*[a-f0-9]{40}[a-z0-9\\.]*)"
-    to = "#{SiteSetting.Upload.s3_base_url}/#{folder}#{prefix}\\1"
+    to = "#{SiteSetting.Upload.s3_base_url}/#{prefix}\\1"
 
     if dry_run
       puts "REPLACING '#{from}' WITH '#{to}'"