media assets: move more file-handling logic into MediaAsset.
Move more of the file-handling logic from UploadService and StorageManager into MediaAsset. This is part of refactoring posts and uploads to allow multiple images per post.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
class MediaAsset < ApplicationRecord
|
||||
has_one :media_metadata, dependent: :destroy
|
||||
delegate :metadata, to: :media_metadata
|
||||
delegate :is_animated?, :is_animated_gif?, :is_animated_png?, :is_non_repeating_animation?, :is_greyscale?, :is_rotated?, to: :metadata
|
||||
delegate :is_non_repeating_animation?, :is_greyscale?, :is_rotated?, to: :metadata
|
||||
|
||||
enum status: {
|
||||
processing: 100,
|
||||
@@ -10,25 +10,198 @@ class MediaAsset < ApplicationRecord
|
||||
expunged: 400,
|
||||
}
|
||||
|
||||
def self.search(params)
|
||||
q = search_attributes(params, :id, :created_at, :updated_at, :md5, :file_ext, :file_size, :image_width, :image_height, :media_metadata)
|
||||
class Variant
|
||||
attr_reader :media_asset, :variant
|
||||
delegate :md5, :storage_service, :backup_storage_service, to: :media_asset
|
||||
|
||||
if params[:metadata].present?
|
||||
q = q.joins(:media_metadata).merge(MediaMetadata.search(metadata: params[:metadata]))
|
||||
def initialize(media_asset, variant)
|
||||
@media_asset = media_asset
|
||||
@variant = variant
|
||||
|
||||
raise ArgumentError, "asset doesn't have #{variant} variant" unless Variant.exists?(media_asset, variant)
|
||||
end
|
||||
|
||||
q.apply_default_order(params)
|
||||
def store_file!(original_file)
|
||||
file = convert_file(original_file)
|
||||
storage_service.store(file, file_path)
|
||||
backup_storage_service.store(file, file_path)
|
||||
end
|
||||
|
||||
def delete_file!
|
||||
storage_service.delete(file_path)
|
||||
backup_storage_service.delete(file_path)
|
||||
end
|
||||
|
||||
def open_file
|
||||
storage_service.open(file_path)
|
||||
end
|
||||
|
||||
def convert_file(media_file)
|
||||
case variant
|
||||
in :preview
|
||||
media_file.preview(Danbooru.config.small_image_width, Danbooru.config.small_image_width)
|
||||
in :crop
|
||||
media_file.crop(Danbooru.config.small_image_width, Danbooru.config.small_image_width)
|
||||
in :sample if media_asset.is_ugoira?
|
||||
media_file.convert
|
||||
in :sample if media_asset.is_static_image? && media_asset.image_width > Danbooru.config.large_image_width
|
||||
media_file.preview(Danbooru.config.large_image_width, media_asset.image_height)
|
||||
in :original
|
||||
media_file
|
||||
end
|
||||
end
|
||||
|
||||
def file_url(slug = "")
|
||||
storage_service.file_url(file_path(slug))
|
||||
end
|
||||
|
||||
def file_path(slug = "")
|
||||
if variant.in?(%i[preview crop]) && media_asset.is_flash?
|
||||
"/images/download-preview.png"
|
||||
else
|
||||
slug = "__#{slug}__" if slug.present?
|
||||
"/#{variant}/#{md5[0..1]}/#{md5[2..3]}/#{slug}#{file_name}"
|
||||
end
|
||||
end
|
||||
|
||||
# The file name of this variant.
|
||||
def file_name
|
||||
case variant
|
||||
when :sample
|
||||
"sample-#{md5}.#{file_ext}"
|
||||
else
|
||||
"#{md5}.#{file_ext}"
|
||||
end
|
||||
end
|
||||
|
||||
# The file extension of this variant.
|
||||
def file_ext
|
||||
case variant
|
||||
when :preview
|
||||
"jpg"
|
||||
when :crop
|
||||
"jpg"
|
||||
when :sample
|
||||
media_asset.is_ugoira? ? "webm" : "jpg"
|
||||
when :original
|
||||
media_asset.file_ext
|
||||
end
|
||||
end
|
||||
|
||||
def self.exists?(media_asset, variant)
|
||||
case variant
|
||||
when :preview
|
||||
true
|
||||
when :crop
|
||||
true
|
||||
when :sample
|
||||
media_asset.is_ugoira? || (media_asset.is_static_image? && media_asset.image_width > Danbooru.config.large_image_width)
|
||||
when :original
|
||||
true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def file=(file_or_path)
|
||||
media_file = file_or_path.is_a?(MediaFile) ? file_or_path : MediaFile.open(file_or_path)
|
||||
concerning :SearchMethods do
|
||||
class_methods do
|
||||
def search(params)
|
||||
q = search_attributes(params, :id, :created_at, :updated_at, :md5, :file_ext, :file_size, :image_width, :image_height)
|
||||
|
||||
self.md5 = media_file.md5
|
||||
self.file_ext = media_file.file_ext
|
||||
self.file_size = media_file.file_size
|
||||
self.image_width = media_file.width
|
||||
self.image_height = media_file.height
|
||||
self.duration = media_file.duration
|
||||
self.media_metadata = MediaMetadata.new(file: media_file)
|
||||
if params[:metadata].present?
|
||||
q = q.joins(:media_metadata).merge(MediaMetadata.search(metadata: params[:metadata]))
|
||||
end
|
||||
|
||||
q.apply_default_order(params)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
concerning :FileMethods do
|
||||
class_methods do
|
||||
def upload!(media_file)
|
||||
media_asset = create!(file: media_file, status: :processing)
|
||||
media_asset.distribute_files!(media_file)
|
||||
media_asset.update!(status: :active)
|
||||
media_asset
|
||||
end
|
||||
end
|
||||
|
||||
def file=(file_or_path)
|
||||
media_file = file_or_path.is_a?(MediaFile) ? file_or_path : MediaFile.open(file_or_path)
|
||||
|
||||
self.md5 = media_file.md5
|
||||
self.file_ext = media_file.file_ext
|
||||
self.file_size = media_file.file_size
|
||||
self.image_width = media_file.width
|
||||
self.image_height = media_file.height
|
||||
self.duration = media_file.duration
|
||||
self.media_metadata = MediaMetadata.new(file: media_file)
|
||||
end
|
||||
|
||||
def delete_files!
|
||||
variants.each(&:delete_file!)
|
||||
end
|
||||
|
||||
def distribute_files!(media_file)
|
||||
variants.each do |variant|
|
||||
variant.store_file!(media_file)
|
||||
end
|
||||
end
|
||||
|
||||
def storage_service
|
||||
Danbooru.config.storage_manager
|
||||
end
|
||||
|
||||
def backup_storage_service
|
||||
Danbooru.config.backup_storage_manager
|
||||
end
|
||||
end
|
||||
|
||||
concerning :VariantMethods do
|
||||
def variant(type)
|
||||
Variant.new(self, type)
|
||||
end
|
||||
|
||||
def has_variant?(variant)
|
||||
Variant.exists?(self, variant)
|
||||
end
|
||||
|
||||
def variants
|
||||
%i[preview crop sample original].select { |v| has_variant?(v) }.map { |v| variant(v) }
|
||||
end
|
||||
end
|
||||
|
||||
concerning :FileTypeMethods do
|
||||
def is_image?
|
||||
file_ext.in?(%w[jpg png gif])
|
||||
end
|
||||
|
||||
def is_static_image?
|
||||
is_image? && !is_animated?
|
||||
end
|
||||
|
||||
def is_video?
|
||||
file_ext.in?(%w[webm mp4])
|
||||
end
|
||||
|
||||
def is_ugoira?
|
||||
file_ext == "zip"
|
||||
end
|
||||
|
||||
def is_flash?
|
||||
file_ext == "swf"
|
||||
end
|
||||
|
||||
def is_animated?
|
||||
duration.present?
|
||||
end
|
||||
|
||||
def is_animated_gif?
|
||||
is_animated? && file_ext == "gif"
|
||||
end
|
||||
|
||||
def is_animated_png?
|
||||
is_animated? && file_ext == "png"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1194,7 +1194,7 @@ class Post < ApplicationRecord
|
||||
ModAction.log("<@#{user.name}> regenerated IQDB for post ##{id}", :post_regenerate_iqdb, user)
|
||||
else
|
||||
media_file = MediaFile.open(file, frame_data: pixiv_ugoira_frame_data&.data.to_a)
|
||||
UploadService::Utils.process_resizes(self, nil, id, media_file: media_file)
|
||||
media_asset.distribute_files!(media_file)
|
||||
|
||||
update!(
|
||||
image_width: media_file.width,
|
||||
|
||||
@@ -116,13 +116,8 @@ class Upload < ApplicationRecord
|
||||
end
|
||||
|
||||
media_asset&.destroy!
|
||||
media_asset&.delete_files!
|
||||
DanbooruLogger.info("Uploads: Deleting files for upload md5=#{md5}")
|
||||
Danbooru.config.storage_manager.delete_file(nil, md5, file_ext, :original)
|
||||
Danbooru.config.storage_manager.delete_file(nil, md5, file_ext, :large)
|
||||
Danbooru.config.storage_manager.delete_file(nil, md5, file_ext, :preview)
|
||||
Danbooru.config.backup_storage_manager.delete_file(nil, md5, file_ext, :original)
|
||||
Danbooru.config.backup_storage_manager.delete_file(nil, md5, file_ext, :large)
|
||||
Danbooru.config.backup_storage_manager.delete_file(nil, md5, file_ext, :preview)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user