From 8d11df697138e29928b56cadb6c6bc6267947f1c Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Fri, 13 Jul 2018 16:10:24 -0400 Subject: [PATCH] FIX: support amazon S3 upload urls in discourse_merger.rb --- script/bulk_import/discourse_merger.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/script/bulk_import/discourse_merger.rb b/script/bulk_import/discourse_merger.rb index f73dfab5781..295d353b65a 100644 --- a/script/bulk_import/discourse_merger.rb +++ b/script/bulk_import/discourse_merger.rb @@ -285,7 +285,9 @@ class BulkImport::DiscourseMerger < BulkImport::Base source_raw_connection.exec("SELECT * FROM uploads").each do |row| user_id = row['user_id'].to_i user_id = user_id_from_imported_id(user_id) if user_id > 0 - absolute_filename = File.join(@uploads_path, row['url'].gsub(/^\/uploads\/[^\/]+\//, '')) + rel_filename = row['url'].gsub(/^\/uploads\/[^\/]+\//, '') + rel_filename = rel_filename.gsub(/^\/\/[^\/]+\.amazonaws\.com\//, '') + absolute_filename = File.join(@uploads_path, rel_filename) print '.' next unless File.exists?(absolute_filename)