IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: support amazon S3 upload urls in discourse_merger.rb

Browse Source
This commit is contained in:
Neil Lalonde 2018-07-13 16:10:24 -04:00
parent 1ad358fa0a
commit 8d11df6971
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
script/bulk_import/discourse_merger.rb
View File

@ -285,7 +285,9 @@ class BulkImport::DiscourseMerger < BulkImport::Base
source_raw_connection.exec("SELECT * FROM uploads").each do |row| source_raw_connection.exec("SELECT * FROM uploads").each do |row|
user_id = row['user_id'].to_i user_id = row['user_id'].to_i
user_id = user_id_from_imported_id(user_id) if user_id > 0 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 '.' print '.'
next unless File.exists?(absolute_filename) next unless File.exists?(absolute_filename)