diff --git a/app/logical/pixiv_ugoira_service.rb b/app/logical/pixiv_ugoira_service.rb index c83e68a4a..663ace72e 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.delay(:queue => Socket.gethostname).convert(source_path, output_path, preview_path, @frame_data) + PixivUgoiraConverter.new.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/db/migrate/20141017231608_fix_pixiv_ugoira_frame_data.rb b/db/migrate/20141017231608_fix_pixiv_ugoira_frame_data.rb new file mode 100644 index 000000000..9e6d48eba --- /dev/null +++ b/db/migrate/20141017231608_fix_pixiv_ugoira_frame_data.rb @@ -0,0 +1,9 @@ +class FixPixivUgoiraFrameData < ActiveRecord::Migration + def change + change_table :pixiv_ugoira_frame_data do |t| + t.change :data, :text, :null => false + t.change :content_type, :string, :null => false + t.remove_timestamps + end + end +end diff --git a/db/structure.sql b/db/structure.sql index 405cb4e1e..d6e07ac4c 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -2367,10 +2367,8 @@ ALTER SEQUENCE notes_id_seq OWNED BY notes.id; CREATE TABLE pixiv_ugoira_frame_data ( id integer NOT NULL, post_id integer, - data text, - content_type character varying(255), - created_at timestamp without time zone, - updated_at timestamp without time zone + data text NOT NULL, + content_type character varying(255) NOT NULL ); @@ -7119,3 +7117,5 @@ INSERT INTO schema_migrations (version) VALUES ('20140725003232'); INSERT INTO schema_migrations (version) VALUES ('20141009231234'); +INSERT INTO schema_migrations (version) VALUES ('20141017231608'); +