forked from fedi/mastodon
a7171af0a3
* Fix avatar and header issues by using custom geometry detector Revert a part of #6508. The file passed to dynamic styles method was not actually a file, but an instance of Paperclip::Attachment, which broke all styles by always returning {} from the method. One problem with GIF avatars was that Paperclip::GeometryDetector reported wrong dimensions for them, e.g. 120x120 GIF avatar would for some reason be detected as 120x53. By writing our own geometry parser, we can use FastImage, which also happens to be faster than ImageMagick, to detect image dimensions, which are also correct. Unfortunately, this PR does not implement skipping a `convert` entirely if the dimensions are already correct, as I found no easy way to write that behaviour into Paperclip without rewriting the Paperclip::Thumbnail class. * Only invoke convert if dimension or format needs to be changed
25 lines
602 B
Ruby
25 lines
602 B
Ruby
# frozen_string_literal: true
|
|
|
|
module Paperclip
|
|
class LazyThumbnail < Paperclip::Thumbnail
|
|
def make
|
|
return @file unless needs_convert?
|
|
Paperclip::Thumbnail.make(file, options, attachment)
|
|
end
|
|
|
|
private
|
|
|
|
def needs_convert?
|
|
needs_different_geometry? || needs_different_format?
|
|
end
|
|
|
|
def needs_different_geometry?
|
|
!@target_geometry.nil? && @current_geometry.width != @target_geometry.width && @current_geometry.height != @target_geometry.height
|
|
end
|
|
|
|
def needs_different_format?
|
|
@format.present? && @current_format != @format
|
|
end
|
|
end
|
|
end
|