A platform for community discussion. Free, open, simple.
MT: Fix upload import issues (#39703)
Gerhard Schlager67664f44a6fd
diff --git a/script/bulk_import/uploads_importer.rb b/script/bulk_import/uploads_importer.rbindex de1d8f355cc..4b8eaa8d929 100644--- a/script/bulk_import/uploads_importer.rb+++ b/script/bulk_import/uploads_importer.rb@@ -433,7 +433,9 @@ module BulkImport(Etc.nprocessors * @settings[:thread_count_factor] * 2).to_i.times do |index|consumer_threads << Thread.new doThread.current.name = "worker-#{index}"- fake_upload = OpenStruct.new(url: "")+ fake_upload =+ OpenStruct.new(url: "", secure?: SiteSetting.secure_uploads, optimized_images: [])+ external_store = store.external?while (row = queue.pop)beginupload = JSON.parse(row["upload"])@@ -441,13 +443,14 @@ module BulkImportpath = add_multisite_prefix(store.get_path_for_upload(fake_upload))file_exists =- if store.external?+ if external_storestore.object_from_path(path).exists?elseFile.exist?(File.join(store.public_dir, path))endif file_exists+ store.update_upload_access_control(fake_upload) if external_storestatus_queue << { id: row["id"], upload_id: upload["id"], status: :ok }elsestatus_queue << { id: row["id"], upload_id: upload["id"], status: :missing }@@ -486,10 +489,10 @@ module BulkImportinit_threads << Thread.new dosql = <<~SQL- SELECT upload_ids- FROM posts- WHERE upload_ids IS NOT NULL- SQL+ SELECT upload_ids+ FROM posts+ WHERE upload_ids IS NOT NULL+ SQLquery(sql, @source_db).tap do |result_set|result_set.each do |row|JSON.parse(row["upload_ids"]).each { |id| post_upload_ids << id }@@ -500,10 +503,10 @@ module BulkImportinit_threads << Thread.new dosql = <<~SQL- SELECT avatar_upload_id- FROM users- WHERE avatar_upload_id IS NOT NULL- SQL+ SELECT avatar_upload_id+ FROM users+ WHERE avatar_upload_id IS NOT NULL+ SQLquery(sql, @source_db).tap do |result_set|result_set.each { |row| avatar_upload_ids << row["avatar_upload_id"] }result_set.close@@ -765,6 +768,9 @@ module BulkImportSiteSetting.authorized_extensions = settings[:authorized_extensions]SiteSetting.max_attachment_size_kb = settings[:max_attachment_size_kb]SiteSetting.max_image_size_kb = settings[:max_image_size_kb]+ SiteSetting.max_image_megapixels = settings[:max_image_megapixels]+ SiteSetting.secure_uploads = settings[:secure_uploads]+ SiteSetting.s3_enable_access_control_tags = settings[:s3_enable_access_control_tags]if settings[:multisite]Rails.configuration.multisite = truediff --git a/script/bulk_import/uploads_importer.yml b/script/bulk_import/uploads_importer.ymlindex 55401826e9e..86eea10b042 100644--- a/script/bulk_import/uploads_importer.yml+++ b/script/bulk_import/uploads_importer.yml@@ -35,8 +35,11 @@ create_optimized_images: falsesite_settings:authorized_extensions: "*"- max_attachment_size_kb: 102_400+ max_attachment_size_kb: 512_000max_image_size_kb: 102_400+ max_image_megapixels: 150+ secure_uploads: false+ s3_enable_access_control_tags: trueenable_s3_uploads: trues3_upload_bucket: "your-bucket-name"