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

Fix #5078: Pixiv booth upload broken.

Browse Source 
Allow image URLs from https://booth.pximg.net to be uploaded. Fix bug
where Booth.pm URLs were incorrectly caught by the Pixiv extractor.
This commit is contained in:
evazion
2022-03-30 03:22:02 -05:00
parent 04551b8154
commit a272c19b98
5 changed files with 77 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/logical/source/url.rb
View File

@@ -25,6 +25,7 @@ module Source
Source::URL::Pixiv,
Source::URL::Twitter,
Source::URL::ArtStation,
Source::URL::Booth,
Source::URL::DeviantArt,
Source::URL::Fanbox,
Source::URL::Fantia,

67
app/logical/source/url/booth.rb Normal file
View File

@@ -0,0 +1,67 @@
# frozen_string_literal: true
# Unhandled:
#
# https://booth.pximg.net/c/128x128/users/3193929/icon_image/5be9eff4-1d9e-4a79-b097-33c1cd4ad314_base_resized.jpg (profile icon)
# https://s2.booth.pm/8bb9e4e3-d171-4027-88df-84480480f79d/3d70de06-8e7c-444e-b8eb-a8a95bf20638.png (profile cover image)
module Source
class URL::Booth < Source::URL
RESERVED_SUBDOMAINS = ["www", "s", "s2", "asset", "accounts", nil]
attr_reader :work_id, :user_id, :username
def self.match?(url)
url.domain == "booth.pm" || url.host == "booth.pximg.net"
end
def parse
case [subdomain, domain, *path_segments]
# https://booth.pximg.net/8bb9e4e3-d171-4027-88df-84480480f79d/i/2864768/00cdfef0-e8d5-454b-8554-4885a7e4827d_base_resized.jpg (full)
# https://booth.pximg.net/c/300x300_a2_g5/8bb9e4e3-d171-4027-88df-84480480f79d/i/2864768/00cdfef0-e8d5-454b-8554-4885a7e4827d_base_resized.jpg (thumb)
# https://booth.pximg.net/c/72x72_a2_g5/8bb9e4e3-d171-4027-88df-84480480f79d/i/2864768/00cdfef0-e8d5-454b-8554-4885a7e4827d_base_resized.jpg (thumb)
#
# https://s2.booth.pm/b242a7bd-0747-48c4-891d-9e8552edd5d7/i/3746752/52dbee27-7ad2-4048-9c1d-827eee36625c_base_resized.jpg (sample)
# https://booth.pximg.net/b242a7bd-0747-48c4-891d-9e8552edd5d7/i/3746752/52dbee27-7ad2-4048-9c1d-827eee36625c.jpg (full)
#
# https://s.booth.pm/1c9bc77f-8ac1-4fa4-94e5-839772ab72cb/i/750997/774dc881-ce6e-45c6-871b-f6c3ca6914d5_base_resized.jpg (sample)
# https://s.booth.pm/1c9bc77f-8ac1-4fa4-94e5-839772ab72cb/i/750997/774dc881-ce6e-45c6-871b-f6c3ca6914d5.png (full)
in _, _, *, /\h{8}-\h{4}-\h{4}-\h{4}-\h{12}/i => user_uuid, "i", /^\d+$/ => work_id, file
@user_uuid = user_uuid
@work_id = work_id
@file = file
# https://booth.pm/en/items/2864768
# https://booth.pm/ja/items/2864768
in _, "booth.pm", _, "items", work_id
@work_id = work_id
# https://re-face.booth.pm/items/3435711
in username, "booth.pm", "items", work_id unless username.in?(RESERVED_SUBDOMAINS)
@username = username
@work_id = work_id
# https://re-face.booth.pm/
# https://re-face.booth.pm/items
# https://re-face.booth.pm/item_lists/m4ZTWzb8
in username, "booth.pm", *rest unless username.in?(RESERVED_SUBDOMAINS)
@username = username
else
end
end
def image_url?
url.host == "booth.pximg.net"
end
def page_url
"https://booth.pm/en/items/#{work_id}" if work_id.present?
end
def profile_url
"https://#{username}.booth.pm" if username.present?
end
end
end

2
app/logical/source/url/pixiv.rb
View File

@@ -5,7 +5,7 @@ module Source
attr_reader :work_id, :page, :username, :user_id
def self.match?(url)
return false if Source::URL::Fanbox.match?(url) || Source::URL::PixivSketch.match?(url)
return false if Source::URL::Fanbox.match?(url) || Source::URL::PixivSketch.match?(url) || Source::URL::Booth.match?(url)
url.domain.in?(%w[pximg.net pixiv.net pixiv.me pixiv.cc]) || url.host == "tc-pximg01.techorus-cdn.com"
end