scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-09 00:49:07 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6385 from okriuchykhin/ok_SCI_9461

Browse source 
Fix file preview generation in projects export jobs [SCI-9461]
This commit is contained in:
Alex Kriuchykhin 2023-10-09 10:17:25 +02:00 committed by GitHub
commit 8e420181ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/jobs/team_zip_export_job.rb
View file

@ -194,13 +194,17 @@ class TeamZipExportJob < ZipExportJob
file_data = preview.image.download file_data = preview.image.download
else else
file_name = preview.blob.filename.to_s file_name = preview.blob.filename.to_s
file_data = nil
begin ActiveRecord::Base.transaction(requires_new: true) do
file_data = preview.processed.service.download(preview.key) file_data = preview.processed.service.download(preview.key)
# handle files not processable by Vips (no preview available) or missing # handle files not processable by Vips (no preview available) or missing
rescue Vips::Error, ActiveStorage::FileNotFoundError rescue Vips::Error, ActiveStorage::FileNotFoundError => e
return nil Rails.logger.error(e.message)
Rails.logger.error(e.backtrace.join("\n"))
raise ActiveRecord::Rollback
end end
return nil if file_data.blank?
end end
{ {