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

make ugoira webm+preview generation async

Browse Source
This commit is contained in:
r888888888
2014-10-17 15:41:16 -07:00
parent 5754dcb260
commit b1d5bb8272
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/logical/pixiv_ugoira_converter.rb
View File

@@ -3,6 +3,8 @@ class PixivUgoiraConverter
folder = Zip::File.new(source_path) folder = Zip::File.new(source_path)
write_webm(folder, output_path, frame_data) write_webm(folder, output_path, frame_data)
write_preview(folder, preview_path) write_preview(folder, preview_path)
RemoteFileManager.new(output_path).distribute
RemoteFileManager.new(preview_path).distribute
end end
def write_webm(folder, write_path, frame_data) def write_webm(folder, write_path, frame_data)
@@ -38,7 +40,7 @@ class PixivUgoiraConverter
ext = folder.first.name.match(/\.(\w{,4})$/)[1] ext = folder.first.name.match(/\.(\w{,4})$/)[1]
system("ffmpeg -loglevel quiet -i #{tmpdir}/images/%06d.#{ext} -codec:v libvpx -crf 4 -b:v 5000k -an #{tmpdir}/tmp.webm") system("ffmpeg -loglevel quiet -i #{tmpdir}/images/%06d.#{ext} -codec:v libvpx -crf 4 -b:v 5000k -an #{tmpdir}/tmp.webm")
system("mkvmerge -q -o #{write_path} --webm --timecodes 0:#{tmpdir}/timecodes.tc #{tmpdir}/tmp.webm") system("mkvmerge -q -o #{write_path} --webm --timecodes 0:#{tmpdir}/timecodes.tc #{tmpdir}/tmp.webm")
end end
end end
def write_preview(folder, path) def write_preview(folder, path)

6
app/logical/pixiv_ugoira_service.rb
View File

@@ -10,7 +10,11 @@ class PixivUgoiraService
end end
def generate_resizes(source_path, output_path, preview_path) def generate_resizes(source_path, output_path, preview_path)
PixivUgoiraConverter.new.convert(source_path, output_path, preview_path, @frame_data) PixivUgoiraConverter.delay(:queue => Socket.gethostname).convert(source_path, output_path, preview_path, @frame_data)
# since the resizes will be delayed, just touch the output file so the
# file distribution wont break
FileUtils.touch([output_path, preview_path])
end end
def load(data) def load(data)