Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-07 12:02:53 +08:00
Code Packages Activity Actions 5

FIX: Use ImageMagick to detect animated images (#11702)

Browse source 
This is a fallback when FastImage cannot be used (animated WEBP images).
This commit is contained in:
Bianca Nenciu 2021-01-13 19:01:30 +02:00 • committed by GitHub
parent 26337408a9
commit 74b95c88ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 47 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

34
lib/upload_creator.rb
View file

@ -126,7 +126,7 @@ class UploadCreator
if is_image
@upload.thumbnail_width, @upload.thumbnail_height = ImageSizer.resize(*@image_info.size)
@upload.width, @upload.height = @image_info.size
@upload.animated = FastImage.animated?(@file)
@upload.animated = animated?
end
add_metadata!
@ -267,13 +267,13 @@ class UploadCreator
end
def should_alter_quality?
return false if FastImage.animated?(@file)
return false if animated?
@upload.target_image_quality(@file.path, SiteSetting.recompress_original_jpg_quality).present?
end
def should_downsize?
max_image_size > 0 && filesize >= max_image_size && !FastImage.animated?(@file)
max_image_size > 0 && filesize >= max_image_size && !animated?
end
def downsize!
@ -351,7 +351,7 @@ class UploadCreator
end
def should_crop?
return false if ['profile_background', 'card_background', 'custom_emoji'].include?(@opts[:type]) && FastImage.animated?(@file)
return false if ['profile_background', 'card_background', 'custom_emoji'].include?(@opts[:type]) && animated?
TYPES_TO_CROP.include?(@opts[:type])
end
@ -427,4 +427,30 @@ class UploadCreator
@upload.secure = UploadSecurity.new(@upload, @opts).should_be_secure?
end
private
def animated?
return @animated if @animated != nil
@animated ||= begin
is_animated = FastImage.animated?(@file)
type = @image_info.type.to_s
if is_animated != nil
# FastImage will return nil if it cannot determine if animated
is_animated
elsif type == "gif" || type == "webp"
# Only GIFs, WEBPs and a few other unsupported image types can be animated
OptimizedImage.ensure_safe_paths!(@file.path)
command = ["identify", "-format", "%n\\n", @file.path]
frames = Discourse::Utils.execute_command(*command).to_i rescue 1
frames > 1
else
false
end
end
end
end