diff --git a/app/logical/download.rb b/app/logical/download.rb index 5f59d938f..a4bb4b474 100644 --- a/app/logical/download.rb +++ b/app/logical/download.rb @@ -40,10 +40,10 @@ class Download end end - def pixiv_http_exists? + def pixiv_http_exists?(url) # example: http://img01.pixiv.net/img/as-special/15649262_big_p2.jpg exists = false - uri = URI.parse(source) + uri = URI.parse(url) Net::HTTP.start(uri.host, uri.port) do |http| headers = {"Referer" => "http://www.pixiv.net", "User-Agent" => "#{Danbooru.config.app_name}/#{Danbooru.config.version}"} http.request_head(uri.request_uri, headers) do |res| diff --git a/app/models/upload.rb b/app/models/upload.rb index 47bffa5bd..5dd90a33d 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -74,7 +74,7 @@ class Upload < ActiveRecord::Base end end rescue Exception => x - update_attribute(:status, "error: #{x.class} - #{x.message} - #{x.backtrace.join("\n")}") + update_attribute(:status, "error: #{x.class} - #{x.message}") ensure delete_temp_file end