1
0
mirror of https://github.com/mastodon/mastodon synced 2024-11-23 14:46:18 +09:00

Improve handling of libvips failures (#30597)

This commit is contained in:
Claire 2024-06-07 17:39:41 +02:00 committed by GitHub
parent 80cd001e0a
commit 82be5d033f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 1 deletions

View File

@ -12,6 +12,8 @@ module Paperclip
attachment.instance.blurhash = Blurhash.encode(width, height, data, **(options[:blurhash] || {}))
@file
rescue Vips::Error => e
raise Paperclip::Error, "Error while generating blurhash for #{@basename}: #{e}"
end
private

View File

@ -69,6 +69,8 @@ module Paperclip
attachment.instance.file.instance_write(:meta, (attachment.instance.file.instance_read(:meta) || {}).merge(meta))
@file
rescue Vips::Error => e
raise Paperclip::Error, "Error while extracting colors for #{@basename}: #{e}"
end
private

View File

@ -68,7 +68,7 @@ module Paperclip
end
dst
rescue Terrapin::ExitStatusError => e
rescue Vips::Error, Terrapin::ExitStatusError => e
raise Paperclip::Error, "Error while optimizing #{@basename}: #{e}"
rescue Terrapin::CommandNotFoundError
raise Paperclip::Errors::CommandNotFoundError, 'Could not run the `ffmpeg` command. Please install ffmpeg.'