jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

posts: generate 180x180px and 360x360px thumbnails (#4932).

Browse Source 
Add two new thumbnail sizes. These new thumbnail sizes are generated on
upload, but not used yet.
This commit is contained in:
evazion
2021-12-02 01:59:22 -06:00
parent 9e77ff4948
commit 17537084fe
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/logical/media_file/image.rb
View File

@@ -86,8 +86,8 @@ class MediaFile::Image < MediaFile
resize(w, h, size: :force, **options) resize(w, h, size: :force, **options)
end end
def crop(max_width, max_height) def crop(max_width, max_height, **options)
resize(max_width, max_height, crop: :attention) resize(max_width, max_height, crop: :attention, **options)
end end
def preview_frame def preview_frame

22
app/models/media_asset.rb
View File

@@ -1,6 +1,8 @@
class MediaAsset < ApplicationRecord class MediaAsset < ApplicationRecord
class Error < StandardError; end class Error < StandardError; end
VARIANTS = %i[preview crop 180x180 360x360 sample original]
has_one :media_metadata, dependent: :destroy has_one :media_metadata, dependent: :destroy
has_one :pixiv_ugoira_frame_data, class_name: "PixivUgoiraFrameData", foreign_key: :md5, primary_key: :md5 has_one :pixiv_ugoira_frame_data, class_name: "PixivUgoiraFrameData", foreign_key: :md5, primary_key: :md5
@@ -34,7 +36,7 @@ class MediaAsset < ApplicationRecord
@media_asset = media_asset @media_asset = media_asset
@variant = variant.to_sym @variant = variant.to_sym
raise ArgumentError, "asset doesn't have #{variant} variant" unless Variant.exists?(media_asset, variant) raise ArgumentError, "asset doesn't have #{@variant} variant" unless Variant.exists?(@media_asset, @variant)
end end
def store_file!(original_file) def store_file!(original_file)
@@ -56,7 +58,7 @@ class MediaAsset < ApplicationRecord
def convert_file(media_file) def convert_file(media_file)
case variant case variant
in :preview in :preview, :"180x180", :"360x360"
media_file.preview(width, height) media_file.preview(width, height)
in :crop in :crop
media_file.crop(width, height) media_file.crop(width, height)
@@ -74,7 +76,7 @@ class MediaAsset < ApplicationRecord
end end
def file_path(slug = "") def file_path(slug = "")
if variant.in?(%i[preview crop]) && media_asset.is_flash? if variant.in?(%i[preview crop 180x180 360x360]) && media_asset.is_flash?
"/images/download-preview.png" "/images/download-preview.png"
else else
slug = "__#{slug}__" if slug.present? slug = "__#{slug}__" if slug.present?
@@ -96,9 +98,7 @@ class MediaAsset < ApplicationRecord
# The file extension of this variant. # The file extension of this variant.
def file_ext def file_ext
case variant case variant
when :preview when :preview, :crop, :"180x180", :"360x360"
"jpg"
when :crop
"jpg" "jpg"
when :sample when :sample
media_asset.is_ugoira? ? "webm" : "jpg" media_asset.is_ugoira? ? "webm" : "jpg"
@@ -113,6 +113,10 @@ class MediaAsset < ApplicationRecord
[150, 150] [150, 150]
when :crop when :crop
[150, 150] [150, 150]
when :"180x180"
[180, 180]
when :"360x360"
[360, 360]
when :sample when :sample
[850, nil] [850, nil]
when :original when :original
@@ -143,6 +147,10 @@ class MediaAsset < ApplicationRecord
true true
when :crop when :crop
true true
when :"180x180"
true
when :"360x360"
true
when :sample when :sample
media_asset.is_ugoira? || (media_asset.is_static_image? && media_asset.image_width > Danbooru.config.large_image_width) media_asset.is_ugoira? || (media_asset.is_static_image? && media_asset.image_width > Danbooru.config.large_image_width)
when :original when :original
@@ -267,7 +275,7 @@ class MediaAsset < ApplicationRecord
end end
def variants def variants
%i[preview crop sample original].select { |v| has_variant?(v) }.map { |v| variant(v) } VARIANTS.select { |v| has_variant?(v) }.map { |v| variant(v) }
end end
end end