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

better error handling for upload extension fixer

Browse Source
This commit is contained in:
Sam 2018-08-10 11:28:05 +10:00
parent 0451dba27a
commit 1fc2597626
2 changed files with 64 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tasks/uploads.rake
View File

@ -713,5 +713,5 @@ end
task "uploads:fix_incorrect_extensions" => :environment do
require_dependency "upload_fixer"
UploadFixer.fix_extensions
UploadFixer.fix_all_extensions
end

118
lib/upload_fixer.rb
View File

@ -1,73 +1,81 @@
class UploadFixer
def self.fix_extensions
def self.fix_all_extensions
Upload.where("uploads.extension IS NOT NULL").find_each do |upload|
is_external = Discourse.store.external?
previous_url = upload.url.dup
fix_extension_on_upload(upload)
end
end
def self.fix_extension_on_upload(upload)
is_external = Discourse.store.external?
previous_url = upload.url.dup
source =
if is_external
"https:#{previous_url}"
else
Discourse.store.path_for(upload)
end
correct_extension = FastImage.type(source).to_s.downcase
current_extension = upload.extension.to_s.downcase
if correct_extension.present?
correct_extension = 'jpg' if correct_extension == 'jpeg'
current_extension = 'jpg' if current_extension == 'jpeg'
if correct_extension != current_extension
new_filename = change_extension(
upload.original_filename,
correct_extension
)
new_url = change_extension(previous_url, correct_extension)
source =
if is_external
"https:#{previous_url}"
else
Discourse.store.path_for(upload)
end
new_url = "/#{new_url}"
source = Discourse.store.get_path_for_upload(upload)
destination = change_extension(source, correct_extension)
correct_extension = FastImage.type(source).to_s.downcase
current_extension = upload.extension.to_s.downcase
if correct_extension.present?
correct_extension = 'jpg' if correct_extension == 'jpeg'
current_extension = 'jpg' if current_extension == 'jpeg'
if correct_extension != current_extension
new_filename = change_extension(
upload.original_filename,
correct_extension
Discourse.store.copy_file(
previous_url,
source,
destination
)
new_url = change_extension(previous_url, correct_extension)
upload.update!(
original_filename: new_filename,
url: new_url,
extension: correct_extension
)
if is_external
new_url = "/#{new_url}"
source = Discourse.store.get_path_for_upload(upload)
destination = change_extension(source, correct_extension)
DbHelper.remap(previous_url, upload.url)
Discourse.store.remove_file(previous_url, source)
else
destination = change_extension(source, correct_extension)
FileUtils.copy(source, destination)
Discourse.store.copy_file(
previous_url,
source,
destination
)
upload.update!(
original_filename: new_filename,
url: new_url,
extension: correct_extension
)
upload.update!(
original_filename: new_filename,
url: new_url,
extension: correct_extension
)
DbHelper.remap(previous_url, upload.url)
DbHelper.remap(previous_url, upload.url)
Discourse.store.remove_file(previous_url, source)
else
destination = change_extension(source, correct_extension)
FileUtils.copy(source, destination)
tombstone_path = source.sub("/uploads/", "/uploads/tombstone/")
FileUtils.mkdir_p(File.dirname(tombstone_path))
upload.update!(
original_filename: new_filename,
url: new_url,
extension: correct_extension
)
DbHelper.remap(previous_url, upload.url)
tombstone_path = source.sub("/uploads/", "/uploads/tombstone/")
FileUtils.mkdir_p(File.dirname(tombstone_path))
FileUtils.move(
source,
tombstone_path
)
end
FileUtils.move(
source,
tombstone_path
)
end
end
end
rescue => e
STDERR.puts "Skipping upload: ailed to correct extension on upload id: #{upload.id} #{current_extension} => #{correct_extension}"
STDERR.puts e
end
private