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

don't overwrite upload source with downloaded source

Browse Source
This commit is contained in:
Albert Yi
2018-07-26 18:19:31 -07:00
parent 77854349e5
commit 7753461f6f
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/logical/upload_service/utils.rb
View File

@@ -222,8 +222,6 @@ class UploadService
def download_for_upload(source, upload) def download_for_upload(source, upload)
file = download_from_source(source, referer_url: upload.referer_url) do |context| file = download_from_source(source, referer_url: upload.referer_url) do |context|
upload.downloaded_source = context[:downloaded_source] upload.downloaded_source = context[:downloaded_source]
puts "source: #{source} -> #{context[:source]}"
#upload.source = context[:source]
if context[:ugoira] if context[:ugoira]
upload.context = { ugoira: context[:ugoira] } upload.context = { ugoira: context[:ugoira] }

2
test/unit/artist_test.rb
View File

@@ -168,7 +168,7 @@ class ArtistTest < ActiveSupport::TestCase
should "not allow invalid urls" do should "not allow invalid urls" do
artist = FactoryBot.create(:artist, :url_string => "blah") artist = FactoryBot.create(:artist, :url_string => "blah")
assert_equal(false, artist.valid?) assert_equal(false, artist.valid?)
assert_equal(["blah must begin with http:// or https://"], artist.errors[:url]) assert_equal([" blah must begin with http:// or https://"], artist.errors[:url])
end end
should "make sure old urls are deleted" do should "make sure old urls are deleted" do