Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Adding media controller, 1 webm/compose form allowed, previews generated

Browse source
This commit is contained in:
Eugen Rochko 2016-09-17 17:47:26 +02:00
parent 183a23943b
commit bd5ad304ba
7 changed files with 42 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/media_attachment.rb
View file

@ -5,7 +5,7 @@ class MediaAttachment < ApplicationRecord
belongs_to :account, inverse_of: :media_attachments
belongs_to :status, inverse_of: :media_attachments
has_attached_file :file, styles: lambda { |f| f.instance.image? ? { small: '510x680>' } : { small: { format: 'webm' } } }, processors: lambda { |f| f.video? ? [:transcoder] : [:thumbnail] }
has_attached_file :file, styles: lambda { |f| f.instance.image? ? { small: '510x680>' } : { small: { convert_options: { output: { vf: 'scale="min(510\, iw):min(680\, ih)":force_original_aspect_ratio=decrease' } }, format: 'png', time: 1 } } }, processors: lambda { |f| f.video? ? [:transcoder] : [:thumbnail] }
validates_attachment_content_type :file, content_type: IMAGE_MIME_TYPES + VIDEO_MIME_TYPES
validates_attachment_size :file, less_than: 4.megabytes
@ -26,4 +26,8 @@ class MediaAttachment < ApplicationRecord
def video?
VIDEO_MIME_TYPES.include? file_content_type
end
def type
image? ? 'image' : 'video'
end
end