nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

We may no longer have a file for an unprocessed photo

Browse source
This commit is contained in:
Jonne Haß 2015-03-06 00:52:17 +01:00
parent e7b92c15e2
commit c2dab008ab
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/models/user.rb
View file

@ -328,9 +328,14 @@ class User < ActiveRecord::Base
Zip::ZipOutputStream.open(temp_zip.path) do |zos|
photos.each do |photo|
begin
photo_data = photo.unprocessed_image.file.read
zos.put_next_entry(photo.remote_photo_name)
zos.print(photo_data)
photo_file = photo.unprocessed_image.file
if photo_file
photo_data = photo_file.read
zos.put_next_entry(photo.remote_photo_name)
zos.print(photo_data)
else
logger.info "Export photos error: No file for #{photo.remote_photo_name} not found"
end
rescue Errno::ENOENT
logger.info "Export photos error: #{photo.unprocessed_image.file.path} not found"
end
@ -347,7 +352,7 @@ class User < ActiveRecord::Base
update exporting_photos: false
end
end
######### Mailer #######################
def mail(job, *args)
pref = job.to_s.gsub('Workers::Mail::', '').underscore