github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 11:23:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: skip validation while recovering uploads from s3

Browse Source 
TODO: add tests
This commit is contained in:
Vinoth Kannan 2019-05-16 15:37:11 +05:30
parent 56ada8374f
commit ec84c87ddb
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/s3_inventory.rb
View File

@ -76,7 +76,7 @@ class S3Inventory
def list_missing_post_uploads
log "Listing missing post uploads..."
missing = Post.find_missing_uploads(include_local_upload: false) do |_, _, _, sha1|
missing = Post.find_missing_uploads(include_local_upload: false) do |post, _, _, sha1|
next if sha1.blank?
upload_id = nil
@ -87,14 +87,16 @@ class S3Inventory
data = @s3_helper.object(key).data
filename = (data.content_disposition&.match(/filename=\"(.*)\"/) || [])[1]
upload_id = Upload.create!(
upload = Upload.new(
user_id: Discourse.system_user.id,
original_filename: filename || File.basename(key),
filesize: data.content_length,
url: File.join(Discourse.store.absolute_base_url, key),
sha1: sha1,
etag: result[0]["etag"]
).id
)
upload.save!(validate: false)
upload_id = upload.id
end
upload_id