From e8f973601c2b446663714e66c5b08520d11f4480 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Wed, 22 Oct 2014 22:10:01 -0700 Subject: [PATCH] fixes for ugoira convert --- app/logical/pixiv_ugoira_service.rb | 2 +- app/models/upload.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/logical/pixiv_ugoira_service.rb b/app/logical/pixiv_ugoira_service.rb index 663ace72e..c83e68a4a 100644 --- a/app/logical/pixiv_ugoira_service.rb +++ b/app/logical/pixiv_ugoira_service.rb @@ -10,7 +10,7 @@ class PixivUgoiraService end def generate_resizes(source_path, output_path, preview_path) - PixivUgoiraConverter.new.delay(:queue => Socket.gethostname).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 diff --git a/app/models/upload.rb b/app/models/upload.rb index 4e97ee842..99c366da0 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -108,6 +108,7 @@ class Upload < ActiveRecord::Base end generate_resizes(file_path) move_file + save post = convert_to_post post.distribute_files if post.save @@ -148,7 +149,7 @@ class Upload < ActiveRecord::Base end def async_conversion? - is_ugoira? + has_ugoira_tag? end def ugoira_service