codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 23:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Failed file upload shouldn't crash phpBB3 importer

Browse source
This commit is contained in:
Gerhard Schlager 2016-01-13 22:46:03 +01:00
parent 166c56ee0d
commit bed9135f40
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
script/import_scripts/phpbb3/importers/attachment_importer.rb
View file

@ -22,7 +22,7 @@ module ImportScripts::PhpBB3
filename = CGI.unescapeHTML(row[:real_filename]) filename = CGI.unescapeHTML(row[:real_filename])
upload = @uploader.create_upload(user_id, path, filename) upload = @uploader.create_upload(user_id, path, filename)
if upload.nil? || !upload.valid? if upload.nil? || !upload.persisted?
puts "Failed to upload #{path}" puts "Failed to upload #{path}"
puts upload.errors.inspect if upload puts upload.errors.inspect if upload
else else

5
script/import_scripts/phpbb3/importers/avatar_importer.rb
View file

@ -24,14 +24,15 @@ module ImportScripts::PhpBB3
filename = "avatar#{File.extname(path)}" filename = "avatar#{File.extname(path)}"
upload = @uploader.create_upload(user.id, path, filename) upload = @uploader.create_upload(user.id, path, filename)
if upload.persisted? if upload.present? && upload.persisted?
user.import_mode = false user.import_mode = false
user.create_user_avatar user.create_user_avatar
user.import_mode = true user.import_mode = true
user.user_avatar.update(custom_upload_id: upload.id) user.user_avatar.update(custom_upload_id: upload.id)
user.update(uploaded_avatar_id: upload.id) user.update(uploaded_avatar_id: upload.id)
else else
Rails.logger.error("Could not persist avatar for user #{user.username}") puts "Failed to upload avatar for user #{user.username}: #{path}"
puts upload.errors.inspect if upload
end end
rescue SystemCallError => err rescue SystemCallError => err
Rails.logger.error("Could not import avatar for user #{user.username}: #{err.message}") Rails.logger.error("Could not import avatar for user #{user.username}: #{err.message}")

2
script/import_scripts/phpbb3/support/smiley_processor.rb
View file

@ -65,7 +65,7 @@ module ImportScripts::PhpBB3
filename = File.basename(path) filename = File.basename(path)
upload = @uploader.create_upload(Discourse::SYSTEM_USER_ID, path, filename) upload = @uploader.create_upload(Discourse::SYSTEM_USER_ID, path, filename)
if upload.nil? || !upload.valid? if upload.nil? || !upload.persisted?
puts "Failed to upload #{path}" puts "Failed to upload #{path}"
puts upload.errors.inspect if upload puts upload.errors.inspect if upload
html = nil html = nil