diff --git a/app/services/asciicast_image_generator.rb b/app/services/asciicast_image_generator.rb index 8168a9e..49d93f5 100644 --- a/app/services/asciicast_image_generator.rb +++ b/app/services/asciicast_image_generator.rb @@ -11,7 +11,7 @@ class AsciicastImageGenerator def generate(asciicast) Dir.mktmpdir do |dir| - asciicast_url = asciicast.file.absolute_url + asciicast_url = asciicast.data.absolute_url image_path = "#{dir}/#{asciicast.image_filename}" time = asciicast.snapshot_at || asciicast.duration / 2 theme = AsciicastDecorator.new(asciicast).theme_name diff --git a/app/uploaders/asciicast_uploader.rb b/app/uploaders/asciicast_uploader.rb index def3fc3..c72f08a 100644 --- a/app/uploaders/asciicast_uploader.rb +++ b/app/uploaders/asciicast_uploader.rb @@ -1,11 +1,2 @@ class AsciicastUploader < BaseUploader - - def absolute_url - if CFG.carrierwave_storage == 'file' - path - else - url - end - end - end diff --git a/app/uploaders/base_uploader.rb b/app/uploaders/base_uploader.rb index bb5e5b8..93c6cd3 100644 --- a/app/uploaders/base_uploader.rb +++ b/app/uploaders/base_uploader.rb @@ -50,4 +50,12 @@ class BaseUploader < CarrierWave::Uploader::Base # "something.jpg" if original_filename # end + def absolute_url + if CFG.carrierwave_storage == 'file' + path + else + url + end + end + end