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

nijie: normalize all thumbnail urls (#3919).

Browse Source
This commit is contained in:
evazion
2018-09-23 18:45:08 -05:00
parent d294514dc0
commit 5525bbe1ca
3 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/logical/sources/strategies/nijie.rb
View File

@@ -125,7 +125,7 @@ module Sources
end end
def normalize_thumbnails(x) def normalize_thumbnails(x)
x.gsub(%r!__rs_l120x120/!i, "") x.gsub(%r!__rs_\w+/!i, "")
end end
def illust_id def illust_id

22
test/unit/downloads/nijie_test.rb
View File

@@ -1,22 +0,0 @@
require "test_helper"
module Downloads
class NijieTest < ActiveSupport::TestCase
context "downloading a 'http://nijie.info/view.php?id=:id' url" do
should "download the original file" do
@source = "http://nijie.info/view.php?id=213043"
@rewrite = "https://pic03.nijie.info/nijie_picture/728995_20170505014820_0.jpg"
assert_rewritten(@rewrite, @source)
assert_downloaded(132_555, @source)
end
end
context "downloading a 'https://pic*.nijie.info/nijie_picture/:id.jpg' url" do
should "download the original file" do
@source = "https://pic03.nijie.info/nijie_picture/728995_20170505014820_0.jpg"
assert_not_rewritten(@source)
assert_downloaded(132_555, @source)
end
end
end
end

31
test/unit/sources/nijie_test.rb
View File

@@ -2,6 +2,37 @@ require 'test_helper'
module Sources module Sources
class NijieTest < ActiveSupport::TestCase class NijieTest < ActiveSupport::TestCase
context "downloading a 'http://nijie.info/view.php?id=:id' url" do
should "download the original file" do
@source = "http://nijie.info/view.php?id=213043"
@rewrite = "https://pic03.nijie.info/nijie_picture/728995_20170505014820_0.jpg"
assert_rewritten(@rewrite, @source)
assert_downloaded(132_555, @source)
end
end
context "downloading a 'https://pic*.nijie.info/nijie_picture/:id.jpg' url" do
should "download the original file" do
@source = "https://pic03.nijie.info/nijie_picture/728995_20170505014820_0.jpg"
assert_not_rewritten(@source)
assert_downloaded(132_555, @source)
end
end
context "downloading a 'https://pic*.nijie.info/__rs_*/nijie_picture/:id.jpg' preview url" do
should "download the original file" do
assert_rewritten(
"https://pic01.nijie.info/nijie_picture/diff/main/218856_0_236014_20170620101329.png",
"https://pic01.nijie.info/__rs_l120x120/nijie_picture/diff/main/218856_0_236014_20170620101329.png"
)
assert_rewritten(
"https://pic03.nijie.info/nijie_picture/236014_20170620101426_0.png",
"https://pic03.nijie.info/__rs_cns350x350/nijie_picture/236014_20170620101426_0.png"
)
end
end
context "The source site for a nijie page" do context "The source site for a nijie page" do
setup do setup do
CurrentUser.user = FactoryBot.create(:user) CurrentUser.user = FactoryBot.create(:user)