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 recovering images using 'upload://' scheme

Browse Source
This commit is contained in:
Régis Hanol 2018-01-19 15:40:17 +01:00
parent bd5a82cfe7
commit 2d49250107
1 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
lib/tasks/uploads.rake
View File

@ -412,50 +412,65 @@ def recover_from_tombstone
original_setting = SiteSetting.max_image_size_kb original_setting = SiteSetting.max_image_size_kb
SiteSetting.max_image_size_kb = 10240 SiteSetting.max_image_size_kb = 10240
current_db = RailsMultisite::ConnectionManagement.current_db current_db = RailsMultisite::ConnectionManagement.current_db
public_path = Rails.root.join("public") public_path = Rails.root.join("public")
paths = Dir.glob(File.join(public_path, 'uploads', 'tombstone', current_db, '**', '*.*')) paths = Dir.glob(File.join(public_path, 'uploads', 'tombstone', current_db, '**', '*.*'))
max = paths.length max = paths.size
paths.each_with_index do |path, index| paths.each_with_index do |path, index|
filename = File.basename(path) filename = File.basename(path)
printf("%9d / %d (%5.1f%%)\n", (index + 1), max, (((index + 1).to_f / max.to_f) * 100).round(1)) printf("%9d / %d (%5.1f%%)\n", (index + 1), max, (((index + 1).to_f / max.to_f) * 100).round(1))
Post.where("raw LIKE ?", "%#{filename}%").each do |post| Post.where("raw LIKE ?", "%#{filename}%").find_each do |post|
doc = Nokogiri::HTML::fragment(post.raw) doc = Nokogiri::HTML::fragment(post.raw)
updated = false updated = false
doc.css("img[src]").each do |img| doc.css("img[src]").each do |img|
url = img["src"] url = img["src"]
next unless url =~ /^\/uploads\// next if !url.start_with?("/uploads/")
next if Upload.exists?(url: url)
upload = Upload.find_by(url: url) puts "Restoring #{path}..."
tombstone_path = File.join(public_path, 'uploads', 'tombstone', url.gsub(/^\/uploads\//, ""))
if !upload && url if File.exists?(tombstone_path)
printf "Restoring #{path}..." File.open(tombstone_path) do |file|
tombstone_path = File.join(public_path, 'uploads', 'tombstone', url.gsub(/^\/uploads\//, "")) new_upload = UploadCreator.new(file, File.basename(url)).create_for(Discourse::SYSTEM_USER_ID)
if File.exists?(tombstone_path) if new_upload.persisted?
File.open(tombstone_path) do |file| puts "Restored into #{new_upload.url}"
new_upload = UploadCreator.new(file, File.basename(url)).create_for(Discourse::SYSTEM_USER_ID) DbHelper.remap(url, new_upload.url)
updated = true
if new_upload.persisted? else
printf "Restored into #{new_upload.url}\n" puts "Failed to create upload for #{url}: #{new_upload.errors.full_messages}."
DbHelper.remap(url, new_upload.url)
updated = true
else
puts "Failed to create upload for #{url}: #{new_upload.errors.full_messages}."
end
end end
else
puts "Failed to find file (#{tombstone_path}) in tombstone."
end end
else
puts "Failed to find file (#{tombstone_path}) in tombstone."
end end
end end
post.rebake! if updated post.rebake! if updated
end end
sha1 = File.basename(filename, File.extname(filename))
short_url = "upload://#{Base62.encode(sha1.hex)}"
Post.where("raw LIKE ?", "%#{short_url}%").find_each do |post|
puts "Restoring #{path}..."
File.open(path) do |file|
new_upload = UploadCreator.new(file, filename).create_for(Discourse::SYSTEM_USER_ID)
if new_upload.persisted?
puts "Restored into #{new_upload.short_url}"
DbHelper.remap(short_url, new_upload.short_url) if short_url != new_upload.short_url
post.rebake!
else
puts "Failed to create upload for #{filename}: #{new_upload.errors.full_messages}."
end
end
end
end end
ensure ensure
SiteSetting.max_image_size_kb = original_setting SiteSetting.max_image_size_kb = original_setting