Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Attachment list for uncached attachments (#2110)

Browse source 
* For undownloaded attachments, set type :unknown, display them as a list in the web UI

* Fix case when attachment type is set explicitly
This commit is contained in:
Eugen 2017-04-19 15:37:18 +02:00 • committed by GitHub
parent 5ce8a1811a
commit bfbc2ca0d8
5 changed files with 99 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/models/media_attachment.rb
View file

@ -3,7 +3,7 @@
class MediaAttachment < ApplicationRecord
self.inheritance_column = nil
enum type: [:image, :gifv, :video]
enum type: [:image, :gifv, :video, :unknown]
IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
VIDEO_MIME_TYPES = ['video/webm', 'video/mp4'].freeze
@ -95,6 +95,8 @@ class MediaAttachment < ApplicationRecord
private
def set_shortcode
self.type = :unknown if file.blank? && type.blank?
return unless local?
loop do
@ -104,9 +106,10 @@ class MediaAttachment < ApplicationRecord
end
def set_type_and_extension
self.type = VIDEO_MIME_TYPES.include?(file_content_type) ? :video : :image
unless file.blank?
if file.blank?
self.type = :unknown
else
self.type = VIDEO_MIME_TYPES.include?(file_content_type) ? :video : :image
extension = Paperclip::Interpolations.content_type_extension(file, :original)
basename = Paperclip::Interpolations.basename(file, :original)
file.instance_write :file_name, [basename, extension].delete_if(&:empty?).join('.')