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

upload fixes

Browse Source
This commit is contained in:
albert
2011-09-15 18:47:56 -04:00
parent 45fd093761
commit eddf35556a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/logical/download.rb
View File

@@ -40,10 +40,10 @@ class Download
end end
end end
def pixiv_http_exists? def pixiv_http_exists?(url)
# example: http://img01.pixiv.net/img/as-special/15649262_big_p2.jpg # example: http://img01.pixiv.net/img/as-special/15649262_big_p2.jpg
exists = false exists = false
uri = URI.parse(source) uri = URI.parse(url)
Net::HTTP.start(uri.host, uri.port) do |http| Net::HTTP.start(uri.host, uri.port) do |http|
headers = {"Referer" => "http://www.pixiv.net", "User-Agent" => "#{Danbooru.config.app_name}/#{Danbooru.config.version}"} headers = {"Referer" => "http://www.pixiv.net", "User-Agent" => "#{Danbooru.config.app_name}/#{Danbooru.config.version}"}
http.request_head(uri.request_uri, headers) do |res| http.request_head(uri.request_uri, headers) do |res|

2
app/models/upload.rb
View File

@@ -74,7 +74,7 @@ class Upload < ActiveRecord::Base
end end
end end
rescue Exception => x rescue Exception => x
update_attribute(:status, "error: #{x.class} - #{x.message} - #{x.backtrace.join("\n")}") update_attribute(:status, "error: #{x.class} - #{x.message}")
ensure ensure
delete_temp_file delete_temp_file
end end