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

Fix bug where webm thumbnail generation could fail

Browse Source
This commit is contained in:
Toks
2014-07-15 17:19:36 -04:00
parent 4b1573bc29
commit f23fbc65cf
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/upload.rb
View File

@@ -190,8 +190,9 @@ class Upload < ActiveRecord::Base
raise Error.new("file not found") raise Error.new("file not found")
end end
output_path = resized_file_path_for(width)
if is_image? if is_image?
Danbooru.resize(source_path, resized_file_path_for(width), width, height, quality) Danbooru.resize(source_path, output_path, width, height, quality)
elsif is_video? elsif is_video?
dimension_ratio = image_width.to_f / image_height dimension_ratio = image_width.to_f / image_height
if dimension_ratio > 1 if dimension_ratio > 1
@@ -199,8 +200,8 @@ class Upload < ActiveRecord::Base
else else
width = (height * dimension_ratio).to_i width = (height * dimension_ratio).to_i
end end
video.screenshot(resized_file_path_for(width), {:seek_time => 0, :resolution => "#{width}x#{height}"}) video.screenshot(output_path, {:seek_time => 0, :resolution => "#{width}x#{height}"})
FileUtils.chmod(0664, resized_file_path_for(width)) FileUtils.chmod(0664, output_path)
end end
end end
end end